Markus Koschany pushed to branch master at Debian Java Maintainers / javafxsvg


Commits:
5bb1cb5c by Markus Koschany at 2018-11-14T13:12:45Z
Switch to compat level 11

- - - - -
a27bf5f7 by Markus Koschany at 2018-11-14T13:13:10Z
Remove trailing whitespace.

- - - - -
3adc6b68 by Markus Koschany at 2018-11-14T13:16:47Z
Fix FTBFS with OpenJFX 11 by build-depending on openjfx artifacts explicitly.

Closes: #893345

- - - - -
aeeeaf8f by Markus Koschany at 2018-11-14T13:19:52Z
Declare compliance with Debian Policy 4.2.1.

- - - - -
475ade09 by Markus Koschany at 2018-11-14T13:20:37Z
Update changelog

- - - - -
089d2b8d by Markus Koschany at 2018-11-14T13:21:13Z
Use https for Format field.

- - - - -


6 changed files:

- debian/changelog
- debian/compat
- debian/control
- debian/copyright
- + debian/patches/javafx.patch
- + debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+javafxsvg (1.2.1-2) unstable; urgency=medium
+
+  * Team upload.
+  * Switch to compat level 11.
+  * Fix FTBFS with OpenJFX 11 by build-depending on openjfx artifacts
+    explicitly. (Closes: #893345)
+  * Declare compliance with Debian Policy 4.2.1.
+
+ -- Markus Koschany <[email protected]>  Wed, 14 Nov 2018 14:20:10 +0100
+
 javafxsvg (1.2.1-1) unstable; urgency=medium
 
   * Initial release (Closes: #848401)


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


=====================================
debian/control
=====================================
@@ -3,9 +3,9 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers 
<[email protected]>
 Uploaders: tony mancill <[email protected]>
-Build-Depends: debhelper (>= 10), default-jdk, maven-debian-helper (>= 2.1)
+Build-Depends: debhelper (>= 11), default-jdk, maven-debian-helper (>= 2.1)
 Build-Depends-Indep: libbatik-java, libxmlgraphics-commons-java, openjfx
-Standards-Version: 3.9.8
+Standards-Version: 4.2.1
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/javafxsvg.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/javafxsvg.git
 Homepage: https://github.com/codecentric/javafxsvg
@@ -15,5 +15,5 @@ Architecture: all
 Depends: ${misc:Depends}, ${maven:Depends}
 Suggests: ${maven:OptionalDepends}
 Description: CenterDevice JavaFxSVG library
- JavaFxSVG is a simple library adding SVG support to JavaFX. 
+ JavaFxSVG is a simple library adding SVG support to JavaFX.
  It allows use of SVG graphics just like any other image type.


=====================================
debian/copyright
=====================================
@@ -1,4 +1,4 @@
-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: CenterDevice JavaFxSVG
 Source: https://github.com/codecentric/javafxsvg
 


=====================================
debian/patches/javafx.patch
=====================================
@@ -0,0 +1,38 @@
+From: Markus Koschany <[email protected]>
+Date: Wed, 14 Nov 2018 14:15:33 +0100
+Subject: javafx
+
+Build-depend on openjfx artifacts explicitly to fix the FTBFS with OpenJFX 11.
+
+Bug-Debian: https://bugs.debian.org/893345
+Forwarded: no
+---
+ pom.xml | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/pom.xml b/pom.xml
+index 57cbe99..56ed69c 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -136,6 +136,21 @@
+                       <artifactId>xmlgraphics-commons</artifactId>
+                       <version>2.1</version>
+               </dependency>
++              <dependency>
++                      <groupId>org.openjfx</groupId>
++                      <artifactId>javafx-controls</artifactId>
++                      <version>11</version>
++              </dependency>
++              <dependency>
++                      <groupId>org.openjfx</groupId>
++                      <artifactId>javafx-graphics</artifactId>
++                      <version>11</version>
++              </dependency>
++              <dependency>
++                      <groupId>org.openjfx</groupId>
++                      <artifactId>javafx-fxml</artifactId>
++                      <version>11</version>
++              </dependency>
+               <dependency>
+                       <groupId>org.loadui</groupId>
+                       <artifactId>testFx</artifactId>


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+javafx.patch



View it on GitLab: 
https://salsa.debian.org/java-team/javafxsvg/compare/276741db3744cff423dda730e84669efb3b1280f...089d2b8ded0d40c96eb21c75c05d28926b890f7d

-- 
View it on GitLab: 
https://salsa.debian.org/java-team/javafxsvg/compare/276741db3744cff423dda730e84669efb3b1280f...089d2b8ded0d40c96eb21c75c05d28926b890f7d
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
pkg-java-commits mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to