Merged branch 'experimental'.

Conflicts:
	debian/changelog

diff --git a/debian/README.Debian b/debian/README.Debian
index 967dbfd5045f9493342d620c362604b357823fc1..e35012c1a20883756d7d5e5cc0056b8ea50b26c6 100644 (file)
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -10,3 +10,6 @@ text and POD documentation which is usually installed by the upstream source
 package has been left out of the Debian packages as it does not provide any
 further benefits over the other documentation.
 
+More examples and useful applications can be found at the upstream site at
+<http://oss.oetiker.ch/rrdtool/pub/contrib/>.
+

diff --git a/debian/changelog b/debian/changelog
index 0b199cc9d799a5f0bcf930a53784ea5d75ef5f01..b89635c52fb685fca58b577496f99d4d6248ef7c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+rrdtool (1.3.8-2) UNRELEASED; urgency=low
+
+  [ Bernd Zeimetz ]
+  * debian/rules:
+    - Prepare to build with Python 2.6.
+
+  [ Sebastian Harl ]
+  * debian/README.Debian:
+    - Added a note about <http://oss.oetiker.ch/rrdtool/pub/contrib/> as
+      requested in #323969 and lost in 1.2.26-1.
+
+ -- Sebastian Harl <tokkee@debian.org>  Thu, 24 Sep 2009 11:50:44 +0200
+
 rrdtool (1.4~rc2+20091004-1) experimental; urgency=low
 
   [ Sebastian Harl ]

diff --git a/debian/rules b/debian/rules
index 6430e061c28ccc5edb064bc0038e38e2f36ccf78..e0701250de2a67f534cb811a690f8a6b271f877f 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,17 @@
 #we use quilt
 include /usr/share/quilt/quilt.make
 
+#needed to build with Python 2.6
+-include /usr/share/python/python.mk
+ifeq (,$(py_sitename))
+  py_sitename = site-packages
+  py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages
+  py_sitename_sh = $(py_sitename)
+  py_libdir_sh = $(py_libdir)
+  py_setup_install_args = 
+endif
+
+
 
 #Ruby versions to build for
 RUBY_VERS := 1.8 1.9
@@ -170,8 +181,11 @@ install-python%: install-common-stamp
        dh_testroot
        set -e ;\
         cd bindings/python ;\
-        python$* setup.py install --root=$(CURDIR)/debian/python-rrdtool ;\
-        python$*-dbg setup.py install --root=$(CURDIR)/debian/rrdtool-dbg
+        python$* setup.py install --root=$(CURDIR)/debian/python-rrdtool \
+               $(py_setup_install_args) ;\
+        python$*-dbg setup.py install --root=$(CURDIR)/debian/rrdtool-dbg \
+               $(py_setup_install_args)
+
        find $(CURDIR)/debian/rrdtool-dbg -type f -name '*.egg-info' -print0 |\
                 xargs -0r rm -f