[libjackson-json-java] 01/01: Imported Debian patch 1.9.2-5

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository libjackson-json-java.

commit ce62a30387015dca97fb9901b12ffc154e4f1f30
Author: Markus Koschany <apo at debian.org>
Date:   Fri Nov 13 23:48:50 2015 +0100

    Imported Debian patch 1.9.2-5
---
 debian/changelog | 9 +++++++++
 debian/control   | 4 ++--
 debian/rules     | 4 ++--
 debian/watch     | 3 ---
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 94f5c23..7a1eaf2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libjackson-json-java (1.9.2-5) unstable; urgency=medium
+
+  * Team upload.
+  * Vcs-Browser: Switch to cgit and use https.
+  * Switch to bnd1.50 because libjackson-json-java FTBFS with bnd >= 2.1.
+  * Remove watch file because codehaus.org is offline.
+
+ -- Markus Koschany <apo at debian.org>  Fri, 13 Nov 2015 23:48:50 +0100
+
 libjackson-json-java (1.9.2-4) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index bd28471..7ca0326 100644
--- a/debian/control
+++ b/debian/control
@@ -5,12 +5,12 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders:
  James Page <james.page at ubuntu.com>
 Homepage: http://jackson.codehaus.org
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/libjackson-json-java.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libjackson-json-java.git
 Vcs-Git: git://anonscm.debian.org/pkg-java/libjackson-json-java.git
 Standards-Version: 3.9.6
 Build-Depends:
  ant (>= 1.6.0),
- bnd,
+ bnd1.50,
  debhelper (>= 9),
  default-jdk,
  default-jdk-doc,
diff --git a/debian/rules b/debian/rules
index 206a441..6b8e1d8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 	dh $@ --with maven-repo-helper --with javahelper
 
 debian/bnd_plugin/net/luminis/build/plugin/bnd/BuildTask.class:
-	CLASSPATH="/usr/share/java/bnd.jar:/usr/share/java/ant.jar" \
+	CLASSPATH="/usr/share/java/bnd-1.50.0.jar:/usr/share/java/ant.jar" \
 	javac -source 1.5 -target 1.5 debian/bnd_plugin/net/luminis/build/plugin/bnd/BuildTask.java
 
 override_dh_auto_build: mklibdirs debian/bnd_plugin/net/luminis/build/plugin/bnd/BuildTask.class
@@ -12,7 +12,7 @@ override_dh_auto_build: mklibdirs debian/bnd_plugin/net/luminis/build/plugin/bnd
 	ln -s /usr/share/java/jsr311-api.jar lib/jaxrs/jsr311-api.jar || true
 	ln -s /usr/share/java/asm4.jar lib/ext/asm/asm-3.3.jar || true
 	ln -s /usr/share/java/jarjar.jar lib/ext/jarjar/jarjar-1.0.jar || true
-	CLASSPATH="debian/bnd_plugin:/usr/share/java/bnd.jar" \
+	CLASSPATH="debian/bnd_plugin:/usr/share/java/bnd-1.50.0.jar" \
 		ant -buildfile debian/build.xml repackage-asm compile.main jars javadoc \
 			generate-poms
 
diff --git a/debian/watch b/debian/watch
deleted file mode 100644
index cdb3d2c..0000000
--- a/debian/watch
+++ /dev/null
@@ -1,3 +0,0 @@
-version=3
-opts="dversionmangle=s/\.dfsg\.\d+$//" \
-    http://wiki.fasterxml.com/JacksonDownload http://jackson.codehaus.org/.*/jackson-src-(.+).tar.gz debian jh_repack

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjackson-json-java.git