[Git][java-team/jxgrabkey][master] 8 commits: Removed the doc package to avoid the build failure with Java 11.0.2

Sat Mar 2 01:31:33 GMT 2019

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


Commits:
f24828bc by Emmanuel Bourg at 2019-03-02T01:19:30Z
Removed the doc package to avoid the build failure with Java 11.0.2

- - - - -
86ba3b3f by Emmanuel Bourg at 2019-03-02T01:20:43Z
Wrap and sort

- - - - -
ee368e2d by Emmanuel Bourg at 2019-03-02T01:24:29Z
Switch to debhelper level 11

- - - - -
5254bf80 by Emmanuel Bourg at 2019-03-02T01:24:34Z
Standards-Version updated to 4.3.0

- - - - -
a6e5bd9d by Emmanuel Bourg at 2019-03-02T01:24:34Z
Use salsa.debian.org Vcs-* URLs

- - - - -
0e847703 by Emmanuel Bourg at 2019-03-02T01:24:34Z
Changed the Priority from extra to optional

- - - - -
38f6c3f4 by Emmanuel Bourg at 2019-03-02T01:27:49Z
Added debian/rules

- - - - -
ad0baef0 by Emmanuel Bourg at 2019-03-02T01:29:22Z
Upload to unstable

- - - - -


8 changed files:

- debian/changelog
- + debian/clean
- debian/compat
- debian/control
- − debian/libjxgrabkey-doc.doc-base
- − debian/libjxgrabkey-doc.install
- debian/rules
- − debian/source.lintian-overrides


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+jxgrabkey (0.3.2-10) unstable; urgency=medium
+
+  * Team upload.
+  * Removed the doc package to avoid the build failure with Java 11.0.2
+  * Switch to debhelper level 11
+  * Standards-Version updated to 4.3.0
+  * Use salsa.debian.org Vcs-* URLs
+  * Changed the Priority from extra to optional
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Sat, 02 Mar 2019 02:27:54 +0100
+
 jxgrabkey (0.3.2-9) unstable; urgency=medium
 
   * Separate build of -arch and -indep targets


=====================================
debian/clean
=====================================
@@ -0,0 +1,7 @@
+JXGrabKey/C++/.dep.inc
+JXGrabKey/C++/build/
+JXGrabKey/C++/dist/
+JXGrabKey/Java/build/
+JXGrabKey/Java/dist/
+JXGrabKey/Java/manifest.mf
+debian/libjxgrabkey-jni.install


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


=====================================
debian/control
=====================================
@@ -1,20 +1,24 @@
 Source: jxgrabkey
 Section: java
-Priority: extra
+Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Gilles Filippini <pini at debian.org>
-Build-Depends: debhelper (>= 8.1.3~), javahelper, default-jdk (>= 1:1.6), ant, libx11-dev,
+Uploaders:
+ Gilles Filippini <pini at debian.org>
+Build-Depends:
+ ant,
+ debhelper (>= 11),
+ default-jdk (>= 1:1.6),
+ javahelper,
+ libx11-dev,
  maven-repo-helper
-Build-Depends-Indep: default-jdk-doc
-Standards-Version: 3.9.8
-Vcs-Git: git://anonscm.debian.org/collab-maint/jxgrabkey.git
-Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/jxgrabkey.git
+Standards-Version: 4.3.0
+Vcs-Git: https://salsa.debian.org/java-team/jxgrabkey.git
+Vcs-Browser: https://salsa.debian.org/java-team/jxgrabkey
 Homepage: http://jxgrabkey.sourceforge.net/
 
 Package: libjxgrabkey-java
 Architecture: all
 Depends: ${java:Depends}, ${misc:Depends}, libjxgrabkey-jni
-Suggests: libjxgrabkey-doc
 Description: X11 hotkey API for java
  JXGrabKey provides an API to make java programs hotkey aware.
  .
@@ -30,12 +34,3 @@ Description: X11 hotkey API for java (jni backend)
  .
  This package holds the architecture dependent jni backend of the java
  library.
-
-Package: libjxgrabkey-doc
-Section: doc
-Architecture: all
-Depends: ${misc:Depends}
-Recommends: default-jdk-doc
-Description: documentation for libjxgrabkey-java
- This package contains the javadoc API documentation for libjxgrabkey-java
- plus a couple of examples.


=====================================
debian/libjxgrabkey-doc.doc-base deleted
=====================================
@@ -1,9 +0,0 @@
-Document: libjxgrabkey-java
-Title: Programmer API for JXGrabKey 
-Author: Edwin Stang <edwinstang at gmail.com>
-Abstract: Javadocs for JXGrabKey, a Java hotkey handling library.
-Section: Programming/Java
-
-Format: HTML
-Index: /usr/share/doc/libjxgrabkey-java/api/index.html
-Files: /usr/share/doc/libjxgrabkey-java/api/*.html


=====================================
debian/libjxgrabkey-doc.install deleted
=====================================
@@ -1,4 +0,0 @@
-misc/ReleaseFiles/example usr/share/doc/libjxgrabkey-java
-# Not using jh_installjavadoc here because I'm not happy with the
-# generated doc-base file
-JXGrabKey/Java/dist/javadoc/* usr/share/doc/libjxgrabkey-java/api


=====================================
debian/rules
=====================================
@@ -1,5 +1,4 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
 
 ifeq ($(DEB_HOST_MULTIARCH),$(DEB_BUILD_MULTIARCH))
 CXX := g++
@@ -27,18 +26,10 @@ override_dh_auto_build-arch:
 		build-jni
 
 override_dh_auto_build-indep:
-	cd misc/Ant && ant build-java build-doc
+	cd misc/Ant && ant build-java
 
 override_dh_auto_configure-arch:
 	sed "s/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/" debian/libjxgrabkey-jni.install.in > debian/libjxgrabkey-jni.install
 
-override_dh_auto_clean:
-	rm -f JXGrabKey/C++/.dep.inc
-	rm -fr JXGrabKey/C++/build
-	rm -fr JXGrabKey/Java/build
-	rm -fr JXGrabKey/Java/dist
-	rm -f JXGrabKey/Java/manifest.mf
-	rm -f debian/libjxgrabkey-jni.install
-
 override_dh_installchangelogs:
 	dh_installchangelogs -k misc/ReleaseFiles/CHANGELOG.txt


=====================================
debian/source.lintian-overrides deleted
=====================================
@@ -1,3 +0,0 @@
-# Temporary override for Multi-Arch.
-# See http://wiki.debian.org/Multiarch/Implementation
-jxgrabkey source: package-needs-versioned-debhelper-build-depends 9



View it on GitLab: https://salsa.debian.org/java-team/jxgrabkey/compare/5bf3a1a9f8f2f96b66d560e256990572fb0c4ad1...ad0baef0478aaaa606d1a36c642f5e3be0e1787c

-- 
View it on GitLab: https://salsa.debian.org/java-team/jxgrabkey/compare/5bf3a1a9f8f2f96b66d560e256990572fb0c4ad1...ad0baef0478aaaa606d1a36c642f5e3be0e1787c
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/20190302/c0726199/attachment.html>
