r1121 - vdr/vdr-plugin-muggle/trunk/debian

[Thomas Schmidt]

Author: tschmidt
Date: 2005-08-31 21:35:11 +0000 (Wed, 31 Aug 2005)
New Revision: 1121

Modified:
   vdr/vdr-plugin-muggle/trunk/debian/changelog
   vdr/vdr-plugin-muggle/trunk/debian/control
   vdr/vdr-plugin-muggle/trunk/debian/rules
Log:
vdr-plugin-muggle: use dependencies.sh and new patchlevel.sh

Modified: vdr/vdr-plugin-muggle/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/changelog	2005-08-31 21:29:01 UTC (rev 1120)
+++ vdr/vdr-plugin-muggle/trunk/debian/changelog	2005-08-31 21:35:11 UTC (rev 1121)
@@ -3,8 +3,9 @@
   * NOT RELEASED YET
 
   * Thomas Schmidt <tschmidt at debian.org>
-    - Depend/Build-Depend on vdr (>=1.3.31-1)
-    - Conflict with vdr (>=1.3.31.99)
+    - Build-Depend on vdr (>=1.3.31-1)
+    - Use dependencies.sh from vdr-dev to set vdr dependencies and
+      conflicts to the right vdr version when building the package
 
  -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Sun, 28 Aug 2005 18:35:22 +0200
 

Modified: vdr/vdr-plugin-muggle/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/control	2005-08-31 21:29:01 UTC (rev 1120)
+++ vdr/vdr-plugin-muggle/trunk/debian/control	2005-08-31 21:35:11 UTC (rev 1121)
@@ -8,10 +8,10 @@
 
 Package: vdr-plugin-muggle
 Architecture: any
-Depends: ${shlibs:Depends}, vdr (>=1.3.31-1)
+Depends: ${shlibs:Depends}, ${vdr:Depends}
 Suggests: mysql-server, mysql-client
-Conflicts: vdr (>=1.3.31.99)
+Conflicts: ${vdr:Conflicts}
 Description: Media juggle plugin for VDR
  This plugin allows the management of arbitrary media files via a database
  using VDR and its OSD.
-XB-VDR-Patchlevel: ${patchlevel}
+XB-VDR-Patchlevel: ${vdr:Patchlevel}

Modified: vdr/vdr-plugin-muggle/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-muggle/trunk/debian/rules	2005-08-31 21:29:01 UTC (rev 1120)
+++ vdr/vdr-plugin-muggle/trunk/debian/rules	2005-08-31 21:35:11 UTC (rev 1121)
@@ -92,6 +92,7 @@
 #	dh_perl
 	dh_shlibdeps
 	/usr/lib/$(VDR)-dev/patchlevel.sh subst
+	/usr/lib/$(VDR)-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb