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

diff --git a/debian/rules b/debian/rules
index 0138c10..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,6 +13,8 @@ PACKAGE_DOC := $(PACKAGE)-doc
 INSTDIR := debian/$(PACKAGE)
 INSTDIR_DEV := debian/$(PACKAGE_DEV)
 INSTDIR_DOC := debian/$(PACKAGE_DOC)
+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
@@ -86,9 +88,6 @@ binary-indep: build-indep install-indep
 	echo Ion:ApiVersion=$$((cat version.h; echo ION_API_VERSION) \
 		| cpp -P | tail -1 | sed 's/"//g') >>debian/ion3-dev.substvars
 
-	dh_link -p$(PACKAGE_DEV) usr/share/doc/$(PACKAGE) \
-		usr/share/doc/$(PACKAGE_DEV)
-
 	dh_installchangelogs -i
 	dh_installdocs -i
 # remove empty images and TeX droppings
@@ -111,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
@@ -144,7 +143,7 @@ binary-arch: build-arch install-arch
 
 	cat $(CURDIR)/debian/patches/extra/debian-menu.cfg >> $(INSTDIR)/etc/X11/ion3/cfg_ioncore.lua
 
-#	dh_installdebconf	 -a
+	dh_installdebconf -a
 #	dh_installlogrotate -a
 #	dh_installemacsen -a
 #	dh_installpam -a
@@ -162,11 +161,18 @@ binary-arch: build-arch install-arch
 #	dh_python -a
 #	dh_makeshlibs -a
 	dh_installdeb -a
+	sed -i 's/^DEBIAN_VERSION=/&$(DEBIAN_VERSION)/; s/^UPSTREAM_VERSION=/&$(UPSTREAM_VERSION)/' \
+		debian/ion3/DEBIAN/postinst
 	dh_shlibdeps -a
 	dh_gencontrol -a
 	dh_md5sums -a
 	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