Merge branch 'upstream' into experimental

[pkg-rrdtool.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 209a1ff11bec20a89fc07c8b8e24462082a8a5da..10f18a0394ff74a32a01fabd2729b8a15b903955 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -87,13 +87,13 @@ build-python%: build-arch-stamp
        set -e ;\
         cd bindings/python ;\
         BUILDLIBDIR=../../src/.libs LIBDIR=../../src/.libs python$* setup.py build ;\
-       touch $@
+        touch $@
 
 build-indep: build-arch-stamp
        #indep stuff is built in build-arch-stamp, too.
 
 clean: clean-patched
-clean-patched: unpatch $(PY_VERS:%=clean-python%)
+clean-patched: unpatch $(PY_VERS:%=clean-python%) $(PY_VERS:%=clean-python%-dbg)
        dh_testdir
        dh_testroot
 
@@ -123,8 +123,8 @@ endif
 clean-python%: unpatch
        set -e ;\
         cd bindings/python ;\
-        python$* setup.py clean
-       rm -f build-python$*
+        python$* setup.py clean ;\
+        rm -f build-python$*
 
 
 install: install-arch install-indep
@@ -165,16 +165,17 @@ install-python%: install-common-stamp
         cd bindings/python ;\
         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
        dh_testdir
        dh_testroot
        dh_link -plibrrd-ruby /usr/share/doc/librrd-ruby$(RUBY_DEFAULT_VERS) /usr/share/doc/librrd-ruby
-       dh_link -ppython-rrd /usr/share/doc/python-rrdtool /usr/share/doc/python-rrd
-       dh_installchangelogs -i -Nlibrrd-ruby -Npython-rrd CHANGES
-       dh_installdocs -i -Nlibrrd-ruby -Npython-rrd -A CONTRIBUTORS NEWS
-       dh_link -i -Nlibrrd-ruby -Npython-rrd
+       dh_installchangelogs -i -Nlibrrd-ruby CHANGES
+       dh_installdocs -i -Nlibrrd-ruby -A CONTRIBUTORS NEWS
+       dh_link -i -Nlibrrd-ruby
        echo 'rubydefault:Depends=librrd-ruby$(RUBY_DEFAULT_VERS)' >> debian/librrd-ruby.substvars
        dh_perl -i
        dh_compress -i
@@ -193,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