summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-09-10 20:31:03 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-09-10 20:32:20 +0000
commit8ea8e605d2b475aca3b81d8ef5402e50f49cb99c (patch)
treec416884d91a0f51ec799905f40d136e2ae00f37b
parentMerging upstream version 0.14.0. (diff)
downloadlibixion-8ea8e605d2b475aca3b81d8ef5402e50f49cb99c.zip
libixion-8ea8e605d2b475aca3b81d8ef5402e50f49cb99c.tar.xz
Merging debian version 0.14.0-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog8
-rw-r--r--debian/control6
-rw-r--r--debian/libixion-0.13-0.install1
-rw-r--r--debian/libixion-0.14-0.install1
-rw-r--r--debian/tests/control7
-rwxr-xr-xdebian/tests/unit9
-rw-r--r--debian/watch6
7 files changed, 15 insertions, 23 deletions
diff --git a/debian/changelog b/debian/changelog
index 61135c2..73c9cb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libixion (0.14.0-1) experimental; urgency=medium
+
+ * New upstream version 0.14.0
+ * rename libixion-0.13-0 to libixion-0.14-0 and
+ bump (build-)depends on mdds to >= 1.4
+
+ -- Rene Engelhard <rene@debian.org> Mon, 27 Aug 2018 10:36:33 +0200
+
libixion (0.13.0-3~dschinn1) dschinn-backports; urgency=medium
* Uploading to dschinn-backports, remaining changes:
diff --git a/debian/control b/debian/control
index 7060a0d..f8dbcf6 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ XSBC-Uploaders: Daniel Baumann <daniel.baumann@progress-linux.org>
XSBC-Original-Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
XSBC-Original-Uploaders: Rene Engelhard <rene@debian.org>
Bugs: mailto:maintainers@lists.progress-linux.org
-Build-Depends: debhelper (>= 9), zlib1g-dev, python3, dh-autoreconf, pkg-config, libboost-system-dev, dpkg-dev (>= 1.16.1), libboost-thread-dev, libboost-program-options-dev, libmdds-dev (>= 1.2), python3-dev, dh-python, sphinx-common
+Build-Depends: debhelper (>= 9), zlib1g-dev, python3, dh-autoreconf, pkg-config, libboost-system-dev, dpkg-dev (>= 1.16.1), libboost-thread-dev, libboost-program-options-dev, libmdds-dev (>= 1.4), python3-dev, dh-python, sphinx-common
Build-Depends-Indep: doxygen, python3-sphinx, python3-sphinx-bootstrap-theme, python3-breathe
Build-Conflicts: python-sphinx
Standards-Version: 3.9.3
@@ -18,7 +18,7 @@ Package: libixion-dev
Section: libdevel
Architecture: any
Multi-Arch: same
-Depends: libixion-0.13-0 (= ${binary:Version}), ${misc:Depends}, libmdds-dev (>= 1.2)
+Depends: libixion-0.14-0 (= ${binary:Version}), ${misc:Depends}, libmdds-dev (>= 1.4)
Description: general purpose formula parser & interpreter library -- development
Ixion is a general purpose formula parser & interpreter that can calculate
multiple named targets, or “cells”.
@@ -26,7 +26,7 @@ Description: general purpose formula parser & interpreter library -- development
This package contains headers, pkg-config file and static library for
developing applications using Ixion.
-Package: libixion-0.13-0
+Package: libixion-0.14-0
Section: libs
Architecture: any
Multi-Arch: same
diff --git a/debian/libixion-0.13-0.install b/debian/libixion-0.13-0.install
deleted file mode 100644
index 725f613..0000000
--- a/debian/libixion-0.13-0.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libixion*-0.13.so.*
diff --git a/debian/libixion-0.14-0.install b/debian/libixion-0.14-0.install
new file mode 100644
index 0000000..e3d1a99
--- /dev/null
+++ b/debian/libixion-0.14-0.install
@@ -0,0 +1 @@
+usr/lib/*/libixion*-0.14.so.*
diff --git a/debian/tests/control b/debian/tests/control
deleted file mode 100644
index 1d9acdc..0000000
--- a/debian/tests/control
+++ /dev/null
@@ -1,7 +0,0 @@
-Test-Command: set -e ; cd "$AUTOPKGTEST_TMP" ; python3 -c "import ixion; print(ixion)"
-Depends: python3, python3-ixion
-
-Tests: unit
-Depends: @builddeps@, libixion-0.13-0, python3-ixion
-Restrictions: build-needed, rw-build-tree
-
diff --git a/debian/tests/unit b/debian/tests/unit
deleted file mode 100755
index c234ea1..0000000
--- a/debian/tests/unit
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# remove locally built libixion so that we actually test the system one
-find . -name "*0.13.so*" -exec rm {} \;
-if [ -d ./src/python/.libs ]; then
- rm -rf ./src/python/.libs
-fi
-
-make check
diff --git a/debian/watch b/debian/watch
index fb9574c..f9d6453 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
-version=4
-opts=downloadurlmangle=s|gitlab.com/ixion/ixion/repository/(@ANY_VERSION@)/archive.tar.gz|kohei.us/files/ixion/src/@PACKAGE@-$1.tar.xz|,repack,compression=xz \
-http://gitlab.com/ixion/ixion/tags .*/@ANY_VERSION@/archive\.tar\.gz
+version=2
+opts=filenamemangle=s/.*\.tar\.gz\?ref=v?(\d\S*)/ixion-$1\.tar\.gz/g \
+ https://gitlab.com/ixion/ixion/tags .*archive\.tar\.gz\?ref=v?(\d\S*)