[med-svn] [r-cran-reshape2] 06/06: Merge branch 'master' of git+ssh://git.debian.org/git/debian-med/r-cran-reshape2

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository r-cran-reshape2.

commit ffaffc84f1246e3761af4d38bec83bae2ba998db
Merge: 682c89e 598a7fd
Author: Andreas Tille <tille at debian.org>
Date:   Thu Jan 23 11:11:13 2014 +0100

    Merge branch 'master' of git+ssh://git.debian.org/git/debian-med/r-cran-reshape2
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/changelog | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --cc debian/changelog
index 3356e21,5a86d90..a703d36
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,12 +1,21 @@@
 +r-cran-reshape2 (1.2.2-2) UNRELEASED; urgency=medium
 +
 +  * New upstream version
 +  * debian/control:
 +     - Add myself as Uploader
 +     - cme fix dpkg-control
 +
 + -- Andreas Tille <tille at debian.org>  Tue, 21 Jan 2014 10:14:42 +0100
 +
+ r-cran-reshape2 (1.2.2-1) unstable; urgency=low
+ 
+   * Upgraded to current upstream version
+   * debian/control: Set Build-Depends: to current R version
+   * debian/control: Set Standards-Version: to current version 
+   * (Re-)building with R 3.0.0
+ 
+  -- Dirk Eddelbuettel <edd at debian.org>  Thu, 18 Apr 2013 20:01:57 -0500
+ 
  r-cran-reshape2 (1.2.1-1) unstable; urgency=low
  
    * Initial release (Closes: #657937)

-- 
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/r-cran-reshape2.git