debian/changelog

+libpdfbox2-java (2.0.13-2) unstable; urgency=medium
+
+  * Team upload.
+  * Build the tools module
+  * Standards-Version updated to 4.3.0
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Thu, 17 Jan 2019 22:32:22 +0100
+
 libpdfbox2-java (2.0.13-1) unstable; urgency=medium
 
   * New upstream version 2.0.13.

debian/control

@@ -18,9 +18,9 @@ Build-Depends:
  libmaven-javadoc-plugin-java,
  libpdfbox2-java,
  maven-debian-helper
-Standards-Version: 4.2.1
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/libpdfbox2-java.git
-Vcs-Browser: https://anonscm.debian.org/git/pkg-java/libpdfbox2-java.git
+Standards-Version: 4.3.0
+Vcs-Git: https://salsa.debian.org/java-team/libpdfbox2-java.git
+Vcs-Browser: https://salsa.debian.org/java-team/libpdfbox2-java
 Homepage: http://pdfbox.apache.org
 
 Package: libpdfbox2-java

debian/libpdfbox2-java.poms

@@ -34,6 +34,6 @@ preflight/pom.xml --ignore
 preflight-app/pom.xml --ignore
 app/pom.xml --ignore
 examples/pom.xml --ignore
-tools/pom.xml --ignore
+tools/pom.xml --no-parent --usj-name=pdfbox2-tools --package=libpdfbox2-java --java-lib
 debugger/pom.xml --ignore
 debugger-app/pom.xml --ignore

debian/maven.publishedRules

@@ -2,3 +2,4 @@
 org.apache.pdfbox fontbox s/jar/bundle/ s/.*/2.x/ * *
 org.apache.pdfbox pdfbox s/jar/bundle/ s/.*/2.x/ * *
 org.apache.pdfbox pdfbox-reactor pom s/.*/2.x/ * *
+org.apache.pdfbox pdfbox-tools jar s/.*/2.x/ * *

debian/maven.rules

@@ -7,5 +7,7 @@ org.bouncycastle s/bcprov-jdk15/bcprov/ * s/.*/debian/ * *
 org.bouncycastle s/bcprov-jdk15on/bcprov/ * s/.*/debian/ * *
 org.apache.pdfbox fontbox s/jar/bundle/ s/.*/2.x/ * *
 org.apache.pdfbox pdfbox s/jar/bundle/ s/.*/2.x/ * *
+org.apache.pdfbox pdfbox-debugger * s/.*/2.x/ * *
 org.apache.pdfbox pdfbox-reactor pom s/.*/2.x/ * *
+org.apache.pdfbox pdfbox-tools * s/.*/2.x/ * *
 

debian/patches/disable-debugger.patch

+Description: Disable the debugger support in the tools component
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: not-needed
+--- a/tools/src/main/java/org/apache/pdfbox/tools/PDFBox.java
++++ b/tools/src/main/java/org/apache/pdfbox/tools/PDFBox.java
+@@ -16,8 +16,6 @@
+  */
+ package org.apache.pdfbox.tools;
+ 
+-import org.apache.pdfbox.debugger.PDFDebugger;
+-
+ /**
+  * Simple wrapper around all the command line utilities included in PDFBox.
+  * Used as the main class in the runnable standalone PDFBox jar.
+@@ -71,11 +69,6 @@
+             {
+                 PrintPDF.main(arguments);
+             }
+-            else if (command.equals("PDFDebugger") || command.equals("PDFReader"))
+-            {
+-                PDFDebugger.main(arguments);
+-                exitAfterCallingMain = false;
+-            }
+             else if (command.equals("PDFMerger"))
+             {
+                 PDFMerger.main(arguments);
+@@ -122,7 +115,6 @@
+                 + "  ExtractImages\n"
+                 + "  OverlayPDF\n"
+                 + "  PrintPDF\n"
+-                + "  PDFDebugger\n"
+                 + "  PDFMerger\n"
+                 + "  PDFReader\n"
+                 + "  PDFSplit\n"
+--- a/tools/pom.xml
++++ b/tools/pom.xml
+@@ -39,16 +39,16 @@
+ 
+   <dependencies>
+     <dependency>
++        <groupId>${project.groupId}</groupId>
++        <artifactId>pdfbox</artifactId>
++        <version>${project.version}</version>
++    </dependency>
++    <dependency>
+       <groupId>org.bouncycastle</groupId>
+       <artifactId>bcmail-jdk15on</artifactId>
+       <optional>true</optional>
+     </dependency>
+     <dependency>
+-        <groupId>${project.groupId}</groupId>
+-        <artifactId>pdfbox-debugger</artifactId>
+-        <version>${project.version}</version>
+-    </dependency>
+-    <dependency>
+       <groupId>junit</groupId>
+       <artifactId>junit</artifactId>
+       <scope>test</scope>

debian/patches/series

 jar-packaging.patch
+disable-debugger.patch

debian/rules

@@ -9,6 +9,3 @@ override_dh_installchangelogs:
 override_dh_installexamples:
 	dh_installexamples
 	find $(CURDIR)/debian/libpdfbox2-java-doc/ -type d -empty -delete
-
-get-orig-source:
-	uscan --download-current-version --force-download --repack --rename --compression xz

debian/watch

-version=3
+version=4
 
 # http://pdfbox.apache.org/download.html
 # points to a page for mirror selection
 
 
 opts=\
+repack,\
+compression=xz,\
 dversionmangle=s/(?:\.|\+)dfsg$//,\
 downloadurlmangle=s/pdfbox\/([\d.]+)\//pdfbox\/$1\/pdfbox-$1-src.zip/,\
 filenamemangle=s/([\d.]+)\//pdfbox-$1-src.zip/,\