[Git][java-team/libmiglayout-java][master] 7 commits: Declare compliance with Debian Policy 4.2.1.

Markus Koschany gitlab at salsa.debian.org
Thu Oct 4 12:27:44 BST 2018


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


Commits:
e5dc1663 by Markus Koschany at 2018-10-04T10:10:44Z
Declare compliance with Debian Policy 4.2.1.

- - - - -
904a274d by Markus Koschany at 2018-10-04T10:11:04Z
Build the javafx module.

- - - - -
37ce56f1 by Markus Koschany at 2018-10-04T10:11:36Z
Start new changelog entry.

- - - - -
0c38fdf8 by Markus Koschany at 2018-10-04T10:14:39Z
Ignore test dependecies for javafx module.

- - - - -
a32fc23d by Markus Koschany at 2018-10-04T10:19:25Z
Build-depend on libopenjfx-java.

- - - - -
069b4e22 by Markus Koschany at 2018-10-04T11:15:45Z
Add javafx.patch

- - - - -
d3b961ec by Markus Koschany at 2018-10-04T11:23:33Z
Add a Maven rule for javafx-base.

- - - - -


7 changed files:

- debian/changelog
- debian/control
- debian/libmiglayout-java.poms
- debian/maven.ignoreRules
- debian/maven.rules
- + debian/patches/javafx.patch
- + debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+libmiglayout-java (5.1-2) UNRELEASED; urgency=medium
+
+  * 
+
+ -- Markus Koschany <apo at debian.org>  Thu, 04 Oct 2018 12:11:30 +0200
+
 libmiglayout-java (5.1-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -11,9 +11,10 @@ Build-Depends:
  debhelper (>= 11),
  default-jdk,
  libmaven-bundle-plugin-java,
+ libopenjfx-java,
  libswt-gtk-4-java,
  maven-debian-helper
-Standards-Version: 4.2.0
+Standards-Version: 4.2.1
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/libmiglayout-java.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libmiglayout-java.git
 Homepage: http://www.miglayout.com


=====================================
debian/libmiglayout-java.poms
=====================================
@@ -29,7 +29,7 @@ pom.xml --no-parent --has-package-version
 core/pom.xml --has-package-version --java-lib
 swing/pom.xml --has-package-version --java-lib
 swt/pom.xml --has-package-version --java-lib
-javafx/pom.xml --ignore
+javafx/pom.xml
 ideutil/pom.xml --has-package-version --java-lib
 demo/pom.xml --ignore
 examples/pom.xml --ignore


=====================================
debian/maven.ignoreRules
=====================================
@@ -1,7 +1,6 @@
 
 com.miglayout miglayout-demo jar * * *
 com.miglayout miglayout-examples jar * * *
-com.miglayout miglayout-javafx jar * * *
 junit junit * * * *
 org.apache.maven.plugins maven-javadoc-plugin * * * *
 org.apache.maven.plugins maven-release-plugin * * * *
@@ -9,3 +8,7 @@ org.apache.maven.plugins maven-site-plugin * * * *
 org.apache.maven.plugins maven-source-plugin * * * *
 org.apache.maven.plugins maven-surefire-plugin * * * *
 org.codehaus.mojo nbm-maven-plugin * * * *
+org.loadui testFx * * * *
+org.jfxtras jfxtras-test-support * * * *
+org.jfxtras jfxtras-common * * * *
+


=====================================
debian/maven.rules
=====================================
@@ -2,3 +2,4 @@
 org.eclipse.swt s/org.eclipse.swt.gtk.linux.x86_64/org.eclipse.swt/ * s/.*/debian/ * *
 org.eclipse.swt s/org.eclipse.swt.gtk.linux.x86/org.eclipse.swt/ * s/.*/debian/ * *
 org.apache.felix maven-bundle-plugin * s/.*/3.5.0/ * *
+org-openjfx javafx-base * s/.*/debian/ * *


=====================================
debian/patches/javafx.patch
=====================================
@@ -0,0 +1,24 @@
+From: Markus Koschany <apo at debian.org>
+Date: Thu, 4 Oct 2018 12:38:17 +0200
+Subject: javafx
+
+---
+ javafx/pom.xml | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/javafx/pom.xml b/javafx/pom.xml
+index 5ad9b17..0933fec 100755
+--- a/javafx/pom.xml
++++ b/javafx/pom.xml
+@@ -39,6 +39,11 @@
+     </dependencies>
+ 
+ 	<build>
++        <dependency>
++            <groupId>org.openjfx</groupId>
++            <artifactId>javafx-base</artifactId>
++            <version>11</version>
++        </dependency>
+ 		<plugins>
+ 			<!-- assumes java 1.8 as the minimal JDK -->
+ 			<plugin>


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



View it on GitLab: https://salsa.debian.org/java-team/libmiglayout-java/compare/0ecdff810bb53f634edbda071b3c7b52111df422...d3b961ec6ed47b8c089be9dc1e6f6dbe9d3ce6ae

-- 
View it on GitLab: https://salsa.debian.org/java-team/libmiglayout-java/compare/0ecdff810bb53f634edbda071b3c7b52111df422...d3b961ec6ed47b8c089be9dc1e6f6dbe9d3ce6ae
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/20181004/9fcffcaf/attachment.html>


More information about the pkg-java-commits mailing list