[med-svn] r13847 - in trunk/packages/rosetta/trunk/debian: . patches

[Steffen Möller]

Author: moeller
Date: 2013-06-05 16:22:11 +0000 (Wed, 05 Jun 2013)
New Revision: 13847

Modified:
   trunk/packages/rosetta/trunk/debian/changelog
   trunk/packages/rosetta/trunk/debian/control
   trunk/packages/rosetta/trunk/debian/patches/gcc4.6patch
Log:
Adjusted for Rosetta 3.5.


Modified: trunk/packages/rosetta/trunk/debian/changelog
===================================================================
--- trunk/packages/rosetta/trunk/debian/changelog	2013-06-05 16:21:14 UTC (rev 13846)
+++ trunk/packages/rosetta/trunk/debian/changelog	2013-06-05 16:22:11 UTC (rev 13847)
@@ -1,3 +1,9 @@
+rosetta (3.5-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Steffen Moeller <moeller at debian.org>  Wed, 05 Jun 2013 09:21:49 +0200
+
 rosetta (3.4-1) UNRELEASED; urgency=low
 
   * New upstream release.

Modified: trunk/packages/rosetta/trunk/debian/control
===================================================================
--- trunk/packages/rosetta/trunk/debian/control	2013-06-05 16:21:14 UTC (rev 13846)
+++ trunk/packages/rosetta/trunk/debian/control	2013-06-05 16:22:11 UTC (rev 13847)
@@ -2,12 +2,11 @@
 Section: non-free/science
 Priority: extra
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-DM-Upload-Allowed: yes
 Uploaders: Steffen Moeller <moeller at debian.org>
 Build-Depends: debhelper (>= 7.0.50~), scons, zlib1g-dev, libboost-dev
 #cxxtest
 #Build-Depends-Indep: doxygen
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
 Homepage: http://www.rosettacommons.org
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/rosetta/trunk/
 Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/rosetta/trunk/

Modified: trunk/packages/rosetta/trunk/debian/patches/gcc4.6patch
===================================================================
--- trunk/packages/rosetta/trunk/debian/patches/gcc4.6patch	2013-06-05 16:21:14 UTC (rev 13846)
+++ trunk/packages/rosetta/trunk/debian/patches/gcc4.6patch	2013-06-05 16:22:11 UTC (rev 13847)
@@ -1,8 +1,8 @@
-Index: rosetta-3.4/tools/build/basic.settings
+Index: rosetta_source/tools/build/basic.settings
 ===================================================================
---- rosetta-3.4.orig/tools/build/basic.settings	2012-03-20 19:44:23.000000000 +0100
-+++ rosetta-3.4/tools/build/basic.settings	2012-04-23 16:58:16.491426801 +0200
-@@ -327,6 +327,12 @@
+--- rosetta_source.orig/tools/build/basic.settings
++++ rosetta_source/tools/build/basic.settings
+@@ -372,6 +372,12 @@
              "cxx": "g++-4.6",
          },
      },
@@ -15,16 +15,21 @@
      "gcc, macos" : {
          "appends" : {
              "flags" : {
-Index: rosetta-3.4/tools/build/options.settings
+Index: rosetta_source/tools/build/options.settings
 ===================================================================
---- rosetta-3.4.orig/tools/build/options.settings	2012-03-20 19:44:23.000000000 +0100
-+++ rosetta-3.4/tools/build/options.settings	2012-04-23 16:58:35.675165901 +0200
-@@ -9,7 +9,7 @@
+--- rosetta_source.orig/tools/build/options.settings
++++ rosetta_source/tools/build/options.settings
+@@ -9,11 +9,11 @@
  options = {
  
      "cxx" : {
--        "gcc"     : [ "3.3", "3.4", "4.0", "4.1", "4.2", "4.3","4.4","4.5", "4.6", "*" ],
-+        "gcc"     : [ "3.3", "3.4", "4.0", "4.1", "4.2", "4.3","4.4","4.5", "4.6", "4.7", "*" ],
+-        "gcc"     : [ "3.3", "3.4", "4.0", "4.1", "4.2", "4.3","4.4","4.5", "4.6","4.7", "*" ],
++        "gcc"     : [ "3.3", "3.4", "4.0", "4.1", "4.2", "4.3","4.4","4.5", "4.6","4.7", "4.8", "*" ],
          "icc"     : [ "8.0", "8.1", "9.0", "9.1", "10.0", "10.1", "11.1", "*" ], #PBHACK
          "msvc"    : [ "7.0", "7.1", "8.0", "8.1", "*" ],
          "xlc"     : [ "7.0", "8.0", "9.0", "XL", "*" ],
+-        "clang"   : [ "1.7", "2.1", "2.0", "2.8", "2.9", "3.0", "3.1", "4.0", "3.0-6ubuntu3", "4.1", "4.2", "*" ],
++        "clang"   : [ "1.7", "2.1", "2.0", "2.8", "2.9", "3.0", "3.1", "4.0", "3.0-6ubuntu3", "4.1", "4.2", "4.3", "*" ],
+     },
+ 
+     "os" : {