[Python-modules-commits] r16102 - in packages/gamera/trunk/debian (5 files)

jwilk at users.alioth.debian.org jwilk at users.alioth.debian.org
Fri Mar 11 16:55:11 UTC 2011 

    Date: Friday, March 11, 2011 @ 16:55:06
  Author: jwilk
Revision: 16102

New upstream release.

Modified:
  packages/gamera/trunk/debian/changelog
  packages/gamera/trunk/debian/patches/series
  packages/gamera/trunk/debian/patches/use-system-python-modules.diff
  packages/gamera/trunk/debian/patches/use-system-vigra.diff
Deleted:
  packages/gamera/trunk/debian/patches/fix-memory-leak-to-raw-string.diff

Modified: packages/gamera/trunk/debian/changelog
===================================================================
--- packages/gamera/trunk/debian/changelog	2011-03-11 16:47:12 UTC (rev 16101)
+++ packages/gamera/trunk/debian/changelog	2011-03-11 16:55:06 UTC (rev 16102)
@@ -1,5 +1,8 @@
-gamera (3.2.6-4) UNRELEASED; urgency=low
+gamera (3.2.7-1) UNRELEASED; urgency=low
 
+  * New upstream release.
+    + Drop fix-memory-leak-to-raw-string.diff, applied upstream.
+    + Refresh other patches.
   * Strip file extension from icon name in the desktop file (closes: #609570).
     Thanks to Daniel Stender for the bug report.
   * Overhaul debian/rules.
@@ -9,7 +12,7 @@
     + Build depend on dpkg-dev (>= 1.15.7).
   * Update patch headers.
 
- -- Jakub Wilk <jwilk at debian.org>  Fri, 11 Mar 2011 17:46:58 +0100
+ -- Jakub Wilk <jwilk at debian.org>  Fri, 11 Mar 2011 17:54:23 +0100
 
 gamera (3.2.6-3) unstable; urgency=low
 

Deleted: packages/gamera/trunk/debian/patches/fix-memory-leak-to-raw-string.diff
===================================================================
--- packages/gamera/trunk/debian/patches/fix-memory-leak-to-raw-string.diff	2011-03-11 16:47:12 UTC (rev 16101)
+++ packages/gamera/trunk/debian/patches/fix-memory-leak-to-raw-string.diff	2011-03-11 16:55:06 UTC (rev 16102)
@@ -1,15 +0,0 @@
-Description: Fix memory leak in the _to_raw_string() method.
-Origin: upstream, http://gamera.svn.sourceforge.net/viewvc/gamera/trunk/gamera/include/plugins/string_io.hpp?r1=1063&r2=1271
-Last-Update: 2010-11-13
-
---- a/include/plugins/string_io.hpp
-+++ b/include/plugins/string_io.hpp
-@@ -37,7 +37,7 @@
-   for (; j != image.vec_end(); ++i, ++j) {
-     *i = *j;
-   }
--  return Py_BuildValue(CHAR_PTR_CAST "O", pystring);
-+  return pystring;
- };
- 
- template <class T>

Modified: packages/gamera/trunk/debian/patches/series
===================================================================
--- packages/gamera/trunk/debian/patches/series	2011-03-11 16:47:12 UTC (rev 16101)
+++ packages/gamera/trunk/debian/patches/series	2011-03-11 16:55:06 UTC (rev 16102)
@@ -4,4 +4,3 @@
 use-system-galib.diff
 use-system-vigra.diff
 use-system-python-modules.diff
-fix-memory-leak-to-raw-string.diff

Modified: packages/gamera/trunk/debian/patches/use-system-python-modules.diff
===================================================================
--- packages/gamera/trunk/debian/patches/use-system-python-modules.diff	2011-03-11 16:47:12 UTC (rev 16101)
+++ packages/gamera/trunk/debian/patches/use-system-python-modules.diff	2011-03-11 16:55:06 UTC (rev 16102)
@@ -37,7 +37,7 @@
  
  config.add_option(
     "-p", "--progress-bar", action="store_true",
-@@ -469,9 +469,9 @@
+@@ -470,9 +470,9 @@
        list.extend(self, other)
        self.trigger_callback('length_change', len(self))
  
@@ -49,7 +49,7 @@
        CallbackObject.__init__(self)
  
     def __del__(self):
-@@ -487,7 +487,7 @@
+@@ -488,7 +488,7 @@
  
     def add(self, element):
        alert = element not in self
@@ -58,7 +58,7 @@
        if alert:
           self.trigger_callback('add', [element])
           self.trigger_callback('length_change', len(self))
-@@ -495,25 +495,25 @@
+@@ -496,25 +496,25 @@
  
     def remove(self, element):
        alert = element in self
@@ -88,7 +88,7 @@
        self.trigger_callback('length_change', len(self))
  
     def update(self, iterable):
-@@ -522,7 +522,7 @@
+@@ -523,7 +523,7 @@
              if i not in self:
                 yield i
        self.trigger_callback('add', iter())
@@ -97,7 +97,7 @@
        self.trigger_callback('length_change', len(self))
  
     def difference_update(self, iterable):
-@@ -531,7 +531,7 @@
+@@ -532,7 +532,7 @@
              if i in self:
                 yield i
        self.trigger_callback('remove', iter())
@@ -106,25 +106,25 @@
        self.trigger_callback('length_change', len(self))
  
     def symmetric_difference_update(self, iterable):
-@@ -545,7 +545,7 @@
+@@ -546,7 +546,7 @@
                 yield i
        self.trigger_callback('remove', remove_iter())
        self.trigger_callback('add', add_iter())
--      self.Set.symmetric_difference_update(self, iterable)
+-      sets.Set.symmetric_difference_update(self, iterable)
 +      set.symmetric_difference_update(self, iterable)
        self.trigger_callback('length_change', len(self))
  
     def intersection_update(self, iterable):
-@@ -554,7 +554,7 @@
+@@ -555,7 +555,7 @@
              if not i in iterable:
                 yield i
        self.trigger_callback('remove', iter())
--      self.Set.intersection_update(self, iterable)
+-      sets.Set.intersection_update(self, iterable)
 +      set.intersection_update(self, iterable)
        self.trigger_callback('length_change', len(self))
  
     def union_update(self, other):
-@@ -565,20 +565,19 @@
+@@ -566,20 +566,19 @@
     def __setstate__(self, data):
        CallbackObject.__init__(self)
        self.trigger_callback('remove', self)
@@ -147,7 +147,7 @@
     types = []
     for method in methods:
        wildcards = ";".join(["*.%s;*.%s" %
-@@ -586,8 +585,8 @@
+@@ -587,8 +586,8 @@
        type = "%s Files (%s)|%s" % (method.exts[0].upper(), wildcards, wildcards)
        types.append(type)
        # We have to cast the lists to sets here to make Python 2.3.0 happy.
@@ -174,7 +174,7 @@
      return 2*common/total
 --- a/gamera/classify.py
 +++ b/gamera/classify.py
-@@ -737,7 +737,7 @@
+@@ -758,7 +758,7 @@
              raise ClassifierError("Grouping of only a single glyph is not allowed.")
  
        added = []

Modified: packages/gamera/trunk/debian/patches/use-system-vigra.diff
===================================================================
--- packages/gamera/trunk/debian/patches/use-system-vigra.diff	2011-03-11 16:47:12 UTC (rev 16101)
+++ packages/gamera/trunk/debian/patches/use-system-vigra.diff	2011-03-11 16:55:06 UTC (rev 16102)
@@ -5,11 +5,11 @@
 
 --- a/setup.py
 +++ b/setup.py
-@@ -167,7 +167,6 @@
+@@ -173,7 +173,6 @@
              for path, ext in
              ("", "*.hpp"),
              ("plugins", "*.hpp"),
 -            ("vigra", "*.hxx"),
              ("geostructs", "*.hpp")]
  
- srcfiles = [(os.path.join(get_python_lib(),"gamera",path),
+ srcfiles = [(os.path.join(gamera_setup.lib_path,path),

More information about the Python-modules-commits mailing list