[Restricted-changes] r140 - in dists/trunk: bladeenc/debian debian-unofficial-archive-keyring/debian faac/debian faac/debian/patches ffmpeg/debian hot-babe/debian lame/debian libdvdcss/debian mjpegtools/debian mjpegtools/debian/patches skype/debian skype-static/debian transcode/debian x264/debian xv/debian xv/debian/patches xvidcore/debian
fabian-guest at alioth.debian.org
fabian-guest at alioth.debian.org
Sun Jul 29 16:56:07 UTC 2007
Author: fabian-guest
Date: 2007-07-29 16:56:06 +0000 (Sun, 29 Jul 2007)
New Revision: 140
Added:
dists/trunk/xv/debian/patches/03-no-xvdocs_pdf.dpatch
Removed:
dists/trunk/hot-babe/debian/examples
dists/trunk/mjpegtools/debian/patches/04-pkg-config.dpatch
Modified:
dists/trunk/bladeenc/debian/control
dists/trunk/debian-unofficial-archive-keyring/debian/control
dists/trunk/faac/debian/changelog
dists/trunk/faac/debian/control
dists/trunk/faac/debian/copyright
dists/trunk/faac/debian/patches/02-configure_in-syntax.dpatch
dists/trunk/faac/debian/patches/03-external-libmp4v2.dpatch
dists/trunk/faac/debian/rules
dists/trunk/faac/debian/watch
dists/trunk/ffmpeg/debian/changelog
dists/trunk/ffmpeg/debian/control
dists/trunk/hot-babe/debian/control
dists/trunk/hot-babe/debian/copyright
dists/trunk/hot-babe/debian/rules
dists/trunk/lame/debian/control
dists/trunk/libdvdcss/debian/control
dists/trunk/mjpegtools/debian/changelog
dists/trunk/mjpegtools/debian/control
dists/trunk/mjpegtools/debian/copyright
dists/trunk/mjpegtools/debian/patches/00list
dists/trunk/mjpegtools/debian/patches/02-include-cassert.dpatch
dists/trunk/mjpegtools/debian/patches/03-libquicktime.dpatch
dists/trunk/mjpegtools/debian/rules
dists/trunk/mjpegtools/debian/watch
dists/trunk/skype-static/debian/control
dists/trunk/skype/debian/control
dists/trunk/transcode/debian/control
dists/trunk/transcode/debian/copyright
dists/trunk/transcode/debian/rules
dists/trunk/transcode/debian/transcode-doc.dirs
dists/trunk/transcode/debian/transcode-doc.doc-base
dists/trunk/transcode/debian/transcode-doc.docs
dists/trunk/transcode/debian/transcode.docs
dists/trunk/transcode/debian/watch
dists/trunk/x264/debian/control
dists/trunk/xv/debian/changelog
dists/trunk/xv/debian/control
dists/trunk/xv/debian/copyright
dists/trunk/xv/debian/patches/00list
dists/trunk/xv/debian/patches/01-xv-3.10a-jumbo-fix-enh-patch-20070520.dpatch
dists/trunk/xv/debian/patches/02-xv-3.10a-jumbo-files-20070520.dpatch
dists/trunk/xv/debian/patches/03-no-xvdocs-pdf.dpatch
dists/trunk/xv/debian/patches/04-dynamic-libjasper.dpatch
dists/trunk/xv/debian/watch
dists/trunk/xv/debian/xv-doc.doc-base
dists/trunk/xv/debian/xv.menu
dists/trunk/xvidcore/debian/control
dists/trunk/xvidcore/debian/copyright
dists/trunk/xvidcore/debian/rules
dists/trunk/xvidcore/debian/watch
Log:
Modified: dists/trunk/bladeenc/debian/control
===================================================================
--- dists/trunk/bladeenc/debian/control 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/bladeenc/debian/control 2007-07-29 16:56:06 UTC (rev 140)
@@ -5,7 +5,7 @@
Uploaders: Daniel Baumann <daniel at debian.org>, Fabian Greffrath <fabian at debian-unofficial.org>
Build-Depends: debhelper (>= 5), sharutils
Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/debian-restricted/dists/trunk/bladeenc/
+XS-Vcs-Svn: svn://svn.debian.org/restricted/dists/trunk/bladeenc/
Package: bladeenc
Section: restricted/sound
Modified: dists/trunk/debian-unofficial-archive-keyring/debian/control
===================================================================
--- dists/trunk/debian-unofficial-archive-keyring/debian/control 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/debian-unofficial-archive-keyring/debian/control 2007-07-29 16:56:06 UTC (rev 140)
@@ -4,7 +4,7 @@
Uploaders: Daniel Baumann <daniel at debian.org>, Fabian Greffrath <fabian at debian-unofficial.org>
Build-Depends: debhelper (>= 5)
Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/debian-restricted/dists/trunk/debian-unofficial-archive-keyring/
+XS-Vcs-Svn: svn://svn.debian.org/restricted/dists/trunk/debian-unofficial-archive-keyring/
Package: debian-unofficial-archive-keyring
Priority: important
Modified: dists/trunk/faac/debian/changelog
===================================================================
--- dists/trunk/faac/debian/changelog 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/faac/debian/changelog 2007-07-29 16:56:06 UTC (rev 140)
@@ -1,6 +1,6 @@
faac (1.25-1) unstable; urgency=low
* Initial release.
- * Statically link the faac binary against libmp4v2.
+ * Statically link against (internal) libmp4v2.
-- Fabian Greffrath <fabian at debian-unofficial.org> Mon, 1 Jan 2007 00:00:00 +0100
Modified: dists/trunk/faac/debian/control
===================================================================
--- dists/trunk/faac/debian/control 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/faac/debian/control 2007-07-29 16:56:06 UTC (rev 140)
@@ -5,7 +5,7 @@
Uploaders: Fabian Greffrath <fabian at debian-unofficial.org>, Daniel Baumann <daniel at debian.org>
Build-Depends: debhelper (>= 5), dpatch, autoconf, automake, autotools-dev, libtool
Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/debian-restricted/dists/trunk/faac/
+XS-Vcs-Svn: svn://svn.debian.org/restricted/dists/trunk/faac/
Package: faac
Section: restricted/sound
Modified: dists/trunk/faac/debian/copyright
===================================================================
--- dists/trunk/faac/debian/copyright 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/faac/debian/copyright 2007-07-29 16:56:06 UTC (rev 140)
@@ -1,10 +1,12 @@
This package was debianized by Fabian Greffrath <fabian at debian-unofficial.org> on
-Mon, 1 Jan 2007 00:00:00 +0100
+Mon, 1 Jan 2007 00:00:00 +0100.
It was downloaded from <http://www.audiocoding.com/>.
-Copyright Holder: M. Bakker <menno at audiocoding.com>
+Upstream Author:
+ M. Bakker <menno at audiocoding.com>
+
License:
Copyright (C) 2001 M. Bakker <menno at audiocoding.com>
@@ -70,4 +72,7 @@
ACTIONS!
On Debian systems, the complete text of the GNU Library General Public License
-can be found in the '/usr/share/common-licenses/LGPL' file.
+can be found in the `/usr/share/common-licenses/LGPL' file.
+
+The Debian packaging is (C) 2005-2007, Fabian Greffrath <fabian at debian-unofficial.org> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
Modified: dists/trunk/faac/debian/patches/02-configure_in-syntax.dpatch
===================================================================
--- dists/trunk/faac/debian/patches/02-configure_in-syntax.dpatch 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/faac/debian/patches/02-configure_in-syntax.dpatch 2007-07-29 16:56:06 UTC (rev 140)
@@ -1,7 +1,7 @@
#!/bin/sh /usr/share/dpatch/dpatch-run
## 02-configure_in-syntax.dpatch by Fabian Greffrath <fabian at debian-unofficial.org>
##
-## DP: Fix broken syntax in `configure.in'.
+## DP: Fix broken syntax in configure.in.
@DPATCH@
Modified: dists/trunk/faac/debian/patches/03-external-libmp4v2.dpatch
===================================================================
--- dists/trunk/faac/debian/patches/03-external-libmp4v2.dpatch 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/faac/debian/patches/03-external-libmp4v2.dpatch 2007-07-29 16:56:06 UTC (rev 140)
@@ -1,5 +1,5 @@
#!/bin/sh /usr/share/dpatch/dpatch-run
-## 03-external-libmp4v2.dpatch from Gentoo (modified).
+## faac-1.25-external-libmp4v2.patch from Gentoo (modified).
##
## DP: Add support for external libmp4v2.
Modified: dists/trunk/faac/debian/rules
===================================================================
--- dists/trunk/faac/debian/rules 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/faac/debian/rules 2007-07-29 16:56:06 UTC (rev 140)
@@ -43,8 +43,21 @@
# Cleaning package
-$(MAKE) --ignore-errors distclean
- rm -rf aclocal.m4 autom4te.cache config.h.in configure depcomp install-sh ltmain.sh missing
- find -name Makefile.in | xargs rm -f
+ # Reversing bootstrapping
+ rm -f aclocal.m4
+ rm -rf autom4te.cache/
+ rm -f common/Makefile.in
+ rm -f common/mp4v2/Makefile.in
+ rm -f config.h.in
+ rm -f configure
+ rm -f depcomp
+ rm -f frontend/Makefile.in
+ rm -f include/Makefile.in
+ rm -f install-sh
+ rm -f libfaac/Makefile.in
+ rm -f ltmain.sh
+ rm -f Makefile.in
+ rm -f missing
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
@@ -64,13 +77,13 @@
# Installing package
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
- # Cleaning package
+ # Removing libmp4v2 relics
rm -f debian/tmp/usr/include/mp4*
rm -f debian/tmp/usr/include/mpeg4*
rm -f debian/tmp/usr/lib/libmp4*
# Adding symlink
- ln -s libfaac.so.0.0.0 debian/tmp/usr/lib/libfaac.so.0.0
+ ln -sf libfaac.so.0.0.0 debian/tmp/usr/lib/libfaac.so.0.0
# Installing bug control
for BUG in debian/bug/*; \
@@ -95,7 +108,7 @@
dh_installman
dh_link
dh_strip --dbg-package=faac-dbg
- dh_compress --exclude=.html
+ dh_compress --exclude=html
dh_fixperms
dh_makeshlibs
dh_installdeb
Modified: dists/trunk/faac/debian/watch
===================================================================
--- dists/trunk/faac/debian/watch 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/faac/debian/watch 2007-07-29 16:56:06 UTC (rev 140)
@@ -1,4 +1,2 @@
-# watch control file for uscan
-
version=3
http://sf.net/faac/faac-(.*)\.tar.gz
Modified: dists/trunk/ffmpeg/debian/changelog
===================================================================
--- dists/trunk/ffmpeg/debian/changelog 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/ffmpeg/debian/changelog 2007-07-29 16:56:06 UTC (rev 140)
@@ -3,6 +3,11 @@
* Rebuilt for <http://www.debian-unofficial.org/>.
* Enabled additional codecs: mp3lame, faad, faac, x264, xvid.
+ [ Reinhard Tartler ]
+
+ * make ffmpeg binNMU-able by using ${binary:Version} rather than
+ ${Source-Version}
+
-- Fabian Greffrath <fabian at debian-unofficial.org> Wed, 1 Jul 2007 00:00:00 +0100
ffmpeg (0.cvs20070307-5) unstable; urgency=low
Modified: dists/trunk/ffmpeg/debian/control
===================================================================
--- dists/trunk/ffmpeg/debian/control 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/ffmpeg/debian/control 2007-07-29 16:56:06 UTC (rev 140)
@@ -5,7 +5,7 @@
Uploaders: Fabian Greffrath <fabian at debian-unofficial.org>, Daniel Baumann <daniel at debian.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, libx264-dev, libxvidcore-dev
Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/debian-restricted/dists/trunk/ffmpeg/
+XS-Vcs-Svn: svn://svn.debian.org/restricted/dists/trunk/ffmpeg/
Package: ffmpeg
Section: restricted/graphics
@@ -73,7 +73,7 @@
Package: libavutil-dev
Section: restricted/libdevel
Architecture: any
-Depends: libavutil1d (= ${Source-Version}), ${shlibs:Depends}
+Depends: libavutil1d (= ${binary:Version}), ${shlibs:Depends}
Conflicts: libavformat-dev (<< 0.cvs20060329-4), libavcodec-dev (<< 0.cvs20070307-1)
Replaces: libavformat-dev (<< 0.cvs20060329-4), libavcodec-dev (<< 0.cvs20070307-1)
Description: development files for libavutil
@@ -86,7 +86,7 @@
Package: libavcodec-dev
Section: restricted/libdevel
Architecture: any
-Depends: libavcodec1d (= ${Source-Version}), libavutil-dev (= ${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: libavcodec1d (= ${binary:Version}), libavutil-dev (= ${binary:Version}), libvorbis-dev, libogg-dev, libdts-dev, liba52-dev, zlib1g-dev, ${lib1394-dev}, libtheora-dev (>> 0.0.0.alpha4), libgsm1-dev, ${shlibs:Depends}
Conflicts: libavformat-dev (<< 0.cvs20060329-4)
Replaces: libavformat-dev (<< 0.cvs20060329-4)
Description: development files for libavcodec
@@ -99,7 +99,7 @@
Package: libpostproc-dev
Section: restricted/libdevel
Architecture: any
-Depends: libpostproc1d (= ${Source-Version}), libavcodec-dev (= ${Source-Version}), ${shlibs:Depends}
+Depends: libpostproc1d (= ${binary:Version}), libavcodec-dev (= ${binary:Version}), ${shlibs:Depends}
Description: development files for libpostproc
This is the video postprocessing library from the ffmpeg project.
.
@@ -109,7 +109,7 @@
Package: libavformat-dev
Section: restricted/libdevel
Architecture: any
-Depends: libavformat1d (= ${Source-Version}), libavcodec-dev (= ${Source-Version}), ${shlibs:Depends}
+Depends: libavformat1d (= ${binary:Version}), libavcodec-dev (= ${binary:Version}), ${shlibs:Depends}
Conflicts: libavcodec-dev (<< 0.cvs20060306-1)
Replaces: libavcodec-dev (<< 0.cvs20060306-1)
Description: development files for libavformat
@@ -122,7 +122,7 @@
Package: libswscale-dev
Section: restricted/libdevel
Architecture: any
-Depends: libswscale1d (= ${Source-Version}), libavutil-dev (= ${Source-Version}), ${shlibs:Depends}
+Depends: libswscale1d (= ${binary:Version}), libavutil-dev (= ${binary:Version}), ${shlibs:Depends}
Description: development files for libswscale
This is the video scaling library from the ffmpeg project.
.
Modified: dists/trunk/hot-babe/debian/control
===================================================================
--- dists/trunk/hot-babe/debian/control 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/hot-babe/debian/control 2007-07-29 16:56:06 UTC (rev 140)
@@ -5,7 +5,7 @@
Uploaders: Fabian Greffrath <fabian at debian-unofficial.org>, Daniel Baumann <daniel at debian.org>
Build-Depends: debhelper (>= 5), libgtk2.0-dev
Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/debian-restricted/dists/trunk/hot-babe/
+XS-Vcs-Svn: svn://svn.debian.org/restricted/dists/trunk/hot-babe/
Package: hot-babe
Section: restricted/x11
Modified: dists/trunk/hot-babe/debian/copyright
===================================================================
--- dists/trunk/hot-babe/debian/copyright 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/hot-babe/debian/copyright 2007-07-29 16:56:06 UTC (rev 140)
@@ -3,10 +3,12 @@
It was downloaded from <http://www.dindinx.net/hotbabe/download.php>.
-Upstream Authors: David Odin <david at dindinx.org> and
- Cyprien Laplace <cyprien33 at laposte.net> (Program),
- Bruno Bellamy <bruno at bellaminettes.com> (Pictures)
+Upstream Authors:
+ David Odin <david at dindinx.org> and
+ Cyprien Laplace <cyprien33 at laposte.net> (Program)
+ Bruno Bellamy <bruno at bellaminettes.com> (Pictures)
+
License:
Copyright (C) 2002-2004 David Odin <david at dindinx.org>
@@ -17,7 +19,7 @@
it under the terms of the Artistic License.
On Debian systems, the complete text of the Artistic License
-can be found in /usr/share/common-licenses/Artistic file.
+can be found in the `/usr/share/common-licenses/Artistic' file.
The Debian packaging is (C) 2005-2007, Fabian Greffrath <fabian at debian-unofficial.org> and
is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
Deleted: dists/trunk/hot-babe/debian/examples
===================================================================
--- dists/trunk/hot-babe/debian/examples 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/hot-babe/debian/examples 2007-07-29 16:56:06 UTC (rev 140)
@@ -1 +0,0 @@
-config.example
Modified: dists/trunk/hot-babe/debian/rules
===================================================================
--- dists/trunk/hot-babe/debian/rules 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/hot-babe/debian/rules 2007-07-29 16:56:06 UTC (rev 140)
@@ -37,7 +37,7 @@
dh_installdirs
# Installing package
- $(MAKE) install DESTDIR=$(CURDIR)/debian/hot-babe PREFIX=/usr DOC="CONTRIBUTORS NEWS TODO"
+ $(MAKE) install PREFIX=/usr DESTDIR=$(CURDIR)/debian/hot-babe DOC="CONTRIBUTORS NEWS TODO"
# Installing bug control
for BUG in debian/bug/*; \
@@ -58,7 +58,7 @@
dh_testroot
dh_installchangelogs ChangeLog
dh_installdocs
- dh_installexamples
+ dh_installexamples config.example
dh_installmenu
dh_strip --dbg-package=hot-babe-dbg
dh_compress
Modified: dists/trunk/lame/debian/control
===================================================================
--- dists/trunk/lame/debian/control 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/lame/debian/control 2007-07-29 16:56:06 UTC (rev 140)
@@ -5,7 +5,7 @@
Uploaders: Daniel Baumann <daniel at debian.org>, Fabian Greffrath <fabian at debian-unofficial.org>
Build-Depends: debhelper (>= 5), dpatch, autotools-dev, libgtk1.2-dev, libncurses5-dev, nasm [i386]
Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/debian-restricted/dists/trunk/lame/
+XS-Vcs-Svn: svn://svn.debian.org/restricted/dists/trunk/lame/
Package: lame
Section: restricted/sound
Modified: dists/trunk/libdvdcss/debian/control
===================================================================
--- dists/trunk/libdvdcss/debian/control 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/libdvdcss/debian/control 2007-07-29 16:56:06 UTC (rev 140)
@@ -5,7 +5,7 @@
Uploaders: Daniel Baumann <daniel at debian.org>, Fabian Greffrath <fabian at debian-unofficial.org>
Build-Depends: debhelper (>= 5), dpatch, autotools-dev
Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/debian-restricted/dists/trunk/libdvdcss/
+XS-Vcs-Svn: svn://svn.debian.org/restricted/dists/trunk/libdvdcss/
Package: libdvdcss2
Section: restricted/libs
Modified: dists/trunk/mjpegtools/debian/changelog
===================================================================
--- dists/trunk/mjpegtools/debian/changelog 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/mjpegtools/debian/changelog 2007-07-29 16:56:06 UTC (rev 140)
@@ -1,5 +1,6 @@
mjpegtools (1.8.0+debian-1) UNRELEASED; urgency=low
* Initial release.
+ * Rebuild upstream source without debian directory.
-- Fabian Greffrath <fabian at debian-unofficial.org> Sun, 1 Jul 2007 00:00:00 +0200
Modified: dists/trunk/mjpegtools/debian/control
===================================================================
--- dists/trunk/mjpegtools/debian/control 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/mjpegtools/debian/control 2007-07-29 16:56:06 UTC (rev 140)
@@ -5,17 +5,25 @@
Uploaders: Fabian Greffrath <fabian at debian-unofficial.org>, Daniel Baumann <daniel at debian.org>
Build-Depends: debhelper (>= 5), dpatch, autotools-dev, libdv4-dev, libjpeg62-dev, libpng12-dev, libquicktime-dev (>= 2:1.0.0), zlib1g-dev
Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/debian-restricted/dists/trunk/mjpegtools/
+XS-Vcs-Svn: svn://svn.debian.org/restricted/dists/trunk/mjpegtools/
Package: mjpegtools
Section: restricted/graphics
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: video capture, editing, playback, and compression
- The mjpeg programs are a set of tools that can do recording of videos and
- playback, simple cut-and-paste editing and the MPEG compression of audio and
- video under Linux.
+Suggests: sox, toolame
+Description: video capture, editing, playback and compression
+ MJPEG tools is a suite of programs which support video capture, basic editing,
+ playback and compression to MPEG-1/2 of MJPEG video.
.
+ The capture software allows MJPEG video streams in AVI, Quicktime and movtar
+ format to be produced using the Iomega Buz, Miro DC10+, Matrox Marvel and
+ similar hardware. The editing and playback tools are hardware independent with
+ support for hardware accelerated playback if present. The MPEG compression
+ tools are based on MPEG Software Simulation Group's reference encoder with
+ enhancements to provide far faster compression and significant quality
+ improvements.
+ .
Homepage: <http://mjpeg.sourceforge.net/>
Package: mjpegtools-dbg
@@ -23,10 +31,9 @@
Priority: extra
Architecture: any
Depends: mjpegtools (= ${binary:Version}), libmjpegtools0 (= ${binary:Version}), libmjpegtools-dev (= ${binary:Version})
-Description: video capture, editing, playback, and compression (debug)
- The mjpeg programs are a set of tools that can do recording of videos and
- playback, simple cut-and-paste editing and the MPEG compression of audio and
- video under Linux.
+Description: video capture, editing, playback and compression (debug)
+ MJPEG tools is a suite of programs which support video capture, basic editing,
+ playback and compression to MPEG-1/2 of MJPEG video.
.
Homepage: <http://mjpeg.sourceforge.net/>
.
@@ -36,10 +43,9 @@
Section: restricted/libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: video capture, editing, playback, and compression (libraries)
- The mjpeg programs are a set of tools that can do recording of videos and
- playback, simple cut-and-paste editing and the MPEG compression of audio and
- video under Linux.
+Description: video capture, editing, playback and compression (libraries)
+ MJPEG tools is a suite of programs which support video capture, basic editing,
+ playback and compression to MPEG-1/2 of MJPEG video.
.
Homepage: <http://mjpeg.sourceforge.net/>
.
@@ -49,10 +55,9 @@
Section: restricted/libdevel
Architecture: any
Depends: libmjpegtools0 (= ${binary:Version})
-Description: video capture, editing, playback, and compression (development)
- The mjpeg programs are a set of tools that can do recording of videos and
- playback, simple cut-and-paste editing and the MPEG compression of audio and
- video under Linux.
+Description: video capture, editing, playback and compression (development)
+ MJPEG tools is a suite of programs which support video capture, basic editing,
+ playback and compression to MPEG-1/2 of MJPEG video.
.
Homepage: <http://mjpeg.sourceforge.net/>
.
Modified: dists/trunk/mjpegtools/debian/copyright
===================================================================
--- dists/trunk/mjpegtools/debian/copyright 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/mjpegtools/debian/copyright 2007-07-29 16:56:06 UTC (rev 140)
@@ -1,7 +1,7 @@
This package was debianized by Fabian Greffrath <fabian at debian-unofficial.org> on
-Sun, 1 Jul 2007 00:00:00 +0200.
+Sun, 1 Jul 2007 00:00:00 +0200.
-It was downloaded from <http://sourceforge.net/projects/mjpeg/>
+It was downloaded from <http://sourceforge.net/projects/mjpeg/>.
Upstream Authors:
@@ -9,7 +9,7 @@
Bernhard Praschinger <shadowlord at utanet.at>
Gernot Ziegler <gz at lysator.liu.se>
James Klicman <james at klicman.org>
- Kawamata/Hitoshi <hitoshi.kawamata at nifty.ne.jp>
+ Kawamata Hitoshi <hitoshi.kawamata at nifty.ne.jp>
Matthew Marjanovic <maddog at mir.com>
Mike Bernson <mike at mlb.org>
Philipp Zabel <pzabel at gmx.de>
@@ -20,12 +20,6 @@
Stefan Fendt <stefan at lionfish.ping.de>
Xavier Biquard <biquard at free.fr>
-Copyright:
-
- FIXME!
- See the individual source files for the exact terms.
- FIXME!
-
License:
This program is free software; you can redistribute it and/or modify
@@ -42,5 +36,8 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+On Debian systems, the complete text of the GNU General Public License
+can be found in the `/usr/share/common-licenses/GPL' file.
+
The Debian packaging is (C) 2007, Fabian Greffrath <fabian at debian-unofficial.org> and
is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
Modified: dists/trunk/mjpegtools/debian/patches/00list
===================================================================
--- dists/trunk/mjpegtools/debian/patches/00list 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/mjpegtools/debian/patches/00list 2007-07-29 16:56:06 UTC (rev 140)
@@ -1,4 +1,3 @@
01-debian-directory
02-include-cassert
03-libquicktime
-04-pkg-config
Modified: dists/trunk/mjpegtools/debian/patches/02-include-cassert.dpatch
===================================================================
--- dists/trunk/mjpegtools/debian/patches/02-include-cassert.dpatch 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/mjpegtools/debian/patches/02-include-cassert.dpatch 2007-07-29 16:56:06 UTC (rev 140)
@@ -1,7 +1,7 @@
#!/bin/sh /usr/share/dpatch/dpatch-run
## mjpegtools-1.8.0-gcc41.patch from Gentoo (modified)
##
-## DP: Fix compilation errors with gcc4.1 by adding the include of cassert.
+## DP: Fix compilation errors with gcc-4.1.
@DPATCH@
Modified: dists/trunk/mjpegtools/debian/patches/03-libquicktime.dpatch
===================================================================
--- dists/trunk/mjpegtools/debian/patches/03-libquicktime.dpatch 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/mjpegtools/debian/patches/03-libquicktime.dpatch 2007-07-29 16:56:06 UTC (rev 140)
@@ -1,7 +1,7 @@
#!/bin/sh /usr/share/dpatch/dpatch-run
## mjpegtools-1.8.0-libquicktime.patch from Gentoo
##
-## DP: Fix compilation against latest libquicktime (>= 0.9.9).
+## DP: Fix compilation against current libquicktime.
@DPATCH@
Deleted: dists/trunk/mjpegtools/debian/patches/04-pkg-config.dpatch
===================================================================
--- dists/trunk/mjpegtools/debian/patches/04-pkg-config.dpatch 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/mjpegtools/debian/patches/04-pkg-config.dpatch 2007-07-29 16:56:06 UTC (rev 140)
@@ -1,19 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## mjpegtools-1.8.0-pkg-config.patch from Gentoo
-##
-## DP: Add PKG_PROG_PKG_CONFIG in global scope.
-
- at DPATCH@
-
-diff -Naru mjpegtools-1.8.0.orig/configure.ac mjpegtools-1.8.0/configure.ac
---- mjpegtools-1.8.0.orig/configure.ac 2005-09-19 03:58:48.000000000 +0200
-+++ mjpegtools-1.8.0/configure.ac 2007-07-26 12:47:24.000000000 +0200
-@@ -233,6 +233,8 @@
- have_jpeg=true ],,)
- fi
-
-+PKG_PROG_PKG_CONFIG
-+
- have_libquicktime=false
- if test x$with_libquicktime != xno ; then
- PKG_CHECK_MODULES(LIBQUICKTIME, [libquicktime >= 0.9.4],
Modified: dists/trunk/mjpegtools/debian/rules
===================================================================
--- dists/trunk/mjpegtools/debian/rules 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/mjpegtools/debian/rules 2007-07-29 16:56:06 UTC (rev 140)
@@ -17,7 +17,7 @@
dh_testdir
# Configuring package
- ./configure --prefix=/usr --infodir=\$${prefix}/share/info --mandir=\$${prefix}/share/man
+ CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --infodir=\$${prefix}/share/info --mandir=\$${prefix}/share/man
build: build-stamp
build-stamp: config.status
@@ -55,6 +55,18 @@
# Installing package
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+ # Installing missing header file
+ cp -f mpeg2enc/mpeg2syntaxcodes.h debian/tmp/usr/include/mjpegtools/mpeg2enc
+
+ # Adding symlinks
+ ln -sf libmplex2-1.8.so.0.0.0 debian/tmp/usr/lib/libmplex2-1.8.so.0.0
+ ln -sf liblavfile-1.8.so.0.0.0 debian/tmp/usr/lib/liblavfile-1.8.so.0.0
+ ln -sf libmjpegutils-1.8.so.0.0.0 debian/tmp/usr/lib/libmjpegutils-1.8.so.0.0
+ ln -sf libmpeg2encpp-1.8.so.0.0.0 debian/tmp/usr/lib/libmpeg2encpp-1.8.so.0.0
+ ln -sf liblavplay-1.8.so.0.0.0 debian/tmp/usr/lib/liblavplay-1.8.so.0.0
+ ln -sf liblavjpeg-1.8.so.0.0.0 debian/tmp/usr/lib/liblavjpeg-1.8.so.0.0
+ ln -sf liblavrec-1.8.so.0.0.0 debian/tmp/usr/lib/liblavrec-1.8.so.0.0
+
# Installing bug control
for BUG in debian/bug/*; \
do \
Modified: dists/trunk/mjpegtools/debian/watch
===================================================================
--- dists/trunk/mjpegtools/debian/watch 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/mjpegtools/debian/watch 2007-07-29 16:56:06 UTC (rev 140)
@@ -1,3 +1,2 @@
version=3
-
http://sf.net/mjpeg/mjpegtools-(.*)\.tar\.bz2
Modified: dists/trunk/skype/debian/control
===================================================================
--- dists/trunk/skype/debian/control 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/skype/debian/control 2007-07-29 16:56:06 UTC (rev 140)
@@ -5,7 +5,7 @@
Uploaders: Adam Cécile (Le_Vert) <gandalf at le-vert.net>
Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.13.19), imagemagick, libstdc++5-3.3-dev, libqt3-mt-dev, libasound2-dev
Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/debian-restricted/dists/trunk/skype/
+XS-Vcs-Svn: svn://svn.debian.org/restricted/dists/trunk/skype/
Package: skype
Architecture: i386
Modified: dists/trunk/skype-static/debian/control
===================================================================
--- dists/trunk/skype-static/debian/control 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/skype-static/debian/control 2007-07-29 16:56:06 UTC (rev 140)
@@ -5,7 +5,7 @@
Uploaders: Adam Cécile (Le_Vert) <gandalf at le-vert.net>
Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.13.19), imagemagick, libstdc++5-3.3-dev, libasound2-dev
Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/debian-restricted/dists/trunk/skype-static/
+XS-Vcs-Svn: svn://svn.debian.org/restricted/dists/trunk/skype-static/
Package: skype-static
Architecture: i386 amd64
Modified: dists/trunk/transcode/debian/control
===================================================================
--- dists/trunk/transcode/debian/control 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/transcode/debian/control 2007-07-29 16:56:06 UTC (rev 140)
@@ -3,20 +3,20 @@
Priority: optional
Maintainer: Debian Restricted <restricted-devel at lists.alioth.debian.org>
Uploaders: Fabian Greffrath <fabian at debian-unofficial.org>, Daniel Baumann <daniel at debian.org>
-Build-Depends: debhelper (>= 5), autotools-dev, libavcodec-dev, libmpeg2-4-dev, libpostproc-dev, libmp3lame-dev, libogg-dev, libvorbis-dev, libtheora-dev
+Build-Depends: debhelper (>= 5), dpatch, autotools-dev, libavcodec-dev, libmp3lame-dev, libmpeg2-4-dev, libogg-dev, libpostproc-dev, libtheora-dev, libvorbis-dev
Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/debian-restricted/dists/trunk/transcode/
+XS-Vcs-Svn: svn://svn.debian.org/restricted/dists/trunk/transcode/
Package: transcode
Section: restricted/graphics
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, gawk, xterm | x-terminal-emulator
Recommends: transcode-doc
Suggests: ffmpeg, sox, toolame
Description: utilities for transcoding video and audio codecs
Transcode is a suite of command line utilities for transcoding video and audio
- codecs, and for converting beween different container formats. Transcode can
- decode and encode many audio and video formats, e.g.
+ codecs and for converting bteween different container formats. Transcode can
+ decode and encode many audio and video formats, e.g.:
.
* MPEG-1/2
* MPEG-4(-part 3) (also DivX and XviD variants)
@@ -33,7 +33,7 @@
* smoothing
* cutting
.
- Transcode can import DVDs on-the-fly, or record from Video4Linux (including
+ Transcode can import DVDs on-the-fly or record from Video4Linux (including
V4L2 video capturing) devices.
.
Homepage: <http://www.transcoding.org/>
@@ -42,10 +42,10 @@
Section: restricted/devel
Priority: extra
Architecture: any
-Depends: xv (= ${binary:Version})
+Depends: transcode (= ${binary:Version})
Description: utilities for transcoding video and audio codecs (debug)
Transcode is a suite of command line utilities for transcoding video and audio
- codecs, and for converting beween different container formats.
+ codecs and for converting between different container formats.
.
Homepage: <http://www.transcoding.org/>
.
@@ -57,7 +57,7 @@
Recommends: transcode
Description: utilities for transcoding video and audio codecs (documentation)
Transcode is a suite of command line utilities for transcoding video and audio
- codecs, and for converting beween different container formats.
+ codecs and for converting between different container formats.
.
Homepage: <http://www.transcoding.org/>
.
Modified: dists/trunk/transcode/debian/copyright
===================================================================
--- dists/trunk/transcode/debian/copyright 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/transcode/debian/copyright 2007-07-29 16:56:06 UTC (rev 140)
@@ -1,23 +1,203 @@
This package was debianized by Fabian Greffrath <fabian at debian-unofficial.org> on
-Fri, 13 Jul 2007 09:42:53 +0200.
+Sun, 1 Jul 2007 00:00:00 +0200.
-It was downloaded from <http://www.transcoding.org/cgi-bin/transcode?Download>
+It was downloaded from <http://www.transcoding.org/cgi-bin/transcode?Download>.
-Upstream Author(s):
+Upstream Authors:
- Thomas Östreich <ostreich at theorie.physik.uni-goettingen.de>,
- Tilmann Bitterberg <transcode at tibit.org>,
- Erik Slagter <erik at oldconomy.com>,
- Jacob Meuser <jakemsr at jakemsr.com>,
- Francesco Romani <fromani at gmail.com>
- and others (see `/usr/share/doc/transcode/AUTHORS').
+ Original Author of transcode (core):
-Copyright:
+ Thomas Östreich <ostreich at theorie.physik.uni-goettingen.de>
- Copyright (C) 2001-2003 Thomas Östreich,
- 2003-2004 Tilmann Bitterberg
- and contributors.
+ Current and Previous Maintainers of transcode (core):
+ Tilmann Bitterberg <transcode at tibit.org>
+ Erik Slagter <erik at oldconomy.com>
+ Jacob Meuser <jakemsr at jakemsr.com>
+ Francesco Romani <fromani at gmail.com> (1.0.3, patches only)
+
+ Contributors:
+
+ Tilmann Bitterberg <transcode at tibit.org>
+ * lots of filters
+ * import_nvrec.c
+ * manpages
+ * inverse cropping
+ * tons of bug fixes
+
+ Marek Blaszkowski <mb at intercon.pl>
+ * import_yuv.c
+
+ Gregory Brauer <greg at wildbrain.com>
+ * import_im.c
+
+ Moritz Bunkus <moritz at bunkus.org>
+ * export_ffmpeg.c
+ * import_ffmpeg.c
+ * import_mplayer.c
+
+ Dominique Caron <domi at LPM.univ-montp2.fr>
+ * vob2divx.pl
+
+ Ben Collins <bcollins at debian.org>
+ * export_mjpeg.c
+
+ Arne Driescher <driescher at mpi-magdeburg.mpg.de>
+ * subrip
+
+ German Gomez Garcia <german at piraos.com>
+ * AC3 downmixing patch for -s
+ * import_lav.c
+
+ Carsten Geckeler <geckeler at gmx.net>
+ * gamma correction routine
+ * fast resizing integer arithmetic
+
+ Dirk Gouders <gouders at et.bocholt.fh-ge.de>
+ * manpages
+
+ Juergen Hennerich <s-hej4 at jura.uni-tuebingen.de>
+ * long options
+ * fast resizing updates
+
+ Chris C. Hoover <cchoover at charter.net>
+ * avisplit extensions
+ * import_v4l.c ~/.xawtv parser
+
+ Vladimir Kushnir <vkushnir at alfacom.net>
+ * FreeBSD port
+
+ Christoph Lampert <chl at math.uni-bonn.de>
+ * initial two-pass encoding for MPEG-4
+ * export_divx.c
+ * export_xvid.c
+
+ Georg Ludwig <email at georg-ludwig.de>
+ * export_mp2enc.c
+
+ Jason Lunz <lunz+mlist at falooley.org>
+ * --nav_seek patch
+ * NTSC DVD donations
+
+ Marzio Malanchini <Marzio.Malanchini at omnitelvodafone.it>
+ * import_xml.c
+
+ Volker Moell <moell at gmx.de>
+ * spec file
+
+ Gerhard Monzel <gerhard.monzel at sap.com>
+ * bbmpeg port to linux/transcode
+ * encoder parameter settings with avifile
+ * export_mpeg.c
+ * export_mpeg2enc.c
+
+ Guillaume Morin <guillaume at morinfr.org>
+ * Altivec support
+ * PPC patches
+
+ Andreas Neukoetter <anti at webhome.de>
+ * export_toolame.c
+
+ Chad Page <cpage at silcom.com>
+ * see filter plug-ins
+
+ Andreas Påhlsson <andreas.pahlsson at tjohoo.se>
+ * import_nuv.c
+
+ Jan Panteltje <panteltje at yahoo.com>
+ * subtitler
+
+ Eduardo Perez <eperez at dei.inf.uc3m.es>
+ * ISO8601 date compliance
+
+ Joerg Sauer <js-mail at gmx.net>
+ * liba52 fixes
+
+ Nikita Schmidt <cetus at cnds.ucd.ie>
+ * Linux/Alpha port
+
+ Steven M. Schultz <sms at 2BSD.COM>
+ * BSD port
+
+ Michel Alexandre Salim <salimma1 at yahoo.co.uk>
+ * spec file updates
+
+ Vaclav Slavik <v.slavik at volny.cz>
+ * progress meter patch for option "-c"
+ * high-quality frame resizing, i.e., zooming
+ * audio downsampling patch
+
+ Andrew Stevens <andrew.stevens at nexgo.de>
+ * mjpeg-tools API patch
+
+ Nicolas Vignal <nicolas.vignal at fnac.net>
+ * patch for spaces in filenames
+
+ Christian Vogelgsang <Vogelgsang at informatik.uni-erlangen.de>
+ * import_nuv.c updates
+ * quicktime4linux support
+
+ Charles Wilson <cwilson at ece.gatech.edu>
+ * configure fixes
+
+ Many, many more. See `/usr/share/doc/transcode/ChangeLog'.
+
+Copyright Holders:
+
+ * For filter plug-ins author information see:
+ http://www.Theorie.Physik.UNI-Goettingen.DE/~ostreich/transcode/html/filter.html
+
+ * antialias algorithm adapted from the Anti-Aliasing plug-in for the GIMP v1.2.
+ Kevin Turner <acapnotic at users.sourceforge.net>
+ http://gimp-plug-ins.sourceforge.net/antialias/
+
+ * Port of the original code of Ray Gardener, Daylon Graphics Ltd,
+ from Graphics Gems III, adapted and optimized for use in transcode.
+
+ * lame
+ http://www.sulaco.org/mp3
+ Originally developed by Mike Cheng (www.uq.net.au/~zzmcheng). Now
+ maintained by Mark Taylor (www.sulaco.org/mp3).
+
+ * avilib
+ Original source code
+ Copyright (C) 1999 Rainer Johanni <Rainer at Johanni.de>
+
+ * af6_aux.cpp
+ code borrowed from "vcr" package:
+ Copyright (C) 2001 Bram Avontuur (bram at avontuur.org)
+
+ * export_qt.c (obsolete)
+ Copyright (C) ken at hero.com 2001 (Module Author)
+
+ * libac3
+ Written by Aaron Holtzman (aholtzma at engr.uvic.ca)
+
+ * liba52
+ Aaron Holtzman <aholtzma at ess.engr.uvic.ca> started the project and
+ made the initial working implementation.
+ Michel Lespinasse <walken at zoy.org> did major changes for speed and
+ conformance and is the current maintainer.
+
+ * libmpeg2/libvo
+ Aaron Holtzman <aholtzma at ess.engr.uvic.ca> started the project and
+ made the initial working implementation.
+ Michel Lespinasse <walken at zoy.org> did large changes for speed and
+ mpeg conformance and is the current maintainer.
+
+ * encore2
+ OpenDivX http://www.projectmayo.com/
+
+ * dvdread
+ Copyright (C) 2000, 2001 by:
+ Björn Englund <d4bjorn at dtek.chalmers.se>,
+ Håkan Hjort <d95hjort at dtek.chalmers.se>,
+ Billy Biggs <vektor at dumbterm.net>
+
+ * extsub
+ A subtitle extractor for VOB files Version 1.00
+ by Sham Gardner (risctaker at risctaker.de)
+
License:
This program is free software; you can redistribute it and/or modify
@@ -34,5 +214,8 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+On Debian systems, the complete text of the GNU General Public License
+can be found in the `/usr/share/common-licenses/GPL' file.
+
The Debian packaging is (C) 2007, Fabian Greffrath <fabian at debian-unofficial.org> and
is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
Modified: dists/trunk/transcode/debian/rules
===================================================================
--- dists/trunk/transcode/debian/rules 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/transcode/debian/rules 2007-07-29 16:56:06 UTC (rev 140)
@@ -3,6 +3,8 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+include /usr/share/dpatch/dpatch.make
+
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -11,23 +13,54 @@
CFLAGS += -O2
endif
-config.status: configure
+config.status: patch-stamp configure
dh_testdir
- ./configure CFLAGS="$(CFLAGS)" --prefix=/usr \
- --enable-libavcodec --enable-libmpeg2 --enable-libpostproc \
- --enable-lame --enable-ogg --enable-vorbis --enable-theora
+ CFLAGS="$(CFLAGS)" ./configure --prefix=/usr \
+ --enable-mmx --enable-3dnow --enable-sse --enable-sse2 --enable-altivec \
+ --enable-libavcodec --enable-libmpeg2 \
+ --enable-statbuffer \
+ --enable-netstream \
+ --enable-v4l \
+ --enable-bktr \
+ --enable-sunau \
+ --enable-oss \
+ --enable-ibp \
+ --enable-libpostproc \
+ --enable-freetype2 \
+ --enable-avifile \
+ --enable-lame \
+ --enable-ogg \
+ --enable-vorbis \
+ --enable-theora \
+ --enable-libdvdread \
+ --enable-pvm3 \
+ --enable-libdv \
+ --enable-libquicktime \
+ --enable-lzo \
+ --enable-a52 \
+ --enable-libmpeg3 \
+ --enable-libxml2 \
+ --enable-mjpegtools \
+ --enable-sdl \
+ --enable-gtk \
+ --enable-libfame \
+ --enable-imagemagick \
+ --enable-libjpegmmx \
+ --enable-libjpeg \
+ --enable-bsdav \
+ --enable-iconv \
+ --enable-xio
-
build: build-stamp
build-stamp: config.status
dh_testdir
$(MAKE)
- touch $@
+ touch build-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp
@@ -36,6 +69,13 @@
rm -f tc_pkg_rpt_file tc_pkg_err_file
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+ cp -f /usr/share/misc/config.sub autotools/config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+ cp -f /usr/share/misc/config.guess autotools/config.guess
+endif
+
dh_clean
install: build
@@ -46,9 +86,6 @@
$(MAKE) DESTDIR=$(CURDIR)/debian/transcode install
- # Cleaning out libtool-archives from transcode
- rm -f debian/transcode/usr/lib/transcode/*.la
-
# Moving documentation to transcode-doc package
mv -f debian/transcode/usr/share/doc/transcode debian/transcode-doc/usr/share/doc/transcode-doc
@@ -69,7 +106,7 @@
dh_testroot -i
dh_installchangelogs -i ChangeLog
dh_installdocs -i
- dh_compress -i --exclude=.html
+ dh_compress -i --exclude=html --exclude=php --exclude=png
dh_fixperms -i
dh_installdeb -i
dh_gencontrol -i
Modified: dists/trunk/transcode/debian/transcode-doc.dirs
===================================================================
--- dists/trunk/transcode/debian/transcode-doc.dirs 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/transcode/debian/transcode-doc.dirs 2007-07-29 16:56:06 UTC (rev 140)
@@ -1 +1 @@
-usr/share/doc
+/usr/share/doc
Modified: dists/trunk/transcode/debian/transcode-doc.doc-base
===================================================================
--- dists/trunk/transcode/debian/transcode-doc.doc-base 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/transcode/debian/transcode-doc.doc-base 2007-07-29 16:56:06 UTC (rev 140)
@@ -1,8 +1,8 @@
Document: transcode-doc
-Title: Example transcode sessions
-Author: Thomas Östreich
-Abstract: Linux Video Stream Processing Tool - Examples
-Section: graphics
+Title: Transcode documentation
+Author: Thomas Östreich <ostreich at theorie.physik.uni-goettingen.de>
+Abstract: This manual describes what transcode is and how it can be used.
+Section: Apps/Graphics
Format: HTML
Index: /usr/share/doc/transcode-doc/html/index.html
Modified: dists/trunk/transcode/debian/transcode-doc.docs
===================================================================
--- dists/trunk/transcode/debian/transcode-doc.docs 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/transcode/debian/transcode-doc.docs 2007-07-29 16:56:06 UTC (rev 140)
@@ -1,5 +1,4 @@
AUTHORS
INSTALL
-README
-README-1.0.1
+README*
TODO
Modified: dists/trunk/transcode/debian/transcode.docs
===================================================================
--- dists/trunk/transcode/debian/transcode.docs 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/transcode/debian/transcode.docs 2007-07-29 16:56:06 UTC (rev 140)
@@ -1,4 +1,3 @@
AUTHORS
-README
-README-1.0.1
+README*
TODO
Modified: dists/trunk/transcode/debian/watch
===================================================================
--- dists/trunk/transcode/debian/watch 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/transcode/debian/watch 2007-07-29 16:56:06 UTC (rev 140)
@@ -1,3 +1,2 @@
version=3
-
http://transcode.kabewm.com/transcode-(.*)\.tar\.bz2
Modified: dists/trunk/x264/debian/control
===================================================================
--- dists/trunk/x264/debian/control 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/x264/debian/control 2007-07-29 16:56:06 UTC (rev 140)
@@ -5,8 +5,7 @@
Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>, Fabian Greffrath <fabian at debian-unofficial.org>
Build-Depends: debhelper (>= 5), nasm [i386 hurd-i386 kfreebsd-i386], yasm [amd64 kfreebsd-amd64], quilt
Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/pkg-multimedia/unstable/x264
-XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-multimedia/unstable/x264/
+XS-Vcs-Svn: svn://svn.debian.org/restricted/dists/trunk/x264/
Package: x264
Section: graphics
Modified: dists/trunk/xv/debian/changelog
===================================================================
--- dists/trunk/xv/debian/changelog 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/xv/debian/changelog 2007-07-29 16:56:06 UTC (rev 140)
@@ -1,6 +1,6 @@
xv (1:3.10a-2) unstable; urgency=low
- * Applied 'XV Jumbo Patch' of 20 May 2007.
+ * Applied 'XV Jumbo Patches' of 20 May 2007.
-- Fabian Greffrath <fabian at debian-unofficial.org> Mon, 21 May 2007 00:00:00 +0100
Modified: dists/trunk/xv/debian/control
===================================================================
--- dists/trunk/xv/debian/control 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/xv/debian/control 2007-07-29 16:56:06 UTC (rev 140)
@@ -5,7 +5,7 @@
Uploaders: Fabian Greffrath <fabian at debian-unofficial.org>, Daniel Baumann <daniel at debian.org>
Build-Depends: debhelper (>= 5), dpatch, sharutils, libjasper-dev, libjpeg62-dev, libpng12-dev, libtiff4-dev, libx11-dev, libxt-dev, zlib1g-dev
Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/debian-restricted/dists/trunk/xv/
+XS-Vcs-Svn: svn://svn.debian.org/restricted/dists/trunk/xv/
Package: xv
Section: restricted/graphics
@@ -13,7 +13,7 @@
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: xv-doc
Suggests: gs-esp | gs
-Description: Image viewer and manipulator
+Description: image viewer and manipulator
XV is an interactive image manipulation program for the X Window System. It
can operate on images in the GIF, JPEG, TIFF, PBM, PGM, PPM, XPM, X11 bitmap,
Sun Rasterfile, Targa, RLE, RGB, BMP, PCX, FITS, and PM formats on all known
@@ -27,7 +27,7 @@
Priority: extra
Architecture: any
Depends: xv (= ${binary:Version})
-Description: Image viewer and manipulator (debug)
+Description: image viewer and manipulator (debug)
XV is an interactive image manipulation program for the X Window System. It
can operate on images in the GIF, JPEG, TIFF, PBM, PGM, PPM, XPM, X11 bitmap,
Sun Rasterfile, Targa, RLE, RGB, BMP, PCX, FITS, and PM formats on all known
@@ -43,7 +43,7 @@
Architecture: all
Recommends: xv
Suggests: gv | postscript-viewer, xpdf | pdf-viewer
-Description: Image viewer and manipulator (documentation)
+Description: image viewer and manipulator (documentation)
XV is an interactive image manipulation program for the X Window System. It
can operate on images in the GIF, JPEG, TIFF, PBM, PGM, PPM, XPM, X11 bitmap,
Sun Rasterfile, Targa, RLE, RGB, BMP, PCX, FITS, and PM formats on all known
Modified: dists/trunk/xv/debian/copyright
===================================================================
--- dists/trunk/xv/debian/copyright 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/xv/debian/copyright 2007-07-29 16:56:06 UTC (rev 140)
@@ -3,8 +3,10 @@
It was downloaded from <http://www.trilon.com/xv/>.
-Upstream Author: John Bradley <bradley at trilon.com>
+Upstream Author:
+ John Bradley <bradley at trilon.com>
+
License:
Copyright (C) 1989-1994 John Bradley <bradley at trilon.com>
Modified: dists/trunk/xv/debian/patches/00list
===================================================================
--- dists/trunk/xv/debian/patches/00list 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/xv/debian/patches/00list 2007-07-29 16:56:06 UTC (rev 140)
@@ -1,5 +1,5 @@
01-xv-3.10a-jumbo-fix-enh-patch-20070520
02-xv-3.10a-jumbo-files-20070520
-03-no-xvdocs-pdf
+03-no-xvdocs_pdf
04-dynamic-libjasper
05-dlinux
Modified: dists/trunk/xv/debian/patches/01-xv-3.10a-jumbo-fix-enh-patch-20070520.dpatch
===================================================================
--- dists/trunk/xv/debian/patches/01-xv-3.10a-jumbo-fix-enh-patch-20070520.dpatch 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/xv/debian/patches/01-xv-3.10a-jumbo-fix-enh-patch-20070520.dpatch 2007-07-29 16:56:06 UTC (rev 140)
@@ -1,5 +1,5 @@
#!/bin/sh /usr/share/dpatch/dpatch-run
-## 01-xv-3.10a-jumbo-fix-enh-patch-20070520.dpatch by Greg Roelofs <newt at pobox.com>
+## xv-3.10a-jumbo-fix-enh-patch-20070520.txt by Greg Roelofs <newt at pobox.com>
## It was downloaded from <http://www.sonic.net/~roelofs/greg_xv.html>.
##
## DP: XV Jumbo Patch (fixes and enhancements).
Modified: dists/trunk/xv/debian/patches/02-xv-3.10a-jumbo-files-20070520.dpatch
===================================================================
--- dists/trunk/xv/debian/patches/02-xv-3.10a-jumbo-files-20070520.dpatch 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/xv/debian/patches/02-xv-3.10a-jumbo-files-20070520.dpatch 2007-07-29 16:56:06 UTC (rev 140)
@@ -1,8 +1,8 @@
#!/bin/sh /usr/share/dpatch/dpatch-run
-## 02-xv-3.10a-jumbo-files-20070520.dpatch by Greg Roelofs <newt at pobox.com>
+## xv-3.10a-jumbo-patches-20070520.tar.gz by Greg Roelofs <newt at pobox.com>
## It was downloaded from <http://www.sonic.net/~roelofs/greg_xv.html>.
##
-## DP: XV Jumbo Patch (supplementary files w/o binary file docs/xvdocs.pdf).
+## DP: XV Jumbo Patch (supplementary files).
@DPATCH@
Modified: dists/trunk/xv/debian/patches/03-no-xvdocs-pdf.dpatch
===================================================================
--- dists/trunk/xv/debian/patches/03-no-xvdocs-pdf.dpatch 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/xv/debian/patches/03-no-xvdocs-pdf.dpatch 2007-07-29 16:56:06 UTC (rev 140)
@@ -1,7 +1,7 @@
#!/bin/sh /usr/share/dpatch/dpatch-run
-## 03-no-xvdocs-pdf.dpatch by Fabian Greffrath <fabian at debian-unofficial.org>
+## 03-no-xvdocs_pdf.dpatch by Fabian Greffrath <fabian at debian-unofficial.org>
##
-## DP: Do not install removed binary file docs/xvdocs.pdf.
+## DP: Do not install docs/xvdocs.pdf.
@DPATCH@
Copied: dists/trunk/xv/debian/patches/03-no-xvdocs_pdf.dpatch (from rev 139, dists/trunk/xv/debian/patches/03-no-xvdocs-pdf.dpatch)
===================================================================
--- dists/trunk/xv/debian/patches/03-no-xvdocs_pdf.dpatch (rev 0)
+++ dists/trunk/xv/debian/patches/03-no-xvdocs_pdf.dpatch 2007-07-29 16:56:06 UTC (rev 140)
@@ -0,0 +1,22 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 03-no-xvdocs_pdf.dpatch by Fabian Greffrath <fabian at debian-unofficial.org>
+##
+## DP: Do not install docs/xvdocs.pdf.
+
+ at DPATCH@
+
+diff -Naru xv-3.10a.jumbo.orig/Makefile xv-3.10a/Makefile
+--- xv-3.10a.jumbo.orig/Makefile 2007-05-23 12:15:05.000000000 +0200
++++ xv-3.10a/Makefile 2007-05-23 12:30:17.000000000 +0200
+@@ -418,9 +418,9 @@
+ $(DESTDIR)$(MANDIR)/vdcomp.$(MANSUF)
+ #
+ $(MKDIR) $(DESTDIR)$(DOCDIR) # or $(DESTDIR)$(LIBDIR)
+- cp README.jumbo docs/xvdocs.pdf docs/xvdocs.ps $(DESTDIR)$(DOCDIR)/.
++ cp README.jumbo docs/xvdocs.ps $(DESTDIR)$(DOCDIR)/.
+ chmod 644 $(DESTDIR)$(DOCDIR)/README.jumbo \
+- $(DESTDIR)$(DOCDIR)/xvdocs.pdf $(DESTDIR)$(DOCDIR)/xvdocs.ps
++ $(DESTDIR)$(DOCDIR)/xvdocs.ps
+ #
+ #$(MKDIR) $(DESTDIR)$(SYSCONFDIR)
+ #cp xv_mgcsfx.sample $(DESTDIR)$(SYSCONFDIR)/xv_mgcsfx
Modified: dists/trunk/xv/debian/patches/04-dynamic-libjasper.dpatch
===================================================================
--- dists/trunk/xv/debian/patches/04-dynamic-libjasper.dpatch 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/xv/debian/patches/04-dynamic-libjasper.dpatch 2007-07-29 16:56:06 UTC (rev 140)
@@ -1,7 +1,7 @@
#!/bin/sh /usr/share/dpatch/dpatch-run
## 04-dynamic-libjasper.dpatch by Fabian Greffrath <fabian at debian-unofficial.org>
##
-## DP: Dynamically link against libjasper (JPEG-2000).
+## DP: Dynamically link against libjasper.
@DPATCH@
Modified: dists/trunk/xv/debian/watch
===================================================================
--- dists/trunk/xv/debian/watch 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/xv/debian/watch 2007-07-29 16:56:06 UTC (rev 140)
@@ -1,3 +1,3 @@
version=3
ftp://ftp.cis.upenn.edu/pub/xv/xv-(.*)\.tar\.gz
-http://prdownloads.sourceforge.net/png-mng/xv-3.10a-jumbo-patches-(.*)\.tar\.gz
+http://sf.net/png-mng/xv-3.10a-jumbo-patches-(.*)\.tar\.gz
Modified: dists/trunk/xv/debian/xv-doc.doc-base
===================================================================
--- dists/trunk/xv/debian/xv-doc.doc-base 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/xv/debian/xv-doc.doc-base 2007-07-29 16:56:06 UTC (rev 140)
@@ -1,8 +1,7 @@
Document: xv-doc
-Title: XV Documentation
+Title: XV documentation
Author: John Bradley <bradley at trilon.com>
-Abstract: XV Documentation in PostScript and PDF formats
- XV is an image viewer and manipulator for the X Window System
+Abstract: This manual describes what XV is and how it can be used.
Section: Apps/Graphics
Format: postscript
Modified: dists/trunk/xv/debian/xv.menu
===================================================================
--- dists/trunk/xv/debian/xv.menu 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/xv/debian/xv.menu 2007-07-29 16:56:06 UTC (rev 140)
@@ -1,3 +1,3 @@
?package(xv):needs="X11" section="Apps/Graphics"\
- title="XV" longtitle="Image viewer and manipulator"\
+ title="XV" longtitle="image viewer and manipulator"\
command="/usr/bin/xv" icon="/usr/share/pixmaps/xv.xpm"
Modified: dists/trunk/xvidcore/debian/control
===================================================================
--- dists/trunk/xvidcore/debian/control 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/xvidcore/debian/control 2007-07-29 16:56:06 UTC (rev 140)
@@ -5,7 +5,7 @@
Uploaders: Daniel Baumann <daniel at debian.org>, Fabian Greffrath <fabian at debian-unofficial.org>
Build-Depends: debhelper (>= 5), dpatch, autotools-dev, yasm
Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/debian-restricted/dists/trunk/xvidcore/
+XS-Vcs-Svn: svn://svn.debian.org/restricted/dists/trunk/xvidcore/
Package: libxvidcore4
Section: restricted/libs
@@ -13,11 +13,13 @@
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: MPEG-4 Video Codec library
Xvid is an open source MPEG-4 video codec, implementing MPEG-4 Simple Profile,
- Advanced Simple Profile, and Advanced Video Coding standards. It is especially
+ Advanced Simple Profile and Advanced Video Coding standards. It is especially
optimized towards offline, multi-pass compression for storage and archival
purposes.
.
Homepage: <http://www.xvid.org/>
+ .
+ This package contains the shared library.
Package: libxvidcore-dbg
Section: restricted/devel
@@ -26,7 +28,7 @@
Depends: libxvidcore4 (= ${binary:Version}), libxvidcore-dev (= ${binary:Version})
Description: MPEG-4 Video Codec library (debug)
Xvid is an open source MPEG-4 video codec, implementing MPEG-4 Simple Profile,
- Advanced Simple Profile, and Advanced Video Coding standards. It is especially
+ Advanced Simple Profile and Advanced Video Coding standards. It is especially
optimized towards offline, multi-pass compression for storage and archival
purposes.
.
@@ -40,7 +42,7 @@
Depends: libxvidcore4 (= ${binary:Version})
Description: MPEG-4 Video Codec library (development)
Xvid is an open source MPEG-4 video codec, implementing MPEG-4 Simple Profile,
- Advanced Simple Profile, and Advanced Video Coding standards. It is especially
+ Advanced Simple Profile and Advanced Video Coding standards. It is especially
optimized towards offline, multi-pass compression for storage and archival
purposes.
.
Modified: dists/trunk/xvidcore/debian/copyright
===================================================================
--- dists/trunk/xvidcore/debian/copyright 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/xvidcore/debian/copyright 2007-07-29 16:56:06 UTC (rev 140)
@@ -3,8 +3,11 @@
It was downloaded from <http://www.xvid.org/downloads.html>.
-Copyright Holder: Peter Ross <pross at xvid.org>
+Upstream Authors:
+ Peter Ross <pross at xvid.org>
+ and others (see `/usr/share/doc/libxvidcore4/AUTHORS')
+
License:
Copyright (C) 2001-2004 Peter Ross <pross at xvid.org>
@@ -26,5 +29,5 @@
On Debian systems, the complete text of the GNU General Public License
can be found in the `/usr/share/common-licenses/GPL' file.
-The Debian packaging is (C) 2007, Daniel Baumann <daniel at debian.org> and
+The Debian packaging is (C) 2005-2007, Daniel Baumann <daniel at debian.org> and
is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
Modified: dists/trunk/xvidcore/debian/rules
===================================================================
--- dists/trunk/xvidcore/debian/rules 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/xvidcore/debian/rules 2007-07-29 16:56:06 UTC (rev 140)
@@ -59,10 +59,10 @@
$(MAKE) -C build/generic install prefix=$(CURDIR)/debian/tmp/usr
# Adding symlinks
- mv debian/tmp/usr/lib/libxvidcore.so.4.1 debian/tmp/usr/lib/libxvidcore.so.4.1.0
- ln -s libxvidcore.so.4.1.0 debian/tmp/usr/lib/libxvidcore.so.4.1
- ln -s libxvidcore.so.4.1.0 debian/tmp/usr/lib/libxvidcore.so.4
- ln -s libxvidcore.so.4.1.0 debian/tmp/usr/lib/libxvidcore.so
+ mv -f debian/tmp/usr/lib/libxvidcore.so.4.1 debian/tmp/usr/lib/libxvidcore.so.4.1.0
+ ln -sf libxvidcore.so.4.1.0 debian/tmp/usr/lib/libxvidcore.so.4.1
+ ln -sf libxvidcore.so.4.1.0 debian/tmp/usr/lib/libxvidcore.so.4
+ ln -sf libxvidcore.so.4.1.0 debian/tmp/usr/lib/libxvidcore.so
# Installing bug control
for BUG in debian/bug/*; \
Modified: dists/trunk/xvidcore/debian/watch
===================================================================
--- dists/trunk/xvidcore/debian/watch 2007-07-26 09:26:04 UTC (rev 139)
+++ dists/trunk/xvidcore/debian/watch 2007-07-29 16:56:06 UTC (rev 140)
@@ -1,4 +1,2 @@
-# watch control file for uscan
-
version=3
http://downloads.xvid.org/downloads/xvidcore-(.*)\.tar\.gz
More information about the Restricted-changes
mailing list