r1395 - in /unstable/ffmpeg-debian/debian: changelog rules

[lool at users.alioth.debian.org]

Author: lool
Date: Tue Aug 26 13:33:31 2008
New Revision: 1395

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1395
Log:
Rewrite shlibs logic.

Modified:
    unstable/ffmpeg-debian/debian/changelog
    unstable/ffmpeg-debian/debian/rules

Modified: unstable/ffmpeg-debian/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg-debian/debian/changelog?rev=1395&op=diff
==============================================================================
--- unstable/ffmpeg-debian/debian/changelog (original)
+++ unstable/ffmpeg-debian/debian/changelog Tue Aug 26 13:33:31 2008
@@ -4,7 +4,7 @@
     dashes and be generally stricter.
   * Large cleanup to rules logic: drop some cruft, rewrite some small chunks
     in a slightly more readable manner, whitespaces, .PHONY fixes,
-    internalencoders handling...
+    internalencoders handling, shlibs logic...
   * Rename SRC_VERSION to UPSTREAM_VERSION in rules.
 
  -- Loic Minier <lool at dooz.org>  Tue, 26 Aug 2008 14:38:19 +0200

Modified: unstable/ffmpeg-debian/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg-debian/debian/rules?rev=1395&op=diff
==============================================================================
--- unstable/ffmpeg-debian/debian/rules (original)
+++ unstable/ffmpeg-debian/debian/rules Tue Aug 26 13:33:31 2008
@@ -5,6 +5,9 @@
 DEB_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
 UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -r 's/[^:]+://; s/-[^-]+$$//')
 SVN_VERSION := $(shell echo $(UPSTREAM_VERSION) | sed -nr 's/^[0-9.:-]+\.svn([0-9]+)$$/\1/p')
+SHLIBS_VERSION := 0.svn20080206-8
+
+LIB_PKGS := $(shell sed -nr 's/^Package: *(lib(avutil|avcodec|avdevice|postproc|avformat|swscale)[0-9]+) *$$/\1/p' debian/control)
 
 internalencoders := $(findstring internalencoders,$(DEB_BUILD_OPTIONS))
 
@@ -17,7 +20,6 @@
 
 config-extra-includes.h:
 	sh debian/fixup-config.sh > $@
-
 
 configure-%: configure-stamp-%
 configure-stamp-%: $(QUILT_STAMPFN) config-extra-includes.h
@@ -87,11 +89,6 @@
 
 binary-indep: build-doxy install
 
-define call_dh_makeshlibs
-	dh_makeshlibs -p $(1)$(2) \
-	    -V "$(1)$(2) (>= $(UPSTREAM_VERSION)-8) | $(1)-unstripped-$(2) (>= $(UPSTREAM_VERSION)-8)"
-endef
-
 binary-arch: build install
 	dh_testdir
 	dh_testroot
@@ -105,13 +102,10 @@
 	dh_strip --dbg-package=ffmpeg-dbg
 	dh_compress
 	dh_fixperms
-#	NB: The following is pretty whitespace sensitive
-	$(call call_dh_makeshlibs,libavutil,49)
-	$(call call_dh_makeshlibs,libavcodec,51)
-	$(call call_dh_makeshlibs,libavdevice,52)
-	$(call call_dh_makeshlibs,libpostproc,51)
-	$(call call_dh_makeshlibs,libavformat,52)
-	$(call call_dh_makeshlibs,libswscale,0)
+	for pkg in $(LIB_PKGS); do \
+	    upkg=$$(echo "$$pkg" | sed -r 's/([0-9]+)$$/-unstripped-\1/'); \
+	    echo dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(SHLIBS_VERSION)) | $$upkg (>= $(SHLIBS_VERSION))"; \
+	done
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol -- -Vlib1394-dev="$(lib1394-dev)"