[DRBD-cvs] r1580 - branches/drbd-0.7/debian

[svn at svn.drbd.org]

Author: philhug
Date: 2004-10-01 11:44:00 +0200 (Fri, 01 Oct 2004)
New Revision: 1580

Added:
   branches/drbd-0.7/debian/drbd0.7.conffiles
Modified:
   branches/drbd-0.7/debian/changelog
   branches/drbd-0.7/debian/control
Log:
* conflict with all drbd and drbd-source packages
* added conffiles again, they're needed even if lintian complains



Modified: branches/drbd-0.7/debian/changelog
===================================================================
--- branches/drbd-0.7/debian/changelog	2004-10-01 09:39:48 UTC (rev 1579)
+++ branches/drbd-0.7/debian/changelog	2004-10-01 09:44:00 UTC (rev 1580)
@@ -6,6 +6,7 @@
   * Rewritten debian/rules using module-assistant
   * Change binary package name to drbd0.7
   * Added myself as Uploader
+  * Conflict with drbd and drbd-source
 
  -- Philipp Hug <debian at hug.cx>  Tue, 14 Sep 2004 23:25:12 +0200
 

Modified: branches/drbd-0.7/debian/control
===================================================================
--- branches/drbd-0.7/debian/control	2004-10-01 09:39:48 UTC (rev 1579)
+++ branches/drbd-0.7/debian/control	2004-10-01 09:44:00 UTC (rev 1580)
@@ -10,7 +10,7 @@
 Architecture: any
 Section: misc
 Depends: debconf, ${misc:Depends}
-Conflicts: drbd (<< 0.7)
+Conflicts: drbd
 Provides: drbd
 Suggests: heartbeat
 Description: RAID 1 over tcp/ip for Linux utilities
@@ -30,7 +30,7 @@
 Architecture: all
 Section: misc
 Depends: module-assistant
-Conflicts: drbd-source (<< 0.7)
+Conflicts: drbd-source
 Provides: drbd-source
 Recommends:  dpkg-dev, kernel-package, debhelper (>= 4), debconf-utils
 Description: RAID 1 over tcp/ip for Linux module source

Added: branches/drbd-0.7/debian/drbd0.7.conffiles
===================================================================
--- branches/drbd-0.7/debian/drbd0.7.conffiles	2004-10-01 09:39:48 UTC (rev 1579)
+++ branches/drbd-0.7/debian/drbd0.7.conffiles	2004-10-01 09:44:00 UTC (rev 1580)
@@ -0,0 +1,2 @@
+/etc/drbd.conf
+/etc/ha.d/resource.d/drbddisk