[Git][java-team/jersey1][master] 3 commits: Standards-Version updated to 4.2.1

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / jersey1


Commits:
d530df8f by Emmanuel Bourg at 2018-09-19T09:06:12Z
Standards-Version updated to 4.2.1

- - - - -
e6640c42 by Emmanuel Bourg at 2018-09-19T09:06:22Z
Use salsa.debian.org Vcs-* URLs

- - - - -
ecf9e7a5 by Emmanuel Bourg at 2018-12-13T10:48:26Z
Fixed the build failure with Java 11 (Closes: #905358)

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/rules
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+jersey1 (1.19.3-5) UNRELEASED; urgency=medium
+
+  * Fixed the build failure with Java 11 (Closes: #905358)
+  * Standards-Version updated to 4.2.1
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 19 Sep 2018 11:05:20 +0200
+
 jersey1 (1.19.3-4) unstable; urgency=medium
 
   * Fixed a regression introduced in the previous upload


=====================================
debian/control
=====================================
@@ -6,6 +6,7 @@ Uploaders: Emmanuel Bourg <ebourg at apache.org>
 Build-Depends:
  debhelper (>= 11),
  default-jdk,
+ jaxb,
  libbuild-helper-maven-plugin-java,
  libcdi-api-java,
  libfastinfoset-java,
@@ -25,9 +26,9 @@ Build-Depends:
  librome-java,
  libtomcat8-java,
  maven-debian-helper (>= 1.5)
-Standards-Version: 4.1.3
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/jersey1.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jersey1.git
+Standards-Version: 4.2.1
+Vcs-Git: https://salsa.debian.org/java-team/jersey1.git
+Vcs-Browser: https://salsa.debian.org/java-team/jersey1
 Homepage: https://jersey.java.net
 
 Package: libjersey1-core-java


=====================================
debian/rules
=====================================
@@ -1,13 +1,11 @@
 #!/usr/bin/make -f
 
-JAVA_HOME := /usr/lib/jvm/default-java
-
 %:
 	dh $@
 
 override_dh_auto_build:
 	# Generate the classes manually since the maven-jaxb-plugin isn't in Debian
-	$(JAVA_HOME)/bin/xjc -p com.sun.research.ws.wadl -d jersey-server/src/main/java -catalog jersey-server/etc/catalog.xml jersey-server/etc
+	/usr/bin/xjc -p com.sun.research.ws.wadl -d jersey-server/src/main/java -catalog jersey-server/etc/catalog.xml jersey-server/etc/wadl.xsd
 
 	dh_auto_build
 
@@ -16,6 +14,3 @@ override_dh_clean:
 
 	# Remove the generated WADL classes
 	rm -Rf jersey-server/src/main/java/com/sun/research
-
-get-orig-source:
-	uscan --download-current-version --force-download --no-symlink


=====================================
debian/watch
=====================================
@@ -1,2 +1,2 @@
-version=3
+version=4
 https://github.com/jersey/jersey-1.x/tags .*/([\d\.]+).tar.gz debian debian/orig-tar.sh



View it on GitLab: https://salsa.debian.org/java-team/jersey1/compare/4599588c0a011c5c967561fc31effa3e963c2387...ecf9e7a5a75ddba73b4eff10e7b292622ed3bb90

-- 
View it on GitLab: https://salsa.debian.org/java-team/jersey1/compare/4599588c0a011c5c967561fc31effa3e963c2387...ecf9e7a5a75ddba73b4eff10e7b292622ed3bb90
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/20181213/260e9f67/attachment.html>