[rkward-cvs] SF.net SVN: rkward-code:[4916] trunk/rkward

[tfry at users.sf.net]

Revision: 4916
          http://sourceforge.net/p/rkward/code/4916
Author:   tfry
Date:     2014-10-16 17:48:27 +0000 (Thu, 16 Oct 2014)
Log Message:
-----------
Bump version in trunk

Modified Paths:
--------------
    trunk/rkward/VERSION.cmake
    trunk/rkward/debian/changelog
    trunk/rkward/rkward/main.cpp
    trunk/rkward/rkward/rbackend/rpackages/rkward/R/ver.R

Property Changed:
----------------
    trunk/rkward/
    trunk/rkward/debian/

Index: trunk/rkward
===================================================================
--- trunk/rkward	2014-10-16 17:46:42 UTC (rev 4915)
+++ trunk/rkward	2014-10-16 17:48:27 UTC (rev 4916)

Property changes on: trunk/rkward
___________________________________________________________________
Modified: svn:mergeinfo
## -3,3 +3,4 ##
 /branches/release_branch_0.5.4:3098-3102,3127
 /branches/release_branch_0.5.7:3913,3979-3980,3998
 /branches/release_branches/rkward_0.6.1:4649-4650
+/branches/release_branches/rkward_0.6.2:4914
\ No newline at end of property
Modified: trunk/rkward/VERSION.cmake
===================================================================
--- trunk/rkward/VERSION.cmake	2014-10-16 17:46:42 UTC (rev 4915)
+++ trunk/rkward/VERSION.cmake	2014-10-16 17:48:27 UTC (rev 4916)
@@ -1,3 +1,3 @@
 # DO NOT CHANGE THIS FILE MANUALLY!
 # It will be overwritten by scripts/set_dist_version.sh
-SET(RKVERSION_NUMBER 0.6.1z+0.6.2+test4)
+SET(RKVERSION_NUMBER 0.6.2z+0.6.3+devel1)

Index: trunk/rkward/debian
===================================================================
--- trunk/rkward/debian	2014-10-16 17:46:42 UTC (rev 4915)
+++ trunk/rkward/debian	2014-10-16 17:48:27 UTC (rev 4916)

Property changes on: trunk/rkward/debian
___________________________________________________________________
Modified: svn:mergeinfo
## -2,3 +2,4 ##
 /branches/release_branch_0.5.4:3098-3102
 /branches/release_branch_0.5.4/debian:3098-3102
 /branches/release_branch_0.5.7/debian:3913,3979-3980,3998
+/branches/release_branches/rkward_0.6.2/debian:4914
\ No newline at end of property
Modified: trunk/rkward/debian/changelog
===================================================================
--- trunk/rkward/debian/changelog	2014-10-16 17:46:42 UTC (rev 4915)
+++ trunk/rkward/debian/changelog	2014-10-16 17:48:27 UTC (rev 4916)
@@ -1,11 +1,16 @@
-rkward (0.6.1z+0.6.2+test2-1) unstable; urgency=low
+rkward (0.6.2z+0.6.3+devel1-1) unstable; urgency=low
+  * new upstream release
 
+ -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Tue, 21 Oct 2014 13:30:00 +0100
+
+rkward (0.6.2~rc1-1) unstable; urgency=low
+
   * new upstream release
   * avoid duplicate cmake run during build
   * upstream increased lowest supported R version to 2.8.0
   * bump standards version to 3.9.4 (no changes needed)
 
- -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Tue, 30 Sep 2014 13:30:00 +0100
+ -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Thu, 16 Oct 2014 13:30:00 +0100
 
 rkward (0.6.1-1) unstable; urgency=low
 

Modified: trunk/rkward/rkward/main.cpp
===================================================================
--- trunk/rkward/rkward/main.cpp	2014-10-16 17:46:42 UTC (rev 4915)
+++ trunk/rkward/rkward/main.cpp	2014-10-16 17:48:27 UTC (rev 4916)
@@ -2,7 +2,7 @@
                           main.cpp  -  description
                              -------------------
     begin                : Tue Oct 29 20:06:08 CET 2002
-    copyright            : (C) 2002-2013 by Thomas Friedrichsmeier 
+    copyright            : (C) 2002-2014 by Thomas Friedrichsmeier 
     email                : tfry at users.sourceforge.net
  ***************************************************************************/
 
@@ -124,7 +124,7 @@
 	options.add ("r-executable <command>", ki18n ("Use specified R installation, instead of the one configured at compile time (note: rkward R library must be installed to that installation of R)"), "");
 	options.add ("+[File]", ki18n ("R workspace file to open"), 0);
 
-	KAboutData aboutData("rkward", QByteArray (), ki18n ("RKWard"), RKWARD_VERSION, ki18n ("Frontend to the R statistics language"), KAboutData::License_GPL, ki18n ("(c) 2002, 2004 - 2013"), KLocalizedString (), "http://rkward.sf.net", "rkward-devel at lists.sourceforge.net");
+	KAboutData aboutData("rkward", QByteArray (), ki18n ("RKWard"), RKWARD_VERSION, ki18n ("Frontend to the R statistics language"), KAboutData::License_GPL, ki18n ("(c) 2002, 2004 - 2014"), KLocalizedString (), "http://rkward.sf.net", "rkward-devel at lists.sourceforge.net");
 	aboutData.addAuthor (ki18n ("%1").subs ("Thomas Friedrichsmeier"), ki18n ("Project leader / main developer"));
 	aboutData.addAuthor (ki18n ("%1").subs ("Pierre Ecochard"), ki18n ("C++ developer between 2004 and 2007"));
 	aboutData.addAuthor (ki18n ("%1").subs ("Prasenjit Kapat"), ki18n ("Many plugins, suggestions, plot history feature"));

Modified: trunk/rkward/rkward/rbackend/rpackages/rkward/R/ver.R
===================================================================
--- trunk/rkward/rkward/rbackend/rpackages/rkward/R/ver.R	2014-10-16 17:46:42 UTC (rev 4915)
+++ trunk/rkward/rkward/rbackend/rpackages/rkward/R/ver.R	2014-10-16 17:48:27 UTC (rev 4916)
@@ -3,4 +3,4 @@
 # rkward/SetVersionNumber.cmake
 
 #' @export
-".rk.app.version" <- "0.6.1z+0.6.2+test4"
+".rk.app.version" <- "0.6.2z+0.6.3+devel1"