Merged branch 'rrdtool-1.4.7-2.1'.

diff --cc debian/changelog
index c9ed55ffcac63adc85ba3d3dd1a885d03c92669f,7ec362772078a51a82b54efeeb92e16fa37a2498..8b0294d033ef4cb8d715976cf8b9ca60a40e5f03
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,17 +1,24 @@@
 +rrdtool (1.4.7-3) UNRELEASED; urgency=low
 +
 +  * Fixed changelog of 1.4.7-2 regarding the versioned build-dep on tcl-dev.
 +
 + -- Sebastian Harl <tokkee@debian.org>  Sat, 18 Aug 2012 15:53:54 +0200
 +
+ rrdtool (1.4.7-2.1) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * Switch Ruby bindings packaging to match the Debian Ruby packaging
+     policy. Based on a patch by Jonas Genannt.
+     Introduce ruby-rrd package, turn librrd-ruby* into transitional
+     packages to ruby-rrd; use gem2deb to build the bindings, and build
+     them for currently supported versions of Ruby, without hardcoding
+     a list of versions. (Closes: #687809, #722377)
+ 
+  -- Christian Hofstaedtler <zeha@debian.org>  Wed, 22 Jan 2014 11:27:16 +0100
+ 
  rrdtool (1.4.7-2) unstable; urgency=low
  
 +  [ Sebastian Harl ]
    * Ack NMUs; thanks to Jonathan Wiltshire and gregor herrmann!
    * Added debian/patches/bts664724-rrdcached-j-segfault:
      Fixed segfault in rrdcached when starting without having the journal