.travis.yml

@@ -3,23 +3,20 @@ sudo: false
 
 matrix:
   include:
-    # Ubuntu Linux (trusty) / Open DK 11 / Headed (Glass Robot) / HiDPI
+    # Ubuntu Linux (xenial) / Open DK 11 / Headed (Glass Robot) / HiDPI
     - os: linux
-      dist: trusty
+      dist: xenial
+      services:
+        - xvfb
       jdk: openjdk11
       env:
         - _JAVA_OPTIONS="-Dtestfx.robot=glass -Dglass.gtk.uiScale=2.0"
     # Ubuntu Linux (trusty) / Open DK 11 / Headless
     - os: linux
-      dist: trusty
+      dist: xenial
+      services:
+        - xvfb
       jdk: openjdk11
       env:
         - _JAVA_OPTIONS="-Djava.awt.headless=true -Dtestfx.robot=glass -Dtestfx.headless=true -Dprism.order=sw"
     
-before_install:
-  - 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.3-1) unstable; urgency=medium
+
+  * New upstream version 4.0.3.
+  * Switch to debhelper-compat = 12.
+  * Declare compliance with Debian Policy 4.4.0.
+  * Remove get-orig-source target.
+
+ -- Markus Koschany <apo@debian.org>  Sun, 21 Jul 2019 16:17:58 +0200
+
 pdfsam (4.0.1-1) unstable; urgency=medium
 
   * New upstream version 4.0.1

debian/compat

-11

debian/control

@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.or
 Uploaders:
  Markus Koschany <apo@debian.org>
 Build-Depends:
- debhelper (>= 11),
+ debhelper-compat (= 12),
  default-jdk,
  junit4,
  libatinject-jsr330-api-java,
@@ -28,7 +28,7 @@ Build-Depends:
  libslf4j-java (>= 1.7.21),
  maven-debian-helper,
  openjfx (>= 11)
-Standards-Version: 4.3.0
+Standards-Version: 4.4.0
 Vcs-Git: https://salsa.debian.org/java-team/pdfsam.git
 Vcs-Browser: https://salsa.debian.org/java-team/pdfsam
 Homepage: http://www.pdfsam.org

debian/rules

@@ -29,6 +29,3 @@ override_dh_clean:
 override_dh_fixperms:
 	dh_fixperms
 	chmod a+x $(CURDIR)/debian/pdfsam/usr/share/pdfsam/bin/pdfsam.sh
-
-get-orig-source:
-	uscan --download-current-version --force-download --repack --compression xz

pdfsam-alternate-mix/pom.xml

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

pdfsam-basic/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.pdfsam</groupId>
 		<artifactId>pdfsam-parent</artifactId>
-		<version>4.0.1</version>
+		<version>4.0.3</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -264,7 +264,7 @@
 					<plugin>
 						<groupId>com.akathist.maven.plugins.launch4j</groupId>
 						<artifactId>launch4j-maven-plugin</artifactId>
-						<version>1.7.24</version>
+						<version>1.7.25</version>
 						<executions>
 							<execution>
 								<id>exe-creation</id>
@@ -378,7 +378,7 @@
 									<artifacts>
 										<artifact>
 											<file>${project.build.directory}/pdfsam-${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.msi</file>
-											<type>dmg</type>
+											<type>msi</type>
 										</artifact>
 									</artifacts>
 								</configuration>
@@ -412,14 +412,15 @@
 									<goal>jdeb</goal>
 								</goals>
 								<configuration>
-									<deb>[[buildDir]]/pdfsam_[[version]]-1_all.[[extension]]</deb>
+									<deb>[[buildDir]]/pdfsam_[[version]]-1_amd64.[[extension]]</deb>
 									<dataSet>
 										<data>
 											<src>${project.build.directory}/assembled/bin/pdfsam.sh</src>
-											<dst>/opt/pdfsam-basic/bin/pdfsam-basic</dst>
+											<dst>pdfsam-basic</dst>
 											<type>file</type>
 											<mapper>
 												<type>perm</type>
+												<prefix>/opt/pdfsam-basic/bin</prefix>
 												<filemode>755</filemode>
 											</mapper>
 										</data>

pdfsam-basic/src/deb/icon.svg

@@ -13,8 +13,11 @@
    height="512"
    id="svg3863"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="icon.svg">
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="basic.svg"
+   inkscape:export-filename="/home/torakiki/repos/pdfsam/pdfsam-docs/graphics/basic.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
   <defs
      id="defs3865" />
   <sodipodi:namedview
@@ -25,15 +28,15 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="0.7"
-     inkscape:cx="222.38132"
+     inkscape:cx="-519.04726"
      inkscape:cy="140.39976"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="692"
+     inkscape:window-width="1920"
+     inkscape:window-height="994"
      inkscape:window-x="0"
-     inkscape:window-y="24"
+     inkscape:window-y="27"
      inkscape:window-maximized="1" />
   <metadata
      id="metadata3868">
@@ -52,19 +55,16 @@
      inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-540.36218)">
-    <path
-       sodipodi:type="arc"
+    <circle
        style="fill:#ffffff;fill-opacity:1;stroke:none"
        id="path3827"
-       sodipodi:cx="-242.94168"
-       sodipodi:cy="383.32227"
-       sodipodi:rx="76.266518"
-       sodipodi:ry="76.266518"
-       d="m -166.67516,383.32227 a 76.266518,76.266518 0 1 1 -152.53304,0 76.266518,76.266518 0 1 1 152.53304,0 z"
-       transform="matrix(3.3566499,0,0,3.3566499,1071.4702,-490.31646)" />
+       transform="matrix(3.3566499,0,0,3.3566499,1071.4702,-490.31646)"
+       cx="-242.94168"
+       cy="383.32227"
+       r="76.266518" />
     <g
        id="g4193"
-       transform="matrix(7.9349013,0,0,-7.9349013,-1016.4255,470.62757)">
+       transform="matrix(7.8527983,0,0,-7.9003074,-1005.5886,474.5878)">
       <path
          id="path94-4-8"
          style="fill:#009245;fill-opacity:1;fill-rule:nonzero;stroke:none"