[SCM] libav/experimental: follow soname bump of libavcodec and libavformat 53->54

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sat May 12 20:02:41 UTC 2012


The following commit has been merged in the experimental branch:
commit 321d453b5ebec653922e84d9fcfc8d17cb27b5d4
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat May 12 20:02:26 2012 +0200

    follow soname bump of libavcodec and libavformat 53->54

diff --git a/debian/control b/debian/control
index adc7adf..14d8a1e 100644
--- a/debian/control
+++ b/debian/control
@@ -64,7 +64,7 @@ Package: libav-tools
 Section: video
 Architecture: any
 Replaces:
- libavcodec-extra-53 (<< 4:0.6~),
+ libavcodec-extra-54 (<< 4:0.6~),
  libavcodec53 (<< ${source:Version})
 Depends:
  ${misc:Depends},
@@ -94,7 +94,7 @@ Breaks:
 Depends:
  libav-tools (= ${binary:Version}),
  libavdevice53 (= ${binary:Version}),
- libavformat53 (= ${binary:Version}),
+ libavformat54 (= ${binary:Version}),
  libavutil51 (= ${binary:Version}),
  libswscale2 (= ${binary:Version}),
  ${misc:Depends}
@@ -112,7 +112,7 @@ Section: debug
 Priority: extra
 Architecture: any
 Depends:
- libavcodec53 (= ${binary:Version}),
+ libavcodec54 (= ${binary:Version}),
  ${misc:Depends}
 Description: Debug symbols for Libav related packages
  Libav is a complete, cross-platform solution to decode, encode, record,
@@ -128,7 +128,7 @@ Section: debug
 Priority: extra
 Architecture: any
 Depends:
- libavcodec-extra-53 (= ${binary:Version}),
+ libavcodec-extra-54 (= ${binary:Version}),
  ${misc:Depends}
 Description: Debug symbols for Libav related packages
  Libav is a complete, cross-platform solution to decode, encode, record,
@@ -176,7 +176,7 @@ Description: Libav utility library
  This is the common utility library from Libav. It contains shared code
  used by all other Libav libraries.
 
-Package: libavcodec53
+Package: libavcodec54
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
@@ -184,9 +184,9 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends}
 Conflicts:
- libavcodec-extra-53
+ libavcodec-extra-54
 Breaks:
- libavcodec-extra-53 (<< 4:0.8.0.2)
+ libavcodec-extra-54 (<< 4:0.8.0.2)
 Description: Libav codec library
  Libav is a complete, cross-platform solution to decode, encode, record,
  convert and stream audio and video.
@@ -214,7 +214,7 @@ Description: Libav device handling library
  .
  This is the device handling library from Libav.
 
-Package: libavformat53
+Package: libavformat54
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
@@ -222,11 +222,11 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends}
 Provides:
- libavformat-extra-53
+ libavformat-extra-54
 Replaces:
- libavformat-extra-53
+ libavformat-extra-54
 Breaks:
- libavformat-extra-53 (<< 5:0.8.1-2)
+ libavformat-extra-54 (<< 5:0.8.1-2)
 Description: Libav file format library
  Libav is a complete, cross-platform solution to decode, encode, record,
  convert and stream audio and video.
@@ -293,8 +293,8 @@ Package: libavcodec-dev
 Section: libdevel
 Architecture: any
 Depends:
- libavcodec53 (<= ${source:Upstream-Version}-99) | libavcodec-extra-53 (<= ${source:Upstream-Version}-99),
- libavcodec53 (>= ${binary:Version}) | libavcodec-extra-53 (>= ${binary:Version}),
+ libavcodec54 (<= ${source:Upstream-Version}-99) | libavcodec-extra-54 (<= ${source:Upstream-Version}-99),
+ libavcodec54 (>= ${binary:Version}) | libavcodec-extra-54 (>= ${binary:Version}),
  libavutil-dev (= ${binary:Version}),
  ${misc:Depends}
 Suggests:
@@ -339,7 +339,7 @@ Section: libdevel
 Architecture: any
 Depends:
  libavcodec-dev (= ${binary:Version}),
- libavformat53 (= ${binary:Version}),
+ libavformat54 (= ${binary:Version}),
  libavutil-dev (= ${binary:Version}),
  ${misc:Depends}
 Description: Development files for libavformat
@@ -428,7 +428,7 @@ Description: Libav utility library (transitional package)
  This package is only used for transitional purposes and can be safely
  removed when no other packages depend on this package.
 
-Package: libavcodec-extra-53
+Package: libavcodec-extra-54
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
@@ -436,13 +436,13 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends}
 Conflicts:
- libavcodec53
+ libavcodec54
 Replaces:
- libavcodec53
+ libavcodec54
 Breaks:
  mplayer (<< 2:1.0~rc4.dfsg1+svn34540-1~)
 Enhances:
- libavcodec53
+ libavcodec54
 Description: Libav codec library
  Libav is a complete, cross-platform solution to decode, encode, record,
  convert and stream audio and video.
@@ -491,13 +491,13 @@ Description: Libav filter library (transitional package)
  This package is only used for transitional purposes and can be safely
  removed when no other packages depend on this package.
 
-Package: libavformat-extra-53
+Package: libavformat-extra-54
 Section: oldlibs
 Priority: extra
 Architecture: all
 Multi-Arch: foreign
 Depends:
- libavformat53,
+ libavformat54,
  ${misc:Depends},
 Description: Libav video postprocessing library (transitional package)
  Libav is a complete, cross-platform solution to decode, encode, record,
diff --git a/debian/libavcodec-extra-53.copyright b/debian/libavcodec-extra-54.copyright
similarity index 100%
rename from debian/libavcodec-extra-53.copyright
rename to debian/libavcodec-extra-54.copyright
diff --git a/debian/libavcodec-extra-53.install.in b/debian/libavcodec-extra-54.install.in
similarity index 100%
rename from debian/libavcodec-extra-53.install.in
rename to debian/libavcodec-extra-54.install.in
diff --git a/debian/libavcodec53.install.in b/debian/libavcodec54.install.in
similarity index 100%
rename from debian/libavcodec53.install.in
rename to debian/libavcodec54.install.in
diff --git a/debian/libavcodec53.lintian-overrides b/debian/libavcodec54.lintian-overrides
similarity index 100%
rename from debian/libavcodec53.lintian-overrides
rename to debian/libavcodec54.lintian-overrides
diff --git a/debian/libavformat53.install.in b/debian/libavformat54.install.in
similarity index 100%
rename from debian/libavformat53.install.in
rename to debian/libavformat54.install.in
diff --git a/debian/libavformat53.lintian-overrides b/debian/libavformat54.lintian-overrides
similarity index 100%
rename from debian/libavformat53.lintian-overrides
rename to debian/libavformat54.lintian-overrides
diff --git a/debian/rules b/debian/rules
index 5907d9b..02bcc06 100755
--- a/debian/rules
+++ b/debian/rules
@@ -134,8 +134,8 @@ install-common: build $(DH_INSTALL_FILES)
 	debian/tmp/usr/bin/avconv -formats | tee formats-$(DEB_HOST_ARCH).txt
 	env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)" \
 	debian/tmp/usr/bin/avconv -codecs | tee codecs.txt
-	dh_installdocs -plibavformat53 formats-$(DEB_HOST_ARCH).txt
-	dh_installdocs -plibavcodec53 codecs.txt
+	dh_installdocs -plibavformat54 formats-$(DEB_HOST_ARCH).txt
+	dh_installdocs -plibavcodec54 codecs.txt
 install-extra: build $(DH_INSTALL_FILES)
 	dh_testdir
 	dh_testroot
@@ -146,7 +146,7 @@ install-extra: build $(DH_INSTALL_FILES)
 	dh_strip $(addprefix -p,$(LIB_EXTRA_PKGS)) --dbg-package=libav-extra-dbg
 	env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/extra/usr/lib/$(DEB_HOST_MULTIARCH)" \
 	debian/tmp/usr/bin/avconv -codecs | tee codecs.txt
-	dh_installdocs -plibavcodec-extra-53 codecs.txt
+	dh_installdocs -plibavcodec-extra-54 codecs.txt
 
 binary-indep: build-doxy install
 

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list