X-Git-Url: https://git.decadent.org.uk/gitweb/?p=ion3.git;a=blobdiff_plain;f=debian%2Frules;h=deb88ee784e6b4727cf286c2efe66d219096d885;hp=d9c6418426927930b67197327d24d11dcc2eef57;hb=f14d31a661edfbb631dc1f1eea33f6e0155b818b;hpb=e502d618769591cd5c8c0180b2b4399002988646

diff --git a/debian/rules b/debian/rules
index d9c6418..deb88ee 100755
--- 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