[Git][java-team/libjackson-json-java][master] 11 commits: Declare compliance with Debian Policy 4.2.1.
Markus Koschany
gitlab at salsa.debian.org
Sat Nov 3 14:42:43 GMT 2018
Markus Koschany pushed to branch master at Debian Java Maintainers / libjackson-json-java
Commits:
737bd59f by Markus Koschany at 2018-11-03T13:05:37Z
Declare compliance with Debian Policy 4.2.1.
- - - - -
7cd22c69 by Markus Koschany at 2018-11-03T13:06:59Z
Update Homepage URI.
Closes: #907296
- - - - -
7cd50d18 by Markus Koschany at 2018-11-03T13:10:30Z
Fix FTBFS with OpenJDK 11 by build-depending on libactivation-java.
Closes: #912541
- - - - -
de14e238 by Markus Koschany at 2018-11-03T13:11:34Z
Update changelog
- - - - -
826671bc by Markus Koschany at 2018-11-03T13:28:42Z
Build-depend on libjaxb-java too.
- - - - -
7eff0bd8 by Markus Koschany at 2018-11-03T13:43:16Z
Symlink new build-dependencies into lib directory.
- - - - -
63e65392 by Markus Koschany at 2018-11-03T13:47:13Z
Update changelog
- - - - -
d8babd41 by Markus Koschany at 2018-11-03T14:21:26Z
Create a doc-base file manually because jh_installjavadoc is buggy.
- - - - -
d194d971 by Markus Koschany at 2018-11-03T14:29:06Z
Remove superfluous javadoc file.
- - - - -
f1f6c19a by Markus Koschany at 2018-11-03T14:34:22Z
Don't use jh_installjavadoc because it is buggy.
- - - - -
d90a0df7 by Markus Koschany at 2018-11-03T14:38:14Z
Use an install file.
- - - - -
7 changed files:
- debian/build.xml
- debian/changelog
- debian/control
- + debian/libjackson-json-java-doc.doc-base
- + debian/libjackson-json-java-doc.install
- − debian/libjackson-json-java-doc.javadoc
- debian/rules
Changes:
=====================================
debian/build.xml
=====================================
@@ -15,7 +15,16 @@
<include name="*.jar" />
</fileset>
</classpath>
-
+ <classpath>
+ <fileset dir="${dir.lib}/jaxb">
+ <include name="*.jar" />
+ </fileset>
+ </classpath>
+ <classpath>
+ <fileset dir="${dir.lib}/javax">
+ <include name="*.jar" />
+ </fileset>
+ </classpath>
<packageset dir="${dir.src.java.core}" defaultexcludes="yes">
<include name="org/codehaus/**" />
</packageset>
=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+libjackson-json-java (1.9.2-10) unstable; urgency=medium
+
+ * Team upload.
+ * Declare compliance with Debian Policy 4.2.1.
+ * Update Homepage URI. (Closes: #907296)
+ * Fix FTBFS with OpenJDK 11 by build-depending on libactivation-java and
+ libjaxb-java. (Closes: #912541)
+
+ -- Markus Koschany <apo at debian.org> Sat, 03 Nov 2018 14:11:19 +0100
+
libjackson-json-java (1.9.2-9) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -10,17 +10,19 @@ Build-Depends:
default-jdk,
default-jdk-doc,
javahelper (>= 0.30),
+ libactivation-java,
libasm-java (>= 5.0),
libjarjar-java,
+ libjaxb-java,
libjoda-time-java,
libjsr311-api-java,
libjsr311-api-java-doc,
maven-repo-helper (>= 1.5~),
libnet-luminis-build-plugin-java (>= 0.2.0-3)
-Standards-Version: 4.1.3
+Standards-Version: 4.2.1
Vcs-Git: https://anonscm.debian.org/git/pkg-java/libjackson-json-java.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libjackson-json-java.git
-Homepage: http://jackson.codehaus.org
+Homepage: https://github.com/FasterXML/jackson
Package: libjackson-json-java
Architecture: all
=====================================
debian/libjackson-json-java-doc.doc-base
=====================================
@@ -0,0 +1,9 @@
+Document: libjackson-json-java-doc
+Title: API JavaDoc for libjackson-json-java-doc
+Author: The authors of libjackson-json-java-doc
+Abstract: This is the API JavaDoc for libjackson-json-java-doc
+Section: Programming/Java
+
+Format: HTML
+Index: /usr/share/doc/libjackson-json-java/api
+Files: /usr/share/doc/libjackson-json-java/api/*.html
=====================================
debian/libjackson-json-java-doc.install
=====================================
@@ -0,0 +1 @@
+build/javadoc/* /usr/share/doc/libjackson-json-java/api
=====================================
debian/libjackson-json-java-doc.javadoc deleted
=====================================
@@ -1 +0,0 @@
-build/javadoc /usr/share/doc/libjackson-json-java/api
=====================================
debian/rules
=====================================
@@ -8,6 +8,8 @@ override_dh_auto_build: mklibdirs
ln -s /usr/share/java/jsr311-api.jar lib/jaxrs/jsr311-api.jar || true
ln -s /usr/share/java/asm.jar lib/ext/asm/asm-3.3.jar || true
ln -s /usr/share/java/jarjar.jar lib/ext/jarjar/jarjar-1.0.jar || true
+ ln -s /usr/share/java/jaxb-impl.jar lib/jaxb/jaxb-impl.jar || true
+ ln -s /usr/share/java/javax.activation.jar lib/javax/javax.activation.jar || true
CLASSPATH="/usr/share/java/net.luminis.build.plugin.jar:/usr/share/java/bnd.jar" \
ant -buildfile debian/build.xml repackage-asm compile.main jars javadoc \
generate-poms
@@ -26,3 +28,5 @@ mklibdirs:
mkdir -p lib/jaxrs
mkdir -p lib/repackaged
mkdir -p lib/junit
+ mkdir -p lib/jaxb
+ mkdir -p lib/javax
View it on GitLab: https://salsa.debian.org/java-team/libjackson-json-java/compare/566c8c50dbb0a71c2b12f4ebb9cf0fb8bc7b5996...d90a0df73d3b7be4e2cb8f491ee54e80e0a69738
--
View it on GitLab: https://salsa.debian.org/java-team/libjackson-json-java/compare/566c8c50dbb0a71c2b12f4ebb9cf0fb8bc7b5996...d90a0df73d3b7be4e2cb8f491ee54e80e0a69738
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20181103/01cc5d9c/attachment.html>
More information about the pkg-java-commits
mailing list