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

[tschmidt at users.alioth.debian.org]

Author: tschmidt
Date: Sun Apr 20 21:33:19 2008
New Revision: 6772

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=6772
Log:
merged r6769 from unstable-bugfix-472548 into trunk - this was hopefully the last commit for this package today ;-)

Removed:
    vdr/vdr-plugin-xineliboutput/trunk/debian/shlibs.local
Modified:
    vdr/vdr-plugin-xineliboutput/trunk/debian/changelog
    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=6772&op=diff
==============================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/changelog Sun Apr 20 21:33:19 2008
@@ -28,12 +28,14 @@
 
  -- Tobias Grimm <tg at e-tobi.net>  Sat, 16 Feb 2008 18:25:40 +0100
 
-vdr-plugin-xineliboutput (1.0.0~rc2-16) unstable; urgency=low
-
-  * Readded debian/shlibs.local again, somehow the code from Darren just
-    produces a dependency of libxine1 (>=1.1.8) instead of (>=1.1.12)
-
- -- Thomas Schmidt <tschmidt at debian.org>  Sun, 20 Apr 2008 22:51:50 +0200
+vdr-plugin-xineliboutput (1.0.0~rc2-16) unstable; urgency=medium
+
+  * debian/rules: changed code to add the xine:Depends substvar to put the
+    result into debian/libxine1-xvdr.substvars instead of debian/substvars, 
+    otherwise the wrong dependency of libxine1 (>=1.1.8) instead of (>=1.1.12) 
+    is generated, many thanks to Tobias Grimm for the hint
+
+ -- Thomas Schmidt <tschmidt at debian.org>  Sun, 20 Apr 2008 23:19:52 +0200
 
 vdr-plugin-xineliboutput (1.0.0~rc2-15) unstable; urgency=medium
 

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=6772&op=diff
==============================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/rules (original)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/rules Sun Apr 20 21:33:19 2008
@@ -23,7 +23,7 @@
 	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
+	>> debian/libxine1-xvdr.substvars
 
 install/vdr-plugin-xineliboutput::
 	install -d debian/$(XINEPLUGINDIR)/post/