[med-svn] [populations] 09/13: Import Debian changes 1.2.33+svn0120106-2.1

[Andreas Tille]

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

tille pushed a commit to branch master
in repository populations.

commit 5fd317e51e51e10e65ea50ae6d0fa09f3e082448
Author: gregor herrmann <gregoa at debian.org>
Date:   Sat Apr 21 13:12:39 2012 +0200

    Import Debian changes 1.2.33+svn0120106-2.1
    
    populations (1.2.33+svn0120106-2.1) unstable; urgency=low
    
      * Non-maintainer upload.
      * Fix "ftbfs with GCC-4.7": add patch from Paul Tagliamonte
        (use this->erase).
        Also drop unused and unneeded build-dependency on g++-4.5
        Closes: #667327
---
 debian/changelog                              | 10 ++++++++++
 debian/control                                |  3 +--
 debian/patches/fix-ftbfs-gcc-4.7-667327.patch | 11 +++++++++++
 debian/patches/series                         |  1 +
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7022318..b024667 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+populations (1.2.33+svn0120106-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "ftbfs with GCC-4.7": add patch from Paul Tagliamonte
+    (use this->erase).
+    Also drop unused and unneeded build-dependency on g++-4.5
+    Closes: #667327
+
+ -- gregor herrmann <gregoa at debian.org>  Sat, 21 Apr 2012 13:12:39 +0200
+
 populations (1.2.33+svn0120106-2) unstable; urgency=low
 
   * changed a build-depends: libpng12-dev -> libpng-dev. Closes: #662477
diff --git a/debian/control b/debian/control
index 43e5af0..58832ef 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,7 @@ Maintainer: Georges Khaznadar <georgesk at ofset.org>
 Build-Depends: debhelper (>= 7.0.50~), cmake, qt4-qmake, libqt4-dev,
  libfontconfig1-dev, libfreetype6-dev, libglib2.0-dev, libice-dev,
  libpng-dev, libsm-dev, libx11-dev, libxext-dev, libxrender-dev,
- zlib1g-dev,
- g++-4.5
+ zlib1g-dev
 Standards-Version: 3.9.3
 Homepage: http://www.bioinformatics.org/~tryphon/populations/
 
diff --git a/debian/patches/fix-ftbfs-gcc-4.7-667327.patch b/debian/patches/fix-ftbfs-gcc-4.7-667327.patch
new file mode 100644
index 0000000..8967dd2
--- /dev/null
+++ b/debian/patches/fix-ftbfs-gcc-4.7-667327.patch
@@ -0,0 +1,11 @@
+--- a/src/vecteurs.h	2012-04-14 01:04:00.875307000 -0400
++++ b/src/vecteurs.h	2012-04-14 01:04:06.531306699 -0400
+@@ -86,7 +86,7 @@ public:
+ 	}
+ 
+ 	void Suppr(unsigned long pos) {
+-		erase(vector<T>::begin() + pos);
++		this->erase(vector<T>::begin() + pos);
+ 	}
+ 
+ };
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4d2a44d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-ftbfs-gcc-4.7-667327.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/populations.git