This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository pdfsam.
commit 8d44b34c8fd377223dd668b3cfbe403dc715c73e Author: Torsten Werner <[email protected]> Date: Thu Jan 1 00:47:44 2009 +0000 * New upstream release * Refresh our patches. --- debian/build.xml | 4 ++-- debian/changelog | 7 +++++++ debian/install | 2 +- debian/patches/build.diff | 13 +++++++++---- debian/patches/run.diff | 16 ++++++++-------- debian/rules | 2 +- 6 files changed, 28 insertions(+), 16 deletions(-) diff --git a/debian/build.xml b/debian/build.xml index e6449bf..1980951 100644 --- a/debian/build.xml +++ b/debian/build.xml @@ -7,7 +7,7 @@ <delete dir="classes"/> <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-br1" 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-maine-br1" target="clean"/> <ant antfile="ant/build.xml" dir="pdfsam-merge" target="clean"/> @@ -18,7 +18,7 @@ <mkdir dir="${build.dir}"/> <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-br1" 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-maine-br1" target="build-jars"/> <ant antfile="ant/build.xml" dir="pdfsam-merge" target="build-jars"/> diff --git a/debian/changelog b/debian/changelog index f162f13..d75bc23 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +pdfsam (1.1.0-1) unstable; urgency=low + + * New upstream release + * Refresh our patches. + + -- Torsten Werner <[email protected]> Thu, 01 Jan 2009 01:40:52 +0100 + pdfsam (1.0.3-1) unstable; urgency=low * new upstream release diff --git a/debian/install b/debian/install index 4d5b5b3..f729eaf 100644 --- a/debian/install +++ b/debian/install @@ -1,6 +1,6 @@ build/emp4j/dist/*.jar /usr/share/pdfsam/lib/ build/jcmdline/dist/*.jar /usr/share/pdfsam/lib/ -build/pdfsam-console-br1/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-maine-br1/dist/*.jar /usr/share/pdfsam/ diff --git a/debian/patches/build.diff b/debian/patches/build.diff index 172b757..9591f3b 100644 --- a/debian/patches/build.diff +++ b/debian/patches/build.diff @@ -1,8 +1,8 @@ -Index: pdfsam-1.0.3/pdfsam-maine-br1/ant/build.xml +Index: pdfsam-1.1.0/pdfsam-maine-br1/ant/build.xml =================================================================== ---- pdfsam-1.0.3.orig/pdfsam-maine-br1/ant/build.xml 2008-10-14 23:09:50.000000000 +0200 -+++ pdfsam-1.0.3/pdfsam-maine-br1/ant/build.xml 2008-11-03 21:14:12.000000000 +0100 -@@ -116,46 +116,6 @@ +--- 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> @@ -45,6 +45,11 @@ Index: pdfsam-1.0.3/pdfsam-maine-br1/ant/build.xml - <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> diff --git a/debian/patches/run.diff b/debian/patches/run.diff index 4dc1a5e..5cf5cea 100644 --- a/debian/patches/run.diff +++ b/debian/patches/run.diff @@ -1,14 +1,14 @@ -Index: pdfsam-1.0.3/pdfsam-maine-br1/bin/run-console.sh +Index: pdfsam-1.1.0/pdfsam-maine-br1/bin/run-console.sh =================================================================== ---- pdfsam-1.0.3.orig/pdfsam-maine-br1/bin/run-console.sh 2008-08-21 16:39:08.000000000 +0200 -+++ pdfsam-1.0.3/pdfsam-maine-br1/bin/run-console.sh 2008-11-03 21:14:23.000000000 +0100 +--- pdfsam-1.1.0.orig/pdfsam-maine-br1/bin/run-console.sh 2008-12-14 13:24:42.000000000 +0100 ++++ pdfsam-1.1.0/pdfsam-maine-br1/bin/run-console.sh 2009-01-01 01:39:28.000000000 +0100 @@ -15,7 +15,7 @@ } -DIRNAME="../lib/" +DIRNAME="/usr/share/pdfsam/lib/" - CONSOLEJAR="$DIRNAME/pdfsam-console-1.1.5e.jar" + CONSOLEJAR="$DIRNAME/pdfsam-console-2.0.0e.jar" # Setup the classpath @@ -53,4 +53,4 @@ @@ -18,17 +18,17 @@ Index: pdfsam-1.0.3/pdfsam-maine-br1/bin/run-console.sh - org.pdfsam.console.ConsoleClient "$@" \ No newline at end of file + org.pdfsam.console.ConsoleClient "$@" -Index: pdfsam-1.0.3/pdfsam-maine-br1/bin/run.sh +Index: pdfsam-1.1.0/pdfsam-maine-br1/bin/run.sh =================================================================== ---- pdfsam-1.0.3.orig/pdfsam-maine-br1/bin/run.sh 2008-10-19 13:25:24.000000000 +0200 -+++ pdfsam-1.0.3/pdfsam-maine-br1/bin/run.sh 2008-11-03 21:14:55.000000000 +0100 +--- pdfsam-1.1.0.orig/pdfsam-maine-br1/bin/run.sh 2008-12-14 13:25:10.000000000 +0100 ++++ pdfsam-1.1.0/pdfsam-maine-br1/bin/run.sh 2009-01-01 01:39:52.000000000 +0100 @@ -15,7 +15,7 @@ } -DIRNAME="../" +DIRNAME="/usr/share/pdfsam/" - PDFSAMJAR="$DIRNAME/pdfsam-1.0.3.jar" + PDFSAMJAR="$DIRNAME/pdfsam-1.1.0.jar" # Setup the classpath @@ -53,4 +53,4 @@ diff --git a/debian/rules b/debian/rules index 9527863..25ec83e 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-br1/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/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
