Applied upstream version check to upgrades as well. I wrongly remembered that this...

Uncommented the dh_link -i command so that ion3-dev.links will be processed, replacing the removed invocation that created the doc link as well.

diff --git a/debian/changelog b/debian/changelog
index 4c0fff77c42860d0125090f33606512a70caad92..8f441cca302ebdc62a3de80409b543e68b38bdd6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ion3 (20070506-2) unstable; urgency=low
+
+  * Applied upstream version check to upgrades as well as first
+    installation
+  * Restored links in ion3-dev - closes: #425287
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Sun, 20 May 2007 19:45:37 +0100
+
 ion3 (20070506-1) unstable; urgency=low
 
   * Per Olofsson retired as co-maintainer

diff --git a/debian/ion3.postinst b/debian/ion3.postinst
index 30850138ae4bbd45d87d3f1b49092e572e2932ae..f8e8fd92d20d02d1d7bdbf2c6819b51d2fa61391 100644 (file)
--- a/debian/ion3.postinst
+++ b/debian/ion3.postinst
@@ -3,9 +3,11 @@ set -e
 . /usr/share/debconf/confmodule
 
 UPSTREAM_VERSION=
+DEBIAN_VERSION=
 
-if [ "$1" = configure -a "$2" = "" ]; then
-    # Installing for the first time (or after a purge).
+if [ "$1" = configure ] \
+    && dpkg --compare-versions "$2" lt "$DEBIAN_VERSION"; then
+    # Installing for the first time or upgrading.
     # To comply with the Ion trademark licence terms, we must ensure
     # that this version is up-to-date or that the user acknowledges
     # it is not.  I freely admit that this is a horrible abuse of

diff --git a/debian/rules b/debian/rules
index d9c6418426927930b67197327d24d11dcc2eef57..deb88ee784e6b4727cf286c2efe66d219096d885 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,8 @@ PACKAGE_DOC := $(PACKAGE)-doc
 INSTDIR := debian/$(PACKAGE)
 INSTDIR_DEV := debian/$(PACKAGE_DEV)
 INSTDIR_DOC := debian/$(PACKAGE_DOC)
-UPSTREAM_VERSION := $(shell dpkg-parsechangelog | sed -r 's/^Version: ([0-9]*:)?(.*)-[^-]*$$/\2/; t; d')
+DEBIAN_VERSION := $(shell dpkg-parsechangelog | sed -r 's/^Version: //; t; d')
+UPSTREAM_VERSION := $(shell echo $(DEBIAN_VERSION) | sed -r 's/^[0-9]*://; s/-[^-]*$$//')
 
 doc-orig:
        cp -R doc doc-orig
@@ -109,7 +110,7 @@ binary-indep: build-indep install-indep
 #      dh_installinfo -i
 #      dh_undocumented -i
 #      dh_installman -i
-#      dh_link -i
+       dh_link -i
 #      dh_strip -i
        dh_compress -i
        dh_fixperms -i
@@ -160,7 +161,7 @@ binary-arch: build-arch install-arch
 #      dh_python -a
 #      dh_makeshlibs -a
        dh_installdeb -a
-       sed -i 's/^UPSTREAM_VERSION=/UPSTREAM_VERSION=$(UPSTREAM_VERSION)/' \
+       sed -i 's/^DEBIAN_VERSION=/&$(DEBIAN_VERSION)/; s/^UPSTREAM_VERSION=/&$(UPSTREAM_VERSION)/' \
                debian/ion3/DEBIAN/postinst
        dh_shlibdeps -a
        dh_gencontrol -a