[rkward] /: Merge branch 'releases/0.7.0'

[Thomas Friedrichsmeier]

Git commit 9f2723b75303840662bce32350fdfe6a0412eb37 by Thomas Friedrichsmeier.
Committed on 17/04/2018 at 06:39.
Pushed by tfry into branch 'master'.

Merge branch 'releases/0.7.0'

M  +5    -0    ChangeLog
M  +7    -1    debian-official/changelog
M  +7    -1    debian/changelog

https://commits.kde.org/rkward/9f2723b75303840662bce32350fdfe6a0412eb37

diff --cc ChangeLog
index 0d852380,d5ef427d..9d394cc4
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,3 -1,6 +1,8 @@@
++--- Version 0.7.1 - UNRELEASED
++
+ --- Version 0.7.0b - Apr-16-2018
+ - Fix failure to install translations
+ 
  --- Version 0.7.0 - Apr-16-2018
  - Fix crash with R 3.5.x due to use to STRING_PTR
  - Double click on object in Workspace browser tries to open reference page, not object viewer, if the object is outside of .GlobalEnv
diff --cc debian-official/changelog
index 68f852e2,bd38e173..efa98fc7
--- a/debian-official/changelog
+++ b/debian-official/changelog
@@@ -1,5 -1,6 +1,11 @@@
 +rkward (0.7.0z+0.7.1+devel1-1) UNRELEASED; urgency=low
 +  * New upstream release
++
++ -- Thomas Friedrichsmeier <thomas.friedrichsmeier at kdemail.net>  Sat, 14 Apr 2018 14:00:00 +0100
++
+ rkward (0.7.0b-1) unstable; urgency=low
+   * New upstream release
+     Includes missing translation files in rkward-data
    * Replace kdoctools-dev dependency with libkf5doctools-dev
      closes: #895875
  
diff --cc debian/changelog
index d00600e8,9bf812d2..bea776dd
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,12 +1,17 @@@
 -rkward (0.7.0b-1) unstable; urgency=low
 +rkward (0.7.0z+0.7.1+devel1-1) UNRELEASED; urgency=low
++  * New upstream release
    * THIS IS AN INOFFICIAL PACKAGE
      We use this to build debian packages for a variety to Debian/Ubuntu
      releases, automatically and manually. It is close to the official packages, but due
      to the need to cover more divergent systems, it is not identical to those.
      All changelog entries below cover only the official debian package, not the changes
      made to this inofficial packaging.
++
++ -- Thomas Friedrichsmeier <thomas.friedrichsmeier at kdemail.net>  Sat, 14 Apr 2018 14:00:00 +0100
++
++rkward (0.7.0b-1) unstable; urgency=low
    * New upstream release
+     Includes missing translation files in rkward-data
    * Replace kdoctools-dev dependency with libkf5doctools-dev
      closes: #895875