Remove old README.Debian. Probably write a new one later,

if there's something not-so-obvious to tell.

Build indep packages - don't use -s for debhelper - stupid copy&paste errors..

diff --git a/debian/README.Debian b/debian/README.Debian
deleted file mode 100644 (file)
index 7756d3b..0000000
--- a/debian/README.Debian
+++ /dev/null
@@ -1,31 +0,0 @@
-RRDtool for Debian
-------------------
-
-The RRDtool distribution is split into several packages:
-
-Package: rrdtool
-       Command-line utilities and documentation
-
-Package: librrd2
-       Shared libraries
-
-Package: librrd2-dev
-       Static libraries and headers
-
-Package: librrds-perl
-       Perl interface, using a shared library (RRDs)
-
-Package: librrdp-perl
-       Perl interface, using command pipes to the rrdtool program (RRDp)
-
-Package: rrdtool-tcl
-       TCL interface
-
-Package: python-rrd
-       Python interface
-
-More examples and useful applications can be found at the upstream site
-at http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/contrib/
-
- -- Matt Zimmerman <mdz@csh.rit.edu>, Fri, 10 Sep 1999 10:53:19 -0700
-    Josip Rodin <joy-packages@debian.org>, Mon, 06 Nov 2006 21:10:23 +0100

diff --git a/debian/rules b/debian/rules
index 1ed79fa739f3ede749612c3a4bb196d98f5cd826..a8d73d51be06714bbf10da7894d8d8a3fcba203d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -121,15 +121,7 @@ clean-python%:
         python$* setup.py clean
        rm -f build-python$*
 
-install: install-indep install-arch
-install-indep:
-       dh_testdir
-       dh_testroot
-       dh_clean -k -ppython-rrd
-       dh_installdirs -s
-
-
-       dh_install -s
+install: install-arch
 
 install-arch: $(PY_VERS:%=install-python%)
        dh_testdir
@@ -165,19 +157,19 @@ install-python%:
 binary-indep:
        dh_testdir
        dh_testroot
-       echo 'rubydefault:Depends=librrd-ruby$(RUBY_DEFAULT_VERS)' >> debian/librrd-ruby.substvars
+       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 -s -Nlibrrd-ruby -Nlibrrd2-dev
-       dh_link -s -Nlibrrd-ruby -Nlibrrd2-dev
-       dh_perl -s
-       dh_compress -s
-       dh_fixperms -s
-       dh_installdeb -s
-       dh_gencontrol -s
-       dh_md5sums -s
-       dh_builddeb -s
+       dh_installdocs -i -Nlibrrd-ruby -Nlibrrd2-dev
+       dh_link -i -Nlibrrd-ruby -Nlibrrd2-dev
+       dh_perl -i
+       dh_compress -i
+       dh_fixperms -i
+       dh_installdeb -i
+       dh_gencontrol -i
+       dh_md5sums -i
+       dh_builddeb -i
        
 
 binary-arch: build-arch install-arch
@@ -189,6 +181,7 @@ binary-arch: build-arch install-arch
        dh_pysupport -ppython-rrd
        dh_perl -a
        dh_installman -a
+       echo 'rubydefault:Depends=librrd-ruby$(RUBY_DEFAULT_VERS)' >> debian/librrd-ruby.substvars
        dh_link -plibrrd-dev /usr/lib/librrd.so.$(LIB_version) /usr/lib/librrd.so
        dh_link -plibrrd-dev /usr/lib/librrd_th.so.$(LIB_TH_version) /usr/lib/librrd_th.so
        dh_link -plibrrd$(LIB_major) /usr/lib/librrd.so.$(LIB_version) /usr/lib/librrd.so.$(LIB_major)
@@ -208,5 +201,5 @@ binary-arch: build-arch install-arch
 binary: binary-arch binary-indep
 .PHONY: build clean configure \
         binary-indep binary-arch binary \
-        install install-arch install-indep \
+        install install-arch \
         install-python% clean-python%