Hello, On Wed, 25 Jun 2008, Kapil Hari Paranjape wrote: > I prepared an NMU with version number 0.21-0.1, the output of > interdiff -z -p1 ffmpeg2theora_0.19-1.diff.gz > ffmpeg2theora_0.21-0.1.diff.gz > is attached.
The manpage had some hyphen-used-as-minus bugs which I fixed. I also added -Wl,-z,defs and -Wl,--as-needed to prevent extra dependencies from being added. The latest interdiff is attached. Regards, Kapil. --
diff -u ffmpeg2theora-0.19/debian/rules ffmpeg2theora-0.21/debian/rules --- ffmpeg2theora-0.19/debian/rules +++ ffmpeg2theora-0.21/debian/rules @@ -2,6 +2,7 @@ include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk # DC1394 is Linux-only and not needed #ifneq (,findstring($(DEB_HOST_ARCH_OS), hurd kfreebsd)) @@ -13 +14 @@ -DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-lgsm" +DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-lgsm -Wl,-z,defs -Wl,--as-needed" diff -u ffmpeg2theora-0.19/debian/control ffmpeg2theora-0.21/debian/control --- ffmpeg2theora-0.19/debian/control +++ ffmpeg2theora-0.21/debian/control @@ -2,8 +2,12 @@ Section: graphics Priority: optional Maintainer: RISKO Gergely <[EMAIL PROTECTED]> -Build-Depends: cdbs, debhelper, libavcodec-dev, libswscale-dev, libavformat-dev, libogg-dev, libvorbis-dev, libtheora-dev, pkg-config, zlib1g-dev, libdts-dev, libgsm1-dev -Standards-Version: 3.7.2.0 +Build-Depends: cdbs, debhelper, libavcodec-dev, libavutil-dev, libpostproc-dev, + libswscale-dev, libavformat-dev, libavdevice-dev, libogg-dev, libvorbis-dev, + libtheora-dev, pkg-config, zlib1g-dev, libdts-dev, libgsm1-dev, libfaad-dev, + libx11-dev, libxext-dev +Homepage: http://v2v.cc/~j/ffmpeg2theora/ +Standards-Version: 3.8.0 Package: ffmpeg2theora Architecture: any diff -u ffmpeg2theora-0.19/debian/changelog ffmpeg2theora-0.21/debian/changelog --- ffmpeg2theora-0.19/debian/changelog +++ ffmpeg2theora-0.21/debian/changelog @@ -1,3 +1,24 @@ +ffmpeg2theora (0.21-0.1) unstable; urgency=low + + * Non-maintainer upload. + * New upstream release (0.21). + Closes: #484813, #482218. + * debian/control: + - added libavutil-dev, libavdevice-dev, libfaad-dev, libx11-dev, + libxext-dev to dependencies. + - added Homepage field + - Standards-Version 3.8.0 + * debian/rules: + - added cdbs simple-patchsys include. + - added "as-needed" and "no-undefined" flags for linker + to reduce dependencies. + * debian/patches/01-fix_includes.patch: point the include + directives in ffmpeg2theora.c to the correct directories. + * debian/patches/02-fix_hyphen-used-as-minus_in_manpage.patch: + replaced incorrect uses of hyphen as minus in ffmpeg2theora.1. + + -- Kapil Hari Paranjape <[EMAIL PROTECTED]> Wed, 25 Jun 2008 16:42:05 +0530 + ffmpeg2theora (0.19-1) unstable; urgency=low * New upstream release (closes: #429937, #368588) only in patch2: unchanged: --- ffmpeg2theora-0.21.orig/debian/patches/02-fix_hyphen-used-as-minus_in_manpage.patch +++ ffmpeg2theora-0.21/debian/patches/02-fix_hyphen-used-as-minus_in_manpage.patch @@ -0,0 +1,50 @@ +--- ffmpeg2theora-0.21/ffmpeg2theora.1.orig 2008-05-18 03:42:03.000000000 +0530 ++++ ffmpeg2theora-0.21/ffmpeg2theora.1 2008-06-25 16:40:53.000000000 +0530 +@@ -96,7 +96,7 @@ + [0.1 to 10.0] contrast correction (default: 1.0). Note: lower values make the video darker. + .TP + .B \-B, \-\-brightness +-[-1.0 to 1.0] brightness correction (default: 0.0). Note: lower values make the video darker. ++[\-1.0 to 1.0] brightness correction (default: 0.0). Note: lower values make the video darker. + .TP + .B \-G, \-\-gamma + [0.1 to 10.0] gamma correction (default: 1.0). Note: lower values make the video darker. +@@ -106,7 +106,7 @@ + .SS Audio output options: + .TP + .B \-a, \-\-audioquality +-[-2 to 10] Set encoding quality for audio (default: 1). ++[\-2 to 10] Set encoding quality for audio (default: 1). + use higher values for better quality + .TP + .B \-A, \-\-audiobitrate +@@ -153,7 +153,7 @@ + .B \-\-subtitles + Encode subtitles from the given file to a multiplexed Kate stream. + The input file should be in SubRip (.srt) format, encoded in utf-8, +-unless the --subtitles-encoding option is also given. ++unless the \-\-subtitles-encoding option is also given. + .TP + .B \-\-subtitles-encoding encoding + Assumes the corresponding subtitles file is encoded in the given +@@ -206,17 +206,17 @@ + Encode Videos: + ffmpeg2theora videoclip.avi (will write output to videoclip.ogv) + +- cat something.dv | ffmpeg2theora -f dv -o output.ogv \- ++ cat something.dv | ffmpeg2theora \-f dv \-o output.ogv \- + + Encode a series of images: +- ffmpeg2theora -f image2 frame%06d.png -o output.ogv ++ ffmpeg2theora \-f image2 frame%06d.png \-o output.ogv + + Live streaming from V4L Device: + ffmpeg2theora \-\-v4l /dev/video0 \-\-inputfps 15 \-x 160 \-y 128 \-o \- \\ + | oggfwd iccast2server 8000 password /theora.ogv + + Live encoding from a DV camcorder (needs a fast machine): +- dvgrab - | ffmpeg2theora -f dv -x 352 -y 288 -o output.ogv -\n" ++ dvgrab \- | ffmpeg2theora \-f dv \-x 352 \-y 288 \-o output.ogv \-\n" + + Live encoding and streaming to icecast server: + dvgrab \-\-format raw \- \\ only in patch2: unchanged: --- ffmpeg2theora-0.21.orig/debian/patches/01-fix_includes.patch +++ ffmpeg2theora-0.21/debian/patches/01-fix_includes.patch @@ -0,0 +1,17 @@ +--- ffmpeg2theora-0.21/ffmpeg2theora.c.orig 2008-06-24 21:01:30.000000000 +0530 ++++ ffmpeg2theora-0.21/ffmpeg2theora.c 2008-06-24 21:03:30.000000000 +0530 +@@ -27,10 +27,10 @@ + #include <math.h> + #include <errno.h> + +-#include "libavformat/avformat.h" +-#include "libavdevice/avdevice.h" +-#include "libswscale/swscale.h" +-#include "libpostproc/postprocess.h" ++#include "ffmpeg/avformat.h" ++#include "ffmpeg/avdevice.h" ++#include "ffmpeg/swscale.h" ++#include "postproc/postprocess.h" + + #include "theora/theora.h" + #include "vorbis/codec.h"
signature.asc
Description: Digital signature
