Merge branch 'master' of git://git.snow-crash.org/pkg-rrdtool

Conflicts:

	debian/changelog

diff --git a/debian/changelog b/debian/changelog
index e8cca00fffa536e866b529b79f8ce6cbc6e1e271..8beba106cec4f5c55ae9a658351fa689e449b57a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 rrdtool (1.3.8-1) unstable; urgency=low
 
+  [ Sebastian Harl ]
   * New upstream release:
     - Fixed various memory leaks in the Python bindings, thanks to Anders
       Hammarquist for reporting this and providing a patch (Closes: #529291).
@@ -7,9 +8,14 @@ rrdtool (1.3.8-1) unstable; urgency=low
     - Added bts530814-hurd to fix a FTBFS on Hurd, thanks to Marc Dequènes for
       reporting this and providing a patch (Closes: #530814).
     - Removed doc-fixes - applied upstream.
-  * debian/control, debian/rules:
+  * debian/control:
     - Removed transitional package "python-rrd" which is no longer required.
 
+  [ Bernd Zeimetz ]
+  * debian/rules, debian/control:
+    - Build Python dbg modules into rrdtool-dbg. Add necessary
+      (build-) dependencies.
+
  -- Sebastian Harl <tokkee@debian.org>  Mon, 01 Jun 2009 13:23:33 +0200
 
 rrdtool (1.3.7-1) unstable; urgency=low

diff --git a/debian/control b/debian/control
index fa1aa7997037d9d14bbf9361a772e108d7d65375..fa6ce886c26634f1a53c0a5cd53df01bb570f83e 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,8 @@ Build-Depends: debhelper (>= 5.0.38), groff, autotools-dev, quilt,
  libxml2-dev,
  tcl-dev,
  perl (>= 5.8.0),
- python-all-dev (>= 2.3.5-10), python-support (>= 0.4),
+ python-all-dev (>= 2.3.5-10), python-all-dbg (>= 2.3.5-10),
+ python-support (>= 0.7.1),
  ruby1.8, ruby1.8-dev, ruby1.9, ruby1.9-dev
 Homepage: http://oss.oetiker.ch/rrdtool/
 Vcs-Browser: http://git.snow-crash.org/?p=pkg-rrdtool.git;a=summary
@@ -39,10 +40,12 @@ Package: rrdtool-dbg
 Architecture: any
 Priority: extra
 Section: debug
-Depends: rrdtool (= ${binary:Version}), librrd4 (= ${binary:Version})
+Depends: rrdtool (= ${binary:Version}), librrd4 (= ${binary:Version}),
+ ${python:Depends}, ${misc:Depends}
 Recommends: librrds-perl (= ${binary:Version}),
  rrdtool-tcl (= ${binary:Version}), python-rrdtool (= ${binary:Version}),
- librrd-ruby1.8 (= ${binary:Version}), librrd-ruby1.9 (= ${binary:Version})
+ librrd-ruby1.8 (= ${binary:Version}), librrd-ruby1.9 (= ${binary:Version}),
+ python-all-dbg
 Description: Time-series data storage and display system (debugging symbols)
  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/rules b/debian/rules
index db29a2455dfef68d8c1fc1676ecb820c17226d13..8856b128c257b6e760ee414c31c8f610b2c3aedd 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -71,7 +71,7 @@ endif
 
 build: build-arch build-indep 
 
-build-arch: build-arch-stamp $(PY_VERS:%=build-python%)
+build-arch: build-arch-stamp $(PY_VERS:%=build-python%) $(PY_VERS:%=build-python%-dbg)
 build-arch-stamp: config.status 
        make
        #Fix library path to tcl bindings
@@ -86,7 +86,7 @@ build-arch-stamp: config.status
 build-python%: build-arch-stamp
        set -e ;\
         cd bindings/python ;\
-        BUILDLIBDIR=../../src/.libs LIBDIR=../../src/.libs python$* setup.py build
+        BUILDLIBDIR=../../src/.libs LIBDIR=../../src/.libs python$* setup.py build ;\
        touch $@
 
 build-indep: build-arch-stamp
@@ -163,7 +163,10 @@ install-python%: install-common-stamp
        dh_testroot
        set -e ;\
         cd bindings/python ;\
-        python$* setup.py install --root=$(CURDIR)/debian/python-rrdtool
+        python$* setup.py install --root=$(CURDIR)/debian/python-rrdtool ;\
+        python$*-dbg setup.py install --root=$(CURDIR)/debian/rrdtool-dbg
+       find $(CURDIR)/debian/rrdtool-dbg -type f -name '*.egg-info' -print0 |\
+                xargs -0r rm -f
 
 
 binary-indep: build-indep install-indep
@@ -191,6 +194,7 @@ binary-arch: build-arch install-arch
        dh_installdocs -a
        echo 'tcl:Depends=tcl$(TCL_VERS) | tclsh' >> debian/rrdtool-tcl.substvars
        dh_pysupport -ppython-rrdtool
+       dh_pysupport -prrdtool-dbg
        dh_perl -a
        dh_installman -a
        dh_link -a