r1141 - in vdr/vdr/trunk/debian: . plugin-template

[Thomas Günther]

Author: tom-guest
Date: 2005-09-01 21:36:53 +0000 (Thu, 01 Sep 2005)
New Revision: 1141

Modified:
   vdr/vdr/trunk/debian/changelog
   vdr/vdr/trunk/debian/plugin-template/control
   vdr/vdr/trunk/debian/plugin-template/links.ex
   vdr/vdr/trunk/debian/plugin-template/rules
Log:
Made debian/plugin-template/control and debian/plugin-template/rules compatible with dependencies.sh and new patchlevel.sh

Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog	2005-09-01 20:54:30 UTC (rev 1140)
+++ vdr/vdr/trunk/debian/changelog	2005-09-01 21:36:53 UTC (rev 1141)
@@ -19,12 +19,14 @@
       from Tobias inofficial vdr package and changed a few things as suggested
       by Thomas Günther
   * Tobias Grimm <tg at e-tobi.net>
-    - Made debian/patchlevel.sh acccept opt-entries in 00list with leading
+    - Made debian/patchlevel.sh accept opt-entries in 00list with leading
       spaces and removed leading space from vdr-patchlevel output
   * Thomas Günther <tom at toms-cafe.de>
     - Made debian/plugin-template/rules svn-buildpackage-save
     - Updated 15_dvbplayer.dpatch
     - Added 22_vdr-playerepg.dpatch - Fixes mp3 plugin problems
+    - Made debian/plugin-template/control and debian/plugin-template/rules
+      compatible with dependencies.sh and new patchlevel.sh
 
  -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Sun, 28 Aug 2005 18:25:00 +0200
 

Modified: vdr/vdr/trunk/debian/plugin-template/control
===================================================================
--- vdr/vdr/trunk/debian/plugin-template/control	2005-09-01 20:54:30 UTC (rev 1140)
+++ vdr/vdr/trunk/debian/plugin-template/control	2005-09-01 21:36:53 UTC (rev 1141)
@@ -7,7 +7,8 @@
 
 Package: vdr-plugin-#PACKAGE#
 Architecture: any
-Depends: ${shlibs:Depends}, vdr (>= #VDRVERSION#)
+Depends: ${shlibs:Depends}, ${vdr:Depends}
+Conflicts: ${vdr:Conflicts}
 Description: <insert up to 60 chars description>
  <insert long description, indented with spaces>
-XB-VDR-Patchlevel: ${patchlevel}
+XB-VDR-Patchlevel: ${vdr:Patchlevel}

Modified: vdr/vdr/trunk/debian/plugin-template/links.ex
===================================================================
--- vdr/vdr/trunk/debian/plugin-template/links.ex	2005-09-01 20:54:30 UTC (rev 1140)
+++ vdr/vdr/trunk/debian/plugin-template/links.ex	2005-09-01 21:36:53 UTC (rev 1141)
@@ -1 +1 @@
-usr/share/vdr-plugin-#PACKAGE#/#PACKAGE#    /var/lib/vdr/plugins/#PACKAGE#
+usr/share/vdr-plugin-#PACKAGE#/#PACKAGE#    var/lib/vdr/plugins/#PACKAGE#

Modified: vdr/vdr/trunk/debian/plugin-template/rules
===================================================================
--- vdr/vdr/trunk/debian/plugin-template/rules	2005-09-01 20:54:30 UTC (rev 1140)
+++ vdr/vdr/trunk/debian/plugin-template/rules	2005-09-01 21:36:53 UTC (rev 1141)
@@ -87,6 +87,7 @@
 #	dh_perl
 	dh_shlibdeps
 	/usr/lib/$(VDR)-dev/patchlevel.sh subst
+	/usr/lib/$(VDR)-dev/dependencies.sh
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb