[SCM] mapserver branch, master, updated. upstream/6.4.0_rc1-152-gc3bcbca

2013-09-21 Thread Bas Couwenberg 
The following commit has been merged in the master branch:
commit c3bcbcab2dd4569ce6fe2916acac2f57be22dede
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Sat Sep 21 23:19:17 2013 +0200

Use dh_clean instead of manual removal.

diff --git a/debian/rules b/debian/rules
index b749e4c..f57ab41 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,13 +76,10 @@ HARDENING_CONFIG= \
dh $@ --with python2,pkgkde_symbolshelper
 
 override_dh_auto_clean:
-   -$(RM) -rf build/
-
-   -$(RM) debian/.#* .#*
+   dh_clean
 
-   -$(RM) -rf $(CURDIR)/debian/files
-   -$(RM) -f $(CURDIR)/debian/*.debhelper.log
-$(RM) -f $(CURDIR)/debian/man/*.1
+   -$(RM) -rf build/
 
 override_dh_auto_configure:
mkdir -p build  cd build  cmake .. -DCMAKE_BUILD_TYPE=Release 
$(HARDENING_CONFIG) $(COMMON_CONFIG)

-- 
Packaging for MapServer

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

[SCM] mapserver branch, master, updated. upstream/6.4.0_rc1-152-gc3bcbca

2013-09-21 Thread Bas Couwenberg 
The following commit has been merged in the master branch:
commit 58cfec88d3f02bdb9639628779db99d7451dba7f
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Sat Sep 21 23:18:17 2013 +0200

Drop unneeded dh_testdir.

diff --git a/debian/rules b/debian/rules
index e02345e..b749e4c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,14 +76,10 @@ HARDENING_CONFIG= \
dh $@ --with python2,pkgkde_symbolshelper
 
 override_dh_auto_clean:
-   dh_testdir
-
-$(RM) -rf build/
 
-$(RM) debian/.#* .#*
 
-   dh_prep
-
-$(RM) -rf $(CURDIR)/debian/files
-$(RM) -f $(CURDIR)/debian/*.debhelper.log
-$(RM) -f $(CURDIR)/debian/man/*.1
@@ -92,8 +88,6 @@ override_dh_auto_configure:
mkdir -p build  cd build  cmake .. -DCMAKE_BUILD_TYPE=Release 
$(HARDENING_CONFIG) $(COMMON_CONFIG)
 
 override_dh_auto_build:
-   dh_testdir
-
# Create man pages from DocBook XML
for x in $(MANPAGES) ; do \
  docbook2x-man $$x ; \

-- 
Packaging for MapServer

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel