Bug#686244: unblock: libav/6:0.8.3-7

[Reinhard Tartler <siretart@tauware.de>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package libav

The new package compresses with xz now (Bug #683895). The package
libav-regular-dbg is dropped as it does not necessary for transitional
purposes. Also, the fix for #679542 was incomplete, this package
revision fixes it for good.

unblock libav/6:0.8.3-7

Please find the debdiff attached. Thanks for your time.

Cheers,
Reinhard

-- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (500, 'testing'), (50, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 3.2.0-2-686-pae (SMP w/1 CPU core)
Locale: LANG=C.UTF-8, LC_CTYPE=C.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

diff --git a/debian/changelog b/debian/changelog
index cfba07c..6cf6c3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+libav (6:0.8.3-7) unstable; urgency=low
+
+  [ Fabian Greffrath ]
+  * Fix generation of shlibs file not only for libavcodec*, but for all the
+    other library packages as well. Really closes: #679542
+  * Use xz compression for binary packages, thanks Ansgar Burchardt
+    (Closes: #683895).
+
+  [ Reinhard Tartler ]
+  * use EPOCH macro in SHLIBS_VERSION
+  * Drop the package 'libav-regular-dbg'. It was not included in squeeze.
+
+ -- Reinhard Tartler <siretart@tauware.de>  Sat, 25 Aug 2012 11:08:48 +0200
+
 libav (6:0.8.3-6) unstable; urgency=low
 
   * Clarify the changes in the 6:0.8.3-5 upload, as discussed in bug
diff --git a/debian/control b/debian/control
index 43c4f1a..799e8c4 100644
--- a/debian/control
+++ b/debian/control
@@ -123,11 +123,9 @@ Priority: extra
 Architecture: any
 Replaces:
  ffmpeg-dbg (<< 6:0.8.3-5),
- libav-regular-dbg (<< 6:0.8.3-5),
  libav-extra-dbg (<< 6:0.8.3-5)
 Breaks:
  ffmpeg-dbg (<< 6:0.8.3-5),
- libav-regular-dbg (<< 6:0.8.3-5),
  libav-extra-dbg (<< 6:0.8.3-5)
 Depends:
  ffmpeg (= ${binary:Version}),
@@ -148,19 +146,6 @@ Description: Debug symbols for Libav related packages
  Most people will not need this package. Please install it to produce useful
  stacktraces to help debugging the Libav library.
 
-Package: libav-regular-dbg
-Section: oldlibs
-Priority: extra
-Architecture: any
-Depends:
- libav-dbg,
- ${misc:Depends}
-Description: Debug symbols for Libav related packages (transitional package)
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This package serves as a transitional package to libav-dbg.
-
 Package: libav-extra-dbg
 Section: oldlibs
 Priority: extra
diff --git a/debian/rules b/debian/rules
index fa5a4a0..697dd11 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ EPOCH=6:
 DEB_SOURCE := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
 DEB_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
 UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -r 's/[^:]+://; s/-[^-]+$$//')
-SHLIBS_VERSION := 6:0.8.3-1~
+SHLIBS_VERSION := $(EPOCH)0.8.3-1~
 
 # these package do not build -extra variants
 LIB_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avdevice|avformat|avfilter|postproc|swscale)[0-9]+)[[:space:]]*$$/\1/p' debian/control)
@@ -172,7 +172,7 @@ binary-arch: build install
 	dh_strip --dbg-package=libav-dbg
 
 	for pkg in $(LIB_PKGS) $(LIB_EXTRA_PKGS); do \
-	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(DEB_VERSION))"; \
+	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(SHLIBS_VERSION))"; \
 	done
 	for pkg in $(LIB_PKGS2); do \
 	    upkg=$$(echo "$$pkg" | sed -r 's/([0-9]+)$$/-extra-\1/'); \
@@ -182,7 +182,7 @@ binary-arch: build install
 	dh_installdeb
 	dh_gencontrol
 	dh_md5sums
-	dh_builddeb
+	dh_builddeb -- -Zxz
 
 binary: binary-indep binary-arch