r6761 - in /vdr/vdr-plugin-xineliboutput/trunk/debian: changelog control rules shlibs.local

[tschmidt at users.alioth.debian.org]

Author: tschmidt
Date: Sun Apr 20 20:02:11 2008
New Revision: 6761

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=6761
Log:
merged r6759 from unstable-bugfix-472548 into trunk

Removed:
    vdr/vdr-plugin-xineliboutput/trunk/debian/shlibs.local
Modified:
    vdr/vdr-plugin-xineliboutput/trunk/debian/changelog
    vdr/vdr-plugin-xineliboutput/trunk/debian/control
    vdr/vdr-plugin-xineliboutput/trunk/debian/rules

Modified: vdr/vdr-plugin-xineliboutput/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/trunk/debian/changelog?rev=6761&op=diff
==============================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/changelog Sun Apr 20 20:02:11 2008
@@ -27,6 +27,17 @@
   * Updated 02_vdr-include-path.dpatch
 
  -- Tobias Grimm <tg at e-tobi.net>  Sat, 16 Feb 2008 18:25:40 +0100
+
+vdr-plugin-xineliboutput (1.0.0~rc2-15) unstable; urgency=medium
+
+  * Build-Depend on libxine-dev (>=1.1.12 (closes: #476501, #477014)
+  * Removed debian/shlibs.local, use ${xine:Depends} and a short snippet of
+    code from Darren Salt to determine the correct dependancy during
+    build-time (closes: #473434)
+  * Set urgency to high to speed up transition to testing
+  * Do not Build-Depend on libxine-dev (<=1.1.12) anymore
+
+ -- Thomas Schmidt <tschmidt at debian.org>  Sun, 20 Apr 2008 21:04:14 +0200
 
 vdr-plugin-xineliboutput (1.0.0~rc2-14) unstable; urgency=high
 

Modified: vdr/vdr-plugin-xineliboutput/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/trunk/debian/control?rev=6761&op=diff
==============================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/control (original)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/control Sun Apr 20 20:02:11 2008
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>, Thomas Günther <tom at toms-cafe.de>
-Build-Depends: debhelper (>> 4.1.16), cdbs, dpatch, vdr-dev (>= 1.6.0), gettext, libxine-dev (<< 1.1.12), libxine-dev (>= 1.1.11), libjpeg62-dev, libxv-dev, libx11-dev, libxext-dev, sharutils, libdbus-glib-1-dev
+Build-Depends: debhelper (>> 4.1.16), cdbs, dpatch, vdr-dev (>= 1.6.0), gettext, libxine-dev (>= 1.1.12), libjpeg62-dev, libxv-dev, libx11-dev, libxext-dev, sharutils, libdbus-glib-1-dev
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/trunk/
@@ -47,7 +47,7 @@
 
 Package: libxine1-xvdr
 Architecture: any
-Depends: ${shlibs:Depends}, libxine1-ffmpeg
+Depends: ${shlibs:Depends}, ${xine:Depends}, libxine1-ffmpeg
 Replaces: libxine-xvdr (<< 1.0.0~rc2-5)
 Provides: libxine-xvdr
 Conflicts: libxine-xvdr (<< 1.0.0~rc2-5)

Modified: vdr/vdr-plugin-xineliboutput/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/trunk/debian/rules?rev=6761&op=diff
==============================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/rules (original)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/rules Sun Apr 20 20:02:11 2008
@@ -22,6 +22,8 @@
 common-binary-predeb-arch::
 	sh /usr/share/vdr-dev/patchlevel.sh subst
 	sh /usr/share/vdr-dev/dependencies.sh
+	dpkg -p libxine-dev | sed -re '/^Version:/! d; s/^Version: (([0-9]+\.){2}[0-9]+).*$$/xine:Depends=libxine1 (>= \1)/' \
+	>> debian/substvars
 
 install/vdr-plugin-xineliboutput::
 	install -d debian/$(XINEPLUGINDIR)/post/