[Restricted-changes] r132 - in dists/trunk: ffmpeg ffmpeg/debian xvidcore/debian
fabian-guest at alioth.debian.org
fabian-guest at alioth.debian.org
Tue Jul 24 22:48:21 UTC 2007
Author: fabian-guest
Date: 2007-07-24 22:48:21 +0000 (Tue, 24 Jul 2007)
New Revision: 132
Added:
dists/trunk/ffmpeg/interdiff.txt
Modified:
dists/trunk/ffmpeg/debian/rules
dists/trunk/xvidcore/debian/changelog
Log:
Modified: dists/trunk/ffmpeg/debian/rules
===================================================================
--- dists/trunk/ffmpeg/debian/rules 2007-07-24 15:09:51 UTC (rev 131)
+++ dists/trunk/ffmpeg/debian/rules 2007-07-24 22:48:21 UTC (rev 132)
@@ -30,7 +30,7 @@
endif
#ifneq (,$(findstring risky,$(DEB_BUILD_OPTIONS)))
-weak-build-deps += liblame-dev
+weak-build-deps += libmp3lame-dev
confflags += --enable-mp3lame
weak-build-deps += libfaad2-dev
confflags += --enable-faad
Added: dists/trunk/ffmpeg/interdiff.txt
===================================================================
--- dists/trunk/ffmpeg/interdiff.txt (rev 0)
+++ dists/trunk/ffmpeg/interdiff.txt 2007-07-24 22:48:21 UTC (rev 132)
@@ -0,0 +1,225 @@
+diff -Naru ffmpeg-0.cvs20060823-8/debian/bug/ffmpeg ffmpeg-0.cvs20060823-8~duo.1/debian/bug/ffmpeg
+--- ffmpeg-0.cvs20060823-8/debian/bug/ffmpeg 1970-01-01 01:00:00.000000000 +0100
++++ ffmpeg-0.cvs20060823-8~duo.1/debian/bug/ffmpeg 2007-04-25 11:54:18.000000000 +0200
+@@ -0,0 +1 @@
++Send-To: Debian Restricted <restricted-devel at lists.alioth.debian.org>
+diff -Naru ffmpeg-0.cvs20060823-8/debian/bug/libavcodec0d ffmpeg-0.cvs20060823-8~duo.1/debian/bug/libavcodec0d
+--- ffmpeg-0.cvs20060823-8/debian/bug/libavcodec0d 1970-01-01 01:00:00.000000000 +0100
++++ ffmpeg-0.cvs20060823-8~duo.1/debian/bug/libavcodec0d 2007-04-25 11:54:18.000000000 +0200
+@@ -0,0 +1 @@
++Send-To: Debian Restricted <restricted-devel at lists.alioth.debian.org>
+diff -Naru ffmpeg-0.cvs20060823-8/debian/bug/libavcodec-dev ffmpeg-0.cvs20060823-8~duo.1/debian/bug/libavcodec-dev
+--- ffmpeg-0.cvs20060823-8/debian/bug/libavcodec-dev 1970-01-01 01:00:00.000000000 +0100
++++ ffmpeg-0.cvs20060823-8~duo.1/debian/bug/libavcodec-dev 2007-04-25 11:54:18.000000000 +0200
+@@ -0,0 +1 @@
++Send-To: Debian Restricted <restricted-devel at lists.alioth.debian.org>
+diff -Naru ffmpeg-0.cvs20060823-8/debian/bug/libavformat0d ffmpeg-0.cvs20060823-8~duo.1/debian/bug/libavformat0d
+--- ffmpeg-0.cvs20060823-8/debian/bug/libavformat0d 1970-01-01 01:00:00.000000000 +0100
++++ ffmpeg-0.cvs20060823-8~duo.1/debian/bug/libavformat0d 2007-04-25 11:54:18.000000000 +0200
+@@ -0,0 +1 @@
++Send-To: Debian Restricted <restricted-devel at lists.alioth.debian.org>
+diff -Naru ffmpeg-0.cvs20060823-8/debian/bug/libavformat-dev ffmpeg-0.cvs20060823-8~duo.1/debian/bug/libavformat-dev
+--- ffmpeg-0.cvs20060823-8/debian/bug/libavformat-dev 1970-01-01 01:00:00.000000000 +0100
++++ ffmpeg-0.cvs20060823-8~duo.1/debian/bug/libavformat-dev 2007-04-25 11:54:18.000000000 +0200
+@@ -0,0 +1 @@
++Send-To: Debian Restricted <restricted-devel at lists.alioth.debian.org>
+diff -Naru ffmpeg-0.cvs20060823-8/debian/bug/libpostproc0d ffmpeg-0.cvs20060823-8~duo.1/debian/bug/libpostproc0d
+--- ffmpeg-0.cvs20060823-8/debian/bug/libpostproc0d 1970-01-01 01:00:00.000000000 +0100
++++ ffmpeg-0.cvs20060823-8~duo.1/debian/bug/libpostproc0d 2007-04-25 11:54:18.000000000 +0200
+@@ -0,0 +1 @@
++Send-To: Debian Restricted <restricted-devel at lists.alioth.debian.org>
+diff -Naru ffmpeg-0.cvs20060823-8/debian/bug/libpostproc-dev ffmpeg-0.cvs20060823-8~duo.1/debian/bug/libpostproc-dev
+--- ffmpeg-0.cvs20060823-8/debian/bug/libpostproc-dev 1970-01-01 01:00:00.000000000 +0100
++++ ffmpeg-0.cvs20060823-8~duo.1/debian/bug/libpostproc-dev 2007-04-25 11:54:18.000000000 +0200
+@@ -0,0 +1 @@
++Send-To: Debian Restricted <restricted-devel at lists.alioth.debian.org>
+diff -Naru ffmpeg-0.cvs20060823-8/debian/changelog ffmpeg-0.cvs20060823-8~duo.1/debian/changelog
+--- ffmpeg-0.cvs20060823-8/debian/changelog 2007-07-25 00:36:30.000000000 +0200
++++ ffmpeg-0.cvs20060823-8~duo.1/debian/changelog 2007-05-21 16:45:10.000000000 +0200
+@@ -1,3 +1,10 @@
++ffmpeg (0.cvs20060823-8~duo.1) unstable; urgency=low
++
++ * Rebuilt for <http://www.debian-unofficial.org/>.
++ * Enabled additional codecs: mp3lame, faad, faac, xvid.
++
++ -- Fabian Greffrath <fabian at debian-unofficial.org> Wed, 25 Apr 2007 00:00:00 +0100
++
+ ffmpeg (0.cvs20060823-8) unstable; urgency=high
+
+ * debian/patches/052_base64_encode_crash.diff:
+diff -Naru ffmpeg-0.cvs20060823-8/debian/control ffmpeg-0.cvs20060823-8~duo.1/debian/control
+--- ffmpeg-0.cvs20060823-8/debian/control 2007-07-25 00:36:30.000000000 +0200
++++ ffmpeg-0.cvs20060823-8~duo.1/debian/control 2007-04-25 22:29:58.000000000 +0200
+@@ -1,15 +1,14 @@
+ Source: ffmpeg
+-Section: libs
++Section: restricted/libs
+ Priority: optional
+-Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
+-Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>, Loic Minier <lool at dooz.org>
+-Build-Depends: debhelper (>= 4.0), quilt, libogg-dev, libvorbis-dev, liba52-dev, libdts-dev, zlib1g-dev, libsdl1.2-dev, libfreetype6-dev, libimlib2-dev, texi2html, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libdc1394-13-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libtheora-dev (>> 0.0.0.alpha4), libgsm1-dev
++Maintainer: Debian Restricted <restricted-devel at lists.alioth.debian.org>
++Uploaders: Daniel Baumann <daniel at debian.org>, Fabian Greffrath <fabian at debian-unofficial.org>
++Build-Depends: debhelper (>= 4.0), quilt, libogg-dev, libvorbis-dev, liba52-dev, libdts-dev, zlib1g-dev, libsdl1.2-dev, libfreetype6-dev, libimlib2-dev, texi2html, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libdc1394-13-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libtheora-dev (>> 0.0.0.alpha4), libgsm1-dev, libfaac-dev, libfaad-dev, libmp3lame-dev, libxvidcore-dev
+ Standards-Version: 3.7.2
+-XS-Vcs-Svn: svn://svn.debian.org/pkg-multimedia/unstable/ffmpeg
+-XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/
++XS-Vcs-Svn: svn://svn.debian.org/debian-restricted/dists/trunk/ffmpeg/
+
+ Package: ffmpeg
+-Section: graphics
++Section: restricted/graphics
+ Architecture: any
+ Depends: ${shlibs:Depends}
+ Description: multimedia player, server and encoder
+@@ -19,7 +18,7 @@
+ DivX, MPEG4, AC3, DV...).
+
+ Package: libavcodec0d
+-Section: libs
++Section: restricted/libs
+ Architecture: any
+ Depends: ${shlibs:Depends}
+ Description: ffmpeg codec library
+@@ -30,7 +29,7 @@
+ object that should only be used by Debian packages.
+
+ Package: libpostproc0d
+-Section: libs
++Section: restricted/libs
+ Architecture: any
+ Depends: ${shlibs:Depends}
+ Description: ffmpeg video postprocessing library
+@@ -40,7 +39,7 @@
+ object that should only be used by Debian packages.
+
+ Package: libavformat0d
+-Section: libs
++Section: restricted/libs
+ Architecture: any
+ Depends: ${shlibs:Depends}
+ Description: ffmpeg file format library
+@@ -51,9 +50,9 @@
+ object that should only be used by Debian packages.
+
+ Package: libavcodec-dev
+-Section: libdevel
++Section: restricted/libdevel
+ Architecture: any
+-Depends: libavcodec0d (= ${Source-Version}), libvorbis-dev, libogg-dev, libdts-dev, liba52-dev, zlib1g-dev, ${lib1394-dev}, libtheora-dev (>> 0.0.0.alpha4), libgsm1-dev, ${shlibs:Depends}
++Depends: libavcodec0d (= ${Source-Version}), libvorbis-dev, libogg-dev, libdts-dev, liba52-dev, zlib1g-dev, ${lib1394-dev}, libtheora-dev (>> 0.0.0.alpha4), libgsm1-dev, libfaac-dev, libfaad-dev, ${shlibs:Depends}
+ Conflicts: libavformat-dev (<< 0.cvs20060329-4)
+ Replaces: libavformat-dev (<< 0.cvs20060329-4)
+ Description: development files for libavcodec
+@@ -64,7 +63,7 @@
+ compile applications or shared objects that use libavcodec.
+
+ Package: libpostproc-dev
+-Section: libdevel
++Section: restricted/libdevel
+ Architecture: any
+ Depends: libpostproc0d (= ${Source-Version}), libavcodec-dev (= ${Source-Version}), ${shlibs:Depends}
+ Description: development files for libpostproc
+@@ -74,7 +73,7 @@
+ compile applications or shared objects that use libpostproc.
+
+ Package: libavformat-dev
+-Section: libdevel
++Section: restricted/libdevel
+ Architecture: any
+ Depends: libavformat0d (= ${Source-Version}), libavcodec-dev (= ${Source-Version}), ${shlibs:Depends}
+ Conflicts: libavcodec-dev (<< 0.cvs20060306-1)
+diff -Naru ffmpeg-0.cvs20060823-8/debian/lintian/ffmpeg ffmpeg-0.cvs20060823-8~duo.1/debian/lintian/ffmpeg
+--- ffmpeg-0.cvs20060823-8/debian/lintian/ffmpeg 1970-01-01 01:00:00.000000000 +0100
++++ ffmpeg-0.cvs20060823-8~duo.1/debian/lintian/ffmpeg 2007-04-25 12:19:04.000000000 +0200
+@@ -0,0 +1 @@
++ffmpeg: unknown-section restricted/graphics
+diff -Naru ffmpeg-0.cvs20060823-8/debian/lintian/libavcodec0d ffmpeg-0.cvs20060823-8~duo.1/debian/lintian/libavcodec0d
+--- ffmpeg-0.cvs20060823-8/debian/lintian/libavcodec0d 1970-01-01 01:00:00.000000000 +0100
++++ ffmpeg-0.cvs20060823-8~duo.1/debian/lintian/libavcodec0d 2007-04-25 12:19:17.000000000 +0200
+@@ -0,0 +1 @@
++libavcodec0d: unknown-section restricted/libs
+diff -Naru ffmpeg-0.cvs20060823-8/debian/lintian/libavcodec-dev ffmpeg-0.cvs20060823-8~duo.1/debian/lintian/libavcodec-dev
+--- ffmpeg-0.cvs20060823-8/debian/lintian/libavcodec-dev 1970-01-01 01:00:00.000000000 +0100
++++ ffmpeg-0.cvs20060823-8~duo.1/debian/lintian/libavcodec-dev 2007-04-25 12:19:25.000000000 +0200
+@@ -0,0 +1 @@
++libavcodec-dev: unknown-section restricted/libdevel
+diff -Naru ffmpeg-0.cvs20060823-8/debian/lintian/libavformat0d ffmpeg-0.cvs20060823-8~duo.1/debian/lintian/libavformat0d
+--- ffmpeg-0.cvs20060823-8/debian/lintian/libavformat0d 1970-01-01 01:00:00.000000000 +0100
++++ ffmpeg-0.cvs20060823-8~duo.1/debian/lintian/libavformat0d 2007-04-25 12:19:32.000000000 +0200
+@@ -0,0 +1 @@
++libavformat0d: unknown-section restricted/libs
+diff -Naru ffmpeg-0.cvs20060823-8/debian/lintian/libavformat-dev ffmpeg-0.cvs20060823-8~duo.1/debian/lintian/libavformat-dev
+--- ffmpeg-0.cvs20060823-8/debian/lintian/libavformat-dev 1970-01-01 01:00:00.000000000 +0100
++++ ffmpeg-0.cvs20060823-8~duo.1/debian/lintian/libavformat-dev 2007-04-25 12:19:39.000000000 +0200
+@@ -0,0 +1 @@
++libavformat-dev: unknown-section restricted/libdevel
+diff -Naru ffmpeg-0.cvs20060823-8/debian/lintian/libpostproc0d ffmpeg-0.cvs20060823-8~duo.1/debian/lintian/libpostproc0d
+--- ffmpeg-0.cvs20060823-8/debian/lintian/libpostproc0d 1970-01-01 01:00:00.000000000 +0100
++++ ffmpeg-0.cvs20060823-8~duo.1/debian/lintian/libpostproc0d 2007-04-25 12:19:47.000000000 +0200
+@@ -0,0 +1 @@
++libpostproc0d: unknown-section restricted/libs
+diff -Naru ffmpeg-0.cvs20060823-8/debian/lintian/libpostproc-dev ffmpeg-0.cvs20060823-8~duo.1/debian/lintian/libpostproc-dev
+--- ffmpeg-0.cvs20060823-8/debian/lintian/libpostproc-dev 1970-01-01 01:00:00.000000000 +0100
++++ ffmpeg-0.cvs20060823-8~duo.1/debian/lintian/libpostproc-dev 2007-04-25 12:19:56.000000000 +0200
+@@ -0,0 +1 @@
++libpostproc-dev: unknown-section restricted/libdevel
+diff -Naru ffmpeg-0.cvs20060823-8/debian/README.Debian ffmpeg-0.cvs20060823-8~duo.1/debian/README.Debian
+--- ffmpeg-0.cvs20060823-8/debian/README.Debian 2007-07-25 00:36:30.000000000 +0200
++++ ffmpeg-0.cvs20060823-8~duo.1/debian/README.Debian 2007-07-25 00:38:31.000000000 +0200
+@@ -16,10 +16,7 @@
+ * AAC decoding and encoding
+ * the ASF file format
+
+- I did not activate MP3 encoding (through LAME) in libavcodec, nor AAC
+-support (through FAAC/FAAD). However, since I have found no real enforcement
+-of the mysterious ASF file format patents, I did not deactivate ASF support in
+-libavformat. See more details in the patents.txt file.
++See more details in the patents.txt file.
+
+
+ Differences with unofficial ffmpeg packages
+diff -Naru ffmpeg-0.cvs20060823-8/debian/rules ffmpeg-0.cvs20060823-8~duo.1/debian/rules
+--- ffmpeg-0.cvs20060823-8/debian/rules 2007-07-25 00:36:30.000000000 +0200
++++ ffmpeg-0.cvs20060823-8~duo.1/debian/rules 2007-07-25 00:39:06.000000000 +0200
+@@ -29,17 +29,17 @@
+ confflags += --disable-strip
+ endif
+
+-ifneq (,$(findstring risky,$(DEB_BUILD_OPTIONS)))
+-weak-build-deps += liblame-dev
++#ifneq (,$(findstring risky,$(DEB_BUILD_OPTIONS)))
++weak-build-deps += libmp3lame-dev
+ confflags += --enable-mp3lame
+ weak-build-deps += libfaad2-dev
+-confflags += --enable-faadbin --enable-faad
++confflags += --enable-faad
+ weak-build-deps += libfaac-dev
+ confflags += --enable-faac
+ weak-build-deps += libxvidcore-dev
+ confflags += --enable-xvid
+ $(warning Make sure these packages are installed: $(weak-build-deps))
+-endif
++#endif
+
+ build: build-stamp
+ build-stamp:
+@@ -150,6 +150,18 @@
+ sed -e s/@FIREWIRELIBS@/$(FIREWIRELIBS)/ -e s/@VERSION@/$(DEB_VERSION)/ ffmpeg-config.in > debian/tmp/usr/bin/ffmpeg-config
+ chmod 644 debian/tmp/usr/bin/ffmpeg-config
+ cp ffmpeg-config.1 debian/tmp/usr/share/man/man1/ffmpeg-config.1
++
++ # Installing bug control
++ for BUG in debian/bug/*; \
++ do \
++ install -D -m 0644 $$BUG debian/`basename $$BUG`/usr/share/bug/`basename $$BUG`/control || exit 1; \
++ done
++
++ # Installing lintian overrides
++ for LINTIAN in debian/lintian/*; \
++ do \
++ install -D -m 0644 $$LINTIAN debian/`basename $$LINTIAN`/usr/share/lintian/overrides/`basename $$LINTIAN` || exit 1; \
++ done
+
+ dh_install --fail-missing --sourcedir=debian/tmp
+
Modified: dists/trunk/xvidcore/debian/changelog
===================================================================
--- dists/trunk/xvidcore/debian/changelog 2007-07-24 15:09:51 UTC (rev 131)
+++ dists/trunk/xvidcore/debian/changelog 2007-07-24 22:48:21 UTC (rev 132)
@@ -1,4 +1,4 @@
-xvidcore (1.1.2+debian-1) unstable; urgency=low
+xvidcore (1.1.3+debian-1) unstable; urgency=low
* Initial release.
* Rebuild upstream source without debian directory.
More information about the Restricted-changes
mailing list