Hi there,

here are some patches that were necassary during some packaging work
for debian:

01_manpages: this fixes some problems with "-" signs in manpages and the
encoding of some names.

07_spelling: fixes spelling problems in manpages and source-files.

02_src_makefile: fixes two little problems with clean-targets in
makefiles.

I would be glat, if that patches could be integrated.


-- 
 MfG, Christian Welzel

  GPG-Key:     4096R/5117E119 2011-09-19
  Fingerprint: 3688 337C 0D3E 3725 94EC  E401 8D52 CDE9 5117 E119
## 01-manpages.patch by Simo Kauppi <[email protected]>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: This patch fixes the jpg2swf.1 and swfstrings.1 manpages, which
## DP: have the letter 'ö' in the author's name.
## DP: Fixes also the minus signs in swfextract.1, swfdump.1, swfbbox.1,
## DP: font2swf.1, pdf2swf.1, wav2swf.1 and swfcombine.1 manpages.

--- swftools-0.9.1+201202040819+ds1.orig/src/font2swf.1
+++ swftools-0.9.1+201202040819+ds1/src/font2swf.1
@@ -20,7 +20,7 @@
     Print short help message and exit
 .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\-o\fR, \fB\-\-output\fR \fIfilename\fR
     Write output to file \fIfilename\fR. (If not given, the output will go
--- swftools-0.9.1+201202040819+ds1.orig/src/jpeg2swf.1
+++ swftools-0.9.1+201202040819+ds1/src/jpeg2swf.1
@@ -8,7 +8,7 @@
 .SH DESCRIPTION
 This tool converts jpeg image files into an SWF animation. It takes any
 number of input pictures, and converts them to SWF one-by-one, where every
-converted picture is a seperate frame in the target SWF.
+converted picture is a separate frame in the target SWF.
 
 .SH OPTIONS
 .TP
@@ -57,6 +57,6 @@
     Make importable as asset with \fIassetname\fR
 .SH AUTHORS
 
-Rainer Böhme <[email protected]>
+Rainer B\[:o]hme <[email protected]>
 .TP
 Matthias Kramm
--- swftools-0.9.1+201202040819+ds1.orig/src/pdf2swf.1
+++ swftools-0.9.1+201202040819+ds1/src/pdf2swf.1
@@ -1,9 +1,9 @@
 .TH pdf2swf "1" "June 2008" "pdf2swf" "swftools"
 .SH NAME
-pdf2swf - Converts Acrobat PDF files into Flash SWF Animation files.
+pdf2swf \- Converts Acrobat PDF files into Flash SWF Animation files.
 
 .SH Synopsis
-.B pdf2swf [-options] file.pdf -o file.swf
+.B pdf2swf [\-options] file.pdf \-o file.swf
 
 .SH DESCRIPTION
 Converts a PDF file to a SWF file.
@@ -17,7 +17,7 @@
     Print version info and exit
 .TP
 \fB\-o\fR, \fB\-\-output\fR file.swf
-    will go into a seperate file.
+    will go into a separate file.
 .TP
 \fB\-p\fR, \fB\-\-pages\fR range
     3-5,10-12
@@ -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\-z\fR, \fB\-\-zlib\fR 
     The resulting SWF will not be playable in browsers with Flash Plugins 5 and below!
@@ -38,7 +38,7 @@
     Set quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best (big). (default:85)
 .TP
 \fB\-s\fR, \fB\-\-set\fR param=value
-    Set a SWF encoder specific parameter.  See pdf2swf -s help for more information.
+    Set a SWF encoder specific parameter.  See pdf2swf \-s help for more information.
 .TP
 \fB\-w\fR, \fB\-\-samewindow\fR 
     When clicked on, the page they point to will be opened in the window the SWF is displayed.
@@ -68,7 +68,7 @@
     filename is an arbitrary swf animation.
 .TP
 \fB\-q\fR, \fB\-\-quiet\fR 
-    Suppress normal messages.  Use -qq to suppress warnings, also.
+    Suppress normal messages.  Use \-qq to suppress warnings, also.
 .TP
 \fB\-S\fR, \fB\-\-shapes\fR 
     Don't use SWF Fonts, but store everything as shape.
--- swftools-0.9.1+201202040819+ds1.orig/src/swfbbox.1
+++ swftools-0.9.1+201202040819+ds1/src/swfbbox.1
@@ -35,7 +35,7 @@
     Clip bounding boxes to movie size
 .TP
 \fB\-o\fR, \fB\-\-output\fR \fIfilename\fR
-    Set output filename to \fIfilename\fR (for -O)
+    Set output filename to \fIfilename\fR (for \-O)
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR 
     Be more verbose
--- swftools-0.9.1+201202040819+ds1.orig/src/swfcombine.1
+++ swftools-0.9.1+201202040819+ds1/src/swfcombine.1
@@ -29,7 +29,7 @@
 .TP
 \fB\-t\fR, \fB\-\-stack\fR 
     Don't assume the first file is a master file. Instead, store each
-    file in a seperate frame.
+    file in a separate frame.
 .TP
 \fB\-T\fR, \fB\-\-stack1\fR 
     place each slave in the first frame (no master movie)
@@ -47,7 +47,7 @@
     Clip the slave objects by the corresponding master objects
 .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\-F\fR, \fB\-\-flashversion\fR 
     Set the flash version of the output file.
@@ -72,10 +72,10 @@
     Force the output to have the framerate \fIfps\fR. (Otherwise, the framerate of the master file will be used)
 .TP
 \fB\-X\fR, \fB\-\-width\fR \fIwidth\fR       
-    Force movie bbox width to \fIwidth\fR (default: use master width (not with -t))
+    Force movie bbox width to \fIwidth\fR (default: use master width (not with \-t))
 .TP
 \fB\-Y\fR, \fB\-\-height\fR \fIheight\fR      
-    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\-N\fR, \fB\-\-local-with-networking\fR 
     Make output file "local-with-networking"
@@ -109,7 +109,7 @@
 The slave name may also be the object id, preceded by '#', in which case 
 the object to be replaced is referenced by id and not by instance name.
 .SH Combining (stacking) one or more .swf files without a master
-The flash files will be inserted in seperate frames. They will still be
+The flash files will be inserted in separate frames. They will still be
 packed into Movieclips, therefore the outputfile will have exactly as many
 frames as there were inputfiles. Also, the files don't need to have names.
 If you want to access the Movieclips, their names are frameXX, where XX is
@@ -120,7 +120,7 @@
 Create two flash movies. Insert some rectangle into one of them, and give
 it a name. (E.g. "foo") Now call
 
-swfcombine -o combined.swf master.swf foo=slave.swf
+swfcombine \-o combined.swf master.swf foo=slave.swf
 
 As a result, the slave movie should be visible inside the master movie
 at the position where the rectangle used to be.
--- swftools-0.9.1+201202040819+ds1.orig/src/swfdump.1
+++ swftools-0.9.1+201202040819+ds1/src/swfdump.1
@@ -18,7 +18,7 @@
     Print short help message and exit
 .TP
 \fB\-D\fR, \fB\-\-full\fR 
-    Show everything. Same as -atp
+    Show everything. Same as \-atp
 .TP
 \fB\-V\fR, \fB\-\-version\fR 
     Print version info and exit
@@ -51,16 +51,16 @@
     Print tag's bounding boxes
 .TP
 \fB\-X\fR, \fB\-\-width\fR 
-    Print out the horizontal dimension of the movie, in a string of the form "-X width"
+    Print out the horizontal dimension of the movie, in a string of the form "\-X width"
 .TP
 \fB\-Y\fR, \fB\-\-height\fR 
-    Print out the vertical dimension of the movie, in a string of the form "-Y height"
+    Print out the vertical dimension of the movie, in a string of the form "\-Y height"
 .TP
 \fB\-r\fR, \fB\-\-rate\fR 
-    Print out the frame rate of the movie, in a string of the form "-r rate".
+    Print out the frame rate of the movie, in a string of the form "\-r rate".
 .TP
 \fB\-f\fR, \fB\-\-frames\fR 
-    Print out the number of frames in the movie, in a string of the form "-f frames"
+    Print out the number of frames in the movie, in a string of the form "\-f frames"
 .TP
 \fB\-d\fR, \fB\-\-hex\fR 
     Print hex output of tag data, too.
--- swftools-0.9.1+201202040819+ds1.orig/src/swfextract.1
+++ swftools-0.9.1+201202040819+ds1/src/swfextract.1
@@ -5,7 +5,7 @@
 .B swfextract
 [\fIoptions\fR] [\fIfile.swf\fR]
 .SH DESCRIPTION
-swfextracts allows to extract swf movieclips and objects out of swf files.
+swfextracts allows one to extract swf movieclips and objects out of swf files.
 .PP
 SWF files are animation files which can be displayed in Web Browsers using
 the Flash Plugin.
@@ -27,7 +27,7 @@
 \fIids\fR is a range of JPEG IDs to extract. E.g. 1-2,3,14-
 .TP
 \fB\-p\fR, \fB\-\-pngs\fR \fIids\fR
-\fIids\fR is a range of PNG IDs to extract. E.g. -10,20-30
+\fIids\fR is a range of PNG IDs to extract. E.g. \-10,20\-30
 .TP
 \fB\-f\fR, \fB\-\-frame\fR \fIframes\fR
 \fIframes\fR is a range of frames to extract. E.g. 1-10,20-30,40-
@@ -40,7 +40,7 @@
 .TP
 \fB\-P\fR, \fB\-\-placeobject\fR
 Copy original placeobject tag for the given object into the
-output file (Use with -i). This means that the object is
+output file (Use with \-i). This means that the object is
 at the same position in the generated movie as in the
 original movie.
 .TP
--- swftools-0.9.1+201202040819+ds1.orig/src/swfstrings.1
+++ swftools-0.9.1+201202040819+ds1/src/swfstrings.1
@@ -30,6 +30,6 @@
     Print version information and exit
 .SH AUTHORS
 
-Rainer Böhme <[email protected]>
+Rainer B\[:o]hme <[email protected]>
 .TP
 Matthias Kramm <[email protected]>
--- swftools-0.9.1+201202040819+ds1.orig/src/wav2swf.1
+++ swftools-0.9.1+201202040819+ds1/src/wav2swf.1
@@ -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)
 .SH AUTHOR
 
 Matthias Kramm <[email protected]>
--- swftools-0.9.1+201202040819+ds1.orig/src/gif2swf.1
+++ swftools-0.9.1+201202040819+ds1/src/gif2swf.1
@@ -9,7 +9,7 @@
 .SH DESCRIPTION
 This tools converts gif image files into an SWF animation. It takes any
 number of input pictures, and converts them to SWF one-by-one, where every
-converted picture is a seperate frame in the target SWF. 
+converted picture is a separate frame in the target SWF. 
 
 .SH OPTIONS
 .TP
--- swftools-0.9.1+201202040819+ds1.orig/src/png2swf.1
+++ swftools-0.9.1+201202040819+ds1/src/png2swf.1
@@ -9,7 +9,7 @@
 .SH DESCRIPTION
 This tools converts png image files into an SWF animation. It takes any
 number of input pictures, and converts them to SWF one-by-one, where every
-converted picture is a seperate frame in the target SWF. 
+converted picture is a separate frame in the target SWF. 
 .PP
 The way the
 images are encoded in SWF is very similar to PNG (in that a zlib-based, lossless
--- swftools-0.9.1+201202040819+ds1.orig/src/as3compile.1
+++ swftools-0.9.1+201202040819+ds1/src/as3compile.1
@@ -1,9 +1,9 @@
 .TH as3compile "1" "April 2009" "as3compile" "swftools"
 .SH NAME
-as3compile - Compile .as ActionScript 3.0 files to swf.
+as3compile \- Compile .as ActionScript 3.0 files to swf.
 
 .SH Synopsis
-.B as3compile file.as [-o file.swf] 
+.B as3compile file.as [\-o file.swf] 
 
 .SH DESCRIPTION
 Compiles a file written in ActionScript 3.0 to a SWF file.
@@ -63,7 +63,7 @@
 .SH EXAMPLE
 
  The following is a basic as3 file that can be compiled e.g.
- with \fBas3compile -X 400 -Y 400 smiley.as\fR
+ with \fBas3compile \-X 400 \-Y 400 smiley.as\fR
 
  // smiley.as
  package
Description: Fixes spelling errors not contained in man pages
 See also 01_manpages.patch.
Author: Christian Welzel <[email protected]>
Last-Update: 2012-02-05

--- swftools_0.9.1+20111215+ds1.orig/src/pdf2swf.c
+++ swftools_0.9.1+20111215+ds1/src/pdf2swf.c
@@ -513,7 +513,7 @@
     printf("\n");
     printf("-h , --help                    Print short help message and exit\n");
     printf("-V , --version                 Print version info and exit\n");
-    printf("-o , --output file.swf         Direct output to file.swf. If file.swf contains '%%' (file%%.swf), then each page goes to a seperate file.\n");
+    printf("-o , --output file.swf         Direct output to file.swf. If file.swf contains '%%' (file%%.swf), then each page goes to a separate file.\n");
     printf("-p , --pages range             Convert only pages in range with range e.g. 1-20 or 1,4,6,9-11 or\n");
     printf("-P , --password password       Use password for deciphering the pdf.\n");
     printf("-v , --verbose                 Be verbose. Use more than one -v for greater effect.\n");
--- swftools_0.9.1+20111215+ds1.orig/src/swfc.c
+++ swftools_0.9.1+20111215+ds1/src/swfc.c
@@ -2916,7 +2916,7 @@
             break;
         }
     if(!inter->function)
-        syntaxerror("unkown interpolation function %s", functionstr);
+        syntaxerror("unknown interpolation function %s", functionstr);
     inter->speed = parseFloat(lu(args, "speed"));
     inter->amplitude = parseTwip(lu(args, "amplitude"));
     inter->growth = parseFloat(lu(args, "growth"));
@@ -3347,7 +3347,7 @@
                 const char* interstr = lu(args, "interpolation");
                 interpolation_t* inter = (interpolation_t*)dict_lookup(&interpolations, interstr);
                 if(!inter)
-                    syntaxerror("unkown interpolation %s", interstr);
+                    syntaxerror("unknown interpolation %s", interstr);
                 s_change(instance, p, inter);
             }
             break;
@@ -3356,7 +3356,7 @@
                 const char* interstr = lu(args, "interpolation");
                 interpolation_t* inter = (interpolation_t*)dict_lookup(&interpolations, interstr);
                 if(!inter)
-                    syntaxerror("unkown interpolation %s", interstr);
+                    syntaxerror("unknown interpolation %s", interstr);
             	s_schange(instance, p, inter);
             }
             break;
@@ -3373,7 +3373,7 @@
                 const char* interstr = lu(args, "interpolation");
                 interpolation_t* inter = (interpolation_t*)dict_lookup(&interpolations, interstr);
                 if(!inter)
-                    syntaxerror("unkown interpolation %s", interstr);
+                    syntaxerror("unknown interpolation %s", interstr);
             	s_sweep(instance, p, radius, clockwise, short_arc, inter);
             }
             break;
@@ -3653,7 +3653,7 @@
                 const char* interstr = lu(args, "interpolation");
                 interpolation_t* inter = (interpolation_t*)dict_lookup(&interpolations, interstr);
                 if(!inter)
-                    syntaxerror("unkown interpolation %s", interstr);
+                    syntaxerror("unknown interpolation %s", interstr);
                 s_change(instance, p, inter);
             }
             break;
@@ -3662,7 +3662,7 @@
                 const char* interstr = lu(args, "interpolation");
                 interpolation_t* inter = (interpolation_t*)dict_lookup(&interpolations, interstr);
                 if(!inter)
-                    syntaxerror("unkown interpolation %s", interstr);
+                    syntaxerror("unknown interpolation %s", interstr);
             	s_schange(instance, p, inter);
             }
             break;
--- swftools_0.9.1+20111215+ds1.orig/src/swfcombine.c
+++ swftools_0.9.1+20111215+ds1/src/swfcombine.c
@@ -309,7 +309,7 @@
     printf("OR:    %s [-rXYomlcv] --dummy [-xys] [file]\n", name);
     printf("\n");
     printf("-o , --output <outputfile>      explicitly specify output file. (otherwise, output.swf will be used)\n");
-    printf("-t , --stack                   place each slave in a seperate frame (no master movie)\n");
+    printf("-t , --stack                   place each slave in a separate frame (no master movie)\n");
     printf("-T , --stack1                  place each slave in the first frame (no master movie)\n");
     printf("-m , --merge                   Don't store the slaves in Sprites/MovieClips\n");
     printf("-a , --cat                     concatenate all slave files (no master movie)\n");
Description: Modify upstreams Makefiles to clean correctly
Author: Christian Welzel <[email protected]>
Last-Update: 2012-02-05

--- swftools_2011-12-15.orig/Makefile.in
+++ swftools_2011-12-15/Makefile.in
@@ -25,7 +25,7 @@
 distclean:
 	$(MAKE) clean
 	rm -f config.status config.cache config.h Makefile Makefile.common libtool
-	rm -f lib/lame/Makefile lib/python/Makefile lib/Makefile src/Makefile avi2swf/Makefile pdf2swf/fonts/Makefile
+	rm -f lib/readers/Makefile lib/lame/Makefile lib/python/Makefile lib/Makefile src/Makefile avi2swf/Makefile pdf2swf/fonts/Makefile
 
 clean-local:
 	rm -f config.cache gmon.out
--- swftools_2011-12-15.orig/m4/Makefile
+++ swftools_2011-12-15/m4/Makefile
@@ -1,7 +1,7 @@
 # simple pmake detecting Makefile
 
 all: clear  test.o
-clean: all
+clean: clear
 install:
 uninstall:
 
---------------
SWFTools-common is a self-managed list. To subscribe/unsubscribe, or amend an 
existing subscription, please kindly point your favourite web browser 
at:<http://lists.nongnu.org/mailman/listinfo/swftools-common>

Reply via email to