Merged branch 'experimental'.

Conflicts:
	debian/changelog

diff --combined debian/changelog
index 30303a59360249440c70aa9fb26efbb0b1fec5ed,0b199cc9d799a5f0bcf930a53784ea5d75ef5f01..b89635c52fb685fca58b577496f99d4d6248ef7c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,53 +1,66 @@@
 +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 ]
+   * New upstream SVN snapshot based on trunk at revision 1930.
+   * Uploading to experimental.
+   * debian/control:
+     - Build-depend on gettext instead of intltool following the switch made by
+       upstream.
+     - Build-depend on libdbi0-dev, required by rrdgraph to read values from an
+       SQL database.
+     - Updated Standards-Version to 3.8.3.
+     - Let the synopsis start with a small letter (as suggested in dev-ref
+       6.2.2).
+     - Let rrdtool-dbg recommend liblua5.1-rrd0.
+   * debian/rules:
+     - Remove config.h in the 'clean' target - this is created by configure but
+       not cleaned up by any Makefile.
+     - Use DEB_HOST_ARCH_CPU instead of DEB_HOST_GNU_TYPE to check for the
+       build host.
+     - Set examples/rrdcached/RRDCached.pm's file mode to 0644.
+     - Run dh_installinit for the "rrdcached" package.
+   * debian/patches:
+     - Removed bts494874-gnu-kfreebsd - included upstream.
+     - Removed bts332766-negative-timestamps - included upstream.
+     - Removed compiler-warning-fixes - included upstream.
+     - Updated bts428778-floating-point-exception for RRDtool 1.4.
+   * Added debian/README.source:
+     - The file includes a pointer to /usr/share/doc/quilt/README.source.
+   * debian/librrd4.symbols:
+     - Added symbols introduced in 1.4~rc2.
+   * Added new binary package 'rrdcached' for the newly introduced "data
+     caching daemon".
+   * debian/rrdcached.init.d, debian/rrdcached.default:
+     - Added an init script for rrdcached supporting start, stop, status,
+       restart, force-reload. The script is based on the collectd init script.
+   * debian/rrdtool.install:
+     - Install manpages in section 3 as well.
+   * debian/rrdcached.postrm:
+     - Remove /var/lib/rrdcached/ on purge.
+ 
+   [ Bernd Zeimetz ]
+   * debian/rules, debian/control:
+     - Build Lua bindings and put them into appropriate packages.
+   * Added debian/lua-rrd.h.
+   * debian/rules:
+     - Tell dh_makeshlibs to not modify postinst/postrm of the lua packages -
+       we do not need to run ldconfig when installing them.
+ 
+  -- Sebastian Harl <tokkee@debian.org>  Mon, 05 Oct 2009 22:27:13 +0200
+ 
  rrdtool (1.3.8-1) unstable; urgency=low
  
    [ Sebastian Harl ]

diff --combined debian/rules
index 996f23ce56d79cd11310ddb22cde23a7f52c9db1,6430e061c28ccc5edb064bc0038e38e2f36ccf78..e0701250de2a67f534cb811a690f8a6b271f877f
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -7,17 -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
@@@ -29,10 -18,11 +29,11 @@@ PY_VERS := $(shell pyversions -vr
  TCL_VERS := $(shell dpkg -s tcl-dev | grep '^Depends' \
        | sed 's,.*\<tcl\([0-9.]*\)-dev\>.*,\1,')
  
- 
  #let's help configure to figure out our host/build system
  DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
  DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ DEB_HOST_ARCH_CPU   ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+ 
  ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
    CONFFLAGS += --build $(DEB_HOST_GNU_TYPE)
  else
@@@ -57,7 -47,7 +58,7 @@@ ifneq (,$(findstring noopt,$(DEB_BUILD_
          CFLAGS += -O0
  else
  #don't optimize on arm for now - #447041
- ifneq ($(DEB_HOST_GNU_TYPE), arm)
+ ifneq ($(DEB_HOST_ARCH_CPU), arm)
          CFLAGS += -O2
  endif
  endif
@@@ -128,6 -118,7 +129,7 @@@ endi
        rm -rf src/.libs src/.deps doc/*.html doc/*.1 doc/*.txt
        rm -f intltool-extract intltool-merge intltool-update
        rm -f src/librrd.sym
+       rm -f config.h
  
        dh_clean
  
@@@ -152,6 -143,10 +154,10 @@@ install-common-stamp: build-arch-stam
        # we don't want .txt and .pod documentation in the package
        rm -rf debian/tmp/usr/share/doc/rrdtool/txt
        dh_install --sourcedir=$(CURDIR)/debian/tmp --fail-missing
+       # remove duplicates
+       rm debian/rrdtool/usr/bin/rrdcached
+       rm debian/rrdtool/usr/share/man/man1/rrdcached.1
+       rm debian/rrdtool/usr/share/doc/rrdtool/html/rrdcached.html
  
        touch $@
  
@@@ -168,17 -163,15 +174,18 @@@ install-arch: install-common-stamp $(PY
        done
  
        dh_installexamples -s
+       chmod 644 debian/rrdcached/usr/share/doc/rrdcached/examples/RRDCached.pm
  
  install-python%: install-common-stamp
        dh_testdir
        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
  
@@@ -211,11 -204,13 +218,13 @@@ binary-arch: build-arch install-arc
        dh_pysupport -prrdtool-dbg
        dh_perl -a
        dh_installman -a
+       dh_installinit -prrdcached
        dh_link -a
        dh_strip -a --dbg-package=rrdtool-dbg
        dh_compress -a
        dh_fixperms -a
-       dh_makeshlibs -a
+       dh_makeshlibs -a -Nliblua5.1-rrd0 -Nliblua5.1-rrd-dev
+       dh_makeshlibs -pliblua5.1-rrd0 -pliblua5.1-rrd-dev -n
        dh_installdeb -a
        dh_shlibdeps -a
        dh_gencontrol -a