[Python-modules-commits] r18344 - in packages/gamera/trunk/debian (3 files)

[jwilk at users.alioth.debian.org]

    Date: Friday, August 26, 2011 @ 00:00:17
  Author: jwilk
Revision: 18344

New upstream release.

Modified:
  packages/gamera/trunk/debian/changelog
  packages/gamera/trunk/debian/patches/series
Deleted:
  packages/gamera/trunk/debian/patches/fix-ftbfs-gcc4.6.diff

Modified: packages/gamera/trunk/debian/changelog
===================================================================
--- packages/gamera/trunk/debian/changelog	2011-08-25 19:39:21 UTC (rev 18343)
+++ packages/gamera/trunk/debian/changelog	2011-08-26 00:00:17 UTC (rev 18344)
@@ -1,9 +1,11 @@
-gamera (3.3.0-3) UNRELEASED; urgency=low
+gamera (3.3.1-1) UNRELEASED; urgency=low
 
+  * New upstream release.
+    + Drop fix-ftbfs-gcc4.6.diff, applied upstream.
   * Demote Recommends of the documentation package to Suggests.
   * Update debian/copyright to the latest DEP-5 version.
 
- -- Jakub Wilk <jwilk at debian.org>  Mon, 15 Aug 2011 23:12:18 +0200
+ -- Jakub Wilk <jwilk at debian.org>  Fri, 26 Aug 2011 01:57:22 +0200
 
 gamera (3.3.0-2) unstable; urgency=low
 

Deleted: packages/gamera/trunk/debian/patches/fix-ftbfs-gcc4.6.diff
===================================================================
--- packages/gamera/trunk/debian/patches/fix-ftbfs-gcc4.6.diff	2011-08-25 19:39:21 UTC (rev 18343)
+++ packages/gamera/trunk/debian/patches/fix-ftbfs-gcc4.6.diff	2011-08-26 00:00:17 UTC (rev 18344)
@@ -1,17 +0,0 @@
-Description: Add a missing include to fix FTBFS with GCC 4.6.
-Author: Jakub Wilk <jwilk at debian.org>
-Bug: http://tech.groups.yahoo.com/group/gamera-devel/message/2119
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gamera/+bug/770886
-Forwarded: yes
-Last-Update: 2011-04-30
-
---- a/include/geostructs/kdtree.hpp
-+++ b/include/geostructs/kdtree.hpp
-@@ -21,6 +21,7 @@
- 
- #include <vector>
- #include <queue>
-+#include <cstdlib>
- 
- namespace Gamera { namespace Kdtree {
- 

Modified: packages/gamera/trunk/debian/patches/series
===================================================================
--- packages/gamera/trunk/debian/patches/series	2011-08-25 19:39:21 UTC (rev 18343)
+++ packages/gamera/trunk/debian/patches/series	2011-08-26 00:00:17 UTC (rev 18344)
@@ -5,4 +5,3 @@
 use-system-vigra.diff
 use-system-python-modules.diff
 setup-no-import-wx.diff
-fix-ftbfs-gcc4.6.diff