Transition the python package to a policy conform name.

diff --git a/debian/changelog b/debian/changelog
index c5c174d3cb997f0227d91bf9f95d1adb6b63243f..97da961a2a4b88b7c38420085860093cae7710d4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,8 +19,12 @@ rrdtool (1.2.26-1) unstable; urgency=low
     - 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 21:47:40 +0100
+ -- Bernd Zeimetz <bzed@debian.org>  Sat, 09 Feb 2008 23:03:45 +0100
 
 rrdtool (1.2.19-1) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 1b3fbe7273aa7cd73799e1f4c7f9858afa218185..040eed53c47182929d9483cf17832f39c73ddd33 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -60,7 +60,7 @@ Description: Transitional dummy package
  extracted data to enforce a certain data density, allowing for useful
  graphical representation of data values.
  .
- This package is a transitional dummy package to easy the transition towards
+ 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
@@ -123,13 +123,13 @@ Description: Time-series data storage and display system (Tcl interface)
  .
  This package contains a Tcl interface to RRDs.
 
-Package: python-rrd
+Package: python-rrdtool
 Architecture: any
 Section: python
 Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Conflicts: python2.3-rrd, python2.4-rrd
-Replaces: python2.3-rrd, python2.4-rrd
-Provides: ${python:Provides}
+Conflicts: python2.3-rrd, python2.4-rrd, python-rrd (<< 1.2.26)
+Replaces: python2.3-rrd, python2.4-rrd, python-rrd (<< 1.2.26)
+Provides: ${python:Provides}, python-rrd
 Description: Time-series data storage and display system (Python interface)
  The Round Robin Database Tool (RRDtool) is a system to store and display
  time-series data (e.g. network bandwidth, machine-room temperature,
@@ -140,6 +140,21 @@ Description: Time-series data storage and display system (Python interface)
  .
  This package contains a Python interface to RRDs.
 
+Package: python-rrd
+Architecture: all
+Section: python
+Depends: python-rrdtool
+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 rename the package to
+ python-rrdtool as required by the Python policy.  It can be safely removed.
+
 Package: librrd-ruby
 Architecture: all
 Section: interpreters

diff --git a/debian/rules b/debian/rules
index 7561da1e2b24de274bbe0dc1ceaceff52b76635b..a37399725cd5678870c1bc26c13ea29a5cbc5037 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -130,7 +130,7 @@ install: install-arch
 install-arch: $(PY_VERS:%=install-python%)
        dh_testdir
        dh_testroot
-       dh_clean -k -s -Npython-rrd
+       dh_clean -k -s -Npython-rrdtool
        dh_installdirs -s
 
        make install DESTDIR=$(CURDIR)/debian/tmp
@@ -154,7 +154,7 @@ install-python%:
        dh_testroot
        set -e ;\
         cd bindings/python ;\
-        python$* setup.py install --root=$(CURDIR)/debian/python-rrd
+        python$* setup.py install --root=$(CURDIR)/debian/python-rrdtool
 
 
 binary-indep:
@@ -163,9 +163,10 @@ binary-indep:
        dh_clean -k -i
        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_installchangelogs
-       dh_installdocs -i -Nlibrrd-ruby -Nlibrrd2-dev
-       dh_link -i -Nlibrrd-ruby -Nlibrrd2-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_perl -i
        dh_compress -i
        dh_fixperms -i
@@ -181,7 +182,7 @@ binary-arch: build-arch install-arch
        dh_installchangelogs -a CHANGES
        dh_installdocs -a
 #      dh_installexamples -a
-       dh_pysupport -ppython-rrd
+       dh_pysupport -ppython-rrdtool
        dh_perl -a
        dh_installman -a
        echo 'rubydefault:Depends=librrd-ruby$(RUBY_DEFAULT_VERS)' >> debian/librrd-ruby.substvars