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

diff --git a/debian/rules b/debian/rules
index d9c6418..f7ed172 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,15 +5,16 @@
 
 export SHELL=/bin/bash
 
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
 
-PACKAGE := ion3
+PACKAGE := $(shell dpkg-parsechangelog | sed -r 's/^Source: //; t; d')
 PACKAGE_DEV := $(PACKAGE)-dev
 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
@@ -85,7 +86,7 @@ binary-indep: build-indep install-indep
 
 # automatically keep track of api version
 	echo Ion:ApiVersion=$$((cat version.h; echo ION_API_VERSION) \
-		| cpp -P | tail -1 | sed 's/"//g') >>debian/ion3-dev.substvars
+		| cpp -P | tail -1 | sed 's/"//g') >>debian/$(PACKAGE_DEV).substvars
 
 	dh_installchangelogs -i
 	dh_installdocs -i
@@ -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
@@ -128,19 +129,17 @@ binary-arch: build-arch install-arch
 
 # automatically keep track of api version
 	echo Ion:ApiVersion=$$((cat version.h; echo ION_API_VERSION) \
-		| cpp -P | tail -1 | sed 's/"//g') >>debian/ion3.substvars
+		| cpp -P | tail -1 | sed 's/"//g') >>debian/$(PACKAGE).substvars
 
 	dh_installchangelogs -a
 	dh_installdocs -a
-	rm -f $(INSTDIR)/usr/share/doc/ion3/LICENSE
-	mv $(INSTDIR)/usr/share/doc/ion3/ChangeLog $(INSTDIR)/usr/share/doc/ion3/changelog
+	rm -f $(INSTDIR)/usr/share/doc/$(PACKAGE)/LICENSE
+	mv $(INSTDIR)/usr/share/doc/$(PACKAGE)/ChangeLog $(INSTDIR)/usr/share/doc/$(PACKAGE)/changelog
 #	dh_installexamples -a
 #	dh_install -a
 	dh_installmenu -a
-	install -m644 debian/ion3.menu-method.i18n \
-		$(INSTDIR)/etc/menu-methods/ion3-i18n
-
-	cat $(CURDIR)/debian/patches/extra/debian-menu.cfg >> $(INSTDIR)/etc/X11/ion3/cfg_ioncore.lua
+	install -m644 debian/$(PACKAGE).menu-method.i18n \
+		$(INSTDIR)/etc/menu-methods/$(PACKAGE)-i18n
 
 	dh_installdebconf -a
 #	dh_installlogrotate -a
@@ -153,20 +152,25 @@ binary-arch: build-arch install-arch
 #	dh_undocumented -a
 #	dh_installman -a
 	dh_link -a
-#	dh_strip -a
+	dh_strip -a
 	dh_compress -a -X.lua
 	dh_fixperms -a
 #	dh_perl -a
 #	dh_python -a
 #	dh_makeshlibs -a
 	dh_installdeb -a
-	sed -i 's/^UPSTREAM_VERSION=/UPSTREAM_VERSION=$(UPSTREAM_VERSION)/' \
-		debian/ion3/DEBIAN/postinst
+	sed -i 's/^DEBIAN_VERSION=/&$(DEBIAN_VERSION)/; s/^UPSTREAM_VERSION=/&$(UPSTREAM_VERSION)/' \
+		$(INSTDIR)/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