Don't rename librrd2-dev, only add provides:

diff --git a/debian/changelog b/debian/changelog
index 97da961a2a4b88b7c38420085860093cae7710d4..0206db33b35fef13e1c6430c18dd8f4aa2022bd4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,16 +13,14 @@ rrdtool (1.2.26-1) unstable; urgency=low
         * Update of Maintainer, Standards-Version, Uploaders
         * Building ruby modules now (Closes: #453304).
         * Change the Python binary package to conform with the Python policy,
-          using python-support.
+          using python-support. Also renaming the package to follow the Python
+          policy.
         * Bump Standards Version to 3.7.3.
         * Using and depending on quilt to handle patches.
+        * Adding Provides: librrd-dev to librrd2-dev.
     - debian/watch:
         * File redone to meet version 3 of uscan and to work again, using the
           new location of the upstream source.
-    - Renaming packages using transitional packages:
-        * librrd2-dev to librrd-dev as it was done on almost all other library
-          packages now.
-        * python-rrd to python-rrdtool to follow the Python policy.
 
  -- Bernd Zeimetz <bzed@debian.org>  Sat, 09 Feb 2008 23:03:45 +0100
 

diff --git a/debian/control b/debian/control
index 040eed53c47182929d9483cf17832f39c73ddd33..4b9822c441c36330db07643d5ef7500628917c0c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -49,27 +49,12 @@ Description: Time-series data storage and display system (runtime library)
  This package contains shared libraries used to access and manipulate RRDs.
 
 Package: librrd2-dev
-Architecture: all
-Section: libdevel
-Depends: librrd-dev
-Description: Transitional dummy package
- The Round Robin Database Tool (RRDtool) is a system to store and display
- time-series data (e.g. network bandwidth, machine-room temperature,
- server load average). It stores the data in Round Robin Databases (RRDs),
- a very compact way that will not expand over time. RRDtool processes the
- extracted data to enforce a certain data density, allowing for useful
- graphical representation of data values.
- .
- This package is a transitional dummy package to ease the transition towards
- a -dev package name without encoded soname. It can be safely removed.
-
-Package: librrd-dev
 Architecture: any
 Section: libdevel
 Depends: librrd2 (= ${binary:Version}), libpng12-dev, zlib1g-dev, libart-2.0-dev, libfreetype6-dev, ${misc:Depends}
 Conflicts: librrd0-dev, librrd0, librrd2-dev (<< 1.2.26)
 Replaces: librrd0, librrd2-dev (<< 1.2.26)
-Provides: librrd2-dev
+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
deleted file mode 100644 (file)
index 7188652..0000000
--- a/debian/librrd-dev.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/include
-usr/lib/librrd.a
-usr/lib/librrd_th.a
-usr/lib/librrd.la
-usr/lib/librrd_th.la

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

diff --git a/debian/rules b/debian/rules
index 0f8a40a3bac453dc4763811fde7ca92cd0eadb68..cc67b8aaee87e7433777f84763d1b4a30a12694e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -44,8 +44,7 @@ CONFFLAGS += --disable-python --disable-ruby
 CONFFLAGS += --prefix=/usr --docdir=/usr/share/doc/rrdtool
 
 #install perl libs in vendor mode
-CONFFLAGS += --with-perl-options=INSTALLDIRS=vendor
-
+CONFFLAGS += --with-perl-options=INSTALLDIRS=vendor 
 
 
 
@@ -167,11 +166,10 @@ binary-indep: build-indep install-indep
        dh_testdir
        dh_testroot
        dh_link -plibrrd-ruby /usr/share/doc/librrd-ruby$(RUBY_DEFAULT_VERS) /usr/share/doc/librrd-ruby
-       dh_link -plibrrd2-dev /usr/share/doc/librrd-dev /usr/share/doc/librrd2-dev
        dh_link -ppython-rrd /usr/share/doc/python-rrdtool /usr/share/doc/python-rrd
-       dh_installchangelogs -i -Nlibrrd-ruby -Nlibrrd2-dev -Npython-rrd
-       dh_installdocs -i -Nlibrrd-ruby -Nlibrrd2-dev -Npython-rrd
-       dh_link -i -Nlibrrd-ruby -Nlibrrd2-dev -Npython-rrd
+       dh_installchangelogs -i -Nlibrrd-ruby -Npython-rrd
+       dh_installdocs -i -Nlibrrd-ruby -Npython-rrd
+       dh_link -i -Nlibrrd-ruby -Npython-rrd
        echo 'rubydefault:Depends=librrd-ruby$(RUBY_DEFAULT_VERS)' >> debian/librrd-ruby.substvars
        dh_perl -i
        dh_compress -i