Skip to content
GitLab
Explore
Sign in
Register
Commits on Source (6)
Add javafx.patch.
· 8d0b1bcd
Markus Koschany
authored
Oct 07, 2018
8d0b1bcd
Update changelog
· 1e4b8126
Markus Koschany
authored
Oct 07, 2018
1e4b8126
Update libmiglayout-java.poms
· 9ebc4198
Markus Koschany
authored
Oct 07, 2018
9ebc4198
Update patch header
· 0c36fa51
Markus Koschany
authored
Oct 07, 2018
0c36fa51
Fix a changelog typo
· dc1f95bc
Markus Koschany
authored
Oct 07, 2018
dc1f95bc
Merge branch 'master' of salsa.debian.org:java-team/libmiglayout-java
· e621ea3c
Markus Koschany
authored
Oct 07, 2018
e621ea3c
Show whitespace changes
Inline
Side-by-side
debian/changelog
View file @
e621ea3c
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@debian.org>
Thu
, 0
4
Oct 2018 1
2:11:30
+0200
-- Markus Koschany <apo@debian.org>
Sun
, 0
7
Oct 2018 1
1:21:45
+0200
libmiglayout-java (5.1-1) unstable; urgency=medium
...
...
debian/libmiglayout-java.poms
View file @
e621ea3c
...
...
@@ -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
View file @
e621ea3c
...
...
@@ -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
View file @
e621ea3c
...
...
@@ -2,23 +2,39 @@ From: Markus Koschany <apo@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
@@ -3
9
,6 +3
9,11
@@
</dependencies
>
<build
>
@@ -3
6
,6 +3
6,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>