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

[Tobias Grimm]

Author: tiber-guest
Date: 2006-11-08 22:42:11 +0100 (Wed, 08 Nov 2006)
New Revision: 3711

Modified:
   vdr/vdr/trunk/debian/changelog
   vdr/vdr/trunk/debian/plugin-template/control
Log:
* NOT RELEASED YET
* Removed Conflicts line from plugin template

Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog	2006-11-08 18:39:30 UTC (rev 3710)
+++ vdr/vdr/trunk/debian/changelog	2006-11-08 21:42:11 UTC (rev 3711)
@@ -1,3 +1,10 @@
+vdr (1.4.4-2) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Removed Conflicts line from plugin template
+
+ -- Tobias Grimm <tg at e-tobi.net>  Wed,  8 Nov 2006 22:40:36 +0100
+
 vdr (1.4.4-1) unstable; urgency=low
 
   [ Tobias Grimm ]

Modified: vdr/vdr/trunk/debian/plugin-template/control
===================================================================
--- vdr/vdr/trunk/debian/plugin-template/control	2006-11-08 18:39:30 UTC (rev 3710)
+++ vdr/vdr/trunk/debian/plugin-template/control	2006-11-08 21:42:11 UTC (rev 3711)
@@ -8,7 +8,6 @@
 Package: vdr-plugin-#PACKAGE#
 Architecture: any
 Depends: ${shlibs:Depends}, ${vdr:Depends}
-Conflicts: ${vdr:Conflicts}
 Description: <insert up to 60 chars description>
  <insert long description, indented with spaces>
 XB-VDR-Patchlevel: ${vdr:Patchlevel}