[SCM] mapserver branch, master, updated. upstream/6.2.1-104-g2dc9da4

2013-07-22 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 2dc9da437e935eb9d0488b359aaacf380736dbdb
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Mon Jul 22 21:11:26 2013 +0200

Set distribution for unstable upload.

diff --git a/debian/changelog b/debian/changelog
index d308258..b9b49d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mapserver (6.2.1-3) UNRELEASED; urgency=low
+mapserver (6.2.1-3) unstable; urgency=low
 
   * Upload for Debian closes: #706157
   * Merge changes from 6.0.1-4: 

-- 
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.2.1-104-g2dc9da4

2013-07-22 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 083baef7835132808f8376c3a05e45acf9b47a5f
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Sun Jul 21 20:32:43 2013 +0200

Use dh_autoreconf for retooling.

diff --git a/debian/changelog b/debian/changelog
index 85984c4..d308258 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,6 +44,7 @@ mapserver (6.2.1-3) UNRELEASED; urgency=low
   * Update TODO.Debian to reflect current status.
   * Add maintainer scripts for libmapserver-6.2.1 to call ldconfig,
 don't call ldconfig for php5-mapscript.
+  * Use dh_autoreconf for retooling.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Fri, 14 Jun 2013 22:00:07 +0200
 
diff --git a/debian/control b/debian/control
index 393fc16..c97da9e 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends: debhelper (= 9), dpkg-dev (= 1.16.1.1), 
autotools-dev,
  sharutils, libsdl1.2-dev,
  libfcgi-dev, libxml2-dev, libogdi3.2-dev, libxslt1-dev, libpam0g-dev, 
libreadline-dev,
  libedit-dev, libepsilon-dev,
- autoconf, chrpath, 
+ autoconf, dh-autoreconf, chrpath, 
  docbook2x, docbook-xsl, docbook-xml, xsltproc
 Build-Conflicts: libcurl3-openssl-dev
 Homepage: http://www.mapserver.org
diff --git a/debian/rules b/debian/rules
index a2201b9..3b2ffbb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -58,7 +58,7 @@ MS_CPPFLAGS=$(CPPFLAGS)
 MS_LDFLAGS=$(LDFLAGS)
 
 %:
-   dh $@ --with python2
+   dh $@ --with autoreconf,python2
 
 override_dh_auto_clean:
dh_testdir

-- 
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