[redeclipse] 249/494: Do cleaning in rules file instead of patch

[Martin Werner]

This is an automated email from the git hooks/post-receive script.

arand-guest pushed a commit to branch debdir
in repository redeclipse.

commit d3de9dd90a9b3dc49ddd7ca3e211890125b19595
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Wed Nov 23 00:03:47 2011 +0100

    Do cleaning in rules file instead of patch
---
 patches/fix-clean-target.diff | 14 --------------
 patches/series                |  1 -
 rules                         | 12 +++++++++---
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/patches/fix-clean-target.diff b/patches/fix-clean-target.diff
deleted file mode 100644
index cd48bc6..0000000
--- a/patches/fix-clean-target.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -114,9 +114,9 @@
- 	$(MAKE) -C enet/ all
- 
- clean-enet: enet/Makefile
--	$(MAKE) -C enet/ clean
-+	$(MAKE) -C enet/ distclean
- 
--clean: clean-client clean-server
-+clean: clean-client clean-server clean-enet
- 
- clean-client:
- 	@rm -fv $(CLIENT_PCH) $(CLIENT_OBJS) reclient
diff --git a/patches/series b/patches/series
index 161623d..4647334 100644
--- a/patches/series
+++ b/patches/series
@@ -1,4 +1,3 @@
-fix-clean-target.diff
 build-with-debug-symbols.diff
 fix-install-target.diff
 license-required-naming.diff
diff --git a/rules b/rules
index d67c3a1..7525b64 100755
--- a/rules
+++ b/rules
@@ -4,19 +4,25 @@
 %:
 	dh $@ --sourcedirectory=src
 
+override_dh_auto_clean:
+	make -C src/enet/ distclean
+	rm -rf src/cube2font
+	rm -rf src/cube2font.o
+	dh_auto_clean
+
 override_dh_auto_build:
 	convert -resize 48x48 'src/redeclipse.ico[2]' debian/redeclipse.png
 	convert 'src/redeclipse.ico[1]' debian/redeclipse.xpm
 	dh_auto_build -- client server cube2font
 
-override_dh_install:
-	dh_install --exclude="license.txt"
-
 override_dh_strip:
 	dh_strip -predeclipse --dbg-package=redeclipse-dbg
 	dh_strip -predeclipse-server --dbg-package=redeclipse-server-dbg
 	dh_strip
 
+override_dh_install:
+	dh_install --exclude="license.txt"
+
 URL=https://redeclipse.svn.sourceforge.net/svnroot/redeclipse
 REV=$(shell dpkg-parsechangelog | sed -rne 's,^Version: .*[+~]svn([0-9]+).*,\1,p')
 VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/redeclipse.git