[pkg-java] r19214 - in trunk/pdfsam/debian: . patches

[Markus Koschany]

Author: apo
Date: 2017-03-05 22:33:01 +0000 (Sun, 05 Mar 2017)
New Revision: 19214

Added:
   trunk/pdfsam/debian/patches/change-default-LAF-theme.patch
Modified:
   trunk/pdfsam/debian/changelog
   trunk/pdfsam/debian/control
   trunk/pdfsam/debian/patches/series
Log:
Release 1.1.4-3


Modified: trunk/pdfsam/debian/changelog
===================================================================
--- trunk/pdfsam/debian/changelog	2017-03-04 08:11:43 UTC (rev 19213)
+++ trunk/pdfsam/debian/changelog	2017-03-05 22:33:01 UTC (rev 19214)
@@ -1,3 +1,14 @@
+pdfsam (1.1.4-3) unstable; urgency=medium
+
+  * Team upload.
+  * Add change-default-LAF-theme.patch and set the LAF setting to 0.
+    Thanks to Philip Rinn for the report. (Closes: #855324)
+  * Fix Lintian error "depends on obsolete package" and depend on default-jre
+    instead of openjdk-6-jre.
+  * Use secure canonical Vcs-address.
+
+ -- Markus Koschany <apo at debian.org>  Sun, 05 Mar 2017 20:30:27 +0100
+
 pdfsam (1.1.4-2) unstable; urgency=low
 
   [ Miguel Landaeta ]

Modified: trunk/pdfsam/debian/control
===================================================================
--- trunk/pdfsam/debian/control	2017-03-04 08:11:43 UTC (rev 19213)
+++ trunk/pdfsam/debian/control	2017-03-05 22:33:01 UTC (rev 19214)
@@ -8,12 +8,12 @@
  liblog4j1.2-java, javahelper
 Standards-Version: 3.9.3
 Homepage: http://www.pdfsam.org
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/pdfsam
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/pdfsam/
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/pdfsam
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-java/trunk/pdfsam/
 
 Package: pdfsam
 Architecture: all
-Depends: openjdk-6-jre | java2-runtime, libdom4j-java, libitext-java,
+Depends: default-jre | java2-runtime, libdom4j-java, libitext-java,
  libjaxen-java, libjgoodies-looks-java, liblog4j1.2-java, ${misc:Depends},
  java-wrappers, ${java:Depends}, libcommons-httpclient-java
 Description: PDF Split and Merge

Added: trunk/pdfsam/debian/patches/change-default-LAF-theme.patch
===================================================================
--- trunk/pdfsam/debian/patches/change-default-LAF-theme.patch	                        (rev 0)
+++ trunk/pdfsam/debian/patches/change-default-LAF-theme.patch	2017-03-05 22:33:01 UTC (rev 19214)
@@ -0,0 +1,23 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sun, 5 Mar 2017 20:09:33 +0100
+Subject: change default LAF theme
+
+Work around a startup crash by changing the LAF setting to 0.
+Bug-Debian: https://bugs.debian.org/855324
+---
+ template-basic-1/config.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/template-basic-1/config.xml b/template-basic-1/config.xml
+index d29c12e..270c01a 100644
+--- a/template-basic-1/config.xml
++++ b/template-basic-1/config.xml
+@@ -9,7 +9,7 @@
+   </info>  
+   <settings> 
+     <lookAndfeel> 
+-      <LAF>5</LAF>  
++      <LAF>0</LAF>  
+       <theme>14</theme> 
+     </lookAndfeel>  
+     <i18n>en_GB</i18n>  

Modified: trunk/pdfsam/debian/patches/series
===================================================================
--- trunk/pdfsam/debian/patches/series	2017-03-04 08:11:43 UTC (rev 19213)
+++ trunk/pdfsam/debian/patches/series	2017-03-05 22:33:01 UTC (rev 19214)
@@ -1,2 +1,3 @@
 0001-prefer-debian-build.xml.patch
 0002-fix-the-startup-scripts.patch
+change-default-LAF-theme.patch