[Git][java-team/osgi-foundation-ee][master] 5 commits: Declare compliance with Debian Policy 4.1.4.

[Markus Koschany]

Markus Koschany pushed to branch master at Debian Java Maintainers / osgi-foundation-ee


Commits:
05c92e6a by Markus Koschany at 2018-06-17T19:20:29+02:00
Declare compliance with Debian Policy 4.1.4.

- - - - -
da8d333f by Markus Koschany at 2018-06-17T19:21:38+02:00
Drop libosgi-foundation-ee-java-doc package to work around a FTBFS

with Java 9. The documentation is expendable.

Closes: #893382

- - - - -
3e93be43 by Markus Koschany at 2018-06-17T19:23:08+02:00
Update changelog

- - - - -
c14f9675 by Markus Koschany at 2018-06-17T19:28:45+02:00
Do not build the javadoc anymore.

- - - - -
741c1aac by Markus Koschany at 2018-06-17T19:32:32+02:00
Use https for Format field.

- - - - -


6 changed files:

- debian/changelog
- debian/control
- debian/copyright
- − debian/javabuild
- − debian/libosgi-foundation-ee-java-doc.javadoc
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+osgi-foundation-ee (4.2.0-4) unstable; urgency=medium
+
+  * Team upload.
+  * Declare compliance with Debian Policy 4.1.4.
+  * Drop libosgi-foundation-ee-java-doc package to work around a FTBFS
+    with Java 9. The documentation is expendable. (Closes: #893382)
+
+ -- Markus Koschany <apo at debian.org>  Sun, 17 Jun 2018 19:22:55 +0200
+
 osgi-foundation-ee (4.2.0-3) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
  default-jdk,
  javahelper,
  maven-repo-helper
-Standards-Version: 4.1.3
+Standards-Version: 4.1.4
 Homepage: http://www.osgi.org/Specifications/HomePage
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/osgi-foundation-ee.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/osgi-foundation-ee.git
@@ -20,8 +20,6 @@ Architecture: all
 Depends:
  ${java:Depends},
  ${misc:Depends}
-Suggests:
- libosgi-foundation-ee-java-doc
 Description: Java OSGi API - Foundation Execution Environment
  OSGi, for Open Services Gateway initiative framework, is a module system and
  service platform for the Java programming language.
@@ -30,22 +28,3 @@ Description: Java OSGi API - Foundation Execution Environment
  for Release 4 Version 4.2.
  This provide Java interfaces for javax.microedition package (J2ME) and
  java.net/java.lang/java.io/java.util packages (J2SE).
-
-Package: libosgi-foundation-ee-java-doc
-Architecture: all
-Section: doc
-Depends:
- ${misc:Depends}
-Recommends:
- ${java:Recommends}
-Description: Javadoc for Java OSGi API - Foundation Execution Environment
- OSGi, for Open Services Gateway initiative framework, is a module system and
- service platform for the Java programming language.
- .
- This package contains OSGi Foundation Execution Environment
- for Release 4 Version 4.2.
- This provide Java interfaces for javax.microedition package (J2ME) and
- java.net/java.lang/java.io/java.util packages (J2SE).
- .
- This package contains Javadoc HTML documentation for
- libosgi-foundation-ee-java.


=====================================
debian/copyright
=====================================
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
+Format: https://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
 Upstream-Name: OSGi Foundation EE Classes
 Upstream-Contact: OSGi Alliance (http://www.osgi.org/)
 Source: http://www.osgi.org/Download/Release4V42


=====================================
debian/javabuild deleted
=====================================
--- a/debian/javabuild
+++ /dev/null
@@ -1 +0,0 @@
-ee.foundation.jar src


=====================================
debian/libosgi-foundation-ee-java-doc.javadoc deleted
=====================================
--- a/debian/libosgi-foundation-ee-java-doc.javadoc
+++ /dev/null
@@ -1 +0,0 @@
-internal /usr/share/doc/libosgi-foundation-ee-java/api/


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,9 @@ PACKAGE			:= libosgi-foundation-ee-java
 %:
 	dh $@ --with javahelper --with jh_maven_repo_helper
 
+override_jh_build:
+	jh_build --no-javadoc ee.foundation.jar src
+
 override_jh_manifest:
 	jar umf src/META-INF/MANIFEST.MF debian/$(PACKAGE)/usr/share/java/$(JAR_NAME).jar
 



View it on GitLab: https://salsa.debian.org/java-team/osgi-foundation-ee/compare/34f58e24a533a9a453e256c04b7e2c670ea35f4d...741c1aacfb69b3548a1e36058d3a3e8499be0658

-- 
View it on GitLab: https://salsa.debian.org/java-team/osgi-foundation-ee/compare/34f58e24a533a9a453e256c04b7e2c670ea35f4d...741c1aacfb69b3548a1e36058d3a3e8499be0658
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/20180617/0f478d24/attachment.html>