r1308 - in /unstable/ffmpeg/debian: ./ README.Debian changelog rules

[siretart at users.alioth.debian.org]

Author: siretart
Date: Thu Jul 10 20:01:38 2008
New Revision: 1308

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1308
Log:
rework the shlibs file. Make applications linking against libraries
produced by this source package generate an alternate dependency on
the 'unstripped' variants of this package. They actually do not exist
yet at this point, but this way reverse dependencies are enabled to
use them when they eventually appear.

Modified:
    unstable/ffmpeg/debian/   (props changed)
    unstable/ffmpeg/debian/README.Debian
    unstable/ffmpeg/debian/changelog
    unstable/ffmpeg/debian/rules

Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------
--- bzr:file-ids (original)
+++ bzr:file-ids Thu Jul 10 20:01:38 2008
@@ -1,1 +1,0 @@
-patches/020_bug489965_bufferoverflow_str_demuxer.diff	020_bug489965_buffer-20080709075053-htd03e50ze13kewl-1

Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------
--- bzr:revision-id:v3-single1-dW5zdGFibGUvZmZtcGVnL2RlYmlhbg.. (original)
+++ bzr:revision-id:v3-single1-dW5zdGFibGUvZmZtcGVnL2RlYmlhbg.. Thu Jul 10 20:01:38 2008
@@ -44,3 +44,4 @@
 78 siretart at tauware.de-20080708125428-7jvyke7mw1daxqbj
 79 siretart at tauware.de-20080708125447-yacvth4x5njytrip
 80 siretart at tauware.de-20080709075516-hffgk4qdf523wk8o
+81 siretart at tauware.de-20080709121015-unpmg3rf7ox4ddfy

Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------
--- bzr:revision-info (original)
+++ bzr:revision-info Thu Jul 10 20:01:38 2008
@@ -1,4 +1,4 @@
-timestamp: 2008-07-09 09:55:16.184000015 +0200
+timestamp: 2008-07-09 14:10:15.947000027 +0200
 committer: Reinhard Tartler <siretart at tauware.de>
 properties: 
 	branch-nick: unstable

Modified: unstable/ffmpeg/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/README.Debian?rev=1308&op=diff
==============================================================================
--- unstable/ffmpeg/debian/README.Debian (original)
+++ unstable/ffmpeg/debian/README.Debian Thu Jul 10 20:01:38 2008
@@ -90,9 +90,10 @@
     'multiverse' (ubuntu) component will be named as above without the
     '-stripped-' marker in the name.
   
-  * Only Until the next SONAME bump happens: an unstripped replacement package
-    for the stripped 'libavcodec51' will can provided e.g. in ubuntu multiverse
-    with the name 'libavcodec-unstripped-51'.
+  * Only until the next SONAME bump happens: an unstripped replacement package
+    for the stripped 'libavcodec51' can provided e.g. in ubuntu multiverse with
+    the name 'libavcodec-unstripped-51'. This is implemented by generating an
+    shlibs file containing an alternative depedency.
 
   * Ubuntu will track the ffmpeg packages in Debian and tries to minimize the
     diff for maintenance reason.

Modified: unstable/ffmpeg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/changelog?rev=1308&op=diff
==============================================================================
--- unstable/ffmpeg/debian/changelog (original)
+++ unstable/ffmpeg/debian/changelog Thu Jul 10 20:01:38 2008
@@ -10,8 +10,13 @@
     buffer overflow in the STR demuxer. Thanks to Moritz Muehlenhoff for
     reporting the issue. (Closes: #489965)
   * Raising severity to high because of security issue.
-
- -- Reinhard Tartler <siretart at tauware.de>  Wed, 09 Jul 2008 09:54:52 +0200
+  * rework the shlibs file. Make applications linking against libraries
+    produced by this source package generate an alternate dependency on
+    the 'unstripped' variants of this package. They actually do not exist
+    yet at this point, but this way reverse dependencies are enabled to
+    use them when they eventually appear.
+
+ -- Reinhard Tartler <siretart at tauware.de>  Wed, 09 Jul 2008 14:04:06 +0200
 
 ffmpeg-debian (0.svn20080206-9) unstable; urgency=low
 

Modified: unstable/ffmpeg/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/rules?rev=1308&op=diff
==============================================================================
--- unstable/ffmpeg/debian/rules (original)
+++ unstable/ffmpeg/debian/rules Thu Jul 10 20:01:38 2008
@@ -95,6 +95,11 @@
 
 binary-indep: build-doxy install
 
+define call_dh_makeshlibs
+	dh_makeshlibs -p $(1)$(2) \
+	    -V "$(1)$(2) (>= $(SRC_VERSION)-8) | $(1)-unstripped-$(2) (>= $(SRC_VERSION)-8)"
+endef
+
 binary-arch: build install
 	dh_testdir
 	dh_testroot
@@ -108,7 +113,13 @@
 	dh_strip --dbg-package=ffmpeg-dbg
 	dh_compress
 	dh_fixperms
-	dh_makeshlibs -V
+#	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)
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol -- -Vlib1394-dev="$(lib1394-dev)"