[Restricted-changes] r141 - in dists/trunk: ffmpeg mjpegtools/debian transcode/debian xv/debian/patches

fabian-guest at alioth.debian.org fabian-guest at alioth.debian.org
Sun Jul 29 20:43:05 UTC 2007 

Author: fabian-guest
Date: 2007-07-29 20:43:05 +0000 (Sun, 29 Jul 2007)
New Revision: 141

Removed:
   dists/trunk/xv/debian/patches/03-no-xvdocs-pdf.dpatch
Modified:
   dists/trunk/ffmpeg/ffmpeg-duo_interdiff.patch
   dists/trunk/mjpegtools/debian/copyright
   dists/trunk/mjpegtools/debian/rules
   dists/trunk/transcode/debian/rules
Log:


Modified: dists/trunk/ffmpeg/ffmpeg-duo_interdiff.patch
===================================================================
--- dists/trunk/ffmpeg/ffmpeg-duo_interdiff.patch	2007-07-29 16:56:06 UTC (rev 140)
+++ dists/trunk/ffmpeg/ffmpeg-duo_interdiff.patch	2007-07-29 20:43:05 UTC (rev 141)
@@ -55,13 +55,18 @@
 +Send-To: Debian Restricted <restricted-devel at lists.alioth.debian.org>
 diff -Naru ffmpeg-0.cvs20070307-5/debian/changelog ffmpeg-0.cvs20070307-5~duo.1/debian/changelog
 --- ffmpeg-0.cvs20070307-5/debian/changelog	2007-07-25 22:24:00.000000000 +0200
-+++ ffmpeg-0.cvs20070307-5~duo.1/debian/changelog	2007-07-25 22:16:50.000000000 +0200
-@@ -1,3 +1,10 @@
++++ ffmpeg-0.cvs20070307-5~duo.1/debian/changelog	2007-07-28 11:37:34.000000000 +0200
+@@ -1,3 +1,15 @@
 +ffmpeg (0.cvs20070307-5~duo.1) unstable; urgency=low
 +
 +  * 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
@@ -69,7 +74,7 @@
    * upload to unstable
 diff -Naru ffmpeg-0.cvs20070307-5/debian/control ffmpeg-0.cvs20070307-5~duo.1/debian/control
 --- ffmpeg-0.cvs20070307-5/debian/control	2007-07-25 22:24:00.000000000 +0200
-+++ ffmpeg-0.cvs20070307-5~duo.1/debian/control	2007-07-25 22:16:50.000000000 +0200
++++ ffmpeg-0.cvs20070307-5~duo.1/debian/control	2007-07-28 11:36:44.000000000 +0200
 @@ -1,15 +1,14 @@
  Source: ffmpeg
 -Section: libs
@@ -84,7 +89,7 @@
  Standards-Version: 3.7.2
 -XS-Vcs-Svn: svn://svn.debian.org/pkg-multimedia/experimental/ffmpeg
 -XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/
-+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: graphics
@@ -137,51 +142,66 @@
  Architecture: any
  Depends: ${shlibs:Depends}
  Description: ffmpeg video scaling library
-@@ -72,7 +71,7 @@
+@@ -72,9 +71,9 @@
   object that should only be used by Debian packages.
  
  Package: libavutil-dev
 -Section: libdevel
 +Section: restricted/libdevel
  Architecture: any
- Depends: libavutil1d (= ${Source-Version}), ${shlibs:Depends}
+-Depends: libavutil1d (= ${Source-Version}), ${shlibs:Depends}
++Depends: libavutil1d (= ${binary:Version}), ${shlibs:Depends}
  Conflicts: libavformat-dev (<< 0.cvs20060329-4), libavcodec-dev (<< 0.cvs20070307-1)
-@@ -85,7 +84,7 @@
+ Replaces: libavformat-dev (<< 0.cvs20060329-4), libavcodec-dev (<< 0.cvs20070307-1)
+ Description: development files for libavutil
+@@ -85,9 +84,9 @@
   compile applications or shared objects that use libavutil.
  
  Package: libavcodec-dev
 -Section: libdevel
 +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 (= ${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)
-@@ -98,7 +97,7 @@
+ Replaces: libavformat-dev (<< 0.cvs20060329-4)
+ Description: development files for libavcodec
+@@ -98,9 +97,9 @@
   compile applications or shared objects that use libavcodec.
  
  Package: libpostproc-dev
 -Section: libdevel
 +Section: restricted/libdevel
  Architecture: any
- Depends: libpostproc1d (= ${Source-Version}), libavcodec-dev (= ${Source-Version}), ${shlibs:Depends}
+-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
-@@ -108,7 +107,7 @@
+  This is the video postprocessing library from the ffmpeg project.
+  .
+@@ -108,9 +107,9 @@
   compile applications or shared objects that use libpostproc.
  
  Package: libavformat-dev
 -Section: libdevel
 +Section: restricted/libdevel
  Architecture: any
- Depends: libavformat1d (= ${Source-Version}), libavcodec-dev (= ${Source-Version}), ${shlibs:Depends}
+-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)
-@@ -121,7 +120,7 @@
+ Replaces: libavcodec-dev (<< 0.cvs20060306-1)
+ Description: development files for libavformat
+@@ -121,9 +120,9 @@
   compile applications or shared objects that use libavformat.
  
  Package: libswscale-dev
 -Section: libdevel
 +Section: restricted/libdevel
  Architecture: any
- Depends: libswscale1d (= ${Source-Version}), libavutil-dev (= ${Source-Version}), ${shlibs:Depends}
+-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.
+  .
 diff -Naru ffmpeg-0.cvs20070307-5/debian/lintian/ffmpeg ffmpeg-0.cvs20070307-5~duo.1/debian/lintian/ffmpeg
 --- ffmpeg-0.cvs20070307-5/debian/lintian/ffmpeg	1970-01-01 01:00:00.000000000 +0100
 +++ ffmpeg-0.cvs20070307-5~duo.1/debian/lintian/ffmpeg	2007-07-25 22:16:50.000000000 +0200

Modified: dists/trunk/mjpegtools/debian/copyright
===================================================================
--- dists/trunk/mjpegtools/debian/copyright	2007-07-29 16:56:06 UTC (rev 140)
+++ dists/trunk/mjpegtools/debian/copyright	2007-07-29 20:43:05 UTC (rev 141)
@@ -20,6 +20,82 @@
 	Stefan Fendt <stefan at lionfish.ping.de>
 	Xavier Biquard <biquard at free.fr>
 
+Copyright:
+
+	aenc/:
+
+	  Copyright (C) 1991 MPEG/Audio Software Simulation Group.
+	  All Rights Reserved
+
+	  MPEG/audio coding/decoding software, work in progress
+	  NOT for public distribution until verified and approved by the
+	  MPEG/audio committee.  For further information, please contact
+	  Davis Pan, 508-493-2241, e-mail: pan at 3d.enet.dec.com 
+
+	mpeg2enc/:
+
+	  Copyright (C) 1996 MPEG Software Simulation Group. All Rights Reserved.
+
+	  Disclaimer of Warranty
+
+	  These software programs are available to the user without any license fee or
+	  royalty on an "as is" basis.  The MPEG Software Simulation Group disclaims
+	  any and all warranties, whether express, implied, or statuary, including any
+	  implied warranties or merchantability or of fitness for a particular
+	  purpose.  In no event shall the copyright-holder be liable for any
+	  incidental, punitive, or consequential damages of any kind whatsoever
+	  arising from the use of these programs.
+
+	  This disclaimer of warranty extends to the user of these programs and user's
+	  customers, employees, agents, transferees, successors, and assigns.
+
+	  The MPEG Software Simulation Group does not represent or warrant that the
+	  programs furnished hereunder are free of infringement of any third-party
+	  patents.
+
+	  Commercial implementations of MPEG-1 and MPEG-2 video, including shareware,
+	  are subject to royalty fees to patent holders.  Many of these patents are
+	  general enough such that they are unavoidable regardless of implementation
+	  design.
+
+	  Modifications and enhancements (C) 2000-2005 Andrew Stevens
+
+	  These modifications are free software; you can redistribute it
+	  and/or modify it under the terms of the GNU General Public License
+	  as published by the Free Software Foundation; either version 2 of
+	  the License, or (at your option) any later version.
+
+	  This program is distributed in the hope that it will be useful,
+	  but WITHOUT ANY WARRANTY; without even the implied warranty of
+	  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+	  General Public License for more details.
+
+	  You should have received a copy of the GNU General Public License
+	  along with this program; if not, write to the Free Software
+	  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+	  02111-1307, USA.
+
+	mplex/:
+	
+	  Orginally based on mplex
+	  Copyright (C) 1994-1995 Christoph Moar 
+	  Reengineered version in C++
+	  Copyright (C) 2000-2003 Andrew Stevens
+	  
+	  This program is free software; you can redistribute it and/or modify
+	  it under the terms of the GNU General Public License as published by
+	  the Free Software Foundation; either version 2 of the License, or
+	  (at your option) any later version.
+
+	  This program is distributed in the hope that it will be useful,
+	  but WITHOUT ANY WARRANTY; without even the implied warranty of
+	  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+	  GNU General Public License in the file COPYING for more details.
+
+	  You should have received a copy of the GNU General Public License
+	  along with this program; if not, write to the Free Software
+	  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
 License:
 
 	This program is free software; you can redistribute it and/or modify

Modified: dists/trunk/mjpegtools/debian/rules
===================================================================
--- dists/trunk/mjpegtools/debian/rules	2007-07-29 16:56:06 UTC (rev 140)
+++ dists/trunk/mjpegtools/debian/rules	2007-07-29 20:43:05 UTC (rev 141)
@@ -55,9 +55,6 @@
 	# 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

Modified: dists/trunk/transcode/debian/rules
===================================================================
--- dists/trunk/transcode/debian/rules	2007-07-29 16:56:06 UTC (rev 140)
+++ dists/trunk/transcode/debian/rules	2007-07-29 20:43:05 UTC (rev 141)
@@ -44,9 +44,7 @@
 		--enable-mjpegtools \
 		--enable-sdl \
 		--enable-gtk \
-		--enable-libfame \
 		--enable-imagemagick \
-		--enable-libjpegmmx \
 		--enable-libjpeg \
 		--enable-bsdav \
 		--enable-iconv \

Deleted: dists/trunk/xv/debian/patches/03-no-xvdocs-pdf.dpatch
===================================================================
--- dists/trunk/xv/debian/patches/03-no-xvdocs-pdf.dpatch	2007-07-29 16:56:06 UTC (rev 140)
+++ dists/trunk/xv/debian/patches/03-no-xvdocs-pdf.dpatch	2007-07-29 20:43:05 UTC (rev 141)
@@ -1,22 +0,0 @@
-#!/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

More information about the Restricted-changes mailing list