r782 - in /siretart/ffmpeg/debian: ./ patches/

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Wed May 30 10:12:35 UTC 2007 

Author: siretart
Date: Wed May 30 10:12:34 2007
New Revision: 782

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=782
Log:

commit my testbranch. I'm uploading them to an experimental launchpad
build service, therefore the strange version numbers.

Added:
    siretart/ffmpeg/debian/libavcodec2d.install
      - copied unchanged from r778, siretart/ffmpeg/debian/libavcodec1d.install
    siretart/ffmpeg/debian/libavformat2d.install
      - copied unchanged from r778, siretart/ffmpeg/debian/libavformat1d.install
    siretart/ffmpeg/debian/libavutil2d.install
      - copied unchanged from r778, siretart/ffmpeg/debian/libavutil1d.install
    siretart/ffmpeg/debian/libpostproc2d.install
      - copied unchanged from r778, siretart/ffmpeg/debian/libpostproc1d.install
Removed:
    siretart/ffmpeg/debian/libavcodec1d.install
    siretart/ffmpeg/debian/libavformat1d.install
    siretart/ffmpeg/debian/libavutil1d.install
    siretart/ffmpeg/debian/libpostproc1d.install
Modified:
    siretart/ffmpeg/debian/changelog
    siretart/ffmpeg/debian/control
    siretart/ffmpeg/debian/patches/010_shared_library_versioning.diff
    siretart/ffmpeg/debian/rules

Modified: siretart/ffmpeg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/siretart/ffmpeg/debian/changelog?rev=782&op=diff
==============================================================================
--- siretart/ffmpeg/debian/changelog (original)
+++ siretart/ffmpeg/debian/changelog Wed May 30 10:12:34 2007
@@ -1,4 +1,17 @@
-ffmpeg (0.svn20070525-1) unstable; urgency=low
+ffmpeg (3:0.svn20070525-0ubuntu1~ppa3) gutsy; urgency=low
+
+  * no change reupload to see what happens
+
+ -- Reinhard Tartler <siretart at tauware.de>  Wed, 30 May 2007 11:15:14 +0200
+
+ffmpeg (3:0.svn20070525-0ubuntu1~ppa2) gutsy; urgency=low
+
+  * remove a52 for now until it enters ubuntu/main
+  * bump soname, rename packages from 1d to 2d
+
+ -- Reinhard Tartler <siretart at tauware.de>  Tue, 29 May 2007 21:26:11 +0200
+
+ffmpeg (3:0.svn20070525-0ubuntu1~ppa1) gutsy; urgency=low
 
   * new upstream version
   * removed patch 053_rm_demux_crash.diff, merged upstream

Modified: siretart/ffmpeg/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/siretart/ffmpeg/debian/control?rev=782&op=diff
==============================================================================
--- siretart/ffmpeg/debian/control (original)
+++ siretart/ffmpeg/debian/control Wed May 30 10:12:34 2007
@@ -3,7 +3,7 @@
 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>, Reinhard Tartler <siretart at tauware.de>
-Build-Depends: debhelper (>= 4.0), quilt, libogg-dev, libvorbis-dev, liba52-0.7.4-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
+Build-Depends: debhelper (>= 4.0), quilt, libogg-dev, libvorbis-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
 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/
@@ -18,7 +18,7 @@
  file formats (AVI, MPEG, OGG, Matroska, ASF...) and encoding formats (MPEG,
  DivX, MPEG4, AC3, DV...).
 
-Package: libavutil1d
+Package: libavutil2d
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
@@ -29,7 +29,7 @@
  This package contains a Debian-specific version of the libswscale shared
  object that should only be used by Debian packages.
 
-Package: libavcodec1d
+Package: libavcodec2d
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
@@ -40,7 +40,7 @@
  This package contains a Debian-specific version of the libavcodec shared
  object that should only be used by Debian packages.
 
-Package: libpostproc1d
+Package: libpostproc2d
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
@@ -50,7 +50,7 @@
  This package contains a Debian-specific version of the libpostproc shared
  object that should only be used by Debian packages.
 
-Package: libavformat1d
+Package: libavformat2d
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
@@ -61,7 +61,7 @@
  This package contains a Debian-specific version of the libavformat shared
  object that should only be used by Debian packages.
 
-Package: libswscale1d
+Package: libswscale2d
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
@@ -74,7 +74,7 @@
 Package: libavutil-dev
 Section: libdevel
 Architecture: any
-Depends: libavutil1d (= ${Source-Version}), ${shlibs:Depends}
+Depends: libavutil2d (= ${Source-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
@@ -87,7 +87,7 @@
 Package: libavcodec-dev
 Section: libdevel
 Architecture: any
-Depends: libavcodec1d (= ${Source-Version}), libavutil-dev (= ${Source-Version}), libvorbis-dev, libogg-dev, liba52-0.7.4-dev, zlib1g-dev, ${lib1394-dev}, libtheora-dev (>> 0.0.0.alpha4), libgsm1-dev, ${shlibs:Depends}
+Depends: libavcodec2d (= ${Source-Version}), libavutil-dev (= ${Source-Version}), libvorbis-dev, libogg-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
@@ -100,7 +100,7 @@
 Package: libpostproc-dev
 Section: libdevel
 Architecture: any
-Depends: libpostproc1d (= ${Source-Version}), libavcodec-dev (= ${Source-Version}), ${shlibs:Depends}
+Depends: libpostproc2d (= ${Source-Version}), libavcodec-dev (= ${Source-Version}), ${shlibs:Depends}
 Description: development files for libpostproc
  This is the video postprocessing library from the ffmpeg project.
  .
@@ -110,7 +110,7 @@
 Package: libavformat-dev
 Section: libdevel
 Architecture: any
-Depends: libavformat1d (= ${Source-Version}), libavcodec-dev (= ${Source-Version}), ${shlibs:Depends}
+Depends: libavformat2d (= ${Source-Version}), libavcodec-dev (= ${Source-Version}), ${shlibs:Depends}
 Conflicts: libavcodec-dev (<< 0.cvs20060306-1)
 Replaces: libavcodec-dev (<< 0.cvs20060306-1)
 Description: development files for libavformat
@@ -123,7 +123,7 @@
 Package: libswscale-dev
 Section: libdevel
 Architecture: any
-Depends: libswscale1d (= ${Source-Version}), libavutil-dev (= ${Source-Version}), ${shlibs:Depends}
+Depends: libswscale2d (= ${Source-Version}), libavutil-dev (= ${Source-Version}), ${shlibs:Depends}
 Description: development files for libswscale
  This is the video scaling library from the ffmpeg project.
  .

Modified: siretart/ffmpeg/debian/patches/010_shared_library_versioning.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/siretart/ffmpeg/debian/patches/010_shared_library_versioning.diff?rev=782&op=diff
==============================================================================
--- siretart/ffmpeg/debian/patches/010_shared_library_versioning.diff (original)
+++ siretart/ffmpeg/debian/patches/010_shared_library_versioning.diff Wed May 30 10:12:34 2007
@@ -52,7 +52,7 @@
  
  #define LIBAVUTIL_VERSION_INT   ((49<<16)+(4<<8)+0)
 -#define LIBAVUTIL_VERSION       49.4.0
-+#define LIBAVUTIL_VERSION       1d.49.4.0
++#define LIBAVUTIL_VERSION       2d.49.4.0
  #define LIBAVUTIL_BUILD         LIBAVUTIL_VERSION_INT
  
  #define LIBAVUTIL_IDENT         "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION)
@@ -65,7 +65,7 @@
  
  #define LIBAVCODEC_VERSION_INT  ((51<<16)+(40<<8)+4)
 -#define LIBAVCODEC_VERSION      51.40.4
-+#define LIBAVCODEC_VERSION      1d.51.40.4
++#define LIBAVCODEC_VERSION      2d.51.40.4
  #define LIBAVCODEC_BUILD        LIBAVCODEC_VERSION_INT
  
  #define LIBAVCODEC_IDENT        "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
@@ -78,7 +78,7 @@
  
  #define LIBAVFORMAT_VERSION_INT ((51<<16)+(12<<8)+1)
 -#define LIBAVFORMAT_VERSION     51.12.1
-+#define LIBAVFORMAT_VERSION     1d.51.12.1
++#define LIBAVFORMAT_VERSION     2d.51.12.1
  #define LIBAVFORMAT_BUILD       LIBAVFORMAT_VERSION_INT
  
  #define LIBAVFORMAT_IDENT       "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
@@ -104,7 +104,7 @@
  
  #define LIBPOSTPROC_VERSION_INT ((51<<16)+(1<<8)+0)
 -#define LIBPOSTPROC_VERSION     51.1.0
-+#define LIBPOSTPROC_VERSION     1d.51.1.0
++#define LIBPOSTPROC_VERSION     2d.51.1.0
  #define LIBPOSTPROC_BUILD       LIBPOSTPROC_VERSION_INT
  
  #define LIBPOSTPROC_IDENT       "postproc" AV_STRINGIFY(LIBPOSTPROC_VERSION)
@@ -117,7 +117,7 @@
  
  #define LIBSWSCALE_VERSION_INT  ((0<<16)+(5<<8)+0)
 -#define LIBSWSCALE_VERSION      0.5.0
-+#define LIBSWSCALE_VERSION      1d.0.5.0
++#define LIBSWSCALE_VERSION      2d.0.5.0
  #define LIBSWSCALE_BUILD        LIBSWSCALE_VERSION_INT
  
  #define LIBSWSCALE_IDENT        "SwS" AV_STRINGIFY(LIBSWSCALE_VERSION)

Modified: siretart/ffmpeg/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/siretart/ffmpeg/debian/rules?rev=782&op=diff
==============================================================================
--- siretart/ffmpeg/debian/rules (original)
+++ siretart/ffmpeg/debian/rules Wed May 30 10:12:34 2007
@@ -6,7 +6,7 @@
 
 LIBS = libavutil libavcodec libpostproc libavformat libswscale
 confflags += --enable-gpl --enable-pp --enable-swscaler --enable-pthreads --disable-encoders
-confflags += --enable-libvorbis --enable-libtheora --enable-libogg --enable-liba52 --enable-libgsm
+confflags += --enable-libvorbis --enable-libtheora --enable-libogg --enable-libgsm
 
 DEB_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: //p')
 
@@ -136,10 +136,10 @@
 	dh_compress
 	dh_fixperms
 	for d in $(LIBS); do \
-	  dh_makeshlibs -p $${d}1d -V "$${d}1d (>= 0.cvs20070307)" ; \
+	  dh_makeshlibs -p $${d}2d -V "$${d}2d (>= 0.cvs20070525)" ; \
 	done
 	dh_installdeb
-	dh_shlibdeps -L libavutil1d -L libavcodec1d -L libpostproc1d -L libavformat1d -L libswscale1d -l debian/libavutil1d/usr/lib:debian/libavcodec1d/usr/lib:debian/libavformat1d/usr/lib:debian/libpostproc1d/usr/lib:debian/libswscale1d/usr/lib
+	dh_shlibdeps -L libavutil2d -L libavcodec2d -L libpostproc2d -L libavformat2d -L libswscale2d -l debian/libavutil2d/usr/lib:debian/libavcodec2d/usr/lib:debian/libavformat2d/usr/lib:debian/libpostproc2d/usr/lib:debian/libswscale2d/usr/lib
 	dh_gencontrol -- -Vlib1394-dev="$(lib1394-dev)"
 	dh_md5sums
 	dh_builddeb

More information about the pkg-multimedia-commits mailing list