X-Git-Url: https://git.decadent.org.uk/gitweb/?p=ion3.git;a=blobdiff_plain;f=debian%2Frules;h=3f7357336282a23215e555f29930d8785fb0b3d7;hp=99c822ce18909bf84a7d59443cfb8add5d872366;hb=c5d5f5924f1cc7b0aedc7bfbea8bbe1850d394af;hpb=7aea783be1d1de3555cfd377997a6ff7151e9112

diff --git a/debian/rules b/debian/rules
index 99c822c..3f73573 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,31 +5,25 @@
 
 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)
 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
-
 build-indep: build-indep-stamp
-build-indep-stamp: doc-orig patch
+build-indep-stamp: patch
 	dh_testdir
 
 	cd libextl && $(MAKE) libextl-mkexports
-	#cd doc && $(MAKE) all all-pdf
 
 	touch build-indep-stamp
 
 build-arch: build-arch-stamp
-build-arch-stamp: doc-orig patch
+build-arch-stamp: patch
 	dh_testdir
 
 	$(MAKE)
@@ -45,11 +39,6 @@ clean: unpatch
 
 	$(MAKE) realclean
 
-	if [ -d doc-orig ]; then \
-		rm -rf doc; \
-		mv doc-orig doc; \
-	fi
-
 	dh_clean
 
 install-indep: build-indep
@@ -60,7 +49,7 @@ install-indep: build-indep
 	dh_install -i
 
 # install headers
-	find . \( -name debian -o -name config.h -o -name snprintf.h \) \
+	find . \( -name debian -o -name .pc -o -name config.h -o -name snprintf.h \) \
 		-prune -o -name '*.h' -exec install -m644 -D {} \
 		$(INSTDIR_DEV)/usr/include/$(PACKAGE)/{} \;
 
@@ -72,13 +61,13 @@ install-arch: build-arch
 
 	$(MAKE) install \
 		PREFIX=$(CURDIR)/$(INSTDIR)/usr \
-		ETCDIR=$(CURDIR)/$(INSTDIR)/etc/X11/$(PACKAGE)
+		ETCDIR=$(CURDIR)/$(INSTDIR)/etc/X11/ion3
 
 # install other things (mainly -dev)
 	dh_install -a
 
 # fix the installation
-	rm -f $(INSTDIR)/etc/X11/$(PACKAGE)/draw.lua
+	rm -f $(INSTDIR)/etc/X11/ion3/draw.lua
 
 binary-indep: build-indep install-indep
 	dh_testdir
@@ -86,16 +75,10 @@ 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
-# remove empty images and TeX droppings
-	find $(INSTDIR_DOC)/usr/share/doc/$(PACKAGE_DOC) \
-		-name '*.png' -size 0 \
-		-o -name '*.aux' -o -name '*.idx' -o -name '*.log' \
-		-o -name '*.out' -o -name '*.pl' -o -name WARNINGS \
-		| xargs rm --
 
 #	dh_installexamples -i
 #	dh_install -i
@@ -114,6 +97,7 @@ binary-indep: build-indep install-indep
 #	dh_strip -i
 	dh_compress -i
 	dh_fixperms -i
+	chmod 755 $(INSTDIR_DEV)/usr/lib/ion3/libextl/libextl-mkexports
 #	dh_perl -i
 #	dh_python -i
 #	dh_makeshlibs -i
@@ -129,19 +113,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
@@ -154,7 +136,7 @@ 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
@@ -162,7 +144,7 @@ binary-arch: build-arch install-arch
 #	dh_makeshlibs -a
 	dh_installdeb -a
 	sed -i 's/^DEBIAN_VERSION=/&$(DEBIAN_VERSION)/; s/^UPSTREAM_VERSION=/&$(UPSTREAM_VERSION)/' \
-		debian/ion3/DEBIAN/postinst
+		$(INSTDIR)/DEBIAN/postinst
 	dh_shlibdeps -a
 	dh_gencontrol -a
 	dh_md5sums -a
@@ -171,8 +153,7 @@ binary-arch: build-arch install-arch
 binary: binary-indep binary-arch
 
 get-orig-source:
-	chmod +x debian/get-orig-source
-	debian/get-orig-source
+	uscan --force-download
 
 .PHONY: build-indep build-arch build clean binary-indep binary-arch binary \
 	install-indep install-arch unpatch get-orig-source