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

diff --git a/debian/rules b/debian/rules
index d9c6418..ade1b18 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@
 
 export SHELL=/bin/bash
 
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
 
 PACKAGE := ion3
 PACKAGE_DEV := $(PACKAGE)-dev
@@ -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
@@ -168,5 +169,10 @@ binary-arch: build-arch install-arch
 	dh_builddeb -a
 
 binary: binary-indep binary-arch
+
+get-orig-source:
+	chmod +x debian/get-orig-source
+	debian/get-orig-source
+
 .PHONY: build-indep build-arch build clean binary-indep binary-arch binary \
-	install-indep install-arch unpatch
+	install-indep install-arch unpatch get-orig-source