diff options
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | debian/patches/install-dir.patch | 10 | ||||
| -rw-r--r-- | debian/patches/no-missing-messages.patch | 4 | ||||
| -rw-r--r-- | debian/patches/non-static-open-axiom-binary.patch | 4 | ||||
| -rwxr-xr-x | debian/rules | 7 |
6 files changed, 17 insertions, 14 deletions
diff --git a/debian/changelog b/debian/changelog index 3a75674..023cffa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ -open-axiom (1.5.0~svn2797-1) UNRELEASED; urgency=low +open-axiom (1.5.0~svn2823-1) UNRELEASED; urgency=low * New upstream version. + * Use xz compression for both source tarball and packages + * Require g++ >= 4.7 for C++11 + * Refreshed patches -- Igor Pashev <pashev.igor@gmail.com> Wed, 03 Apr 2013 16:56:48 +0400 diff --git a/debian/control b/debian/control index 2289c99..0c17ba6 100644 --- a/debian/control +++ b/debian/control @@ -11,6 +11,7 @@ Build-Depends: libgmp-dev [!i386 !amd64 !kfreebsd-amd64], libxpm-dev, libxt-dev, + g++ (>= 4.7), help2man, Standards-Version: 3.9.3 Vcs-Git: http://git.debian.org/git/pkg-open-axiom/pkg-open-axiom.git diff --git a/debian/patches/install-dir.patch b/debian/patches/install-dir.patch index 4547f11..3e0c4c4 100644 --- a/debian/patches/install-dir.patch +++ b/debian/patches/install-dir.patch @@ -1,8 +1,8 @@ Index: b/configure =================================================================== ---- a/configure 2013-04-03 19:12:46.000000000 +0400 -+++ b/configure 2013-04-03 19:12:52.000000000 +0400 -@@ -3566,7 +3566,7 @@ +--- a/configure 2013-05-09 20:02:38.000000000 +0400 ++++ b/configure 2013-05-09 20:02:42.000000000 +0400 +@@ -3617,7 +3617,7 @@ @@ -13,8 +13,8 @@ Index: b/configure if test $build != $target; then Index: b/configure.ac =================================================================== ---- a/configure.ac 2013-04-03 19:12:46.000000000 +0400 -+++ b/configure.ac 2013-04-03 19:12:52.000000000 +0400 +--- a/configure.ac 2013-05-09 20:02:38.000000000 +0400 ++++ b/configure.ac 2013-05-09 20:02:42.000000000 +0400 @@ -54,7 +54,7 @@ AC_CONFIG_SRCDIR(src/Makefile.in) diff --git a/debian/patches/no-missing-messages.patch b/debian/patches/no-missing-messages.patch index f2d761a..1cbddae 100644 --- a/debian/patches/no-missing-messages.patch +++ b/debian/patches/no-missing-messages.patch @@ -1,7 +1,7 @@ Index: b/src/sman/sman.c =================================================================== ---- a/src/sman/sman.c 2013-04-03 19:12:46.000000000 +0400 -+++ b/src/sman/sman.c 2013-04-03 19:12:53.000000000 +0400 +--- a/src/sman/sman.c 2013-05-09 20:02:37.000000000 +0400 ++++ b/src/sman/sman.c 2013-05-09 20:02:43.000000000 +0400 @@ -450,7 +450,6 @@ const char* command = oa_concatenate_string(root_dir,HypertexProgram); diff --git a/debian/patches/non-static-open-axiom-binary.patch b/debian/patches/non-static-open-axiom-binary.patch index b3a7a20..c42595e 100644 --- a/debian/patches/non-static-open-axiom-binary.patch +++ b/debian/patches/non-static-open-axiom-binary.patch @@ -1,7 +1,7 @@ Index: b/src/driver/Makefile.in =================================================================== ---- a/src/driver/Makefile.in 2013-04-03 19:12:46.000000000 +0400 -+++ b/src/driver/Makefile.in 2013-04-03 19:12:53.000000000 +0400 +--- a/src/driver/Makefile.in 2013-05-09 20:02:37.000000000 +0400 ++++ b/src/driver/Makefile.in 2013-05-09 20:02:43.000000000 +0400 @@ -70,7 +70,7 @@ main.lo: open-axiom.h diff --git a/debian/rules b/debian/rules index dd7ee48..a0f165f 100755 --- a/debian/rules +++ b/debian/rules @@ -22,15 +22,14 @@ PACKAGE := open-axiom SVN_REPO := svn://svn.code.sf.net/p/open-axiom/code/trunk SRC_VERSION := $(shell dpkg-parsechangelog | awk '/^Version:/ {sub(/-[^-]*/, "", $$2); print $$2}') SVN_REVISION := $(shell echo $(SRC_VERSION) | sed -r 's,.+svn([0-9]+),\1,') -TARBALL := $(PACKAGE)_$(SRC_VERSION).orig.tar.gz +TARBALL := $(PACKAGE)_$(SRC_VERSION).orig.tar.xz .PHONY: get-orig-source get-orig-source: rm -rf get-orig-source $(TARBALL) mkdir get-orig-source svn export -r $(SVN_REVISION) $(SVN_REPO) \ get-orig-source/$(PACKAGE)-$(SRC_VERSION) - GZIP='--best --no-name' \ - tar czf $(TARBALL) -C get-orig-source \ + tar cJf $(TARBALL) -C get-orig-source \ $(PACKAGE)-$(SRC_VERSION) @rm -rf get-orig-source @echo " "$(TARBALL)" created; move it to the right destination to build the package" @@ -110,7 +109,7 @@ endif dh_shlibdeps dh_gencontrol dh_md5sums - dh_builddeb + dh_builddeb -- -Zxz clean: dh_testdir |