debian/changelog

+pdfsam (3.3.7-1) UNRELEASED; urgency=medium
+
+  * Update maven rule for fontawesomefx
+  * Update d/rules and link to the correct fontawesomefx-fontawesome jar file.
+  * Switch to compat level 11.
+  * Update debian/copyright
+  * New upstream version 3.3.7
+
+ -- Markus Koschany <apo@debian.org>  Fri, 12 Oct 2018 13:24:49 +0200
+
 pdfsam (3.3.5-1) unstable; urgency=medium
 
   * New upstream version 3.3.5.

debian/compat

-10
+11

debian/control

@@ -5,29 +5,30 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.or
 Uploaders:
  Markus Koschany <apo@debian.org>
 Build-Depends:
- debhelper (>= 10),
+ debhelper (>= 11),
  default-jdk,
  junit4,
  libatinject-jsr330-api-java,
  libbcmail-java,
  libbcprov-java,
+ libcommons-csv-java,
  libcommons-io-java,
  libcommons-lang3-java,
- libfontawesomefx-java,
+ libfontawesomefx-java (>= 9.1.2),
  libgettext-commons-java,
  libgettext-maven-plugin-java,
  libhibernate-validator-java (>= 4.3.3-2),
  libjackson2-jr-java,
  liblogback-java,
  libplexus-classworlds-java,
- libsambox-java (>= 1.1.6),
+ libsambox-java (>= 1.1.41),
  libsejda-eventstudio-java,
  libsejda-injector-java,
- libsejda-java (>= 3.2.29),
+ libsejda-java (>= 3.2.56),
  libslf4j-java (>= 1.7.21),
  maven-debian-helper,
  openjfx
-Standards-Version: 4.1.1
+Standards-Version: 4.2.1
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/pdfsam.git
 Vcs-Browser: https://anonscm.debian.org/git/pkg-java/pdfsam.git
 Homepage: http://www.pdfsam.org
@@ -35,11 +36,12 @@ Homepage: http://www.pdfsam.org
 Package: pdfsam
 Architecture: all
 Depends:
- default-jre (>= 2:1.8) | java8-runtime,
+ default-jre (>= 2:1.9) | java9-runtime,
+ libfontawesomefx-java (>= 9.1.2),
  libhibernate-validator-java (>= 4.3.3-2),
  liblogback-java,
- libsambox-java,
- libsejda-java (>= 3.2.29),
+ libsambox-java (>= 1.1.41),
+ libsejda-java (>= 3.2.56),
  openjfx,
  ${maven:Depends},
  ${misc:Depends}

debian/copyright

@@ -5,14 +5,14 @@ Files-Excluded:
  *.dll
 
 Files: *
-Copyright: 2017, Andrea Vacondio <andrea.vacondio@gmail.com>
+Copyright: 2017-2018, Andrea Vacondio <andrea.vacondio@gmail.com>
                       Sober Lemur S.a.s di Vacondio Andrea <info@pdfsam.org>
 License: AGPL-3+
 
 Files: debian/*
 Copyright: 2008-2010, Torsten Werner <twerner@debian.org>
                 2012, Miguel Landaeta <miguel@miguel.cc>
-                2017, Markus Koschany <apo@debian.org>
+           2017-2018, Markus Koschany <apo@debian.org>
 License: AGPL-3+
 
 License: AGPL-3+

debian/patches/javafx.patch

+From: Markus Koschany <apo@debian.org>
+Date: Fri, 12 Oct 2018 13:55:27 +0200
+Subject: javafx
+
+Depend on OpenJFX 11.
+
+Forwarded: no
+---
+ pdfsam-core/pom.xml | 18 ++++++++++++++++++
+ pdfsam-gui/pom.xml  | 12 ++++++++++++
+ pom.xml             | 16 ++++++++++++++++
+ 3 files changed, 46 insertions(+)
+
+diff --git a/pdfsam-core/pom.xml b/pdfsam-core/pom.xml
+index 6120c0f..be9505c 100644
+--- a/pdfsam-core/pom.xml
++++ b/pdfsam-core/pom.xml
+@@ -58,5 +58,23 @@
+ 			<groupId>jdepend</groupId>
+ 			<artifactId>jdepend</artifactId>
+ 		</dependency>
++		<dependency>
++			<groupId>org.openjfx</groupId>
++			<artifactId>javafx-base</artifactId>
++			<version>11</version>
++			<classifier>linux</classifier>
++		</dependency>
++		<dependency>
++			<groupId>org.openjfx</groupId>
++			<artifactId>javafx-fxml</artifactId>
++			<version>11</version>
++			<classifier>linux</classifier>
++		</dependency>
++		<dependency>
++			<groupId>org.openjfx</groupId>
++			<artifactId>javafx-graphics</artifactId>
++			<version>11</version>
++			<classifier>linux</classifier>
++		</dependency>
+ 	</dependencies>
+ </project>
+diff --git a/pdfsam-gui/pom.xml b/pdfsam-gui/pom.xml
+index 8663424..08b5f5d 100644
+--- a/pdfsam-gui/pom.xml
++++ b/pdfsam-gui/pom.xml
+@@ -123,6 +123,18 @@
+ 			<artifactId>jcl-over-slf4j</artifactId>
+ 			<version>${slf4j.version}</version>
+ 		</dependency>
++		<dependency>
++			<groupId>org.openjfx</groupId>
++			<artifactId>javafx-graphics</artifactId>
++			<version>11</version>
++			<classifier>linux</classifier>
++		</dependency>
++		<dependency>
++			<groupId>org.openjfx</groupId>
++			<artifactId>javafx-media</artifactId>
++			<version>11</version>
++			<classifier>linux</classifier>
++		</dependency>
+ 
+ 		<!-- test dependencies -->
+ 		<dependency>
+diff --git a/pom.xml b/pom.xml
+index 738839d..a7e51a5 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -311,6 +311,22 @@
+ 				<scope>test</scope>
+ 			</dependency>
+ 		</dependencies>
++		<dependency>
++			<groupId>org.openjfx</groupId>
++			<artifactId>javafx-base</artifactId>
++			<version>11</version>
++			<classifier>linux</classifier>
++		</dependency>
++		<dependency>
++			<groupId>org.openjfx</groupId>
++			<artifactId>javafx-fxml</artifactId>
++			<version>11</version>
++		</dependency>
++		<dependency>
++			<groupId>org.openjfx</groupId>
++			<artifactId>javafx-graphics</artifactId>
++			<version>11</version>
++		</dependency>
+ 	</dependencyManagement>
+ 
+ 	<dependencies>

debian/patches/no-check-for-updates.patch

@@ -10,10 +10,10 @@ Forwarded: not-needed
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/pdfsam-core/src/main/java/org/pdfsam/context/DefaultUserContext.java b/pdfsam-core/src/main/java/org/pdfsam/context/DefaultUserContext.java
-index 6d4f05a..5cd30c6 100644
+index c36f2b2..1180d04 100644
 --- a/pdfsam-core/src/main/java/org/pdfsam/context/DefaultUserContext.java
 +++ b/pdfsam-core/src/main/java/org/pdfsam/context/DefaultUserContext.java
-@@ -112,7 +112,7 @@ public final class DefaultUserContext implements UserContext {
+@@ -103,7 +103,7 @@ public final class DefaultUserContext implements UserContext {
      @Override
      public boolean isCheckForUpdates() {
          return prefs.getBoolean(BooleanUserPreference.CHECK_UPDATES.toString(),

debian/patches/pdfsam-bin.patch

@@ -10,7 +10,7 @@ Forwarded: not-needed
  1 file changed, 2 insertions(+), 17 deletions(-)
 
 diff --git a/pdfsam-community/src/assembly/resources/bin/pdfsam.sh b/pdfsam-community/src/assembly/resources/bin/pdfsam.sh
-index af06891..4882e8f 100644
+index fe9f37b..c14771e 100644
 --- a/pdfsam-community/src/assembly/resources/bin/pdfsam.sh
 +++ b/pdfsam-community/src/assembly/resources/bin/pdfsam.sh
 @@ -16,22 +16,7 @@

debian/patches/series

 pdfsam-bin.patch
 no-check-for-updates.patch
+javafx.patch
+fontawesomefx.patch

debian/rules

@@ -5,7 +5,8 @@ LINK_JARS += atinject-jsr330-api sejda-injector fontawesomefx-fontawesome jackso
 LINK_JARS += jackson-core hibernate-validator bcmail bcprov fontbox2 sejda-io sambox
 LINK_JARS += sejda-core sejda-conversion gettext-commons geronimo-validation-1.0-spec sejda-model
 LINK_JARS += commons-io eventstudio commons-lang3 sejda-sambox sejda-fonts sejda-injector
-LINK_JARS += jboss-logging jcl-over-slf4j
+LINK_JARS += jboss-logging jcl-over-slf4j fontawesomefx-materialdesignfont fontawesomefx-materialicons.jar
+LINK_JARS += javafx-base javafx-controls javafx-media javafx-graphics
 
 %:
 	dh $@

pdfsam-alternate-mix/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.pdfsam</groupId>
 		<artifactId>pdfsam-parent</artifactId>
-		<version>3.3.5</version>
+		<version>3.3.7</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

pdfsam-community/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.pdfsam</groupId>
 		<artifactId>pdfsam-parent</artifactId>
-		<version>3.3.5</version>
+		<version>3.3.7</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -30,7 +30,10 @@
 
 	<profiles>
 		<profile>
-			<id>release</id>
+			<id>basic-release</id>
+			<properties>
+				<skip.dmg>false</skip.dmg>
+			</properties>
 			<build>
 				<plugins>
 					<plugin>
@@ -114,6 +117,7 @@
 										<txtFileVersion>${project.version}</txtFileVersion>
 										<fileDescription>PDFsam Basic</fileDescription>
 										<copyright>Sober Lemur S.a.s di Vacondio Andrea</copyright>
+										<companyName>Sober Lemur S.a.s di Vacondio Andrea</companyName>
 										<productVersion>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0</productVersion>
 										<txtProductVersion>${project.version}</txtProductVersion>
 										<productName>PDF Split And Merge Basic Edition</productName>
@@ -294,10 +298,123 @@
 				</plugins>
 			</build>
 		</profile>
+
+		<profile>
+			<id>dmg</id>
+			<activation>
+				<os>
+					<family>mac</family>
+				</os>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>exec-maven-plugin</artifactId>
+						<version>1.6.0</version>
+						<executions>
+							<execution>
+								<id>package-dmg</id>
+								<phase>pre-integration-test</phase>
+								<goals>
+									<goal>exec</goal>
+								</goals>
+								<configuration>
+									<executable>
+										javapackager
+									</executable>
+									<arguments>
+										<argument>-deploy</argument>
+										<argument>-native</argument>
+										<argument>dmg</argument>
+										<argument>-name</argument>
+										<argument>PDFsam Basic</argument>
+										<argument>-description</argument>
+										<argument>A free open source application to split and merge
+											PDF files</argument>
+										<argument>-title</argument>
+										<argument>PDFsam Basic</argument>
+										<argument>-vendor</argument>
+										<argument>Sober Lemur S.a.s. di Vacondio Andrea</argument>
+										<argument>-appclass</argument>
+										<argument>org.pdfsam.community.App</argument>
+										<argument>-outdir</argument>
+										<argument>${project.build.directory}</argument>
+										<argument>-outfile</argument>
+										<argument>pdfsam-${version}</argument>
+										<argument>-srcdir</argument>
+										<argument>${project.build.directory}/assembled</argument>
+										<argument>-srcfiles</argument>
+										<argument>${project.build.finalName}.jar</argument>
+										<argument>-srcfiles</argument>
+										<argument>LICENSE.txt</argument>
+										<argument>-srcfiles</argument>
+										<argument>etc/logback.xml </argument>
+										<argument>-BlicenseFile=LICENSE.txt</argument>
+										<argument>-BmainJar=${project.build.finalName}.jar</argument>
+										<argument>-BappVersion=${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</argument>
+										<argument>-Bicon=${project.basedir}/src/dmg/Icon.icns</argument>
+										<argument>-Bidentifier=org.pdfsam.community.App</argument>
+										<argument>-BuserJvmOptions=-Xmx=512m</argument>
+										<argument>-Bmac.category=Business</argument>
+										<argument>-Bmac.CFBundleIdentifier=org.pdfsam.basic</argument>
+										<argument>-Bmac.signing-key-developer-id-app=SOBER LEMUR SAS DI VACONDIO ANDREA</argument>
+										<argument>-Bclasspath=etc;${project.build.finalName}.jar</argument>
+										<argument>-v</argument>
+									</arguments>
+									<skip>${skip.dmg}</skip>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>com.coderplus.maven.plugins</groupId>
+						<artifactId>copy-rename-maven-plugin</artifactId>
+						<version>1.0</version>
+						<executions>
+							<execution>
+								<id>rename-dmg</id>
+								<phase>pre-integration-test</phase>
+								<goals>
+									<goal>copy</goal>
+								</goals>
+								<configuration>
+									<sourceFile>${project.build.directory}/bundles/PDFsam Basic-${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.dmg</sourceFile>
+									<destinationFile>${project.build.directory}/pdfsam-${version}.dmg</destinationFile>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+						<plugin>
+							<groupId>org.codehaus.mojo</groupId>
+							<artifactId>build-helper-maven-plugin</artifactId>
+							<version>3.0.0</version>
+							<executions>
+								<execution>
+									<id>attach-dmg</id>
+									<phase>pre-integration-test</phase>
+									<goals>
+										<goal>attach-artifact</goal>
+									</goals>
+									<configuration>
+										<artifacts>
+											<artifact>
+												<file>${project.build.directory}/pdfsam-${version}.dmg</file>
+												<type>dmg</type>
+											</artifact>
+										</artifacts>
+									</configuration>
+								</execution>
+							</executions>
+						</plugin>
+				</plugins>
+			</build>
+		</profile>
 	</profiles>
 
 	<properties>
 		<pdfsam.package>COMMUNITY</pdfsam.package>
+		<skip.dmg>true</skip.dmg>
 	</properties>
 
 	<build>

pdfsam-community/src/assembly/resources/bin/pdfsam.bat

 @REM This file is part of the PDF Split And Merge Basic source code
-@REM Copyright 2015 by Andrea Vacondio (andrea.vacondio@gmail.com).
+@REM Copyright 2017 by Sober Lemur S.a.s. di Vacondio Andrea (info@pdfsam.org).
 @REM
 @REM This program is free software: you can redistribute it and/or modify
 @REM it under the terms of the GNU Affero General Public License as

pdfsam-community/src/assembly/resources/bin/pdfsam.sh

 #!/bin/sh
 # This file is part of the PDF Split And Merge Basic source code
-# Copyright 2015 by Andrea Vacondio (andrea.vacondio@gmail.com).
+# Copyright 2017 by Sober Lemur S.a.s. di Vacondio Andrea (info@pdfsam.org).
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as

pdfsam-community/src/detached-sign.sh

+#!/bin/sh
+# This file is part of the PDF Split And Merge Basic source code
+# Copyright 2017 by Sober Lemur S.a.s. di Vacondio Andrea (info@pdfsam.org).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
+gpg --armor --detach-sign *.msi
+gpg --armor --detach-sign *.dmg
\ No newline at end of file

pdfsam-community/src/main/resources/pdfsam.properties

@@ -2,24 +2,24 @@ pdfsam.version=${project.version}
 pdfsam.builddate=${pdfsam.builddate}
 pdfsam.edition=${pdfsam.package}
 pdfsam.home.label=pdfsam.org
-pdfsam.home.url=http://pdfsam.org
+pdfsam.home.url=https://pdfsam.org
 pdfsam.copyright=Copyright by Sober Lemur S.a.s. di Vacondio Andrea
 pdfsam.license.name=GNU Affero General Public License v3
 pdfsam.license.url=http://www.gnu.org/licenses/agpl-3.0.html
-pdfsam.feed.url=http://www.pdfsam.org/feed/
-pdfsam.thanks.url=http://www.pdfsam.org/thanks_to
-pdfsam.tracker.url=http://www.pdfsam.org/issue_tracker
-pdfsam.support.url=http://www.pdfsam.org/support-pdfsam-basic
-pdfsam.quickstart.url=http://www.pdfsam.org/quickstart
-pdfsam.twitter.url=http://www.pdfsam.org/twitter
-pdfsam.facebook.url=http://www.pdfsam.org/facebook
-pdfsam.gplus.url=http://www.pdfsam.org/gplus
-pdfsam.translate.url=http://www.pdfsam.org/translate
-pdfsam.scm.url=http://www.pdfsam.org/scm
-pdfsam.donate.url=http://www.pdfsam.org/donate
-pdfsam.download.url=http://www.pdfsam.org/downloads
+pdfsam.feed.url=https://www.pdfsam.org/feed/
+pdfsam.thanks.url=https://www.pdfsam.org/thanks_to
+pdfsam.tracker.url=https://www.pdfsam.org/issue_tracker
+pdfsam.support.url=https://www.pdfsam.org/support-pdfsam-basic
+pdfsam.documentation.url=https://pdfsam.org/documentation/
+pdfsam.twitter.url=https://www.pdfsam.org/twitter
+pdfsam.facebook.url=https://www.pdfsam.org/facebook
+pdfsam.gplus.url=https://www.pdfsam.org/gplus
+pdfsam.translate.url=https://www.pdfsam.org/translate
+pdfsam.scm.url=https://www.pdfsam.org/scm
+pdfsam.donate.url=https://www.pdfsam.org/donate
+pdfsam.download.url=https://www.pdfsam.org/downloads
 pdfsam.news.url=http://www.pdfsam.org/whats-new
-pdfsam.tweeter.share.url=https://twitter.com/home?status=Split%20and%20merge%20PDF%20files%20with%20%23PDFsam%20fast,%20free%20and%20open%20source!%20%40PDFsamOSS%20http%3A//pdfsam.org%20%23PDFmerge%20%23PDFsplit
-pdfsam.facebook.share.url=https://www.facebook.com/sharer/sharer.php?u=http://pdfsam.org
-pdfsam.gplus.share.url=https://plus.google.com/share?url=%23PDFsam%20is%20a%20free%2C%20open%20source%20and%20super%20fast%20application%20to%20split%20and%20merge%20PDF%20files!%20http%3A%2F%2Fpdfsam.org
+pdfsam.tweeter.share.url=https://twitter.com/home?status=Split%20and%20merge%20PDF%20files%20with%20%23PDFsam%20fast,%20free%20and%20open%20source!%20%40PDFsamOSS%20https%3A//pdfsam.org%20%23PDFmerge%20%23PDFsplit
+pdfsam.facebook.share.url=https://www.facebook.com/sharer/sharer.php?u=https://pdfsam.org
+pdfsam.gplus.share.url=https://plus.google.com/share?url=%23PDFsam%20is%20a%20free%2C%20open%20source%20and%20super%20fast%20application%20to%20split%20and%20merge%20PDF%20files!%20https%3A%2F%2Fpdfsam.org
 pdfsam.premium.modules.url=http://www.pdfsam.org/premium-modules
\ No newline at end of file

pdfsam-core/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.pdfsam</groupId>
 		<artifactId>pdfsam-parent</artifactId>
-		<version>3.3.5</version>
+		<version>3.3.7</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

pdfsam-core/src/main/java/org/pdfsam/ConfigurableProperty.java

@@ -34,7 +34,7 @@ public enum ConfigurableProperty {
     THANKS_URL("pdfsam.thanks.url"),
     TRACKER_URL("pdfsam.tracker.url"),
     SUPPORT_URL("pdfsam.support.url"),
-    QUICKSTART_URL("pdfsam.quickstart.url"),
+    DOCUMENTATION_URL("pdfsam.documentation.url"),
     TWITTER_URL("pdfsam.twitter.url"),
     FACEBOOK_URL("pdfsam.facebook.url"),
     GPLUS_URL("pdfsam.gplus.url"),

pdfsam-core/src/test/resources/logback-test.xml

@@ -7,10 +7,10 @@
 		</encoder>
 	</appender>
 
-	<logger name="org.sejda" level="DEBUG" />	
+	<logger name="org.sejda" level="WARN" />	
 	<logger name="org.sejda.eventstudio" level="ERROR" />
 	<logger name="org.sejda.injector" level="ERROR" />
-	<logger name="org.pdfsam" level="DEBUG" />
+	<logger name="org.pdfsam" level="WARN" />
 	<logger name="org.hibernate" level="WARN" />
 	
 	<root level="WARN">