This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository pdfsam.
commit 2baf78e7af15fc478058cac6c7c77d73c39e6a23 Author: Torsten Werner <[email protected]> Date: Sun Apr 12 17:38:54 2009 +0000 * New upstream release * Fix start scripts. (Closes: #521585) * Bump up Standards-Version: 3.8.1 (no changes). * Add Depends: ${misc:Depends}. --- debian/build.xml | 4 ++-- debian/changelog | 9 ++++++++ debian/control | 4 ++-- debian/install | 2 +- debian/patches/run.diff | 55 ++++++++++++++++++++++++++++++++++++------------- debian/rules | 2 +- 6 files changed, 56 insertions(+), 20 deletions(-) diff --git a/debian/build.xml b/debian/build.xml index 1980951..36d8c5f 100644 --- a/debian/build.xml +++ b/debian/build.xml @@ -8,7 +8,7 @@ <ant antfile="ant/build.xml" dir="emp4j" target="clean"/> <ant antfile="ant/build.xml" dir="jcmdline" target="clean"/> <ant antfile="ant/build.xml" dir="pdfsam-console" target="clean"/> - <ant antfile="ant/build.xml" dir="pdfsam-langpack" target="clean"/> + <ant antfile="ant/build.xml" dir="pdfsam-langpack-br1" target="clean"/> <ant antfile="ant/build.xml" dir="pdfsam-maine-br1" target="clean"/> <ant antfile="ant/build.xml" dir="pdfsam-merge" target="clean"/> <ant antfile="ant/build.xml" dir="pdfsam-split" target="clean"/> @@ -19,7 +19,7 @@ <ant antfile="ant/build.xml" dir="emp4j" target="build-jars"/> <ant antfile="ant/build.xml" dir="jcmdline" target="build-jars"/> <ant antfile="ant/build.xml" dir="pdfsam-console" target="build-jars"/> - <ant antfile="ant/build.xml" dir="pdfsam-langpack" target="build-jars"/> + <ant antfile="ant/build.xml" dir="pdfsam-langpack-br1" target="build-jars"/> <ant antfile="ant/build.xml" dir="pdfsam-maine-br1" target="build-jars"/> <ant antfile="ant/build.xml" dir="pdfsam-merge" target="build-jars"/> <ant antfile="ant/build.xml" dir="pdfsam-split" target="build-jars"/> diff --git a/debian/changelog b/debian/changelog index e848811..b83b346 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +pdfsam (1.1.2-1) unstable; urgency=low + + * New upstream release + * Fix start scripts. (Closes: #521585) + * Bump up Standards-Version: 3.8.1 (no changes). + * Add Depends: ${misc:Depends}. + + -- Torsten Werner <[email protected]> Sun, 12 Apr 2009 19:36:15 +0200 + pdfsam (1.1.1-2) unstable; urgency=low [ Miguel Landaeta ] diff --git a/debian/control b/debian/control index cbfa0a6..c878639 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Torsten Werner <[email protected]> Build-Depends: ant, cdbs, debhelper (>= 5), default-jdk-builddep, libdom4j-java, libitext-java (>= 2), libjaxen-java, libjgoodies-looks-java, liblog4j1.2-java, quilt -Standards-Version: 3.8.0 +Standards-Version: 3.8.1 Homepage: http://www.pdfsam.org Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/pdfsam Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/pdfsam/ @@ -14,7 +14,7 @@ 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 + libjaxen-java, libjgoodies-looks-java, liblog4j1.2-java, ${misc:Depends} 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/install b/debian/install index f729eaf..b0af030 100644 --- a/debian/install +++ b/debian/install @@ -1,7 +1,7 @@ build/emp4j/dist/*.jar /usr/share/pdfsam/lib/ build/jcmdline/dist/*.jar /usr/share/pdfsam/lib/ build/pdfsam-console/dist/*.jar /usr/share/pdfsam/lib/ -build/pdfsam-langpack/dist/*.jar /usr/share/pdfsam/lib/ +build/pdfsam-langpack-br1/dist/*.jar /usr/share/pdfsam/lib/ build/pdfsam-maine-br1/dist/*.jar /usr/share/pdfsam/ template-basic-1/config.xml /usr/share/pdfsam/ diff --git a/debian/patches/run.diff b/debian/patches/run.diff index 2976fb1..ddeaaf8 100644 --- a/debian/patches/run.diff +++ b/debian/patches/run.diff @@ -1,37 +1,64 @@ -Index: pdfsam-1.1.1/pdfsam-maine-br1/bin/run-console.sh +Index: pdfsam-1.1.2/pdfsam-maine-br1/bin/run-console.sh =================================================================== ---- pdfsam-1.1.1.orig/pdfsam-maine-br1/bin/run-console.sh 2009-01-18 17:36:58.000000000 +0100 -+++ pdfsam-1.1.1/pdfsam-maine-br1/bin/run-console.sh 2009-02-17 22:47:44.000000000 +0100 -@@ -15,7 +15,7 @@ +--- 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/" -+DIRNAME="/usr/share/pdfsam/lib/" - CONSOLEJAR="$DIRNAME/pdfsam-console-2.0.1e.jar" +-CONSOLEJAR="$DIRNAME/@CONSOLE_JAR_NAME.jar" ++DIRNAME="/usr/share/pdfsam/lib" ++CONSOLEJAR=$(echo $DIRNAME/pdfsam-console-*.jar) # Setup the classpath -@@ -53,4 +53,4 @@ + 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.1/pdfsam-maine-br1/bin/run.sh +Index: pdfsam-1.1.2/pdfsam-maine-br1/bin/run.sh =================================================================== ---- pdfsam-1.1.1.orig/pdfsam-maine-br1/bin/run.sh 2009-01-21 17:57:58.000000000 +0100 -+++ pdfsam-1.1.1/pdfsam-maine-br1/bin/run.sh 2009-02-17 22:48:02.000000000 +0100 -@@ -15,7 +15,7 @@ +--- 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="../" -+DIRNAME="/usr/share/pdfsam/" - PDFSAMJAR="$DIRNAME/pdfsam-1.1.1.jar" +-PDFSAMJAR="$DIRNAME/@PDFSAM_JAR_NAME.jar" ++DIRNAME="/usr/share/pdfsam" ++PDFSAMJAR=$(echo $DIRNAME/pdfsam-*.jar) # Setup the classpath -@@ -53,4 +53,4 @@ + 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" \ diff --git a/debian/rules b/debian/rules index 25ec83e..c893e32 100755 --- a/debian/rules +++ b/debian/rules @@ -8,7 +8,7 @@ JAVA_HOME := /usr/lib/jvm/default-java DEB_ANT_BUILDFILE := debian/build.xml DEB_JARS := dom4j itext jaxen log4j-1.2 looks DEB_ANT_BUILD_TARGET := -Dbuild.dir=$(CURDIR)/build -DEB_CLASSPATH := $(DEB_CLASSPATH):$(CURDIR)/build/jcmdline/build:$(CURDIR)/build/emp4j/build:$(CURDIR)/build/pdfsam-console/build:$(CURDIR)/build/pdfsam-langpack/build:$(CURDIR)/build/pdfsam-maine-br1/build: +DEB_CLASSPATH := $(DEB_CLASSPATH):$(CURDIR)/build/jcmdline/build:$(CURDIR)/build/emp4j/build:$(CURDIR)/build/pdfsam-console/build:$(CURDIR)/build/pdfsam-langpack-br1/build:$(CURDIR)/build/pdfsam-maine-br1/build: install/pdfsam:: for JAR in $(DEB_JARS); do \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/pdfsam.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
