The following commit has been merged in the master branch: commit 3d1205cd66d6f66ad0b00678ac833a9378ab98cd Author: Markus Wanner <mar...@bluegap.ch> Date: Tue Jul 16 21:42:28 2013 +0200
Revert libgdal1-dev dependency change. Accepting both, now. Tweak extend-diff-ignore to save us a copying dance in debian/rules. diff --git a/debian/changelog b/debian/changelog index d5611cc..932c153 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,14 @@ postgis (2.0.3-2) UNRELEASED; urgency=low - * Rather than depending on the transitional libgdal-dev package, use - libgdal1-dev right away. + * Correct dependency on libgdal-dev, allowing the old, now transitional + libgdal1-dev to satisfy it as well. * Build-Deps: correct libgeos-dev version requirement, depend on libpostgresql-jdbc-java instead of (transitional) libpg-java. * Lower dependency on libgeos-dev to 3.2.2 and instead dynamically disable topology support, if GEOS is not new enough - for backportability. + * Tweak extend-diff-ignore to save us a copying dance in + debian/rules. Cleanup the 'clean' target a bit. -- Markus Wanner <mar...@bluegap.ch> Fri, 14 Jun 2013 13:08:58 +0200 diff --git a/debian/control b/debian/control index ef1a421..da11a8a 100644 --- a/debian/control +++ b/debian/control @@ -9,8 +9,8 @@ Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.16.1~), autotools-dev, libproj-dev (>= 4.5.0), libssl-dev, xsltproc, docbook, docbook-xsl, default-jdk, libpostgresql-jdbc-java, fastjar, libjts-java (>= 1.7), imagemagick, libcunit1-dev, dblatex, libxml2-dev (>= 2.5.0~), - libgtk2.0-dev, libgdal1-dev (>= 1.6.0~), postgresql-server-dev-all, - postgresql + libgtk2.0-dev, libgdal-dev (>= 1.6.0~) | libgdal1-dev (>= 1.6.0~), + postgresql-server-dev-all, postgresql Build-Depends-Indep: libpostgresql-jdbc-java, libsurefire-java, libmaven-clean-plugin-java, libmaven-compiler-plugin-java, libmaven-jar-plugin-java, libmaven-resources-plugin-java, maven2 diff --git a/debian/control.in b/debian/control.in index db1c499..c9f7812 100644 --- a/debian/control.in +++ b/debian/control.in @@ -9,8 +9,8 @@ Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.16.1~), autotools-dev, libproj-dev (>= 4.5.0), libssl-dev, xsltproc, docbook, docbook-xsl, default-jdk, libpostgresql-jdbc-java, fastjar, libjts-java (>= 1.7), imagemagick, libcunit1-dev, dblatex, libxml2-dev (>= 2.5.0~), - libgtk2.0-dev, libgdal1-dev (>= 1.6.0~), postgresql-server-dev-all, - postgresql + libgtk2.0-dev, libgdal-dev (>= 1.6.0~) | libgdal1-dev (>= 1.6.0~), + postgresql-server-dev-all, postgresql Build-Depends-Indep: libpostgresql-jdbc-java, libsurefire-java, libmaven-clean-plugin-java, libmaven-compiler-plugin-java, libmaven-jar-plugin-java, libmaven-resources-plugin-java, maven2 diff --git a/debian/rules b/debian/rules index f993dda..1751d68 100755 --- a/debian/rules +++ b/debian/rules @@ -148,9 +148,6 @@ configuration-stamp: done; \ done) -# Documentation and common files for PostGIS - [ ! -f doc/html/postgis.html.prev -a -f doc/html/postgis.html ] && cp doc/html/postgis.html doc/html/postgis.html.prev || true - # PostGIS for the most recent PostgreSQL version ./configure $(COMMON_CONFIGURE_ARGS) \ --datadir=\$${prefix}/share/postgresql-$(NEWEST_POSTGRES_VERSION)-postgis \ @@ -177,17 +174,16 @@ clean: debian/control rm -rf $(CURDIR)/debian/build-$$PGVER; \ done) - rm -f raster/rt_pg/rtpostgis_drop.sql raster/rt_pg/rtpostgis_upgrade_cleanup.sql postgis/postgis_upgrade_20_minor.sql.in - [ -f doc/html/postgis.html.prev ] && mv doc/html/postgis.html.prev doc/html/postgis.html || true [ ! -f GNUmakefile ] || $(MAKE) distclean || true cd $(CURDIR)/java/jdbc && $(MVN) clean - $(MAKE) -C doc images-clean + [ ! -f GNUmakefile ] || $(MAKE) -C doc images-clean || true + +# Cleanup after the Makefile rm -f $(CURDIR)/debian/*.postinst $(CURDIR)/debian/*.postrm rm -f postgis/postgis_upgrade_20_minor.sql.in raster/rt_pg/rtpostgis_drop.sql \ raster/rt_pg/rtpostgis_upgrade_cleanup.sql rm -f $(CURDIR)/debian/postgresql-*-postgis-2.0.install rm -f $(CURDIR)/debian/postgresql-*-postgis-2.0-scripts.install - rm -f loader/cunit/cu_tester rm -rf liblwgeom/cunit/.libs diff --git a/debian/source/options b/debian/source/options index af35293..c2ef412 100644 --- a/debian/source/options +++ b/debian/source/options @@ -1,3 +1,2 @@ # Ignore changes on auto-updated files -extend-diff-ignore = "(^|/)(doc/html/image_src/Makefile|libtool|postgis/sqldefines.h|doc/html/images/.*\.png)$" - +extend-diff-ignore = "(^|/)(doc/html/postgis\.html|doc/Makefile.comments|doc/html/image_src/Makefile|doc/html/images/.*\.png|libtool|postgis/sqldefines.h|config\.log|topology/test/load_topology-4326.sql|topology/test/load_topology.sql|topology/test/topo_predicates.sql)$" -- PostGIS for PostgreSQL _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel