[pdfsam] 30/36: * Convert patches to dep3 format. * Switch to java-wrappers and prefer openjdk. (Closes: #568545)

Tue Feb 21 04:20:16 UTC 2017

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository pdfsam.

commit f5909564b8de02e7261980f6485c2366624c5574
Author: Torsten Werner <twerner at debian.org>
Date:   Sun Apr 25 18:58:42 2010 +0000

    * Convert patches to dep3 format.
    * Switch to java-wrappers and prefer openjdk. (Closes: #568545)
---
 debian/changelog                                   |  4 +-
 debian/control                                     |  3 +-
 ...ild.diff => 0001-prefer-debian-build.xml.patch} | 18 +++++++--
 ...run.diff => 0002-fix-the-startup-scripts.patch} | 46 ++++++++++++++++------
 debian/patches/series                              |  4 +-
 5 files changed, 54 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f176131..6dc7958 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ pdfsam (1.1.4-1) unstable; urgency=low
   * Switch to source format 3.0.
   * Update Standards-Version: 3.8.4.
   * Remove build directory in clean target.
+  * Convert patches to dep3 format.
+  * Switch to java-wrappers and prefer openjdk. (Closes: #568545)
 
- -- Torsten Werner <twerner at debian.org>  Sun, 25 Apr 2010 20:34:03 +0200
+ -- Torsten Werner <twerner at debian.org>  Sun, 25 Apr 2010 20:48:50 +0200
 
 pdfsam (1.1.3-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index ba92bb9..2ba54aa 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,8 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/pdfsam/
 Package: pdfsam
 Architecture: all
 Depends: openjdk-6-jre | java2-runtime, libdom4j-java, libitext-java,
- libjaxen-java, libjgoodies-looks-java, liblog4j1.2-java, ${misc:Depends}
+ libjaxen-java, libjgoodies-looks-java, liblog4j1.2-java, ${misc:Depends},
+ java-wrappers
 Description: PDF Split and Merge
  PDF Split and Merge is a very simple, easy to use, free, open source
  utility to split and merge pdf files. It has a simple graphical
diff --git a/debian/patches/build.diff b/debian/patches/0001-prefer-debian-build.xml.patch
similarity index 80%
rename from debian/patches/build.diff
rename to debian/patches/0001-prefer-debian-build.xml.patch
index 9591f3b..dcfca5a 100644
--- a/debian/patches/build.diff
+++ b/debian/patches/0001-prefer-debian-build.xml.patch
@@ -1,7 +1,16 @@
-Index: pdfsam-1.1.0/pdfsam-maine-br1/ant/build.xml
-===================================================================
---- pdfsam-1.1.0.orig/pdfsam-maine-br1/ant/build.xml	2008-11-27 18:53:04.000000000 +0100
-+++ pdfsam-1.1.0/pdfsam-maine-br1/ant/build.xml	2009-01-01 01:38:47.000000000 +0100
+From: Torsten Werner <twerner at debian.org>
+Date: Sun, 25 Apr 2010 20:41:55 +0200
+Subject: [PATCH] prefer debian/build.xml
+
+this patch should be checked again if it is really a good idea
+---
+ pdfsam-maine-br1/ant/build.xml |   45 ----------------------------------------
+ 1 files changed, 0 insertions(+), 45 deletions(-)
+
+diff --git a/pdfsam-maine-br1/ant/build.xml b/pdfsam-maine-br1/ant/build.xml
+index 8b64d97..3817ee2 100644
+--- a/pdfsam-maine-br1/ant/build.xml
++++ b/pdfsam-maine-br1/ant/build.xml
 @@ -118,51 +118,6 @@
  			</fileset>
  	    </jar>
@@ -54,3 +63,4 @@ Index: pdfsam-1.1.0/pdfsam-maine-br1/ant/build.xml
  	  	<antcall target="build-jars-enhanced" />
  	  </target>
  	
+-- 
diff --git a/debian/patches/run.diff b/debian/patches/0002-fix-the-startup-scripts.patch
similarity index 54%
rename from debian/patches/run.diff
rename to debian/patches/0002-fix-the-startup-scripts.patch
index ddeaaf8..d96ffa8 100644
--- a/debian/patches/run.diff
+++ b/debian/patches/0002-fix-the-startup-scripts.patch
@@ -1,13 +1,27 @@
-Index: pdfsam-1.1.2/pdfsam-maine-br1/bin/run-console.sh
-===================================================================
---- pdfsam-1.1.2.orig/pdfsam-maine-br1/bin/run-console.sh	2009-03-16 18:26:14.000000000 +0100
-+++ pdfsam-1.1.2/pdfsam-maine-br1/bin/run-console.sh	2009-04-12 19:32:02.000000000 +0200
-@@ -15,14 +15,18 @@
+From: Torsten Werner <twerner at debian.org>
+Date: Sun, 25 Apr 2010 20:41:57 +0200
+Subject: [PATCH] fix the startup scripts
+
+---
+ pdfsam-maine-br1/bin/run-console.sh |   16 ++++++++++++----
+ pdfsam-maine-br1/bin/run.sh         |   15 ++++++++++++---
+ 2 files changed, 24 insertions(+), 7 deletions(-)
+
+diff --git a/pdfsam-maine-br1/bin/run-console.sh b/pdfsam-maine-br1/bin/run-console.sh
+index 66120b2..8b93d96 100644
+--- a/pdfsam-maine-br1/bin/run-console.sh
++++ b/pdfsam-maine-br1/bin/run-console.sh
+@@ -14,15 +14,23 @@ die() {
+     exit 1
  }
  
++# use java-wrappers in Debian:
++. /usr/lib/java-wrappers/java-wrappers.sh
++find_java_runtime openjdk sun
  
 -DIRNAME="../lib/"
 -CONSOLEJAR="$DIRNAME/@CONSOLE_JAR_NAME.jar"
++
 +DIRNAME="/usr/share/pdfsam/lib"
 +CONSOLEJAR=$(echo $DIRNAME/pdfsam-console-*.jar)
  
@@ -24,29 +38,34 @@ Index: pdfsam-1.1.2/pdfsam-maine-br1/bin/run-console.sh
  
  # Setup the JVM
  if [ "x$JAVA" = "x" ]; then
-@@ -53,4 +57,4 @@
+@@ -58,4 +66,4 @@ echo ""
  # Execute the JVM in the foreground
        "$JAVA" $JAVA_OPTS \
           -classpath "$CONSOLE_CLASSPATH" \
 -         org.pdfsam.console.ConsoleClient "$@"
 \ No newline at end of file
 +         org.pdfsam.console.ConsoleClient "$@"
-Index: pdfsam-1.1.2/pdfsam-maine-br1/bin/run.sh
-===================================================================
---- pdfsam-1.1.2.orig/pdfsam-maine-br1/bin/run.sh	2009-03-16 18:26:04.000000000 +0100
-+++ pdfsam-1.1.2/pdfsam-maine-br1/bin/run.sh	2009-04-12 19:32:50.000000000 +0200
-@@ -15,8 +15,8 @@
+diff --git a/pdfsam-maine-br1/bin/run.sh b/pdfsam-maine-br1/bin/run.sh
+index fb6235a..929cd9b 100644
+--- a/pdfsam-maine-br1/bin/run.sh
++++ b/pdfsam-maine-br1/bin/run.sh
+@@ -14,9 +14,13 @@ die() {
+     exit 1
  }
  
++# use java-wrappers in Debian:
++. /usr/lib/java-wrappers/java-wrappers.sh
++find_java_runtime openjdk sun
  
 -DIRNAME="../"
 -PDFSAMJAR="$DIRNAME/@PDFSAM_JAR_NAME.jar"
++
 +DIRNAME="/usr/share/pdfsam"
 +PDFSAMJAR=$(echo $DIRNAME/pdfsam-*.jar)
  
  # Setup the classpath
  if [ ! -f "$PDFSAMJAR" ]; then
-@@ -24,6 +24,11 @@
+@@ -24,6 +28,11 @@ if [ ! -f "$PDFSAMJAR" ]; then
  fi
  PDFSAM_CLASSPATH="$PDFSAMJAR"
  
@@ -58,10 +77,11 @@ Index: pdfsam-1.1.2/pdfsam-maine-br1/bin/run.sh
  # Setup the JVM
  if [ "x$JAVA" = "x" ]; then
      if [ "x$JAVA_HOME" != "x" ]; then
-@@ -53,4 +58,4 @@
+@@ -53,4 +62,4 @@ echo ""
  # Execute the JVM in the foreground
        "$JAVA" $JAVA_OPTS \
           -classpath "$PDFSAM_CLASSPATH" \
 -         org.pdfsam.guiclient.GuiClient "$@"
 \ No newline at end of file
 +         org.pdfsam.guiclient.GuiClient "$@"
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 21c603c..5c912a7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-build.diff
-run.diff
+0001-prefer-debian-build.xml.patch
+0002-fix-the-startup-scripts.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/pdfsam.git

