diff -u amap-align-2.2/debian/compat amap-align-2.2/debian/compat
--- amap-align-2.2/debian/compat
+++ amap-align-2.2/debian/compat
@@ -1 +1 @@
-7
+8
diff -u amap-align-2.2/debian/control amap-align-2.2/debian/control
--- amap-align-2.2/debian/control
+++ amap-align-2.2/debian/control
@@ -5,8 +5,8 @@
 DM-Upload-Allowed: yes
 Uploaders: Charles Plessy <plessy@debian.org>,
  Andreas Tille <tille@debian.org>
-Build-Depends: debhelper (>= 7), quilt
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 8), quilt
+Standards-Version: 3.9.2
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/amap-align/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/amap-align/trunk/
 X-Homepage: http://bio.math.berkeley.edu/amap/ - upstream seems to be dead
@@ -18,8 +18,8 @@
 Description: Protein multiple alignment by sequence annealing
  AMAP is a command line tool to perform multiple alignment of peptidic
  sequences. It utilizes posterior decoding, and a sequence-annealing
- alignment, instead of the traditional progressive alignment method. It
- is the only alignment program that allows to control the sensitivity /
+ alignment, instead of the traditional progressive alignment method. It is
+ the only alignment program that allows one to control the sensitivity /
  specificity tradeoff.  It is based on the ProbCons source code, but
  uses alignment metric accuracy and eliminates the consistency
  transformation.
diff -u amap-align-2.2/debian/changelog amap-align-2.2/debian/changelog
--- amap-align-2.2/debian/changelog
+++ amap-align-2.2/debian/changelog
@@ -1,3 +1,12 @@
+amap-align (2.2-3) unstable; urgency=low
+
+  * Standards-Version: 3.9.2 (no changes needed)
+  * Debhelper 8 (compat+control)
+  * debian/patches/fix-gcc-4.6.diff: Fix gcc-4.6 build error
+    Closes: #624990
+
+ -- Andreas Tille <tille@debian.org>  Mon, 02 May 2011 16:30:17 +0200
+
 amap-align (2.2-2) unstable; urgency=low
 
   [ Charles Plessy ]
diff -u amap-align-2.2/debian/patches/fix-gcc-4.3.diff amap-align-2.2/debian/patches/fix-gcc-4.3.diff
--- amap-align-2.2/debian/patches/fix-gcc-4.3.diff
+++ amap-align-2.2/debian/patches/fix-gcc-4.3.diff
@@ -1,6 +1,7 @@
-Allows building with gcc-4.3.
-Many thanks to Martin Michlmayr (http://bugs.debian.org/413477)
-and to Anibal Avelar (http://bugs.debian.org/468060)
+Description: Allows building with gcc-4.3.
+Author: Martin Michlmayr (http://bugs.debian.org/413477)
+        Anibal Avelar (http://bugs.debian.org/468060)
+Forwarded: Ariel Schwartz <sariel@cs.berkeley.edu>
 --- a/align/Amap.cc
 +++ b/align/Amap.cc
 @@ -12,6 +12,8 @@
diff -u amap-align-2.2/debian/patches/series amap-align-2.2/debian/patches/series
--- amap-align-2.2/debian/patches/series
+++ amap-align-2.2/debian/patches/series
@@ -1,0 +2 @@
+fix-gcc-4.6.diff
only in patch2:
unchanged:
--- amap-align-2.2.orig/debian/patches/fix-gcc-4.6.diff
+++ amap-align-2.2/debian/patches/fix-gcc-4.6.diff
@@ -0,0 +1,10 @@
+--- amap-align-2.2.orig/align/SafeVector.h
++++ amap-align-2.2/align/SafeVector.h
+@@ -10,6 +10,7 @@
+ 
+ #include <cassert>
+ #include <vector>
++#include <cstddef>
+ 
+ /////////////////////////////////////////////////////////////////
+ // SafeVector