[mapserver] 31/43: Fix make clean.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch wheezy-backports
in repository mapserver.

commit 8a70fbbe9f6f528b08e38b50e3a106c56d328ff0
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Jul 20 03:13:59 2013 +0200

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

diff --git a/debian/rules b/debian/rules
index b87001b..5303517 100755
--- a/debian/rules
+++ b/debian/rules
@@ -58,14 +58,9 @@ MS_LDFLAGS=$(LDFLAGS)
 	dh $@
 
 override_dh_clean:
-	touch config.log
-
-	dh_clean
-
 	dh_testdir
 
 	-$(RM) configure-stamp build-arch-stamp build-indep-stamp
-	-$(RM) install-arch-stamp install-indep-stamp
 
 	[ ! -f Makefile ] || $(MAKE) distclean
 
@@ -78,7 +73,7 @@ override_dh_clean:
 	  for python in $(PYVERS); do $$python setup.py clean; done
 	-$(RM) -rf mapscript/python/build mapscript/python/Makefile
 	[ ! -f $(CURDIR)/mapscript/ruby/Makefile ] || $(MAKE) distclean -C $(CURDIR)/mapscript/ruby
-	-$(RM) -rf $(CURDIR)/mapscript/ruby/mapscript_wrap.c
+	-$(RM) -rf $(CURDIR)/mapscript/ruby/mapscript_wrap.c $(CURDIR)/mapscript/ruby/*mapscript.so
 	-$(RM) mapscriptvars libtool
 
 	-$(RM)  mapscript/perl/mapscript.i \
@@ -93,8 +88,15 @@ override_dh_clean:
 	-$(RM) config.log config.status
 
 	-$(RM) debian/.#* .#*
-	-$(RM) -f debian/*.debhelper.log
+
+	dh_prep
+
+	-$(RM) install-arch-stamp install-indep-stamp
+
 	-$(RM) -rf $(CURDIR)/debian/files
+	rm -f debian/*.debhelper.log
+	rm -f debian/man/*.1
+
 
 override_dh_auto_configure:
 	dh_auto_configure -- $(COMMON_CONFIG) CFLAGS="$(MS_CFLAGS)" CXXFLAGS="$(MS_CXXFLAGS)" CPPFLAGS="$(MS_CPPFLAGS)" LDFLAGS="$(MS_LDFLAGS)"

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