.travis.yml

 language: java
 sudo: false
+
+matrix:
+  include:
+    # Ubuntu Linux (trusty) / Open DK 11 / Headed (Glass Robot) / HiDPI
+    - os: linux
+      dist: trusty
+      jdk: openjdk11
+      env:
+        - _JAVA_OPTIONS="-Dtestfx.robot=glass -Dglass.gtk.uiScale=2.0"
+    # Ubuntu Linux (trusty) / Open DK 11 / Headless
+    - os: linux
+      dist: trusty
+      jdk: openjdk11
+      env:
+        - _JAVA_OPTIONS="-Djava.awt.headless=true -Dtestfx.robot=glass -Dtestfx.headless=true -Dprism.order=sw"
+    
 before_install:
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
-jdk:
-  - oraclejdk8
+  - if [[ "${TRAVIS_OS_NAME}" == linux ]]; then 
+      export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start; 
+    elif [[ "${TRAVIS_OS_NAME}" == osx ]]; then
+      brew update && brew install gettext && brew link --force gettext;
+    fi
+

debian/changelog

+pdfsam (4.0.0-1) unstable; urgency=medium
+
+  * New upstream version 4.0.0.
+  * Drop fontawesomefx.patch and javafx.patch. Fixed upstream.
+  * Rebase pdfsam-bin.patch.
+  * Don't install logback.xml separately because it is included in pdfsam-basic
+    now.
+
+ -- Markus Koschany <apo@debian.org>  Sat, 22 Dec 2018 21:02:59 +0100
+
 pdfsam (3.3.7-1) unstable; urgency=medium
 
   * New upstream version 3.3.7.

debian/install

 debian/pdfsam.desktop                                            usr/share/applications/
 debian/pdfsam.svg                                                usr/share/icons/hicolor/scalable/apps/
 pdfsam-alternate-mix/target/*.jar                                usr/share/pdfsam/lib/
-pdfsam-community/src/assembly/resources/bin/pdfsam.sh            usr/share/pdfsam/bin/
-pdfsam-community/src/main/etc/logback.xml                        usr/share/pdfsam/etc/
-pdfsam-community/src/main/resources/images/community/splash.gif  usr/share/pdfsam/resources/
-pdfsam-community/target/*.jar                                    usr/share/pdfsam/lib/
+pdfsam-basic/src/assembly/resources/bin/pdfsam.sh                usr/share/pdfsam/bin/
+pdfsam-basic/src/main/resources/images/basic/splash.gif          usr/share/pdfsam/resources/
+pdfsam-basic/target/*.jar                                        usr/share/pdfsam/lib/
 pdfsam-core/target/*.jar                                         usr/share/pdfsam/lib/
 pdfsam-extract/target/*.jar                                      usr/share/pdfsam/lib/
 pdfsam-fx/target/*.jar                                           usr/share/pdfsam/lib/

debian/maven.ignoreRules

@@ -8,3 +8,5 @@ org.codehaus.mojo exec-maven-plugin * * * *
 org.hamcrest hamcrest-all * * * *
 org.loadui testFx * * * *
 org.mockito mockito-all * * * *
+kr.motd.maven os-maven-plugin * * * *
+org.testfx  * * * * *

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: https://github.com/torakiki/pdfsam/issues/310
----
- pdfsam-core/pom.xml | 4 ++++
- pdfsam-fx/pom.xml   | 4 ++++
- pdfsam-gui/pom.xml  | 8 ++++++++
- 3 files changed, 16 insertions(+)
-
-diff --git a/pdfsam-core/pom.xml b/pdfsam-core/pom.xml
-index 6120c0f..d5bc19a 100644
---- a/pdfsam-core/pom.xml
-+++ b/pdfsam-core/pom.xml
-@@ -58,5 +58,9 @@
- 			<groupId>jdepend</groupId>
- 			<artifactId>jdepend</artifactId>
- 		</dependency>
-+		<dependency>
-+			<groupId>org.openjfx</groupId>
-+			<artifactId>javafx-controls</artifactId>
-+		</dependency>
- 	</dependencies>
- </project>
-diff --git a/pdfsam-fx/pom.xml b/pdfsam-fx/pom.xml
-index 9972811..eb63905 100644
---- a/pdfsam-fx/pom.xml
-+++ b/pdfsam-fx/pom.xml
-@@ -91,5 +91,9 @@
- 			<type>test-jar</type>
- 			<scope>test</scope>
- 		</dependency>
-+		<dependency>
-+			<groupId>org.openjfx</groupId>
-+			<artifactId>javafx-controls</artifactId>
-+		</dependency>
- 	</dependencies>
- </project>
-diff --git a/pdfsam-gui/pom.xml b/pdfsam-gui/pom.xml
-index 8663424..b3f5662 100644
---- a/pdfsam-gui/pom.xml
-+++ b/pdfsam-gui/pom.xml
-@@ -123,6 +123,14 @@
- 			<artifactId>jcl-over-slf4j</artifactId>
- 			<version>${slf4j.version}</version>
- 		</dependency>
-+		<dependency>
-+			<groupId>org.openjfx</groupId>
-+			<artifactId>javafx-controls</artifactId>
-+		</dependency>
-+		<dependency>
-+			<groupId>org.openjfx</groupId>
-+			<artifactId>javafx-media</artifactId>
-+		</dependency>
- 
- 		<!-- test dependencies -->
- 		<dependency>

debian/patches/pdfsam-bin.patch

 From: Markus Koschany <apo@debian.org>
-Date: Fri, 7 Jul 2017 13:22:21 +0200
+Date: Sat, 22 Dec 2018 01:01:33 +0100
 Subject: pdfsam bin
 
 Customize the start script for Debian.
 
 Forwarded: not-needed
 ---
- .../src/assembly/resources/bin/pdfsam.sh             | 20 +++-----------------
- 1 file changed, 3 insertions(+), 17 deletions(-)
-
-diff --git a/pdfsam-community/src/assembly/resources/bin/pdfsam.sh b/pdfsam-community/src/assembly/resources/bin/pdfsam.sh
-index fe9f37b..fc37baa 100644
---- a/pdfsam-community/src/assembly/resources/bin/pdfsam.sh
-+++ b/pdfsam-community/src/assembly/resources/bin/pdfsam.sh
-@@ -16,22 +16,7 @@
+ pdfsam-basic/src/assembly/resources/bin/pdfsam.sh | 33 +++++------------------
+ 1 file changed, 6 insertions(+), 27 deletions(-)
+
+diff --git a/pdfsam-basic/src/assembly/resources/bin/pdfsam.sh b/pdfsam-basic/src/assembly/resources/bin/pdfsam.sh
+index af6182e..38b1678 100644
+--- a/pdfsam-basic/src/assembly/resources/bin/pdfsam.sh
++++ b/pdfsam-basic/src/assembly/resources/bin/pdfsam.sh
+@@ -16,32 +16,8 @@
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
  
@@ -32,24 +32,43 @@ index fe9f37b..fc37baa 100644
 -
 -PRGDIR=`dirname "$PRG"`
 -BASEDIR=`cd "$PRGDIR/.." >/dev/null; pwd`
+-RUNTIME="$BASEDIR"/runtime
 -
+-if [ -z "$PDFSAM_JAVA_PATH" ]; then
+-  	# the rutime is supplied
+-	if [ -d "$RUNTIME" ]; then
+-	  JAVA_HOME="$RUNTIME"
+-	fi
+-else
+-  JAVA_HOME="$PDFSAM_JAVA_PATH"
+-fi
+ 
 +BASEDIR=/usr/share/pdfsam
+ 
  # OS specific support.  $var _must_ be set to either true or false.
  cygwin=false;
- darwin=false;
-@@ -85,7 +70,7 @@ if [ ! -x "$JAVACMD" ] ; then
+@@ -95,7 +71,7 @@ if [ ! -x "$JAVACMD" ] ; then
    exit 1
  fi
  
--CLASSPATH="$BASEDIR"/etc:"$BASEDIR"/${project.build.finalName}.${project.packaging}
-+CLASSPATH="$BASEDIR"/etc:"$BASEDIR"/lib/*
+-JAR_ARG="$BASEDIR"/${project.build.finalName}.${project.packaging}
++CLASSPATH="$BASEDIR"/lib/*
+ 
+ # For Cygwin, switch paths to Windows format before running java
+ if $cygwin; then
+@@ -103,11 +79,14 @@ if $cygwin; then
+   [ -n "$BASEDIR" ] && BASEDIR=`cygpath --path --windows "$BASEDIR"`
+ fi
  
- ENDORSED_DIR=
- if [ -n "$ENDORSED_DIR" ] ; then
-@@ -114,5 +99,6 @@ exec "$JAVACMD" $JAVA_OPTS -Xmx256M \
+-exec "$JAVACMD" -jar "$JAR_ARG" $JAVA_OPTS -Xmx512M \
++exec "$JAVACMD" $JAVA_OPTS -Xmx512M \
++  -classpath "$CLASSPATH" \
++  -splash:"$BASEDIR"/resources/splash.gif \
+   -Dapp.name="pdfsam-basic" \
+   -Dapp.pid="$$" \
+   -Dapp.home="$BASEDIR" \
    -Dbasedir="$BASEDIR" \
-   -Dprism.text=t2k \
    -Dprism.lcdtext=false \
 +  -Djdk.gtk.version=2 \
-   org.pdfsam.community.App \
+   org.pdfsam.basic.App \
    "$@"

debian/patches/series

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

debian/pdfsam.poms

@@ -26,7 +26,7 @@
 #     Empty by default. [mh_install]
 #
 pom.xml
-pdfsam-community/pom.xml
+pdfsam-basic/pom.xml
 pdfsam-gui/pom.xml
 pdfsam-i18n/pom.xml
 pdfsam-core/pom.xml
@@ -40,4 +40,3 @@ pdfsam-alternate-mix/pom.xml
 pdfsam-rotate/pom.xml
 pdfsam-extract/pom.xml
 pdfsam-docs/pom.xml
-pdfsam-msi-installer/pom.xml --ignore

debian/rules

@@ -12,7 +12,7 @@ LINK_JARS += javafx-base javafx-controls javafx-media javafx-graphics fontawesom
 	dh $@
 
 override_dh_install:
-	cp $(CURDIR)/pdfsam-community/src/deb/icon.svg $(CURDIR)/debian/pdfsam.svg
+	cp $(CURDIR)/pdfsam-basic/src/deb/icon.svg $(CURDIR)/debian/pdfsam.svg
 	dh_install
 	$(RM) -r $(CURDIR)/debian/pdfsam/usr/share/maven-repo
 

pdfsam-alternate-mix/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.pdfsam</groupId>
 		<artifactId>pdfsam-parent</artifactId>
-		<version>3.3.7</version>
+		<version>4.0.0</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -44,6 +44,10 @@
 			<groupId>javax.inject</groupId>
 			<artifactId>javax.inject</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.openjfx</groupId>
+			<artifactId>javafx-controls</artifactId>
+		</dependency>
 		<!-- test dependencies -->
 		<dependency>
 			<groupId>org.pdfsam</groupId>
@@ -58,8 +62,8 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.loadui</groupId>
-			<artifactId>testFx</artifactId>
+			<groupId>org.openjfx</groupId>
+			<artifactId>javafx-swing</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>