[Git][java-team/triplea][master] 4 commits: Fix FTBFS with OpenJFX 11.

[Markus Koschany]

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


Commits:
432300c0 by Markus Koschany at 2018-10-08T20:57:37Z
Fix FTBFS with OpenJFX 11.

- - - - -
aab98107 by Markus Koschany at 2018-10-08T21:01:26Z
Switch to compat level 11.

- - - - -
d378a5d4 by Markus Koschany at 2018-10-08T21:01:41Z
Declare compliance with Debian Policy 4.2.1.

- - - - -
01bf430b by Markus Koschany at 2018-10-08T21:02:58Z
Update changelog

- - - - -


4 changed files:

- debian/changelog
- debian/compat
- debian/control
- debian/patches/build.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+triplea (1.9.0.0.7062-2) unstable; urgency=medium
+
+  * Team upload.
+  * Fix FTBFS with OpenJFX 11. (Closes: #874132)
+  * Switch to compat level 11.
+  * Declare compliance with Debian Policy 4.2.1.
+
+ -- Markus Koschany <apo at debian.org>  Mon, 08 Oct 2018 23:02:12 +0200
+
 triplea (1.9.0.0.7062-1) unstable; urgency=medium
 
   * Team upload.


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


=====================================
debian/control
=====================================
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders:
  Scott Howard <showard at debian.org>
 Build-Depends:
- debhelper (>= 10),
+ debhelper (>= 11),
  default-jdk,
  gradle-debian-helper,
  javahelper,
@@ -27,7 +27,7 @@ Build-Depends:
  libyaml-snake-java,
  openjfx,
  substance
-Standards-Version: 4.1.2
+Standards-Version: 4.2.1
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/triplea.git
 Vcs-browser: https://anonscm.debian.org/git/pkg-java/triplea.git
 Homepage: http://www.triplea-game.org/


=====================================
debian/patches/build.patch
=====================================
@@ -4,11 +4,11 @@ Subject: build
 
 Forwarded: not-needed
 ---
- build.gradle | 158 +++++++++--------------------------------------------------
- 1 file changed, 23 insertions(+), 135 deletions(-)
+ build.gradle | 162 ++++++++++-------------------------------------------------
+ 1 file changed, 27 insertions(+), 135 deletions(-)
 
 diff --git a/build.gradle b/build.gradle
-index 631f87f..168214c 100644
+index 631f87f..45e6988 100644
 --- a/build.gradle
 +++ b/build.gradle
 @@ -1,16 +1,16 @@
@@ -55,17 +55,21 @@ index 631f87f..168214c 100644
      compile 'com.google.code.findbugs:jsr305:3.0.2'
      compile 'com.google.guava:guava:19.0'
      compile 'com.googlecode.soundlibs:jlayer:1.0.1-2'
-@@ -92,6 +95,9 @@ dependencies {
+@@ -92,6 +95,13 @@ dependencies {
      compile 'org.json:json:20160810'
      compile 'com.yuvimasory:orange-extensions:1.3.0'
  
 +    compile name: 'substance'
 +    compile name: 'trident'
++    compile name: 'javafx-fxml'
++    compile name: 'javafx-base'
++    compile name: 'javafx-controls'
++    compile name: 'javafx-graphics'
 +
      testCompile 'eu.codearte.catch-exception:catch-exception:2.0.0-ALPHA-1'
      testCompile 'nl.jqno.equalsverifier:equalsverifier:2.3'
      testCompile 'org.hamcrest:java-hamcrest:2.0.0.0'
-@@ -104,7 +110,7 @@ test {
+@@ -104,7 +114,7 @@ test {
  }
  
  
@@ -74,7 +78,7 @@ index 631f87f..168214c 100644
      group = LifecycleBasePlugin.VERIFICATION_GROUP
      description = 'Runs the integration tests.'
  
-@@ -119,26 +125,7 @@ task integTest(type: Test) {
+@@ -119,26 +129,7 @@ task integTest(type: Test) {
      }
  
      mustRunAfter tasks.test
@@ -102,7 +106,7 @@ index 631f87f..168214c 100644
  
  task validateYamls(group: 'verification', description: 'Validates YAML files.') {
      doLast {
-@@ -151,35 +138,6 @@ task validateYamls(group: 'verification', description: 'Validates YAML files.')
+@@ -151,35 +142,6 @@ task validateYamls(group: 'verification', description: 'Validates YAML files.')
      }
  }
  
@@ -138,7 +142,7 @@ index 631f87f..168214c 100644
  task prepareGameEngineProperties() {
      group = 'release'
      description = 'Updates the game engine properties with final values for distribution.'
-@@ -195,7 +153,7 @@ task prepareGameEngineProperties() {
+@@ -195,7 +157,7 @@ task prepareGameEngineProperties() {
      }
  }
  
@@ -147,7 +151,7 @@ index 631f87f..168214c 100644
      classifier 'all_platforms'
      ['assets', 'dice_servers'].each { folder ->
          from(folder) {
-@@ -203,41 +161,11 @@ task allPlatform(type: Zip, group: 'release', dependsOn: [renameShadowJar, prepa
+@@ -203,41 +165,11 @@ task allPlatform(type: Zip, group: 'release', dependsOn: [renameShadowJar, prepa
          }
      }
      from(gameEnginePropertiesArtifactFile)
@@ -191,7 +195,7 @@ index 631f87f..168214c 100644
      doLast {
          def artifacts = [
              file("$libsDir/triplea-$version-all.jar"),
-@@ -263,53 +191,13 @@ task prepareArtifacts(group: 'release', dependsOn: [generateZipReleases, prepare
+@@ -263,53 +195,13 @@ task prepareArtifacts(group: 'release', dependsOn: [generateZipReleases, prepare
  
  task release(group: 'release', dependsOn: [prepareArtifacts]) {}
  



View it on GitLab: https://salsa.debian.org/java-team/triplea/compare/617ca86c21d78cc505f76f93a5c4a5596daabf79...01bf430b80f7fffa2acbb679d47ca748b4e6f345

-- 
View it on GitLab: https://salsa.debian.org/java-team/triplea/compare/617ca86c21d78cc505f76f93a5c4a5596daabf79...01bf430b80f7fffa2acbb679d47ca748b4e6f345
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/20181008/781da7e6/attachment.html>