[osmosis] 01/03: Merge tag 'debian/0.45-1' into jessie-backports
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Fri Jun 10 21:23:59 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch jessie-backports
in repository osmosis.
commit cba2f0e96762ba879efbe7a752384bd62f323f68
Merge: 70d3a13 46951a0
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Thu Jun 2 18:50:12 2016 +0200
Merge tag 'debian/0.45-1' into jessie-backports
Conflicts:
debian/changelog
debian/control
.gitignore | 3 +-
build.gradle | 2 +-
db-server/docker-start.sh | 29 ++++++
debian/changelog | 37 +++++++
debian/control | 35 +++----
debian/dependencies.txt | 16 ---
debian/install | 6 +-
debian/lintian-overrides | 4 -
debian/maven.rules | 7 ++
debian/osmosis.1 | 10 +-
debian/osmosis.xml | 6 +-
debian/patches/02-fix_plexus.patch | 2 +-
debian/patches/03-local-dependencies.patch | 72 -------------
debian/patches/04-osmosis-version.patch | 6 +-
debian/patches/06-java-7.patch | 14 ---
debian/patches/series | 2 -
debian/rules | 19 +---
debian/upstream/metadata | 2 +-
debian/watch | 4 +-
gradle.properties | 16 +--
osmosis-core/build.gradle | 2 +-
.../osmosis/core/database/DatabaseConstants.java | 10 ++
.../core/database/DatabaseLoginCredentials.java | 20 ++++
.../core/database/DatabaseTaskManagerFactory.java | 2 +
osmosis-pgsimple/build.gradle | 2 +-
osmosis-pgsnapshot/build.gradle | 2 +-
.../osmosis/pgsnapshot/common/DatabaseContext.java | 7 ++
.../osmosis/pgsnapshot/v0_6/PostgreSqlTest.java | 71 +++++++++++--
.../template/v0_6/pgsql_with_schema-authfile.txt | 4 +
osmosis-replication-http/build.gradle | 2 +-
.../v0_6/impl/SequenceClientHandler.java | 2 +-
.../v0_6/impl/SequenceServerHandler.java | 12 +--
.../osmosis/xml/common/SaxParserFactory.java | 114 +++++++++++++++++++++
.../osmosis/xml/v0_6/XmlChangeReader.java | 79 ++++++--------
.../openstreetmap/osmosis/xml/v0_6/XmlReader.java | 49 +++------
.../osmosis/xml/common/test-unicode-node.osm | 11 ++
.../osmosis/xml/common/SaxParserFactoryTest.java | 23 +++++
package/bin/osmosis.bat | 2 +-
package/changes.txt | 9 ++
39 files changed, 445 insertions(+), 270 deletions(-)
diff --cc debian/changelog
index 5cc3fa7,b11ccad..43e9e3f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,40 +1,47 @@@
+ osmosis (0.45-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Update Vcs-Git URL to use HTTPS.
+ * Update watch file to handle more tag conventions.
+ * Bump Standards-Version to 3.9.8, no changes.
+ * Drop 06-java-7.patch, applied upstream.
+ * Add maven rule for com.fasterxml.woodstox woodstox-core.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 27 May 2016 17:32:11 +0200
+
+ osmosis (0.44.1-4) unstable; urgency=medium
+
+ * Use postgis-jdbc.jar instead of old postgis.jar symlink in plexus.conf.
+ Symlink not provided by libpostgis-java (>= 2.2.0).
+ (closes: #808255)
+
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 17 Dec 2015 22:34:44 +0100
+
+ osmosis (0.44.1-3) unstable; urgency=medium
+
+ [ Bas Couwenberg ]
+ * Update Vcs-Browser and various openstreemap.org URLs to use HTTPS.
+
+ [ Emmanuel Bourg ]
+ * Removed the build dependency on checkstyle
+ * Build with gradle-debian-helper
+
+ -- Emmanuel Bourg <ebourg at apache.org> Mon, 14 Dec 2015 23:31:54 +0100
+
+ osmosis (0.44.1-2) unstable; urgency=medium
+
+ * Team upload.
+ * Depend on libnetty-3.9-java instead of libnetty-java
+
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 28 Jul 2015 16:00:57 +0200
+
+osmosis (0.44.1-1~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> Wed, 10 Jun 2015 08:03:39 +0200
+
osmosis (0.44.1-1) unstable; urgency=medium
* New upstream release.
diff --cc debian/control
index e3838a9,23a4fb0..8b64f56
--- a/debian/control
+++ b/debian/control
@@@ -20,23 -24,18 +24,18 @@@ Build-Depends: debhelper (>= 9)
libspring-context-java,
libspring-jdbc-java,
libspring-transaction-java,
- libwoodstox-java,
libstax2-api-java,
- libbatik-java,
- libprotobuf-java,
libosmpbf-java,
libplexus-classworlds-java,
+ libprotobuf-java,
+ libwoodstox-java,
libxerces2-java,
libxz-java,
- checkstyle (>= 5.6),
- ivy,
- junit4 (>= 4.10),
- default-jdk,
maven-repo-helper
- Standards-Version: 3.9.6
- Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/osmosis.git
- Vcs-Git: git://anonscm.debian.org/pkg-grass/osmosis.git -b jessie-backports
- Homepage: http://wiki.openstreetmap.org/wiki/Osmosis
+ Standards-Version: 3.9.8
+ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/osmosis.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-grass/osmosis.git
++Vcs-Git: https://anonscm.debian.org/git/pkg-grass/osmosis.git -b jessie-backports
+ Homepage: https://wiki.openstreetmap.org/wiki/Osmosis
Package: osmosis
Architecture: all
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmosis.git
More information about the Pkg-grass-devel
mailing list