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

diff --git a/debian/rules b/debian/rules
index f7ed172..3f73573 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,27 +9,21 @@ include /usr/share/quilt/quilt.make
 
 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
@@ -90,12 +79,6 @@ binary-indep: build-indep install-indep
 
 	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
@@ -169,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