[Git][java-team/libmiglayout-java][master] 6 commits: Add javafx.patch.

[Markus Koschany]

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


Commits:
8d0b1bcd by Markus Koschany at 2018-10-07T09:19:11Z
Add javafx.patch.

- - - - -
1e4b8126 by Markus Koschany at 2018-10-07T09:22:35Z
Update changelog

- - - - -
9ebc4198 by Markus Koschany at 2018-10-07T09:23:32Z
Update libmiglayout-java.poms

- - - - -
0c36fa51 by Markus Koschany at 2018-10-07T09:24:08Z
Update patch header

- - - - -
dc1f95bc by Markus Koschany at 2018-10-07T09:27:37Z
Fix a changelog typo

- - - - -
e621ea3c by Markus Koschany at 2018-10-07T10:14:06Z
Merge branch 'master' of salsa.debian.org:java-team/libmiglayout-java

- - - - -


4 changed files:

- debian/changelog
- debian/libmiglayout-java.poms
- debian/maven.rules
- debian/patches/javafx.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,8 +1,13 @@
-libmiglayout-java (5.1-2) UNRELEASED; urgency=medium
+libmiglayout-java (5.1-2) unstable; urgency=medium
 
-  * 
+  * Team upload.
+  * Declare compliance with Debian Policy 4.2.1.
+  * Build the javafx module.
+  * Ignore test dependencies for javafx module.
+  * Build-depend on libopenjfx-java.
+  * Add javafx.patch and depend on the new OpenJFX11 artifacts.
 
- -- Markus Koschany <apo at debian.org>  Thu, 04 Oct 2018 12:11:30 +0200
+ -- Markus Koschany <apo at debian.org>  Sun, 07 Oct 2018 11:21:45 +0200
 
 libmiglayout-java (5.1-1) unstable; urgency=medium
 


=====================================
debian/libmiglayout-java.poms
=====================================
@@ -25,12 +25,12 @@
 #   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
 #     Empty by default. [mh_install]
 #
-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
-ideutil/pom.xml --has-package-version --java-lib
+pom.xml --no-parent
+core/pom.xml --java-lib
+swing/pom.xml --java-lib
+swt/pom.xml --java-lib
+javafx/pom.xml --java-lib
+ideutil/pom.xml --java-lib
 demo/pom.xml --ignore
 examples/pom.xml --ignore
 nbm/pom.xml --ignore


=====================================
debian/maven.rules
=====================================
@@ -2,4 +2,3 @@
 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
=====================================
@@ -2,23 +2,39 @@ From: Markus Koschany <apo at debian.org>
 Date: Thu, 4 Oct 2018 12:38:17 +0200
 Subject: javafx
 
+Build-depend on new OpenJFX11 artifatcts.
+
+Forwarded: not-needed
 ---
- javafx/pom.xml | 5 +++++
- 1 file changed, 5 insertions(+)
+ javafx/pom.xml | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
 
 diff --git a/javafx/pom.xml b/javafx/pom.xml
-index 5ad9b17..0933fec 100755
+index 5ad9b17..b9b8db9 100755
 --- a/javafx/pom.xml
 +++ b/javafx/pom.xml
-@@ -39,6 +39,11 @@
-     </dependencies>
- 
- 	<build>
+@@ -36,6 +36,24 @@
+         	<version>8.0-r3</version>
+         	<scope>test</scope>
+         </dependency>
 +        <dependency>
 +            <groupId>org.openjfx</groupId>
 +            <artifactId>javafx-base</artifactId>
 +            <version>11</version>
++            <classifier>linux</classifier>
++        </dependency>
++        <dependency>
++            <groupId>org.openjfx</groupId>
++            <artifactId>javafx-controls</artifactId>
++            <version>11</version>
++            <classifier>linux</classifier>
 +        </dependency>
- 		<plugins>
- 			<!-- assumes java 1.8 as the minimal JDK -->
- 			<plugin>
++        <dependency>
++            <groupId>org.openjfx</groupId>
++            <artifactId>javafx-graphics</artifactId>
++            <version>11</version>
++            <classifier>linux</classifier>
++        </dependency>
+     </dependencies>
+ 
+ 	<build>



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

-- 
View it on GitLab: https://salsa.debian.org/java-team/libmiglayout-java/compare/d3b961ec6ed47b8c089be9dc1e6f6dbe9d3ce6ae...e621ea3c87fc026b2be6e2eb585873cd4463e7d9
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/20181007/f9a638b2/attachment.html>