The following commit has been merged in the master branch: commit 71a1d51d349d38959a93552e53481c75cc15b710 Author: Francesco Paolo Lovergine <fran...@debian.org> Date: Mon Dec 16 12:42:48 2013 +0100
Some minor cleanup and new b-d. diff --git a/debian/changelog b/debian/changelog index cf5ffdc..90e4561 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +grass (6.4.3-3) unstable; urgency=medium + + * Now b-d on current libgdal-dev. + * Policy bumped to 3.9.5. + * Now use dh_autotools-dev_{restore,update}config instead of manual + update/restore in debian/rules + + -- Francesco Paolo Lovergine <fran...@debian.org> Mon, 16 Dec 2013 12:37:57 +0100 + grass (6.4.3-2) unstable; urgency=low [ M. Hamish Bowman ] diff --git a/debian/control b/debian/control index 883b16d..b0a527b 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Build-depends: libcairo2-dev, libfftw3-dev, libfreetype6-dev, - libgdal-dev | libgdal1-dev (>= 1.5.0), + libgdal-dev (>= 1.10.0-0~), libgeos-dev, libglu1-mesa-dev | libglu1-xorg-dev, libjpeg-dev, @@ -36,7 +36,7 @@ Build-depends: tcl-dev (>= 8.5), tk-dev (>= 8.5), unixodbc-dev, hardening-includes -Standards-Version: 3.9.3 +Standards-Version: 3.9.5 Build-Conflicts: wx2.6-headers Homepage: http://grass.osgeo.org/ Vcs-Browser: http://git.debian.org/?p=pkg-grass/grass.git diff --git a/debian/control.in b/debian/control.in index 295c2e3..e758452 100644 --- a/debian/control.in +++ b/debian/control.in @@ -14,7 +14,7 @@ Build-depends: libcairo2-dev, libfftw3-dev, libfreetype6-dev, - libgdal-dev | libgdal1-dev (>= 1.5.0), + libgdal-dev (>= 1.10.0-0~), libgeos-dev, libglu1-mesa-dev | libglu1-xorg-dev, libjpeg-dev, @@ -36,7 +36,7 @@ Build-depends: tcl-dev (>= 8.5), tk-dev (>= 8.5), unixodbc-dev, hardening-includes -Standards-Version: 3.9.3 +Standards-Version: 3.9.5 Build-Conflicts: wx2.6-headers Homepage: http://grass.osgeo.org/ Vcs-Browser: http://git.debian.org/?p=pkg-grass/grass.git diff --git a/debian/rules b/debian/rules index 46486c3..685da7e 100755 --- a/debian/rules +++ b/debian/rules @@ -54,16 +54,8 @@ debian/% :: debian/%.in configure: config.status config.status: dh_testdir - -ifneq "$(wildcard /usr/share/misc/config.sub)" "" - cp -f config.sub config.sub.original - cp -f /usr/share/misc/config.sub config.sub -endif -ifneq "$(wildcard /usr/share/misc/config.guess)" "" - cp -f config.guess config.guess.original - cp -f /usr/share/misc/config.guess config.guess -endif - + + dh_autotools-dev_updateconfig # Add here commands to configure the package. CFLAGS="$(CFLAGS)" ./configure \ --host=$(DEB_HOST_GNU_TYPE) \ @@ -122,13 +114,7 @@ clean: templates true-clean true-clean: dh_testdir dh_testroot - -ifneq "$(wildcard /usr/share/misc/config.sub.original)" "" - mv -f config.sub.original config.sub -endif -ifneq "$(wildcard /usr/share/misc/config.guess.original)" "" - mv -f config.guess.original config.guess -endif + dh_autotools-dev_restoreconfig # Add here commands to clean up after the build process. [ ! -f $(CURDIR)/include/Make/Platform.make ] || $(MAKE) distclean -- Geographic Resources Analysis Support System _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel