Removed SONAME version from the -dev package.

 * Renamed librrd4-dev to librrd-dev.
 * Added conflict on librrd2-dev to librrd-dev (replacing librrd4-dev's
   conflict with librrd-dev).

diff --git a/debian/changelog b/debian/changelog
index cbc3334d84063a116062b46f78087a46522e9dda..f45f73ad1198c38843a4bc35c380bf4fa36f76c1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,15 +8,14 @@ rrdtool (1.3.0-1) experimental; urgency=low
     - "implicit-decl-fix" partly applied upstream
     - "typos" removed, has been applied upstream
   * debian/control:
-    - Replaced librrd2 / librrd2-dev with librrd4 / librrd4-dev.
+    - Replaced librrd2 / librrd2-dev with librrd4 / librrd-dev.
+    - Removed SONAME version from the -dev package.
     - Added "ttf-dejavu | ttf-bitstream-vera" recommendation to librrd4 -
       upstream no longer ships DejaVuSansMono-Roman.ttf.
     - Replaced "libart-2.0-dev" with "libcairo2-dev, libpango1.0-dev" in the
-      build dependencies and librrd4-dev's dependencies following the switch
+      build dependencies and librrd-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.
     - Updated standards-version to 3.8.0 - no changes.
   * debian/librrd4.symbols:
     - Added symbols file for the new SONAME version number replacing
@@ -25,7 +24,7 @@ rrdtool (1.3.0-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>  Fri, 13 Jun 2008 20:11:31 +0200
+ -- Sebastian Harl <sh@tokkee.org>  Sat, 14 Jun 2008 23:21:05 +0200
 
 rrdtool (1.2.27-3) UNRELEASED; urgency=low
 

diff --git a/debian/control b/debian/control
index d72830896f6c4f315339e27b6a02db875443ae02..9982b7b0b32530acbcd6b7c58503b3b05c0d0420 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -50,13 +50,12 @@ Description: Time-series data storage and display system (runtime library)
  .
  This package contains shared libraries used to access and manipulate RRDs.
 
-Package: librrd4-dev
+Package: librrd-dev
 Architecture: any
 Section: libdevel
 Depends: libc-dev, librrd4 (= ${binary:Version}), libpng12-dev, zlib1g-dev, libcairo2-dev, libpango1.0-dev, libfreetype6-dev, ${misc:Depends}
-Conflicts: librrd-dev, librrd0-dev, librrd0
+Conflicts: librrd2-dev, librrd0-dev, librrd0
 Replaces: librrd0
-Provides: librrd-dev
 Description: Time-series data storage and display system (development)
  The Round Robin Database Tool (RRDtool) is a system to store and display
  time-series data (e.g. network bandwidth, machine-room temperature,

diff --git a/debian/librrd-dev.install b/debian/librrd-dev.install
new file mode 100644 (file)
index 0000000..dccee1a
--- /dev/null
+++ b/debian/librrd-dev.install
@@ -0,0 +1,7 @@
+usr/include
+usr/lib/librrd.a
+usr/lib/librrd_th.a
+usr/lib/librrd.la
+usr/lib/librrd_th.la
+usr/lib/librrd.so
+usr/lib/librrd_th.so

diff --git a/debian/librrd4-dev.install b/debian/librrd4-dev.install
deleted file mode 100644 (file)
index dccee1a..0000000
--- a/debian/librrd4-dev.install
+++ /dev/null
@@ -1,7 +0,0 @@
-usr/include
-usr/lib/librrd.a
-usr/lib/librrd_th.a
-usr/lib/librrd.la
-usr/lib/librrd_th.la
-usr/lib/librrd.so
-usr/lib/librrd_th.so