diff -Nur swftools-0.8.1/debian/changelog swftools-0.9.0/debian/changelog --- swftools-0.8.1/debian/changelog 2009-03-31 06:08:13.000000000 +0000 +++ swftools-0.9.0/debian/changelog 2009-05-23 06:23:44.000000000 +0000 @@ -1,3 +1,17 @@ +swftools (0.9.0-0ubuntu1) karmic; urgency=low + + * New upstream release (LP: #369931) + - patches/01_manpages: edited to match updated version of src/pdf2swf.1 and + src/wav2swf.1 + - patches/02_faq: edited to match updated version of FAQ + - patches/04_makefile: edited to delete the patch on lib/Makefile.in and + src/Makefile.in (applied upstream) + - deleted patch 99_configure_for_python2.5_and_2.6 (applied upstream) + - debian/swftools.doc: deleted installation of TODO and + pdf2swf/HOWTO_pdf2swf as they don't exist anymore + + -- Fabrice Coutadeur Thu, 30 Apr 2009 05:22:19 +0200 + swftools (0.8.1-2.1ubuntu1) jaunty; urgency=low * debian/rules: diff -Nur swftools-0.8.1/debian/patches/00list swftools-0.9.0/debian/patches/00list --- swftools-0.8.1/debian/patches/00list 2009-03-31 05:33:02.000000000 +0000 +++ swftools-0.9.0/debian/patches/00list 2009-05-23 06:14:54.000000000 +0000 @@ -19,7 +19,3 @@ # - Added LDFLAGS to Makefile.common.in 04_makefile.dpatch #------------------------------------------------------------------------ -# Configure -# - Updated for python2.5 and python2.6 -99_configure_for_python2.5_and_2.6.dpatch -#------------------------------------------------------------------------ diff -Nur swftools-0.8.1/debian/patches/01_manpages.dpatch swftools-0.9.0/debian/patches/01_manpages.dpatch --- swftools-0.8.1/debian/patches/01_manpages.dpatch 2009-03-31 04:34:40.000000000 +0000 +++ swftools-0.9.0/debian/patches/01_manpages.dpatch 2009-05-06 03:26:56.000000000 +0000 @@ -8,9 +8,9 @@ ## DP: font2swf.1, pdf2swf.1, wav2swf.1 and swfcombine.1 manpages. @DPATCH@ -diff -urNad swftools-0.8.1~/src/font2swf.1 swftools-0.8.1/src/font2swf.1 ---- swftools-0.8.1~/src/font2swf.1 2007-01-13 19:19:12.000000000 +0200 -+++ swftools-0.8.1/src/font2swf.1 2007-10-30 19:49:31.000000000 +0200 +diff -urNad swftools-0.9.0~/src/font2swf.1 swftools-0.9.0/src/font2swf.1 +--- swftools-0.9.0~/src/font2swf.1 2009-04-17 15:39:51.000000000 +0000 ++++ swftools-0.9.0/src/font2swf.1 2009-05-06 03:25:58.000000000 +0000 @@ -20,7 +20,7 @@ Print short help message and exit .TP @@ -20,10 +20,10 @@ .TP \fB\-o\fR, \fB\-\-output\fR \fIfilename\fR Write output to file \fIfilename\fR. (If not given, the output will go -diff -urNad swftools-0.8.1~/src/jpeg2swf.1 swftools-0.8.1/src/jpeg2swf.1 ---- swftools-0.8.1~/src/jpeg2swf.1 2007-01-13 19:19:12.000000000 +0200 -+++ swftools-0.8.1/src/jpeg2swf.1 2007-10-30 19:46:48.000000000 +0200 -@@ -54,7 +54,7 @@ +diff -urNad swftools-0.9.0~/src/jpeg2swf.1 swftools-0.9.0/src/jpeg2swf.1 +--- swftools-0.9.0~/src/jpeg2swf.1 2009-04-17 15:39:51.000000000 +0000 ++++ swftools-0.9.0/src/jpeg2swf.1 2009-05-06 03:25:58.000000000 +0000 +@@ -57,6 +57,6 @@ Make importable as asset with \fIassetname\fR .SH AUTHORS @@ -31,31 +31,30 @@ +Rainer B\[:o]hme .TP Matthias Kramm - -diff -urNad swftools-0.8.1~/src/pdf2swf.1 swftools-0.8.1/src/pdf2swf.1 ---- swftools-0.8.1~/src/pdf2swf.1 2006-08-16 16:02:05.000000000 +0300 -+++ swftools-0.8.1/src/pdf2swf.1 2007-10-30 19:49:56.000000000 +0200 +diff -urNad swftools-0.9.0~/src/pdf2swf.1 swftools-0.9.0/src/pdf2swf.1 +--- swftools-0.9.0~/src/pdf2swf.1 2009-05-06 03:25:50.000000000 +0000 ++++ swftools-0.9.0/src/pdf2swf.1 2009-05-06 03:26:54.000000000 +0000 @@ -3,7 +3,7 @@ - pdf2swf - convert PDF files into SWF + pdf2swf - Converts Acrobat PDF files into Flash SWF Animation files. + .SH Synopsis - .B pdf2swf --[\fIoptions\fR] \fIfile.pdf\fR [-o \fIfile.swf\fR] -+[\fIoptions\fR] \fIfile.pdf\fR [\-o \fIfile.swf\fR] +-.B pdf2swf [-options] file.pdf -o file.swf ++.B pdf2swf [-options] file.pdf /-o file.swf + .SH DESCRIPTION - This tools converts Acrobat PDF files into Flash SWF Animation - files. -@@ -20,7 +20,7 @@ - 3-5,10-12 + Converts a PDF file to a SWF file. +@@ -26,7 +26,7 @@ + Use password for deciphering the pdf. + .TP + \fB\-v\fR, \fB\-\-verbose\fR +- Be verbose. Use more than one -v for greater effect. ++ Be verbose. Use more than one /-v for greater effect. .TP - \fB\-v\fR, \fB\-\-verbose\fR --Be verbose. Use more than one -v for greater effect. -+Be verbose. Use more than one \-v for greater effect. - .TP - \fB\-z\fR, \fB\-\-zlib\fR - Use Flash 6 (MX) zlib compression. -diff -urNad swftools-0.8.1~/src/swfbbox.1 swftools-0.8.1/src/swfbbox.1 ---- swftools-0.8.1~/src/swfbbox.1 2007-01-13 19:19:12.000000000 +0200 -+++ swftools-0.8.1/src/swfbbox.1 2007-10-30 19:49:14.000000000 +0200 + \fB\-z\fR, \fB\-\-zlib\fR + The resulting SWF will not be playable in browsers with Flash Plugins 5 and below! +diff -urNad swftools-0.9.0~/src/swfbbox.1 swftools-0.9.0/src/swfbbox.1 +--- swftools-0.9.0~/src/swfbbox.1 2009-04-17 15:39:51.000000000 +0000 ++++ swftools-0.9.0/src/swfbbox.1 2009-05-06 03:25:58.000000000 +0000 @@ -35,7 +35,7 @@ Clip bounding boxes to movie size .TP @@ -65,9 +64,9 @@ .TP \fB\-v\fR, \fB\-\-verbose\fR Be more verbose -diff -urNad swftools-0.8.1~/src/swfcombine.1 swftools-0.8.1/src/swfcombine.1 ---- swftools-0.8.1~/src/swfcombine.1 2007-01-13 19:19:12.000000000 +0200 -+++ swftools-0.8.1/src/swfcombine.1 2007-10-30 19:51:01.000000000 +0200 +diff -urNad swftools-0.9.0~/src/swfcombine.1 swftools-0.9.0/src/swfcombine.1 +--- swftools-0.9.0~/src/swfcombine.1 2009-04-17 15:39:51.000000000 +0000 ++++ swftools-0.9.0/src/swfcombine.1 2009-05-06 03:25:58.000000000 +0000 @@ -47,7 +47,7 @@ Clip the slave objects by the corresponding master objects .TP @@ -88,9 +87,9 @@ - Force movie bbox height to \fIheight\fR (default: use master height (not with -t)) + Force movie bbox height to \fIheight\fR (default: use master height (not with \-t)) .TP - \fB\-z\fR, \fB\-\-zlib\fR \fIzlib\fR - Use Flash MX (SWF 6) Zlib encoding for the output. The resulting SWF will be -@@ -105,7 +105,7 @@ + \fB\-N\fR, \fB\-\-local-with-networking\fR + Make output file "local-with-networking" +@@ -111,7 +111,7 @@ Create two flash movies. Insert some rectangle into one of them, and give it a name. (E.g. "foo") Now call @@ -99,9 +98,9 @@ As a result, the slave movie should be visible inside the master movie at the position where the rectangle used to be. -diff -urNad swftools-0.8.1~/src/swfdump.1 swftools-0.8.1/src/swfdump.1 ---- swftools-0.8.1~/src/swfdump.1 2007-01-13 19:19:12.000000000 +0200 -+++ swftools-0.8.1/src/swfdump.1 2007-10-30 19:48:54.000000000 +0200 +diff -urNad swftools-0.9.0~/src/swfdump.1 swftools-0.9.0/src/swfdump.1 +--- swftools-0.9.0~/src/swfdump.1 2009-04-17 15:39:51.000000000 +0000 ++++ swftools-0.9.0/src/swfdump.1 2009-05-06 03:25:58.000000000 +0000 @@ -18,7 +18,7 @@ Print short help message and exit .TP @@ -111,7 +110,7 @@ .TP \fB\-V\fR, \fB\-\-version\fR Print version info and exit -@@ -45,16 +45,16 @@ +@@ -51,16 +51,16 @@ Print tag's bounding boxes .TP \fB\-X\fR, \fB\-\-width\fR @@ -132,9 +131,9 @@ .TP \fB\-d\fR, \fB\-\-hex\fR Print hex output of tag data, too. -diff -urNad swftools-0.8.1~/src/swfextract.1 swftools-0.8.1/src/swfextract.1 ---- swftools-0.8.1~/src/swfextract.1 2006-01-04 11:15:11.000000000 +0200 -+++ swftools-0.8.1/src/swfextract.1 2007-10-30 19:47:37.000000000 +0200 +diff -urNad swftools-0.9.0~/src/swfextract.1 swftools-0.9.0/src/swfextract.1 +--- swftools-0.9.0~/src/swfextract.1 2009-01-27 17:18:37.000000000 +0000 ++++ swftools-0.9.0/src/swfextract.1 2009-05-06 03:25:58.000000000 +0000 @@ -27,7 +27,7 @@ \fIids\fR is a range of JPEG IDs to extract. E.g. 1-2,3,14- .TP @@ -153,9 +152,9 @@ at the same position in the generated movie as in the original movie. .TP -diff -urNad swftools-0.8.1~/src/swfstrings.1 swftools-0.8.1/src/swfstrings.1 ---- swftools-0.8.1~/src/swfstrings.1 2006-01-04 11:15:11.000000000 +0200 -+++ swftools-0.8.1/src/swfstrings.1 2007-10-30 19:46:48.000000000 +0200 +diff -urNad swftools-0.9.0~/src/swfstrings.1 swftools-0.9.0/src/swfstrings.1 +--- swftools-0.9.0~/src/swfstrings.1 2009-01-27 17:18:37.000000000 +0000 ++++ swftools-0.9.0/src/swfstrings.1 2009-05-06 03:25:58.000000000 +0000 @@ -20,5 +20,5 @@ .SH AUTHOR @@ -163,12 +162,15 @@ -Rainer Böhme +Rainer B\[:o]hme -diff -urNad swftools-0.8.1~/src/wav2swf.1 swftools-0.8.1/src/wav2swf.1 ---- swftools-0.8.1~/src/wav2swf.1 2007-01-13 19:19:12.000000000 +0200 -+++ swftools-0.8.1/src/wav2swf.1 2007-10-30 19:50:11.000000000 +0200 -@@ -47,4 +47,4 @@ +diff -urNad swftools-0.9.0~/src/wav2swf.1 swftools-0.9.0/src/wav2swf.1 +--- swftools-0.9.0~/src/wav2swf.1 2009-05-06 03:25:44.000000000 +0000 ++++ swftools-0.9.0/src/wav2swf.1 2009-05-06 03:26:32.000000000 +0000 +@@ -47,7 +47,7 @@ Set mp3 bitrate to \fIbps\fR (default: 32) .TP \fB\-v\fR, \fB\-\-verbose\fR - Be more verbose. (Use more than one -v for greater effect) -+ Be more verbose. (Use more than one \-v for greater effect) ++ Be more verbose. (Use more than one /-v for greater effect) + .SH AUTHOR + + Matthias Kramm diff -Nur swftools-0.8.1/debian/patches/02_faq.dpatch swftools-0.9.0/debian/patches/02_faq.dpatch --- swftools-0.8.1/debian/patches/02_faq.dpatch 2009-03-31 04:34:40.000000000 +0000 +++ swftools-0.9.0/debian/patches/02_faq.dpatch 2009-05-06 03:25:06.000000000 +0000 @@ -6,14 +6,14 @@ ## DP: questions from the FAQ file. @DPATCH@ -diff -urNad swftools-0.8.1~/FAQ swftools-0.8.1/FAQ ---- swftools-0.8.1~/FAQ 2007-02-05 15:26:39.000000000 +0200 -+++ swftools-0.8.1/FAQ 2007-03-04 08:09:25.000000000 +0200 -@@ -3,89 +3,7 @@ - SWFTools is free of charge, and is released under the GPL - (http://www.gnu.org/licenses/gpl.html). +diff -urNad swftools-0.9.0~/FAQ swftools-0.9.0/FAQ +--- swftools-0.9.0~/FAQ 2009-05-06 03:21:46.000000000 +0000 ++++ swftools-0.9.0/FAQ 2009-05-06 03:25:03.000000000 +0000 +@@ -9,81 +9,7 @@ + on http://www.swftools.org/donate.html + . --2.) How to compile/link swftools on Unix/Linux/BSD? +-3.) How to compile/link swftools on Unix/Linux/BSD? - - Download swftools-0.x.x.tar.gz. Then type, on the - command-line: @@ -26,24 +26,16 @@ - - (you will have to be root for the last step) - --3.) What libraries do I need to compile swftools on Unix/Linux/BSD? +-4.) What libraries do I need to compile swftools on Unix/Linux/BSD? - -- You need t1lib, freetype and jpeglib to compile pdf2swf. +- You need freetype and jpeglib to compile pdf2swf. - Links: - freetype: - http://www.freetype.org -- t1lib: -- ftp://sunsite.unc.edu/pub/linux/libs/graphics/t1lib-1.3.1.tar.gz -- t1lib (mirrored here): -- http://www.quiss.org/swftools/t1lib-1.3.1.tar.gz - jpeglib: - http://www.ijg.org/files/jpegsrc.v6b.tar.gz - -- Furthermore, if you want to compile avi2swf, you need the avifile library: -- http://avifile.sourceforge.net -- . -- --4.) when compiling the sourcecode version, configure doesn't find my jpeglib / my t1lib! +-5.) when compiling the sourcecode version, configure doesn't find my jpeglib! - - In case some of your libraries/include files are installed in /usr/local, - try the following: @@ -66,7 +58,7 @@ - If it still doesn't work, try removing the file "config.cache" - before running configure again. - --5.) There are problems during compilation: +-6.) There are problems during compilation: - Error messages complain about "undefined reference to `operator new(unsigned)'" - as well as "undefined reference to `__gxx_personality_v0'". - @@ -74,7 +66,7 @@ - - LDFLAGS=-lstdc++ ./configure - --6.) How do I compile swftools on Mac OS X? +-7.) How do I compile swftools on Mac OS X? - - You need to get fink (http://fink.sourceforge.net), and install it. - After this, you need to install all the required libs (jpeg, freetype, lame): @@ -96,7 +88,7 @@ - Imaging headers (Imaging.h, ImPlatform.h, ImConfig.h) to - /System/Library/Frameworks/Python.framework/Versions/2.3/include/python2.3/ - before running configure. -+2.-6.) Install/compile related FAQs are removed from the Debian package. ++3.-7.) Install/compile related FAQs are removed from the Debian package. - 7.) Is there a pdf2swf/avi2swf for Windows? + 8.) Is there a pdf2swf/avi2swf for Windows? diff -Nur swftools-0.8.1/debian/patches/04_makefile.dpatch swftools-0.9.0/debian/patches/04_makefile.dpatch --- swftools-0.8.1/debian/patches/04_makefile.dpatch 2009-03-31 04:34:40.000000000 +0000 +++ swftools-0.9.0/debian/patches/04_makefile.dpatch 2009-05-06 03:41:52.000000000 +0000 @@ -9,11 +9,11 @@ ## DP: one included in the upstream tar ball. @DPATCH@ -diff -urNad swftools-0.8.0~/Makefile.common.in swftools-0.8.0/Makefile.common.in ---- swftools-0.8.0~/Makefile.common.in 2007-02-01 17:34:27.000000000 +0200 -+++ swftools-0.8.0/Makefile.common.in 2007-02-01 17:35:12.000000000 +0200 -@@ -10,8 +10,8 @@ - INCLUDES= +diff -urNad swftools-0.9.0~/Makefile.common.in swftools-0.9.0/Makefile.common.in +--- swftools-0.9.0~/Makefile.common.in 2009-04-12 23:27:16.000000000 +0000 ++++ swftools-0.9.0/Makefile.common.in 2009-05-06 03:38:30.000000000 +0000 +@@ -11,8 +11,8 @@ + DEP=@CC@ -MM $(DEFS) $(INCLUDES) @CPPFLAGS@ C=@CC@ -c $(DEFS) $(INCLUDES) @CPPFLAGS@ @CFLAGS@ CC=@CXX@ -c $(DEFS) $(INCLUDES) @CPPFLAGS@ @CXXFLAGS@ -L=@CC@ $(DEFS) @@ -23,27 +23,3 @@ AR=@AR@ LIBTOOL=@LIBTOOL@ SC=$(LIBTOOL) @CC@ -c $(DEFS) $(INCLUDES) @CPPFLAGS@ @CFLAGS@ -diff -urNad swftools-0.8.0~/lib/Makefile.in swftools-0.8.0/lib/Makefile.in ---- swftools-0.8.0~/lib/Makefile.in 2007-02-01 17:34:27.000000000 +0200 -+++ swftools-0.8.0/lib/Makefile.in 2007-02-01 17:34:45.000000000 +0200 -@@ -7,7 +7,7 @@ - devices/arts.$(O) devices/record.$(O) devices/ops.$(O) \ - devices/rescale.$(O) devices/bbox.$(O) #devices/lrf.$(O) devices/opengl.$(O) - --all: librfxswf$(A) libpdf$(A) q.$(O) mem.$(O) os.$(O) gfxtools.$(O) gfxfont.$(O) art/libart$(A) png.$(O) mp3.$(O) wav.$(O) $(DEVICES) -+all: librfxswf$(A) libpdf$(A) q.$(O) mem.$(O) os.$(O) gfxtools.$(O) gfxfont.$(O) png.$(O) mp3.$(O) wav.$(O) $(DEVICES) - - - lame_objects = @lame_objects@ -diff -urNad swftools-0.8.0~/src/Makefile.in swftools-0.8.0/src/Makefile.in ---- swftools-0.8.0~/src/Makefile.in 2007-02-01 17:34:27.000000000 +0200 -+++ swftools-0.8.0/src/Makefile.in 2007-02-01 17:34:45.000000000 +0200 -@@ -87,7 +87,7 @@ - $(L) swfrender.$(O) -o $@ ../lib/librfxswf$(A) ../lib/png.$(O) $(LIBS) - $(STRIP) $@ - pdf2swf$(E): pdf2swf.$(O) ../lib/librfxswf$(A) ../lib/libpdf$(A) ../lib/devices/ops.$(O) ../lib/devices/arts.$(O) ../lib/devices/swf.$(O) ../lib/devices/render.$(O) -- $(LL) pdf2swf.$(O) -o $@ ../lib/librfxswf$(A) ../lib/libpdf$(A) ../lib/gfxtools.$(O) ../lib/gfxfont.$(O) ../lib/os.$(O) ../lib/devices/swf.$(O) ../lib/devices/arts.$(O) ../lib/devices/ops.$(O) ../lib/devices/record.$(O) ../lib/devices/render.$(O) ../lib/art/libart$(A) $(LIBS) $(CXXLIBS) -+ $(LL) pdf2swf.$(O) -o $@ ../lib/librfxswf$(A) ../lib/libpdf$(A) ../lib/gfxtools.$(O) ../lib/gfxfont.$(O) ../lib/os.$(O) ../lib/devices/swf.$(O) ../lib/devices/arts.$(O) ../lib/devices/ops.$(O) ../lib/devices/record.$(O) ../lib/devices/render.$(O) $(LIBS) $(CXXLIBS) - $(STRIP) $@ - swfc$(E): parser.$(O) swfc.$(O) ../lib/q.$(O) ../lib/mp3.$(O) ../lib/wav.$(O) ../lib/png.$(O) ../lib/librfxswf$(A) - $(L) parser.$(O) swfc.$(O) ../lib/q.$(O) ../lib/mp3.$(O) ../lib/wav.$(O) ../lib/png.$(O) -o $@ ../lib/librfxswf$(A) $(LIBS) diff -Nur swftools-0.8.1/debian/patches/99_configure_for_python2.5_and_2.6.dpatch swftools-0.9.0/debian/patches/99_configure_for_python2.5_and_2.6.dpatch --- swftools-0.8.1/debian/patches/99_configure_for_python2.5_and_2.6.dpatch 2009-03-31 05:31:55.000000000 +0000 +++ swftools-0.9.0/debian/patches/99_configure_for_python2.5_and_2.6.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 99_configure_for_python2.5_and_2.6.dpatch by Fabrice Coutadeur -## -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: This patch patches the configure script, totake into account python2.5 -## DP: and python2.6 - -@DPATCH@ -diff -urNad swftools-0.8.1.orig/configure swftools-0.8.1/configure ---- swftools-0.8.1.orig/configure -+++ swftools-0.8.1/configure -@@ -9545,8 +9545,8 @@ - if test "x$PYTHON_LIB" '!=' "x" -o "x$PYTHON_INCLUDES" '!=' "x";then - echo "Set both PYTHON_LIB and PYTHON_INCLUDES, or none at all" - fi -- # iterate through version 2.2 to 2.4 -- for v in 2 3 4; do -+ # iterate through version 2.2 to 2.6 -+ for v in 2 3 4 5 6; do - # Linux - if test -f "/usr/lib/python2.$v/site-packages/PIL/_imaging.so" -a -f "/usr/include/python2.$v/Python.h";then - PY_VERSION=2.$v diff -Nur swftools-0.8.1/debian/swftools.docs swftools-0.9.0/debian/swftools.docs --- swftools-0.8.1/debian/swftools.docs 2009-03-31 04:34:40.000000000 +0000 +++ swftools-0.9.0/debian/swftools.docs 2009-05-06 04:07:40.000000000 +0000 @@ -1,4 +1,2 @@ FAQ -TODO AUTHORS -pdf2swf/HOWTO_pdf2swf