This is an automated email from the git hooks/post-receive script.
markus_wanner-guest pushed a commit to branch master
in repository postgis.
commit 1ea3a0297f610cd80e970bc693a28347cbd01a6e
Author: Markus Wanner <mar...@bluegap.ch>
Date: Wed Mar 19 10:09:50 2014 +0100
* Drop the ored dependency on openjdk-6-jdk.
* Add a couple more files to the extend-diff-ignore.
---
debian/changelog | 2 ++
debian/control | 2 +-
debian/control.in | 2 +-
debian/source/options | 2 +-
4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index cbf6717..f35e360 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ postgis (2.1.1-6) UNRELEASED; urgency=low
* Correct java-version-fix, so the jar-version becomes 2.1.1 rather than
some rc. Closes: #721721.
* Deduplicate highly redundant .sql files in *-postgis-scripts.
+ * Drop the ored dependency on openjdk-6-jdk.
+ * Add a couple more files to the extend-diff-ignore.
-- Markus Wanner <mar...@bluegap.ch> Tue, 28 Jan 2014 22:32:14 +0100
diff --git a/debian/control b/debian/control
index 28242fb..c8a973b 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.16.1~),
autotools-dev,
imagemagick, libcunit1-dev, dblatex, libxml2-dev (>= 2.5.0~),
libgtk2.0-dev, libgdal-dev (>= 1.9.0~) | libgdal1-dev (>= 1.9.0~),
postgresql-server-dev-all, postgresql-common (>= 148~), postgresql
-Build-Depends-Indep: openjdk-8-jdk | openjdk-7-jdk | openjdk-6-jdk,
+Build-Depends-Indep: openjdk-8-jdk | openjdk-7-jdk,
libpostgresql-jdbc-java, fastjar, libjts-java (>= 1.7), maven2,
libmaven-clean-plugin-java, libmaven-jar-plugin-java,
libsurefire-java, libmaven-compiler-plugin-java,
diff --git a/debian/control.in b/debian/control.in
index b768015..f47799a 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.16.1~),
autotools-dev,
imagemagick, libcunit1-dev, dblatex, libxml2-dev (>= 2.5.0~),
libgtk2.0-dev, libgdal-dev (>= 1.9.0~) | libgdal1-dev (>= 1.9.0~),
postgresql-server-dev-all, postgresql-common (>= 148~), postgresql
-Build-Depends-Indep: openjdk-8-jdk | openjdk-7-jdk | openjdk-6-jdk,
+Build-Depends-Indep: openjdk-8-jdk | openjdk-7-jdk,
libpostgresql-jdbc-java, fastjar, libjts-java (>= 1.7), maven2,
libmaven-clean-plugin-java, libmaven-jar-plugin-java,
libsurefire-java, libmaven-compiler-plugin-java,
diff --git a/debian/source/options b/debian/source/options
index ce502b2..633e80b 100644
--- a/debian/source/options
+++ b/debian/source/options
@@ -1,2 +1,2 @@
# Ignore changes on auto-updated files
-extend-diff-ignore =
"(^|/)(doc/html/postgis\.html|doc/Makefile|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)$"
+extend-diff-ignore =
"(^|/)(doc/html/postgis\.html|doc/Makefile|doc/Makefile\.comments|doc/html/image_src/Makefile|doc/html/images/.*\.png|extensions/postgis_tiger_geocoder/sql_bits/tiger_geocoder.*\.sql\.in|libtool|postgis/sfcgal\.sql|postgis/sqldefines\.h|config\.log|topology/test/load_topology-4326\.sql|topology/test/load_topology\.sql|topology/test/regress/topogeo_addlinestring_expected|topology/test/Makefile|topology/test/topo_predicates\.sql)$"
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/postgis.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
