debian/changelog

+afterburner.fx (1.7.0-2) unstable; urgency=medium
+
+  * Update Vcs URLs to point to Salsa
+  * Use debhelper 11
+  * Bump Standards-Version to 4.3.0
+  * Update build-dep from openjfx -> libopenjfx-java
+  * Patch upstream pom for javafx and javax.inject and annotations
+  * Add build-deps on libfindbugs-annotations-java and
+    libgeronimo-annotation-1.3-spec-java
+  * Freshen debian/copyright
+  * Drop get-orig-source target from debian/rules
+  * No longer build a shaded JAR
+
+ -- tony mancill <tmancill@debian.org>  Sun, 13 Jan 2019 13:18:25 -0800
+
 afterburner.fx (1.7.0-1) unstable; urgency=medium
 
   * Initial release (Closes: #848398)

debian/compat

-10
+11

debian/control

@@ -3,20 +3,23 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: tony mancill <tmancill@debian.org>
-Build-Depends: debhelper (>= 10), default-jdk, maven-debian-helper (>= 2.1)
-Build-Depends-Indep: libmaven-shade-plugin-java,
- libatinject-jsr330-api-java,
+Build-Depends: debhelper (>= 11),
+ default-jdk,
+ maven-debian-helper (>= 2.1)
+Build-Depends-Indep: default-jdk-doc,
  junit4,
- libmockito-java,  
- default-jdk-doc,
+ libatinject-jsr330-api-java,
  libatinject-jsr330-api-java-doc,
+ libfindbugs-annotations-java,
+ libgeronimo-annotation-1.3-spec-java,
  libmaven-javadoc-plugin-java,
- openjfx,
+ libmockito-java,
+ libopenjfx-java,
  xauth,
  xvfb
-Standards-Version: 3.9.8
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/afterburner.fx.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/afterburner.fx.git
+Standards-Version: 4.3.0
+Vcs-Git: https://salsa.debian.org/java-team/afterburner.fx.git
+Vcs-Browser: https://salsa.debian.org/java-team/afterburner.fx
 Homepage: http://afterburner.adam-bien.com
 
 Package: libafterburner.fx-java

debian/copyright

@@ -8,7 +8,7 @@ Copyright: 2013-2017, Adam Bien
 License: Apache-2.0
 
 Files: debian/*
-Copyright: 2017, tony mancill <tmancill@debian.org>
+Copyright: 2017-2019, tony mancill <tmancill@debian.org>
 License: Apache-2.0
 
 License: Apache-2.0

debian/patches/disable_shade_jar.patch

+--- a/pom.xml
++++ b/pom.xml
+@@ -105,6 +105,7 @@
+                     </execution>
+                 </executions>
+             </plugin>
++            <!-- Debian does not build a shaded JAR
+             <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-shade-plugin</artifactId>
+@@ -125,6 +126,7 @@
+                     </execution>
+                 </executions>
+             </plugin>
++            -->
+             <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-gpg-plugin</artifactId>

debian/patches/javafx_pom.patch

+--- a/pom.xml
++++ b/pom.xml
+@@ -52,6 +52,24 @@
+             <version>1</version>
+             <scope>compile</scope>
+         </dependency>
++        <dependency>
++            <groupId>org.openjfx</groupId>
++            <artifactId>javafx-fxml</artifactId>
++            <version>debian</version>
++            <scope>compile</scope>
++        </dependency>
++        <dependency>
++            <groupId>org.openjfx</groupId>
++            <artifactId>javafx-graphics</artifactId>
++            <version>debian</version>
++            <scope>compile</scope>
++        </dependency>
++        <dependency>
++            <groupId>org.openjfx</groupId>
++            <artifactId>javafx-swing</artifactId>
++            <version>debian</version>
++            <scope>compile</scope>
++        </dependency>
+     </dependencies>
+     <build>
+         <plugins>

debian/patches/javax_pom.patch

+--- a/pom.xml
++++ b/pom.xml
+@@ -47,6 +47,12 @@
+             <scope>test</scope>
+         </dependency>
+         <dependency>
++            <groupId>com.google.code.findbugs</groupId>
++            <artifactId>annotations</artifactId>
++            <version>debian</version>
++            <scope>test</scope>
++        </dependency>
++        <dependency>
+             <groupId>javax.inject</groupId>
+             <artifactId>javax.inject</artifactId>
+             <version>1</version>
+@@ -70,6 +76,12 @@
+             <version>debian</version>
+             <scope>compile</scope>
+         </dependency>
++        <dependency>
++            <groupId>javax.annotation</groupId>
++            <artifactId>jsr250-api</artifactId>
++            <version>debian</version>
++            <scope>compile</scope>
++        </dependency>
+     </dependencies>
+     <build>
+         <plugins>

debian/patches/series

+javafx_pom.patch
+javax_pom.patch
+disable_shade_jar.patch

debian/rules

@@ -5,6 +5,3 @@
 
 override_dh_auto_test:
 	xvfb-run dh_auto_test
-
-get-orig-source:
-	uscan --download-current-version --force-download --no-symlink