[rkward/releases/0.6.5] debian-official: Merge branch 'releases/0.6.4' into releases/0.6.5

[Thomas Friedrichsmeier]

Git commit b5516dfca479bb80bb45e6bba50a95b977dbfec5 by Thomas Friedrichsmeier.
Committed on 14/03/2016 at 19:50.
Pushed by tfry into branch 'releases/0.6.5'.

Merge branch 'releases/0.6.4' into releases/0.6.5

M  +5    -2    debian-official/changelog

http://commits.kde.org/rkward/b5516dfca479bb80bb45e6bba50a95b977dbfec5

diff --cc debian-official/changelog
index f917edb,77ee334..3e3a592
--- a/debian-official/changelog
+++ b/debian-official/changelog
@@@ -1,9 -1,5 +1,11 @@@
 +rkward (0.6.4z+0.6.5+devel1-1) UNRELEASED; urgency=low
 +  * new upstream release
++  * TODO: FIX changelog in case 0.6.4-2 never gets uploaded!!!!!!!!!!
 +
 + -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Wed, 10 Feb 2016 11:30:00 +0100
 +
-  rkward (0.6.4-2) unstable; urgency=low
+ rkward (0.6.4-2) unstable; urgency=low
+   * bump standards version to 3.9.7 (no changes needed)
    * strip testing locale "x-test" from package
    * split architecture independent files into new rkward-data package
    * add override for false-positive source-contains-prebuilt-javascript-object