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

[tfry at users.sf.net]

Revision: 4922
          http://sourceforge.net/p/rkward/code/4922
Author:   tfry
Date:     2014-10-17 09:20:27 +0000 (Fri, 17 Oct 2014)
Log Message:
-----------
Merge r4921 from release branch

Revision Links:
--------------
    http://sourceforge.net/p/rkward/code/4921

Modified Paths:
--------------
    trunk/rkward/debian/changelog
    trunk/rkward/debian/control

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

Index: trunk/rkward/debian
===================================================================
--- trunk/rkward/debian	2014-10-17 09:16:19 UTC (rev 4921)
+++ trunk/rkward/debian	2014-10-17 09:20:27 UTC (rev 4922)

Property changes on: trunk/rkward/debian
___________________________________________________________________
Modified: svn:mergeinfo
## -2,4 +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
+/branches/release_branches/rkward_0.6.2/debian:4914,4921
\ No newline at end of property
Modified: trunk/rkward/debian/changelog
===================================================================
--- trunk/rkward/debian/changelog	2014-10-17 09:16:19 UTC (rev 4921)
+++ trunk/rkward/debian/changelog	2014-10-17 09:20:27 UTC (rev 4922)
@@ -3,6 +3,12 @@
 
  -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Tue, 21 Oct 2014 13:30:00 +0100
 
+rkward (0.6.2~rc1-2) unstable; urgency=low
+
+  * bump standards version to 3.9.6 (no changes needed)
+
+ -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Fri, 17 Oct 2014 10:30:00 +0100
+
 rkward (0.6.2~rc1-1) unstable; urgency=low
 
   * new upstream release

Modified: trunk/rkward/debian/control
===================================================================
--- trunk/rkward/debian/control	2014-10-17 09:16:19 UTC (rev 4921)
+++ trunk/rkward/debian/control	2014-10-17 09:20:27 UTC (rev 4922)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Thomas Friedrichsmeier <tfry at users.sourceforge.net>
 Build-Depends: debhelper (>= 6.0.0), kdelibs5-dev, cmake, r-base-dev (>= 2.8.0), libx11-dev
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Homepage: http://rkward.sourceforge.net
 Vcs-Browser: http://sourceforge.net/p/rkward/code/HEAD/tree/trunk/rkward/debian/
 Vcs-Svn: http://svn.code.sf.net/p/rkward/code/trunk/rkward/debian/