[Git][java-team/libcommons-collections3-java][master] 9 commits: Wrap and sort
Emmanuel Bourg
gitlab at salsa.debian.org
Tue Nov 6 16:29:32 GMT 2018
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / libcommons-collections3-java
Commits:
f37f78e9 by Emmanuel Bourg at 2018-11-06T15:55:08Z
Wrap and sort
- - - - -
08ecf4bf by Emmanuel Bourg at 2018-11-06T15:56:23Z
Standards-Version updated to 4.2.1
- - - - -
84718068 by Emmanuel Bourg at 2018-11-06T16:17:56Z
Switch to debhelper level 11
- - - - -
53fa6362 by Emmanuel Bourg at 2018-11-06T16:18:03Z
Use salsa.debian.org Vcs-* URLs
- - - - -
2af16536 by Emmanuel Bourg at 2018-11-06T16:18:03Z
Build with the DH sequencer instead of CDBS
- - - - -
b85ffa13 by Emmanuel Bourg at 2018-11-06T16:18:03Z
Fixed the build failure with Java 11 (Closes: #912515)
- - - - -
7371e2ec by Emmanuel Bourg at 2018-11-06T16:20:18Z
No longer build and install the test framework (never used in Debian)
- - - - -
f0df8810 by Emmanuel Bourg at 2018-11-06T16:27:02Z
Generate Java 6 compatible bytecode
- - - - -
4b55db01 by Emmanuel Bourg at 2018-11-06T16:27:39Z
Upload to unstable
- - - - -
7 changed files:
- debian/changelog
- debian/compat
- debian/control
- debian/libcommons-collections3-java-doc.doc-base
- + debian/patches/java11-compatibility.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+libcommons-collections3-java (3.2.2-2) unstable; urgency=medium
+
+ * Fixed the build failure with Java 11 (Closes: #912515)
+ * No longer build and install the test framework (never used in Debian)
+ * Build with the DH sequencer instead of CDBS
+ * Standards-Version updated to 4.2.1
+ * Switch to debhelper level 11
+ * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 06 Nov 2018 17:27:14 +0100
+
libcommons-collections3-java (3.2.2-1) unstable; urgency=medium
* Team upload.
=====================================
debian/compat
=====================================
@@ -1 +1 @@
-9
+11
=====================================
debian/control
=====================================
@@ -2,19 +2,29 @@ Source: libcommons-collections3-java
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Varun Hiremath <varun at debian.org>, Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: debhelper (>= 9), cdbs, default-jdk
-Build-Depends-Indep: default-jdk-doc, maven-repo-helper, ant, ant-optional, junit
-Standards-Version: 3.9.6
-Vcs-Git: git://anonscm.debian.org/pkg-java/libcommons-collections3-java.git
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/libcommons-collections3-java.git
+Uploaders:
+ Varun Hiremath <varun at debian.org>,
+ Emmanuel Bourg <ebourg at apache.org>
+Build-Depends:
+ ant,
+ ant-optional,
+ debhelper (>= 11),
+ default-jdk,
+ default-jdk-doc,
+ junit,
+ maven-repo-helper
+Standards-Version: 4.2.1
+Vcs-Git: https://salsa.debian.org/java-team/libcommons-collections3-java.git
+Vcs-Browser: https://salsa.debian.org/java-team/libcommons-collections3-java
Homepage: http://commons.apache.org/collections/
Package: libcommons-collections3-java
Architecture: all
Depends: ${misc:Depends}
Suggests: libcommons-collections3-java-doc
-Breaks: libjson-java (<= 2.3-2), jenkins-json (<= 2.4-jenkins-3-1)
+Breaks:
+ jenkins-json (<= 2.4-jenkins-3-1),
+ libjson-java (<= 2.3-2)
Description: Apache Commons Collections - Extended Collections API for Java
The Java Collections Framework was a major addition in JDK 1.2. It added many
powerful data structures that accelerate development of most significant Java
=====================================
debian/libcommons-collections3-java-doc.doc-base
=====================================
@@ -6,5 +6,5 @@ Abstract: Programmer API of the commons collections library version 3,
Section: Programming
Format: HTML
-Index: /usr/share/doc/libcommons-collections3-java-doc/api/index.html
-Files: /usr/share/doc/libcommons-collections3-java-doc/api/*
+Index: /usr/share/doc/libcommons-collections3-java/api/index.html
+Files: /usr/share/doc/libcommons-collections3-java/api/*
=====================================
debian/patches/java11-compatibility.patch
=====================================
@@ -0,0 +1,13 @@
+Description: Fixes the build failure with Java 11
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/build.xml
++++ b/build.xml
+@@ -269,6 +269,7 @@
+ <javac srcdir="${source.test}"
+ destdir="${build.tests}"
+ debug="true"
++ release="8"
+ deprecation="false"
+ optimize="false">
+ <classpath>
=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
OSGI_Manifest.diff
java8-compatibility.patch
+java11-compatibility.patch
=====================================
debian/rules
=====================================
@@ -1,32 +1,15 @@
#!/usr/bin/make -f
-# debian/rules file for libcommons-collections3-java (uses cdbs)
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/dpkg/pkg-info.mk
-PACKAGE := $(DEB_SOURCE_PACKAGE)
-VERSION := $(DEB_UPSTREAM_VERSION)
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := $(ANT_HOME)/lib/ant-junit.jar junit
-DEB_ANT_BUILD_TARGET := jar tf.jar javadoc
LAST_MODIFIED := $(shell date +%s%N | cut -c -13)
-DEB_ANT_ARGS := -Dlastmodified=$(LAST_MODIFIED)
-ANT_OPTS = -Dant.build.javac.source=1.4
-clean::
- mh_clean
- -rm -f debian/files
- -rm -f TEST-*
- -rm -rf debian/tmp
+%:
+ dh $@ --with maven-repo-helper
-install/libcommons-collections3-java::
- mh_installpoms -p$(PACKAGE)
- mh_installjar -p$(PACKAGE) -l --usj-name=commons-collections3 pom.xml build/commons-collections-$(VERSION).jar
- install -D -m644 $(DEB_SRCDIR)/build/commons-collections-testframework-[0-9]*.jar \
- debian/libcommons-collections3-java/usr/share/java/commons-collections3-testframework-$(DEB_UPSTREAM_VERSION).jar
- dh_link /usr/share/java//commons-collections3-testframework-$(DEB_UPSTREAM_VERSION).jar \
- /usr/share/java//commons-collections3-testframework.jar
-
-get-orig-source:
- -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+override_dh_auto_build:
+ dh_auto_build -- jar javadoc -Dlastmodified=$(LAST_MODIFIED) -Dant.build.javac.source=6 -Dant.build.javac.target=6
+override_dh_auto_install:
+ mh_installpoms -plibcommons-collections3-java
+ mh_installjar -plibcommons-collections3-java -l --usj-name=commons-collections3 pom.xml build/commons-collections-$(DEB_VERSION_UPSTREAM).jar
View it on GitLab: https://salsa.debian.org/java-team/libcommons-collections3-java/compare/9c0807bf86a9542d4eb4636169b12ca46ae57d66...4b55db01d7d6b5ab586a649685267d4bbd6ba83e
--
View it on GitLab: https://salsa.debian.org/java-team/libcommons-collections3-java/compare/9c0807bf86a9542d4eb4636169b12ca46ae57d66...4b55db01d7d6b5ab586a649685267d4bbd6ba83e
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/20181106/08d9e3f8/attachment.html>
More information about the pkg-java-commits
mailing list