[med-svn] r1966 - in trunk/packages/clustalw/trunk/debian: . patches

[plessy at alioth.debian.org]

Author: plessy
Date: 2008-06-04 11:56:23 +0000 (Wed, 04 Jun 2008)
New Revision: 1966

Added:
   trunk/packages/clustalw/trunk/debian/patches/series
   trunk/packages/clustalw/trunk/debian/patches/to_build_with_g++-4.3.patch
Modified:
   trunk/packages/clustalw/trunk/debian/changelog
Log:
Uploaded a patched version with the agreement of Upstream.

Modified: trunk/packages/clustalw/trunk/debian/changelog
===================================================================
--- trunk/packages/clustalw/trunk/debian/changelog	2008-06-04 04:09:48 UTC (rev 1965)
+++ trunk/packages/clustalw/trunk/debian/changelog	2008-06-04 11:56:23 UTC (rev 1966)
@@ -1,8 +1,5 @@
-clustalw (2.0.8-1) UNRELEASED; urgency=low
+clustalw (2.0.8-1) unstable; urgency=low
 
-  FTBFS with gcc-4.3: #include <climits> is missing in a file. Upstream is
-  being contacted to know if it is better to patch or to wait for 2.0.9.
-
   * New upstream release.
     - Implemented maxseqlen cmdline switch.
     - Updated help-file.
@@ -12,6 +9,8 @@
     - Added new option;
     - incremented version number.
   * debian/copyright lifted to the latest draft format version.
+  * debian/patches/to_build_with_g++-4.3.patch.
+    (Submitted and accepted upstream for 2.0.9).
 
  -- Charles Plessy <plessy at debian.org>  Wed, 04 Jun 2008 18:04:17 +0900
 

Added: trunk/packages/clustalw/trunk/debian/patches/series
===================================================================
--- trunk/packages/clustalw/trunk/debian/patches/series	                        (rev 0)
+++ trunk/packages/clustalw/trunk/debian/patches/series	2008-06-04 11:56:23 UTC (rev 1966)
@@ -0,0 +1 @@
+to_build_with_g++-4.3.patch

Added: trunk/packages/clustalw/trunk/debian/patches/to_build_with_g++-4.3.patch
===================================================================
--- trunk/packages/clustalw/trunk/debian/patches/to_build_with_g++-4.3.patch	                        (rev 0)
+++ trunk/packages/clustalw/trunk/debian/patches/to_build_with_g++-4.3.patch	2008-06-04 11:56:23 UTC (rev 1966)
@@ -0,0 +1,15 @@
+Author: Charles Plessy <plessy at debian.org>
+Forwarded: clustalw at ucd.ie
+Description: Adds a header necessary to g++-4.3
+ This patch has been accepted upstream and will be removed with clustalw 2.0.9.
+License: Use, copy, modify, distribute as if in public domain.
+--- clustalw-2.0.8.orig/src/general/UserParameters.cpp
++++ clustalw-2.0.8/src/general/UserParameters.cpp
+@@ -14,6 +14,7 @@
+ #include <stdlib.h>
+ #include <exception>
+ #include <iostream>
++#include <climits>
+ //#include <limits>
+ #include <iomanip>
+ #include <fstream>