[Git][java-team/libpicocontainer-java][master] 8 commits: Switch to compat level 11.

[Markus Koschany]

Markus Koschany pushed to branch master at Debian Java Maintainers / libpicocontainer-java


Commits:
ab283803 by Markus Koschany at 2018-11-01T15:33:41Z
Switch to compat level 11.

- - - - -
86d0073f by Markus Koschany at 2018-11-01T15:34:04Z
Declare compliance with Debian Policy 4.2.1.

- - - - -
a7730ecb by Markus Koschany at 2018-11-01T15:35:30Z
Remove comment from d/copyright because codehaus is gone.

- - - - -
d48759a8 by Markus Koschany at 2018-11-01T15:36:06Z
Update copyright years.

- - - - -
cb3ccefa by Markus Koschany at 2018-11-02T18:42:51Z
Fix FTBFS with OpenJDK 11 by depending on libactivation-java.

Closes: #912547

- - - - -
0fb67974 by Markus Koschany at 2018-11-02T18:43:38Z
Use https for Format field.

- - - - -
45dad502 by Markus Koschany at 2018-11-02T18:44:53Z
Update changelog

- - - - -
8f4b8e60 by Markus Koschany at 2018-11-02T19:04:09Z
Build-Depend on libgeronimo-annotation-1.3-spec-java.

- - - - -


5 changed files:

- debian/changelog
- debian/compat
- debian/control
- debian/copyright
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+libpicocontainer-java (2.15-3) unstable; urgency=medium
+
+  * Switch to compat level 11.
+  * Declare compliance with Debian Policy 4.2.1.
+  * Fix FTBFS with OpenJDK 11 by depending on libactivation-java and
+    libgeronimo-annotation-1.3-spec-java. (Closes: #912547)
+
+ -- Markus Koschany <apo at debian.org>  Fri, 02 Nov 2018 19:44:28 +0100
+
 libpicocontainer-java (2.15-2) unstable; urgency=medium
 
   * Vcs-fields: Use https.


=====================================
debian/compat
=====================================
@@ -1 +1 @@
-10
+11


=====================================
debian/control
=====================================
@@ -5,13 +5,15 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders:
  Markus Koschany <apo at debian.org>
 Build-Depends:
- debhelper (>= 10),
+ debhelper (>= 11),
  default-jdk,
  default-jdk-doc,
  javahelper,
+ libactivation-java,
+ libgeronimo-annotation-1.3-spec-java,
  libparanamer-java,
  maven-repo-helper (>= 1.6~)
-Standards-Version: 3.9.8
+Standards-Version: 4.2.1
 Homepage: http://picocontainer.com
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/libpicocontainer-java.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libpicocontainer-java.git


=====================================
debian/copyright
=====================================
@@ -1,13 +1,6 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: PicoContainer
 Source: https://github.com/picocontainer/PicoContainer2
-Comment:
- PicoContainer was downloaded from the central Maven repository because Maven
- is currently the only platform where recent source tarballs of PicoContainer
- are published. However the full license text of PicoContainer can be found in
- the official development repository at codehaus.org.
- .
- https://svn.codehaus.org/picocontainer/java/2.x/trunk/pico/LICENSE.txt
 
 Files: *
 Copyright: 2004-2011, PicoContainer Organization
@@ -38,7 +31,7 @@ License: BSD-3-clause
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Files: debian/*
-Copyright: 2014-2016, Markus Koschany <apo at debian.org>
+Copyright: 2014-2018, Markus Koschany <apo at debian.org>
 License: Expat
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal


=====================================
debian/rules
=====================================
@@ -3,7 +3,7 @@
 PKD  = $(abspath $(dir $(MAKEFILE_LIST)))
 VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s*([\d\.]+)}')
 export JAVA_HOME=/usr/lib/jvm/default-java
-export CLASSPATH=/usr/share/java/paranamer.jar
+export CLASSPATH=/usr/share/java/paranamer.jar:/usr/share/java/javax.activation.jar:/usr/share/java/geronimo-annotation-1.3-spec.jar
 
 %:
 	dh $@ --with javahelper,jh_maven_repo_helper
@@ -13,7 +13,7 @@ override_dh_auto_build:
 
 override_dh_auto_clean:
 	dh_auto_clean
-	rm -f picocontainer-*.jar
+	$(RM) picocontainer-*.jar
 
 get-orig-source:
 	uscan --verbose --repack --compression xz --force-download



View it on GitLab: https://salsa.debian.org/java-team/libpicocontainer-java/compare/c58ae35c52c33755d38dd60a02ff7387b29d62c9...8f4b8e6093d91cd6c28ce7288338eba7267c4be1

-- 
View it on GitLab: https://salsa.debian.org/java-team/libpicocontainer-java/compare/c58ae35c52c33755d38dd60a02ff7387b29d62c9...8f4b8e6093d91cd6c28ce7288338eba7267c4be1
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/20181102/b7409863/attachment.html>