From edf7cb9bdcb5911199065daeb6422c259caa32f5 Mon Sep 17 00:00:00 2001
From: Christoph Egger <Christoph.Egger@gmx.de>
Date: Sat, 1 Nov 2008 23:54:41 +0100
Subject:  * Cleaning up patches  * Using quilt.make in debian/rules

---
 debian/rules | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'debian/rules')

diff --git a/debian/rules b/debian/rules
index 20e8d5f..706c141 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,8 @@
 version=1.4.0
 major=1
 
+include /usr/share/quilt/quilt.make
+
 get-orig-source:
 	cd .. ; rm -rf libsfml-1.3.orig ;  mkdir libsfml-1.3.orig ; cd libsfml-1.3.orig ; \
 		wget http://downloads.sourceforge.net/sfml/SFML-1.3-sdk-linux.tar.gz ; \
@@ -20,11 +22,10 @@ get-orig-source:
 		cd .. ; rm SFML-1.3-sdk-linux.tar.gz; mv SFML-1.3/* . ; rm -r SFML-1.3
 	cd .. ; dpkg-source -b -su libsfml libsfml-1.3.orig
 
-configure: configure-stamp
-configure-stamp:
+configure: configure-stamp 
+configure-stamp: $(QUILT_STAMPFN)
 	dh_testdir
-# Add here commands to configure the package.
-	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+
 	touch configure-stamp
 
 
@@ -32,18 +33,16 @@ build: build-stamp
 build-stamp: configure-stamp 
 	dh_testdir
 
-# Add here commands to compile the package.
 	$(MAKE) sfml
 	touch $@
 
-clean:
+clean: unpatch
 	find lib -name "*so*" -exec rm {} \;
 	dh_testdir
 	dh_testroot
 
 # Add here commands to clean up after the build process.
 	$(MAKE) clean
-	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
 
 	rm -Rf .pc
 
@@ -55,7 +54,6 @@ install: build
 	dh_clean -k 
 	dh_installdirs
 
-# Add here commands to install the package into debian/tmp
 	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp/usr install
 	find $(CURDIR)/debian/tmp -name Win32 -o -name OSX -print | xargs /bin/rm -rf
 
@@ -70,7 +68,7 @@ binary-arch: build install
 	dh_testroot
 	dh_installchangelogs 
 	dh_installdocs
-	dh_installexamples ; find debian/libsfml1.4-doc/usr/share/doc/libsfml1.4-doc/examples/bin -maxdepth 1 ! -type d -exec rm {} \;
+	dh_installexamples ; ( cd debian/libsfml1.4-doc/usr/share/doc/libsfml1.4-doc/examples/ && make clean )
 	dh_install --fail-missing --sourcedir=debian/tmp
 	dh_installman
 	dh_link
-- 
cgit v1.2.3