tags 468060 + patch
thanks
Hi,
Attached is the diff for my amap-align 2.0-3.1 NMU.
diff -u amap-align-2.0/debian/patches/20_fix-gcc-4.3-build amap-align-2.0/debian/patches/20_fix-gcc-4.3-build
--- amap-align-2.0/debian/patches/20_fix-gcc-4.3-build
+++ amap-align-2.0/debian/patches/20_fix-gcc-4.3-build
@@ -8,11 +8,12 @@
--- ./Amap.cc~ 2007-03-05 11:29:54.000000000 +0000
+++ ./Amap.cc 2007-03-05 11:30:58.000000000 +0000
-@@ -12,6 +12,7 @@
+@@ -12,6 +12,8 @@
#include "ProbabilisticModel.h"
#include "EvolutionaryTree.h"
#include "SparseMatrix.h"
+#include <climits>
++#include <cstring>
#include <string>
#include <sstream>
#include <iomanip>
diff -u amap-align-2.0/debian/control amap-align-2.0/debian/control
--- amap-align-2.0/debian/control
+++ amap-align-2.0/debian/control
@@ -1,7 +1,6 @@
Source: amap-align
Section: science
Priority: optional
-Conflicts: amap (<= 4.8-1)
Maintainer: Debian-Med Packaging Team <[EMAIL PROTECTED]>
DM-Upload-Allowed: yes
Uploaders: Charles Plessy <[EMAIL PROTECTED]>,
@@ -16,6 +15,7 @@
Package: amap-align
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: amap (<= 4.8-1)
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
diff -u amap-align-2.0/debian/changelog amap-align-2.0/debian/changelog
--- amap-align-2.0/debian/changelog
+++ amap-align-2.0/debian/changelog
@@ -1,3 +1,13 @@
+amap-align (2.0-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Extend debian/patches/20_fix-gcc-4.3-build with more include fixes from
+ Anibal Avelar. (Closes: #468060)
+ * Move the Conflicts line in debian/control from the source stanza to the
+ binary stanza, so that the package builds.
+
+ -- Adeodato Simó <[EMAIL PROTECTED]> Wed, 9 Apr 2008 16:44:11 +0200
+
amap-align (2.0-3) unstable; urgency=low
[ Charles Plessy ]
