Added conflict with librrd-dev to librrd4-dev.

This prevents two -dev packages from being installed simultaneously.

diff --git a/debian/changelog b/debian/changelog
index 11a1c641d6daf7882f425ac7ec56ed58141f5331..74655c37f508ef5c7d19688f10be09b1037a4448 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ rrdtool (1.3~rc9-1) experimental; urgency=low
       build dependencies and librrd4-dev's dependencies following the switch
       made by upstream.
     - Added "libxml2-dev" to the build dependencies.
+    - Added conflict with librrd-dev to librrd4-dev to prevent two -dev
+      packages from being installed simultaneously.
   * debian/librrd4.symbols:
     - Added symbols file for the new SONAME version number replacing
       librrd2.symbols.
@@ -22,7 +24,7 @@ rrdtool (1.3~rc9-1) experimental; urgency=low
     - Install "NEWS" and "CHANGES" into all packages.
     - No longer set TCL_INC_DIR manually - has been fixed upstream.
 
- -- Sebastian Harl <sh@tokkee.org>  Sun, 08 Jun 2008 20:24:14 +0200
+ -- Sebastian Harl <sh@tokkee.org>  Sun, 08 Jun 2008 21:54:25 +0200
 
 rrdtool (1.2.27-3) UNRELEASED; urgency=low
 

diff --git a/debian/control b/debian/control
index 8b2cccb293c458b6417289ee79fbb5d07d437b61..da3a7ffc642a0e1303fc5a402ccba5f87e5a492b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -54,7 +54,7 @@ Package: librrd4-dev
 Architecture: any
 Section: libdevel
 Depends: librrd4 (= ${binary:Version}), libpng12-dev, zlib1g-dev, libcairo2-dev, libpango1.0-dev, libfreetype6-dev, ${misc:Depends}
-Conflicts: librrd0-dev, librrd0
+Conflicts: librrd-dev, librrd0-dev, librrd0
 Replaces: librrd0
 Provides: librrd-dev
 Description: Time-series data storage and display system (development)