[postgis-java] 01/02: Merge tag 'debian/2.2.1-1' into jessie-backports
Bas Couwenberg
sebastic at debian.org
Thu Aug 4 09:41:48 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch jessie-backports
in repository postgis-java.
commit 3414976438c119ccec5b562a6e3f7ffea51f6050
Merge: 1bb29d9 9890125
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Thu Aug 4 11:23:54 2016 +0200
Merge tag 'debian/2.2.1-1' into jessie-backports
Conflicts:
debian/changelog
.idea/compiler.xml | 19 +-
.idea/encodings.xml | 2 +
...aven__ch_qos_logback_logback_classic_1_1_7.xml} | 8 +-
...> Maven__ch_qos_logback_logback_core_1_1_7.xml} | 8 +-
.idea/libraries/Maven__junit_junit_4_10.xml | 13 --
.../libraries/Maven__org_apache_ant_ant_1_7_0.xml | 13 --
.../Maven__org_apache_ant_ant_launcher_1_7_0.xml | 13 --
.../Maven__org_hamcrest_hamcrest_core_1_1.xml | 13 --
...en__org_postgresql_postgresql_9_4_1209_jre7.xml | 13 ++
...3.xml => Maven__org_slf4j_slf4j_api_1_7_21.xml} | 8 +-
...9_9.xml => Maven__org_testng_testng_6_9_10.xml} | 8 +-
.idea/libraries/Maven__org_yaml_snakeyaml_1_15.xml | 13 --
...aven__postgresql_postgresql_9_1_901_1_jdbc4.xml | 13 --
.idea/modules.xml | 2 +
debian/changelog | 10 +
debian/control | 2 +-
debian/maven.rules | 2 +-
debian/patches/add-classpath.patch | 8 +-
debian/patches/series | 1 +
debian/patches/sqlexception.patch | 23 ++
debian/patches/upstream-version.patch | 82 +++++--
jdbc/pom.xml | 10 +-
jdbc/postgis-jdbc.iml | 15 +-
jdbc/src/main/java/org/postgis/DriverWrapper.java | 4 +-
jdbc_jtsparser/pom.xml | 6 +-
jdbc_jtsparser/postgis-jdbc-jtsparser.iml | 15 +-
.../main/java/org/postgis/jts/JtsGisWrapper.java | 4 +-
.../src/main/java/org/postgis/jts/JtsWrapper.java | 4 +-
pom.xml | 43 ++--
postgis-java-aggregator.iml | 13 +-
postgis-jdbc-java2d/pom.xml | 8 +-
postgis-jdbc-java2d/postgis-jdbc-java2d.iml | 15 +-
.../java/org/postgis/java2d/Java2DWrapper.java | 4 +-
tools/osgeo-postgis-jdbc-test-util/.gitignore | 1 +
.../osgeo-postgis-jdbc-test-util.iml | 16 +-
tools/osgeo-postgis-jdbc-test-util/pom.xml | 99 +++++++++
.../src/main/java/net/postgis/osgeo/util/Main.java | 236 +++++++++++++++++++++
.../src/main/scripts/test.sh | 24 +++
.../test/java/net/postgis/osgeo/util/UtilTest.java | 40 ++++
.../src/test/resources/logback-test.xml | 15 ++
.../src/test/resources/testng.xml | 14 ++
tools/pom.xml | 21 ++
jdbc/postgis-jdbc.iml => tools/tools.iml | 15 +-
43 files changed, 665 insertions(+), 231 deletions(-)
diff --cc debian/changelog
index 7edd5aa,ea6538d..9b1aa10
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,13 +1,20 @@@
+ postgis-java (1:2.2.1-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Bump Standards-Version to 3.9.8, no changes.
+ * Refresh patches.
+ * Update maven.rules for postgresql-jdbc.
+ * Add patch to declare SQLException to fix build failure.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 29 Jul 2016 10:54:56 +0200
+
+postgis-java (1:2.2.0-3~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+ * Update branch in gbp.conf and Vcs-Git URL.
+
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 02 Jun 2016 19:15:21 +0200
+
postgis-java (1:2.2.0-3) unstable; urgency=medium
* Update Vcs-Git URL to use HTTPS.
diff --cc debian/control
index 627f4bf,a4462f6..9533bd9
--- a/debian/control
+++ b/debian/control
@@@ -11,9 -11,9 +11,9 @@@ Build-Depends-Indep: default-jdk
maven-debian-helper,
maven-repo-helper,
maven
- Standards-Version: 3.9.7
+ Standards-Version: 3.9.8
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/postgis-java.git/
-Vcs-Git: https://anonscm.debian.org/git/pkg-grass/postgis-java.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-grass/postgis-java.git -b jessie-backports
Homepage: https://github.com/postgis/postgis-java
Package: libpostgis-java
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/postgis-java.git
More information about the Pkg-grass-devel
mailing list