Fix-up several packages to include the correct Conflicts and Replaces

lines for config-package-dev

svn path=/trunk/packages/xvm-munin-config/; revision=1989

diff --git a/debian/changelog b/debian/changelog
index 486e27c..8deed5a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xvm-munin-config (0.0.6) unstable; urgency=low
+
+  * Add Provides and Conflicts lines to debian/control for
+    config-package-dev
+
+ -- Evan Broder <broder@mit.edu>  Sat, 24 Jan 2009 20:17:06 -0500
+
 xvm-munin-config (0.0.5) unstable; urgency=low
 
   [ Quentin Smith ]

diff --git a/debian/control b/debian/control
index 42a20f2..a7aaa56 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,8 @@ Standards-Version: 3.7.2
 Package: xvm-munin-host-config
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, munin-node, adduser, smartmontools
+Provides: ${diverted-files}
+Conflicts: ${diverted-files}
 Description: Configure Munin monitoring on XVM hosts
  Configure the munin-node daemon on all XVM servers. Each server gets
  a set of plugins configured based on its function.
@@ -17,6 +19,8 @@ Description: Configure Munin monitoring on XVM hosts
 Package: xvm-munin-master-config
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, munin-node, adduser, libdbd-pg-perl
+Provides: ${diverted-files}
+Conflicts: ${diverted-files}
 Description: Configure Munin monitoring on XVM master server
  Configure the munin-node daemon on all XVM servers. Each server gets
  a set of plugins configured based on its function.
@@ -27,6 +31,8 @@ Description: Configure Munin monitoring on XVM master server
 Package: xvm-munin-remote-config
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, munin-node, adduser
+Provides: ${diverted-files}
+Conflicts: ${diverted-files}
 Description: Configure Munin monitoring on XVM remote servers
  Configure the munin-node daemon on all XVM servers. Each server gets
  a set of plugins configured based on its function.
@@ -36,6 +42,8 @@ Description: Configure Munin monitoring on XVM remote servers
 Package: xvm-munin-console-config
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, munin-node, adduser
+Provides: ${diverted-files}
+Conflicts: ${diverted-files}
 Description: Configure Munin monitoring on XVM console server
  Configure the munin-node daemon on all XVM servers. Each server gets
  a set of plugins configured based on its function.