--- pdftk-1.40.orig/debian/changelog +++ pdftk-1.40/debian/changelog @@ -1,13 +1,97 @@ +pdftk (1.40-2ubuntu2) gutsy; urgency=low + + * Rebuild for libgcj8-0 -> libgcj8-1 transistion. + + -- Steve Kowalik Tue, 7 Aug 2007 14:22:45 +1000 + +pdftk (1.40-2ubuntu1) gutsy; urgency=low + + * Rebuild for the libgcj transition. + * Hack in dpatch. + * Add java-gcj-compat to the Build-Depends. + * Move to using gcj and g++ 4.2. + * Sprinkle include paths in some Makefiles so classes can be located. + * Modify Maintainer field as per spec. + + -- Steve Kowalik Thu, 2 Aug 2007 20:58:23 +1000 + +pdftk (1.40-2) unstable; urgency=low + + * New maintainer. + * Add debian/watch file. + + -- Aurélien GÉRÔME Sun, 15 Oct 2006 17:14:13 +0200 + +pdftk (1.40-1) unstable; urgency=low + + * New upstream version. + - Fix concatenation of 2 pdf documents which some kind of pdf + (closes: bug#385598). + + -- Aurelien Jarno Fri, 22 Sep 2006 16:39:10 +0200 + +pdftk (1.12-11) unstable; urgency=low + + * Mixing different versions of g++ and gcj does not work, explicitely + use gcj-4.1 and g++-4.1. + + -- Aurelien Jarno Sat, 20 May 2006 00:40:04 +0200 + +pdftk (1.12-10) unstable; urgency=low + + * Added -O2 to GCJFLAGS (closes: bug#366661). + * Bumped Standards-Version to 3.7.2 (no changes). + + -- Aurelien Jarno Wed, 10 May 2006 10:56:37 +0200 + +pdftk (1.12-9) unstable; urgency=low + + * Fix previous FDF patch (closes: bug#365084). + + -- Aurelien Jarno Thu, 27 Apr 2006 23:27:01 +0200 + +pdftk (1.12-8) unstable; urgency=low + + * Added a patch to support page rotating. Thanks to David Fabel. + * Bumped Standards-Version to 3.6.2 (no changes). + + -- Aurelien Jarno Mon, 24 Apr 2006 22:03:59 +0200 + +pdftk (1.12-7) unstable; urgency=low + + * Build with -fdollars-in-identifiers to workaround a gcc bug on arm + (closes: bug#334642). + + -- Aurelien Jarno Wed, 19 Oct 2005 19:31:00 +0200 + +pdftk (1.12-6) unstable; urgency=low + + * Fixed FTBFS. + + -- Aurelien Jarno Sun, 16 Oct 2005 21:21:49 +0200 + +pdftk (1.12-5) unstable; urgency=low + + * C++ ABI transition. + + -- Aurelien Jarno Wed, 6 Jul 2005 01:03:57 +0200 + +pdftk (1.12-4) unstable; urgency=low + + * Suggests: xpdf-utils (closes: bug#306625). + + -- Aurelien Jarno Sun, 1 May 2005 11:27:28 +0200 + pdftk (1.12-3) unstable; urgency=low * Depends on libgcj-dev instead of libgcj4-dev. - * Build with gcj instead of gcj-3.33. + * Build with gcj instead of gcj-3.3. -- Aurelien Jarno Wed, 30 Mar 2005 16:44:02 +0200 pdftk (1.12-2) unstable; urgency=low - * Added a patch from Bernhard R. Link to adds a new generate_fdf + * Added a patch from Bernhard R. Link to adds a new generate_fdf action to generate a FDF out of a PDF file. The patch will also be added in the next upstream version (closes: bug#289846). @@ -15,7 +99,7 @@ pdftk (1.12-1) unstable; urgency=low - * New upstream release. + * New upstream release. -- Aurelien Jarno Wed, 10 Nov 2004 21:04:25 +0000 @@ -27,7 +111,7 @@ pdftk (1.10-1) unstable; urgency=low - * New upstream version. + * New upstream version. -- Aurelien Jarno Wed, 27 Oct 2004 14:15:40 +0000 --- pdftk-1.40.orig/debian/rules +++ pdftk-1.40/debian/rules @@ -5,6 +5,8 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +include /usr/share/dpatch/dpatch.make + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -17,13 +19,13 @@ INSTALL_PROGRAM += -s endif -build: build-stamp +build: patch build-stamp build-stamp: dh_testdir cd $(CURDIR)/pdftk && $(MAKE) -f Makefile.Debian touch build-stamp -clean: debian-clean +clean: debian-clean unpatch dh_clean debian-clean: --- pdftk-1.40.orig/debian/control +++ pdftk-1.40/debian/control @@ -1,13 +1,15 @@ Source: pdftk -Maintainer: Aurelien Jarno +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Aurélien GÉRÔME Section: text Priority: optional -Build-Depends: debhelper (>= 4.0.0), gcj-4.1, g++-4.1 +Build-Depends: debhelper (>= 4.0.0), gcj-4.2, g++-4.2, java-gcj-compat, dpatch Standards-Version: 3.7.2 Package: pdftk Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Suggests: xpdf-utils Description: A useful tool for manipulating PDF documents If PDF is electronic paper, then pdftk is an electronic stapler-remover, hole-punch, binder, secret-decoder-ring, and X-Ray-glasses. Pdftk is a --- pdftk-1.40.orig/debian/patches/general-fixes.dpatch +++ pdftk-1.40/debian/patches/general-fixes.dpatch @@ -0,0 +1,154 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## general-fixes.dpatch by Steve Kowalik +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Multiple fixes: +## DP: + Change the gcj version to 4.2. +## DP: + Liberally sprinkle include paths around different Makefiles. +## DP: + Don't remove .class files in certain Makefiles since this build system +## DP: is "special" +## DP: + Mark .class files as .PRECIOUS in pdf so they don't get cleaned up. + +@DPATCH@ +diff -urNad pdftk-1.40~/java_libs/com/lowagie/bc/asn1/Makefile pdftk-1.40/java_libs/com/lowagie/bc/asn1/Makefile +--- pdftk-1.40~/java_libs/com/lowagie/bc/asn1/Makefile 2006-07-28 08:18:06.000000000 +1000 ++++ pdftk-1.40/java_libs/com/lowagie/bc/asn1/Makefile 2007-08-02 17:29:10.000000000 +1000 +@@ -25,8 +25,7 @@ + # the "$*" automatic variable, here + # + %.h : %.class +- $(GCJH) --classpath="." $*; +- $(RM) $< ++ $(GCJH) --classpath="." -I../../../.. $*; + + ## + # targets +diff -urNad pdftk-1.40~/java_libs/com/lowagie/text/Makefile pdftk-1.40/java_libs/com/lowagie/text/Makefile +--- pdftk-1.40~/java_libs/com/lowagie/text/Makefile 2007-08-02 00:25:00.000000000 +1000 ++++ pdftk-1.40/java_libs/com/lowagie/text/Makefile 2007-08-02 17:29:10.000000000 +1000 +@@ -2,6 +2,8 @@ + # This is part of pdftk; visit: www.pdftk.com + # + ++.PRECIOUS: %.class ++ + ## + # variables + +@@ -25,8 +27,7 @@ + # the "$*" automatic variable, here + # + %.h : %.class +- $(GCJH) --classpath="." $*; +- $(RM) $< ++ $(GCJH) --classpath="." -I../../.. $*; + + ## + # targets +@@ -38,3 +39,6 @@ + + clean : + $(RM) $(RMFLAGS) *.o *.h *.class *.a ++ ++.SECONDARY: %.class ++ +diff -urNad pdftk-1.40~/java_libs/com/lowagie/text/pdf/Makefile pdftk-1.40/java_libs/com/lowagie/text/pdf/Makefile +--- pdftk-1.40~/java_libs/com/lowagie/text/pdf/Makefile 2006-07-27 06:15:10.000000000 +1000 ++++ pdftk-1.40/java_libs/com/lowagie/text/pdf/Makefile 2007-08-02 17:29:10.000000000 +1000 +@@ -16,17 +16,16 @@ + # implicit rules for creating A from B + + %.o : %.java +- $(GCJ) $(GCJFLAGS) -c $< -o $@ ++ $(GCJ) $(GCJFLAGS) -I../../../.. -c $< -o $@ + + %.class : %.java +- $(GCJ) $(GCJFLAGS) -C $< ++ $(GCJ) $(GCJFLAGS) -I../../../.. -C $< + + # gcjh doesn't want the ".class" extension, so use + # the "$*" automatic variable, here + # + %.h : %.class +- $(GCJH) --classpath="." $*; +- $(RM) $< ++ $(GCJH) --classpath="." -I../../../.. $*; + + ## + # targets +diff -urNad pdftk-1.40~/java_libs/com/lowagie/text/pdf/codec/postscript/Makefile pdftk-1.40/java_libs/com/lowagie/text/pdf/codec/postscript/Makefile +--- pdftk-1.40~/java_libs/com/lowagie/text/pdf/codec/postscript/Makefile 2006-07-28 08:21:06.000000000 +1000 ++++ pdftk-1.40/java_libs/com/lowagie/text/pdf/codec/postscript/Makefile 2007-08-02 17:29:32.000000000 +1000 +@@ -25,8 +25,7 @@ + # the "$*" automatic variable, here + # + %.h : %.class +- $(GCJH) --classpath="." $*; +- $(RM) $< ++ $(GCJH) --classpath="." -I../../../../../.. $*; + + ## + # targets +diff -urNad pdftk-1.40~/java_libs/com/lowagie/text/pdf/codec/wmf/Makefile pdftk-1.40/java_libs/com/lowagie/text/pdf/codec/wmf/Makefile +--- pdftk-1.40~/java_libs/com/lowagie/text/pdf/codec/wmf/Makefile 2006-07-27 06:15:32.000000000 +1000 ++++ pdftk-1.40/java_libs/com/lowagie/text/pdf/codec/wmf/Makefile 2007-08-02 17:29:10.000000000 +1000 +@@ -25,8 +25,7 @@ + # the "$*" automatic variable, here + # + %.h : %.class +- $(GCJH) --classpath="." $*; +- $(RM) $< ++ $(GCJH) --classpath="." -I../../../../../.. $*; + + ## + # targets +diff -urNad pdftk-1.40~/java_libs/com/lowagie/text/xml/xmp/Makefile pdftk-1.40/java_libs/com/lowagie/text/xml/xmp/Makefile +--- pdftk-1.40~/java_libs/com/lowagie/text/xml/xmp/Makefile 2006-07-27 09:53:34.000000000 +1000 ++++ pdftk-1.40/java_libs/com/lowagie/text/xml/xmp/Makefile 2007-08-02 17:29:10.000000000 +1000 +@@ -25,8 +25,7 @@ + # the "$*" automatic variable, here + # + %.h : %.class +- $(GCJH) --classpath="." $*; +- $(RM) $< ++ $(GCJH) --classpath="." -I../../../../.. $*; + + ## + # targets +diff -urNad pdftk-1.40~/java_libs/gnu_local/java/security/provider/Makefile pdftk-1.40/java_libs/gnu_local/java/security/provider/Makefile +--- pdftk-1.40~/java_libs/gnu_local/java/security/provider/Makefile 2007-07-31 18:42:28.000000000 +1000 ++++ pdftk-1.40/java_libs/gnu_local/java/security/provider/Makefile 2007-08-02 17:29:10.000000000 +1000 +@@ -25,7 +25,7 @@ + # the "$*" automatic variable, here + # + %.h : %.class +- $(GCJH) --classpath="." $*; ++ $(GCJH) --classpath="." -I../../../.. $*; + $(RM) $< + + ## +diff -urNad pdftk-1.40~/java_libs/java_local/security/Makefile pdftk-1.40/java_libs/java_local/security/Makefile +--- pdftk-1.40~/java_libs/java_local/security/Makefile 2006-07-27 06:13:04.000000000 +1000 ++++ pdftk-1.40/java_libs/java_local/security/Makefile 2007-08-02 17:29:10.000000000 +1000 +@@ -25,8 +25,7 @@ + # the "$*" automatic variable, here + # + %.h : %.class +- $(GCJH) --classpath="." $*; +- $(RM) $< ++ $(GCJH) --classpath="." -I../.. $*; + + ## + # targets +diff -urNad pdftk-1.40~/pdftk/Makefile.Debian pdftk-1.40/pdftk/Makefile.Debian +--- pdftk-1.40~/pdftk/Makefile.Debian 2007-07-31 20:10:41.000000000 +1000 ++++ pdftk-1.40/pdftk/Makefile.Debian 2007-08-02 17:29:10.000000000 +1000 +@@ -12,7 +12,7 @@ + + # tools + TOOLPATH= +-VERSUFF=-4.1 ++VERSUFF=-4.2 + CXX= $(TOOLPATH)g++$(VERSUFF) + export GCJ= $(TOOLPATH)gcj$(VERSUFF) + export GCJH= $(TOOLPATH)gcjh$(VERSUFF) --- pdftk-1.40.orig/debian/patches/00list +++ pdftk-1.40/debian/patches/00list @@ -0,0 +1 @@ +general-fixes --- pdftk-1.40.orig/debian/watch +++ pdftk-1.40/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://www.pdfhacks.com/pdftk/pdftk-(.*)\.tar\.gz