[pkg-java] r12215 - in trunk/pdfsam/debian: . patches
Torsten Werner
twerner at alioth.debian.org
Sun Apr 25 18:58:46 UTC 2010
Author: twerner
Date: 2010-04-25 18:58:42 +0000 (Sun, 25 Apr 2010)
New Revision: 12215
Added:
trunk/pdfsam/debian/patches/0001-prefer-debian-build.xml.patch
trunk/pdfsam/debian/patches/0002-fix-the-startup-scripts.patch
Removed:
trunk/pdfsam/debian/patches/build.diff
trunk/pdfsam/debian/patches/run.diff
Modified:
trunk/pdfsam/debian/changelog
trunk/pdfsam/debian/control
trunk/pdfsam/debian/patches/series
Log:
* Convert patches to dep3 format.
* Switch to java-wrappers and prefer openjdk. (Closes: #568545)
Modified: trunk/pdfsam/debian/changelog
===================================================================
--- trunk/pdfsam/debian/changelog 2010-04-25 18:35:15 UTC (rev 12214)
+++ trunk/pdfsam/debian/changelog 2010-04-25 18:58:42 UTC (rev 12215)
@@ -4,8 +4,10 @@
* 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
Modified: trunk/pdfsam/debian/control
===================================================================
--- trunk/pdfsam/debian/control 2010-04-25 18:35:15 UTC (rev 12214)
+++ trunk/pdfsam/debian/control 2010-04-25 18:58:42 UTC (rev 12215)
@@ -14,7 +14,8 @@
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
Added: trunk/pdfsam/debian/patches/0001-prefer-debian-build.xml.patch
===================================================================
--- trunk/pdfsam/debian/patches/0001-prefer-debian-build.xml.patch (rev 0)
+++ trunk/pdfsam/debian/patches/0001-prefer-debian-build.xml.patch 2010-04-25 18:58:42 UTC (rev 12215)
@@ -0,0 +1,66 @@
+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>
+
+- <copy todir="${pdfsam.release.jar.dir}">
+- <fileset dir="${pdfsam.dist.dir}">
+- <include name="*.jar" />
+- </fileset>
+- </copy>
+-
+- <!--emp4j-->
+- <ant antfile="${emp4j.dir}/ant/build.xml" dir="${emp4j.dir}" target="build-jars">
+- <property name="emp4j.dist.dir" value="${pdfsam.release.jar.dir}"/>
+- </ant>
+- <copy file="${pdfsam.release.jar.dir}/${emp4j.jar.name}.jar" todir="${libs.dir}" />
+-
+- <!--jcmdline-->
+- <ant antfile="${jcmdline.dir}/ant/build.xml" dir="${jcmdline.dir}" target="build-jars">
+- <property name="jcmdline.dist.dir" value="${pdfsam.release.jar.dir}"/>
+- </ant>
+- <copy file="${pdfsam.release.jar.dir}/${jcmdline.jar.name}.jar" todir="${libs.dir}" />
+-
+- <!--langpack-->
+- <ant antfile="${langpack.dir}/ant/build.xml" dir="${langpack.dir}" target="build-jars">
+- <property name="pdfsam-langpack.dist.dir" value="${pdfsam.release.jar.dir}"/>
+- </ant>
+- <copy file="${pdfsam.release.jar.dir}/${pdfsam-langpack.jar.name}.jar" todir="${libs.dir}" />
+-
+- <!--console-->
+- <ant antfile="${console.dir}/ant/build.xml" dir="${console.dir}" target="build-jars">
+- <property name="pdfsam-console.dist.dir" value="${pdfsam.release.jar.dir}"/>
+- </ant>
+- <copy file="${pdfsam.release.jar.dir}/${pdfsam-console.jar.name}.jar" todir="${libs.dir}" />
+-
+- <!--split-->
+- <ant antfile="${split.dir}/ant/build.xml" dir="${split.dir}" target="build-jars">
+- <property name="pdfsam-split.dist.dir" value="${pdfsam.release.jar.dir}"/>
+- </ant>
+-
+- <!--merge-->
+- <ant antfile="${merge.dir}/ant/build.xml" dir="${merge.dir}" target="build-jars">
+- <property name="pdfsam-merge.dist.dir" value="${pdfsam.release.jar.dir}"/>
+- </ant>
+-
+- <!--mix-->
+- <ant antfile="${mix.dir}/ant/build.xml" dir="${mix.dir}" target="build-jars">
+- <property name="pdfsam-mix.dist.dir" value="${pdfsam.release.jar.dir}"/>
+- </ant>
+-
+ <antcall target="build-jars-enhanced" />
+ </target>
+
+--
Added: trunk/pdfsam/debian/patches/0002-fix-the-startup-scripts.patch
===================================================================
--- trunk/pdfsam/debian/patches/0002-fix-the-startup-scripts.patch (rev 0)
+++ trunk/pdfsam/debian/patches/0002-fix-the-startup-scripts.patch 2010-04-25 18:58:42 UTC (rev 12215)
@@ -0,0 +1,87 @@
+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)
+
+ # Setup the classpath
+ if [ ! -f "$CONSOLEJAR" ]; then
+ die "Missing required file: $CONSOLEJAR"
+ fi
+-CONSOLE_CLASSPATH="$CONSOLEJAR"
++
++for jar in $DIRNAME/*.jar
++do
++ CONSOLE_CLASSPATH=$CONSOLE_CLASSPATH:$jar
++done
+
+ # Setup the JVM
+ if [ "x$JAVA" = "x" ]; then
+@@ -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 "$@"
+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 +28,11 @@ if [ ! -f "$PDFSAMJAR" ]; then
+ fi
+ PDFSAM_CLASSPATH="$PDFSAMJAR"
+
++for jar in $DIRNAME/lib/*.jar
++do
++ PDFSAM_CLASSPATH=$PDFSAM_CLASSPATH:$jar
++done
++
+ # Setup the JVM
+ if [ "x$JAVA" = "x" ]; then
+ if [ "x$JAVA_HOME" != "x" ]; then
+@@ -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 "$@"
+--
Deleted: trunk/pdfsam/debian/patches/build.diff
===================================================================
--- trunk/pdfsam/debian/patches/build.diff 2010-04-25 18:35:15 UTC (rev 12214)
+++ trunk/pdfsam/debian/patches/build.diff 2010-04-25 18:58:42 UTC (rev 12215)
@@ -1,56 +0,0 @@
-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
-@@ -118,51 +118,6 @@
- </fileset>
- </jar>
-
-- <copy todir="${pdfsam.release.jar.dir}">
-- <fileset dir="${pdfsam.dist.dir}">
-- <include name="*.jar" />
-- </fileset>
-- </copy>
--
-- <!--emp4j-->
-- <ant antfile="${emp4j.dir}/ant/build.xml" dir="${emp4j.dir}" target="build-jars">
-- <property name="emp4j.dist.dir" value="${pdfsam.release.jar.dir}"/>
-- </ant>
-- <copy file="${pdfsam.release.jar.dir}/${emp4j.jar.name}.jar" todir="${libs.dir}" />
--
-- <!--jcmdline-->
-- <ant antfile="${jcmdline.dir}/ant/build.xml" dir="${jcmdline.dir}" target="build-jars">
-- <property name="jcmdline.dist.dir" value="${pdfsam.release.jar.dir}"/>
-- </ant>
-- <copy file="${pdfsam.release.jar.dir}/${jcmdline.jar.name}.jar" todir="${libs.dir}" />
--
-- <!--langpack-->
-- <ant antfile="${langpack.dir}/ant/build.xml" dir="${langpack.dir}" target="build-jars">
-- <property name="pdfsam-langpack.dist.dir" value="${pdfsam.release.jar.dir}"/>
-- </ant>
-- <copy file="${pdfsam.release.jar.dir}/${pdfsam-langpack.jar.name}.jar" todir="${libs.dir}" />
--
-- <!--console-->
-- <ant antfile="${console.dir}/ant/build.xml" dir="${console.dir}" target="build-jars">
-- <property name="pdfsam-console.dist.dir" value="${pdfsam.release.jar.dir}"/>
-- </ant>
-- <copy file="${pdfsam.release.jar.dir}/${pdfsam-console.jar.name}.jar" todir="${libs.dir}" />
--
-- <!--split-->
-- <ant antfile="${split.dir}/ant/build.xml" dir="${split.dir}" target="build-jars">
-- <property name="pdfsam-split.dist.dir" value="${pdfsam.release.jar.dir}"/>
-- </ant>
--
-- <!--merge-->
-- <ant antfile="${merge.dir}/ant/build.xml" dir="${merge.dir}" target="build-jars">
-- <property name="pdfsam-merge.dist.dir" value="${pdfsam.release.jar.dir}"/>
-- </ant>
--
-- <!--mix-->
-- <ant antfile="${mix.dir}/ant/build.xml" dir="${mix.dir}" target="build-jars">
-- <property name="pdfsam-mix.dist.dir" value="${pdfsam.release.jar.dir}"/>
-- </ant>
--
- <antcall target="build-jars-enhanced" />
- </target>
-
Deleted: trunk/pdfsam/debian/patches/run.diff
===================================================================
--- trunk/pdfsam/debian/patches/run.diff 2010-04-25 18:35:15 UTC (rev 12214)
+++ trunk/pdfsam/debian/patches/run.diff 2010-04-25 18:58:42 UTC (rev 12215)
@@ -1,67 +0,0 @@
-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 @@
- }
-
-
--DIRNAME="../lib/"
--CONSOLEJAR="$DIRNAME/@CONSOLE_JAR_NAME.jar"
-+DIRNAME="/usr/share/pdfsam/lib"
-+CONSOLEJAR=$(echo $DIRNAME/pdfsam-console-*.jar)
-
- # Setup the classpath
- if [ ! -f "$CONSOLEJAR" ]; then
- die "Missing required file: $CONSOLEJAR"
- fi
--CONSOLE_CLASSPATH="$CONSOLEJAR"
-+
-+for jar in $DIRNAME/*.jar
-+do
-+ CONSOLE_CLASSPATH=$CONSOLE_CLASSPATH:$jar
-+done
-
- # Setup the JVM
- if [ "x$JAVA" = "x" ]; then
-@@ -53,4 +57,4 @@
- # 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 @@
- }
-
-
--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 @@
- fi
- PDFSAM_CLASSPATH="$PDFSAMJAR"
-
-+for jar in $DIRNAME/lib/*.jar
-+do
-+ PDFSAM_CLASSPATH=$PDFSAM_CLASSPATH:$jar
-+done
-+
- # Setup the JVM
- if [ "x$JAVA" = "x" ]; then
- if [ "x$JAVA_HOME" != "x" ]; then
-@@ -53,4 +58,4 @@
- # 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 "$@"
Modified: trunk/pdfsam/debian/patches/series
===================================================================
--- trunk/pdfsam/debian/patches/series 2010-04-25 18:35:15 UTC (rev 12214)
+++ trunk/pdfsam/debian/patches/series 2010-04-25 18:58:42 UTC (rev 12215)
@@ -1,2 +1,2 @@
-build.diff
-run.diff
+0001-prefer-debian-build.xml.patch
+0002-fix-the-startup-scripts.patch
More information about the pkg-java-commits
mailing list