[Python-modules-commits] r12608 - in packages/gamera/trunk/debian (11 files)

jwilk at users.alioth.debian.org jwilk at users.alioth.debian.org
Wed Apr 14 15:20:15 UTC 2010 

    Date: Wednesday, April 14, 2010 @ 15:19:58
  Author: jwilk
Revision: 12608

* New upstream release:
  + Drop fix-unaligned-access.diff, tiff-support-64bit.diff,
    png-support-libpng.diff; all applied upstream.
  + Refresh the remaining patches.

Modified:
  packages/gamera/trunk/debian/changelog
  packages/gamera/trunk/debian/patches/fix-paths.diff
  packages/gamera/trunk/debian/patches/gendoc-draw-text.diff
  packages/gamera/trunk/debian/patches/gendoc-use-wxversion.diff
  packages/gamera/trunk/debian/patches/series
  packages/gamera/trunk/debian/patches/use-system-galib.diff
  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-unaligned-access.diff
  packages/gamera/trunk/debian/patches/png-support-libpng.diff
  packages/gamera/trunk/debian/patches/tiff-support-64bit.diff

Modified: packages/gamera/trunk/debian/changelog
===================================================================
--- packages/gamera/trunk/debian/changelog	2010-04-14 14:31:45 UTC (rev 12607)
+++ packages/gamera/trunk/debian/changelog	2010-04-14 15:19:58 UTC (rev 12608)
@@ -1,11 +1,15 @@
-gamera (3.2.4-3) UNRELEASED; urgency=low
+gamera (3.2.5-1) UNRELEASED; urgency=low
 
+  * New upstream release:
+    + Drop fix-unaligned-access.diff, tiff-support-64bit.diff,
+      png-support-libpng.diff; all applied upstream.
+    + Refresh the remaining patches.
   * Let gamera-dbg only recommend (instead of depending on) python-dbg, as the
     package can be useful even without the latter.
   * Move other *-dbg packages from gamera-dbg's Recommends: to Suggests:, as
     it's unlikely they will be helpful in debugging problems with Gamera.
 
- -- Jakub Wilk <jwilk at debian.org>  Sat, 13 Mar 2010 18:46:12 +0100
+ -- Jakub Wilk <jwilk at debian.org>  Wed, 14 Apr 2010 17:14:22 +0200
 
 gamera (3.2.4-2) unstable; urgency=medium
 

Modified: packages/gamera/trunk/debian/patches/fix-paths.diff
===================================================================
--- packages/gamera/trunk/debian/patches/fix-paths.diff	2010-04-14 14:31:45 UTC (rev 12607)
+++ packages/gamera/trunk/debian/patches/fix-paths.diff	2010-04-14 15:19:58 UTC (rev 12608)
@@ -2,10 +2,8 @@
  Fix documentation generator to look for test files in the build directory.
 Author: Jakub Wilk <jwilk at debian.org>
 
-Index: gamera-3.2.3/doc/gendoc.py
-===================================================================
---- gamera-3.2.3.orig/doc/gendoc.py	2009-11-27 17:13:56.000000000 +0100
-+++ gamera-3.2.3/doc/gendoc.py	2009-11-27 17:14:01.000000000 +0100
+--- a/doc/gendoc.py
++++ b/doc/gendoc.py
 @@ -7,6 +7,12 @@
  
  import draw_text_helper
@@ -19,10 +17,8 @@
  if __name__ == "__main__":
     core.init_gamera()
     gendoc.gendoc(classes=[
-Index: gamera-3.2.3/gamera/paths.py
-===================================================================
---- gamera-3.2.3.orig/gamera/paths.py	2009-09-30 09:49:13.000000000 +0200
-+++ gamera-3.2.3/gamera/paths.py	2009-11-27 17:14:01.000000000 +0100
+--- a/gamera/paths.py
++++ b/gamera/paths.py
 @@ -22,11 +22,7 @@
  from __future__ import generators
  import os, sys, dircache, glob, imp  # Python standard library

Deleted: packages/gamera/trunk/debian/patches/fix-unaligned-access.diff
===================================================================
--- packages/gamera/trunk/debian/patches/fix-unaligned-access.diff	2010-04-14 14:31:45 UTC (rev 12607)
+++ packages/gamera/trunk/debian/patches/fix-unaligned-access.diff	2010-04-14 15:19:58 UTC (rev 12608)
@@ -1,64 +0,0 @@
-Description: Fix unaligned memory access in the generated C code.
-Origin: upstream, http://gamera.svn.sourceforge.net/viewvc/gamera/trunk/gamera/gamera/generate.py?r1=1109&r2=1205&pathrev=1205
-Bug: http://tech.groups.yahoo.com/group/gamera-devel/message/1952
-Bug-Debian: http://bugs.debian.org/570953 
-
-Index: gamera-3.2.4/gamera/generate.py
-===================================================================
---- gamera-3.2.4.orig/gamera/generate.py	2009-07-03 17:21:42.000000000 +0200
-+++ gamera-3.2.4/gamera/generate.py	2010-02-24 13:36:37.000000000 +0100
-@@ -1,8 +1,8 @@
- # -*- mode: python; indent-tabs-mode: nil; tab-width: 3 -*-
- # vim: set tabstop=3 shiftwidth=3 expandtab:
- #
--# Copyright (C) 2001-2005 Ichiro Fujinaga, Michael Droettboom,
--#                          and Karl MacMillan
-+# Copyright (C) 2001-2005 Ichiro Fujinaga, Michael Droettboom, Karl MacMillan
-+#               2010      Christoph Dalitz
- #
- # This program is free software; you can redistribute it and/or
- # modify it under the terms of the GNU General Public License
-@@ -183,10 +183,8 @@
- 
-       [[if function.feature_function]]
-          feature_t* feature_buffer = 0;
--         PyObject* str = 0;
-          if (offset < 0) {
--           str = PyString_FromStringAndSize(NULL, [[function.return_type.length]] * sizeof(feature_t));
--           feature_buffer = (feature_t*)PyString_AsString(str);
-+           feature_buffer = new feature_t[ [[function.return_type.length]] ];
-          } else {
-            if (self_arg->features_len < offset + [[function.return_type.length]]) {
-              PyErr_Format(PyExc_ValueError, \"Offset as given (%d) will cause data to be written outside of array of length (%d).  Perhaps the feature array is not initialised?\", offset, (int)self_arg->features_len);
-@@ -212,15 +210,22 @@
-       [[end]]
- 
-       [[if function.feature_function]]
--         if (str != 0) {
--            [[# This is pretty expensive, but simple #]]
--            PyObject* array_init = get_ArrayInit();
--            if (array_init == 0)
--              return 0;
--            PyObject* array = PyObject_CallFunction(
--                  array_init, (char *)\"sO\", (char *)\"d\", str);
--            Py_DECREF(str);
--            return array;
-+         if (offset < 0) {
-+           PyObject* str = PyString_FromStringAndSize((char*)feature_buffer, [[function.return_type.length]] * sizeof(feature_t));
-+           if (str != 0) {
-+              [[# This is pretty expensive, but simple #]]
-+              PyObject* array_init = get_ArrayInit();
-+              if (array_init == 0)
-+                return 0;
-+              PyObject* array = PyObject_CallFunction(
-+                    array_init, (char *)\"sO\", (char *)\"d\", str);
-+              Py_DECREF(str);
-+              delete[] feature_buffer;
-+              return array;
-+           } else {
-+             delete[] feature_buffer;
-+             return 0;
-+           }
-          } else {
-            Py_INCREF(Py_None);
-            return Py_None;

Modified: packages/gamera/trunk/debian/patches/gendoc-draw-text.diff
===================================================================
--- packages/gamera/trunk/debian/patches/gendoc-draw-text.diff	2010-04-14 14:31:45 UTC (rev 12607)
+++ packages/gamera/trunk/debian/patches/gendoc-draw-text.diff	2010-04-14 15:19:58 UTC (rev 12608)
@@ -2,10 +2,8 @@
  example if X server is not available.
 Author: Jakub Wilk <jwilk at debian.org>
 
-Index: gamera-3.2.2/doc/gendoc.py
-===================================================================
---- gamera-3.2.2.orig/doc/gendoc.py	2009-10-04 11:58:57.000000000 +0200
-+++ gamera-3.2.2/doc/gendoc.py	2009-10-04 11:59:10.000000000 +0200
+--- a/doc/gendoc.py
++++ b/doc/gendoc.py
 @@ -5,6 +5,8 @@
  import wxversion
  wxversion.select(["2.8", "2.6", "2.5", "2.4"])
@@ -15,10 +13,8 @@
  if __name__ == "__main__":
     core.init_gamera()
     gendoc.gendoc(classes=[
-Index: gamera-3.2.2/doc/draw_text_helper.py
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gamera-3.2.2/doc/draw_text_helper.py	2009-10-04 12:00:01.000000000 +0200
+--- /dev/null
++++ b/doc/draw_text_helper.py
 @@ -0,0 +1,46 @@
 +#!/usr/bin/python
 +

Modified: packages/gamera/trunk/debian/patches/gendoc-use-wxversion.diff
===================================================================
--- packages/gamera/trunk/debian/patches/gendoc-use-wxversion.diff	2010-04-14 14:31:45 UTC (rev 12607)
+++ packages/gamera/trunk/debian/patches/gendoc-use-wxversion.diff	2010-04-14 15:19:58 UTC (rev 12608)
@@ -2,10 +2,8 @@
  This patch is intended to alleviate Debian bug #451104.
 Author: Jakub Wilk <jwilk at debian.org>
 
-Index: gamera-3.2.0+svn1154/doc/gendoc.py
-===================================================================
---- gamera-3.2.0+svn1154.orig/doc/gendoc.py	2009-09-04 19:26:39.000000000 +0200
-+++ gamera-3.2.0+svn1154/doc/gendoc.py	2009-09-04 19:26:45.000000000 +0200
+--- a/doc/gendoc.py
++++ b/doc/gendoc.py
 @@ -2,6 +2,9 @@
  
  from gamera import core, gendoc

Deleted: packages/gamera/trunk/debian/patches/png-support-libpng.diff
===================================================================
--- packages/gamera/trunk/debian/patches/png-support-libpng.diff	2010-04-14 14:31:45 UTC (rev 12607)
+++ packages/gamera/trunk/debian/patches/png-support-libpng.diff	2010-04-14 15:19:58 UTC (rev 12608)
@@ -1,27 +0,0 @@
-Description: Link _png_support.so with libpng on all Unix architectures.
-Author: Jakub Wilk <jwilk at debian.org>
-Bug: http://tech.groups.yahoo.com/group/gamera-devel/message/1951
-Bug-Debian: http://bugs.debian.org/570809
-
---- gamera-3.2.4.orig/gamera/plugins/png_support.py
-+++ gamera-3.2.4/gamera/plugins/png_support.py
-@@ -82,9 +82,7 @@ class PngSupportModule(PluginModule):
-     cpp_headers = ["png_support.hpp"]
-     internal_png_dir = "src/libpng-1.2.5/"
-     internal_zlib_dir = "src/zlib-1.2.1/"
--    if sys.platform == 'linux2':
--        extra_libraries = ["png"]
--    elif sys.platform == 'darwin':
-+    if sys.platform == 'darwin':
-         found_png = None
-         for p in ["/sw", "/usr", "/usr/local"]:
-             if os.path.exists(os.path.join(p, "include/png.h")):
-@@ -115,6 +113,8 @@ class PngSupportModule(PluginModule):
-                              'uncompr.c','zutil.c']])
-         cpp_include_dirs = [internal_png_dir, "include/zlib-1.2.1"]
- #        extra_libraries = ["z"]
-+    else:
-+        extra_libraries = ["png"]
-     functions = [save_PNG, PNG_info, load_PNG]
-     author = "Michael Droettboom and Albert Bzreckzo"
-     url = "http://gamera.sourceforge.net/"

Modified: packages/gamera/trunk/debian/patches/series
===================================================================
--- packages/gamera/trunk/debian/patches/series	2010-04-14 14:31:45 UTC (rev 12607)
+++ packages/gamera/trunk/debian/patches/series	2010-04-14 15:19:58 UTC (rev 12608)
@@ -1,6 +1,3 @@
-fix-unaligned-access.diff
-tiff-support-64bit.diff
-png-support-libpng.diff
 gendoc-use-wxversion.diff
 gendoc-draw-text.diff
 fix-paths.diff

Deleted: packages/gamera/trunk/debian/patches/tiff-support-64bit.diff
===================================================================
--- packages/gamera/trunk/debian/patches/tiff-support-64bit.diff	2010-04-14 14:31:45 UTC (rev 12607)
+++ packages/gamera/trunk/debian/patches/tiff-support-64bit.diff	2010-04-14 15:19:58 UTC (rev 12608)
@@ -1,27 +0,0 @@
-Description: Fix TIFF export on 64-bit machines.
-Origin: upstream, http://gamera.svn.sourceforge.net/viewvc/gamera?view=rev&revision=1199
-Bug: http://tech.groups.yahoo.com/group/gamera-devel/message/1939
-Bug-Debian: http://bugs.debian.org/570559
-
-Index: gamera-3.2.4/include/plugins/tiff_support.hpp
-===================================================================
---- gamera-3.2.4.orig/include/plugins/tiff_support.hpp	2010-02-20 16:38:27.000000000 +0100
-+++ gamera-3.2.4/include/plugins/tiff_support.hpp	2010-02-22 14:35:52.000000000 +0100
-@@ -218,12 +218,15 @@
-     template<class T>
-     void operator()(const T& matrix, TIFF* tif) {
-       TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_RGB);
--      tdata_t buf = _TIFFmalloc(TIFFScanlineSize(tif));
-+      tsize_t scanline_size = TIFFScanlineSize(tif);
-+      if (scanline_size % 4) // round up to multiple of 4
-+        scanline_size += 4 - (scanline_size % 4);
-+      tdata_t buf = _TIFFmalloc(scanline_size);
-       if (!buf)
-         throw std::runtime_error("Error allocating scanline");
-       TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISWHITE);
-       std::bitset<32> bits;
--      unsigned long* data = (unsigned long *)buf;
-+      uint32* data = (uint32 *)buf;
-       bool little_endian = byte_order_little_endian();
-       typename T::const_vec_iterator it = matrix.vec_begin();
-       for (size_t i = 0; i < matrix.nrows(); i++) {

Modified: packages/gamera/trunk/debian/patches/use-system-galib.diff
===================================================================
--- packages/gamera/trunk/debian/patches/use-system-galib.diff	2010-04-14 14:31:45 UTC (rev 12607)
+++ packages/gamera/trunk/debian/patches/use-system-galib.diff	2010-04-14 15:19:58 UTC (rev 12608)
@@ -2,23 +2,19 @@
  See also Debian bug #544693.
 Author: Jakub Wilk <jwilk at debian.org>
 
-Index: gamera-3.2.0+svn1154/gamera/gamera_setup.py
-===================================================================
---- gamera-3.2.0+svn1154.orig/gamera/gamera_setup.py	2009-09-04 19:26:39.000000000 +0200
-+++ gamera-3.2.0+svn1154/gamera/gamera_setup.py	2009-09-04 19:26:56.000000000 +0200
-@@ -83,7 +83,7 @@
- elif sys.platform == 'darwin':
-    extras['extra_link_args'] = ['-F/System/Library/Frameworks/']
+--- a/gamera/gamera_setup.py
++++ b/gamera/gamera_setup.py
+@@ -87,7 +87,7 @@
+    if macosversion.startswith("10.6"):
+       extras['extra_link_args'].append('-L/Developer/SDKs/MacOSX10.5.sdk/usr/lib')
  elif '--compiler=mingw32' in sys.argv or not sys.platform == 'win32':
 -   extras['libraries'] = ['stdc++'] # Not for intel compiler
 +   extras['libraries'] = ['stdc++', 'ga'] # Not for intel compiler
  
  # Check that we are running a recent enough version of Python.
  # This depends on the platform.
-Index: gamera-3.2.0+svn1154/setup.py
-===================================================================
---- gamera-3.2.0+svn1154.orig/setup.py	2009-09-04 19:26:39.000000000 +0200
-+++ gamera-3.2.0+svn1154/setup.py	2009-09-04 19:26:56.000000000 +0200
+--- a/setup.py
++++ b/setup.py
 @@ -121,8 +121,7 @@
  ########################################
  # Non-plugin extensions
@@ -38,10 +34,8 @@
                          **gamera_setup.extras),
                Extension("gamera.graph", graph_files,
                          include_dirs=["include", "src", "src/graph"],
-Index: gamera-3.2.0+svn1154/src/knncoremodule.cpp
-===================================================================
---- gamera-3.2.0+svn1154.orig/src/knncoremodule.cpp	2009-09-04 19:26:39.000000000 +0200
-+++ gamera-3.2.0+svn1154/src/knncoremodule.cpp	2009-09-04 19:26:56.000000000 +0200
+--- a/src/knncoremodule.cpp
++++ b/src/knncoremodule.cpp
 @@ -34,10 +34,11 @@
  #include <assert.h>
  #include <stdio.h>

Modified: packages/gamera/trunk/debian/patches/use-system-python-modules.diff
===================================================================
--- packages/gamera/trunk/debian/patches/use-system-python-modules.diff	2010-04-14 14:31:45 UTC (rev 12607)
+++ packages/gamera/trunk/debian/patches/use-system-python-modules.diff	2010-04-14 15:19:58 UTC (rev 12608)
@@ -1,10 +1,8 @@
 Description: Don't use embedded copies of standard Python modules.
 Author: Jakub Wilk <jwilk at debian.org>
 
-Index: gamera-3.2.4/gamera/plugin.py
-===================================================================
---- gamera-3.2.4.orig/gamera/plugin.py	2009-07-03 17:21:41.000000000 +0200
-+++ gamera-3.2.4/gamera/plugin.py	2010-02-13 18:25:56.000000000 +0100
+--- a/gamera/plugin.py
++++ b/gamera/plugin.py
 @@ -23,7 +23,6 @@
  from gamera import paths
  from gamera import util
@@ -26,10 +24,8 @@
        return list(methods)
     elif plugin_methods.has_key(pixel_type):
        methods = plugin_methods[pixel_type]
-Index: gamera-3.2.4/gamera/util.py
-===================================================================
---- gamera-3.2.4.orig/gamera/util.py	2009-11-13 20:54:24.000000000 +0100
-+++ gamera-3.2.4/gamera/util.py	2010-02-13 18:27:31.000000000 +0100
+--- a/gamera/util.py
++++ b/gamera/util.py
 @@ -27,7 +27,7 @@
  from gamera.enums import *
  from gamera.gui import has_gui
@@ -160,10 +156,8 @@
     all_extensions = ";".join(["*.%s" % x for x in extensions])
     types.insert(0, "All images (%s)|%s" % (all_extensions, all_extensions))
     types.append("All files (*.*)|*.*")
-Index: gamera-3.2.4/gamera/stats.py
-===================================================================
---- gamera-3.2.4.orig/gamera/stats.py	2009-07-03 17:21:42.000000000 +0200
-+++ gamera-3.2.4/gamera/stats.py	2010-02-13 18:25:56.000000000 +0100
+--- a/gamera/stats.py
++++ b/gamera/stats.py
 @@ -3063,9 +3063,8 @@
  
  Usage:  dices(x,y)
@@ -176,10 +170,8 @@
      common = len(x.intersection(y))
      total = float(len(x) + len(y))
      return 2*common/total
-Index: gamera-3.2.4/gamera/classify.py
-===================================================================
---- gamera-3.2.4.orig/gamera/classify.py	2009-10-01 17:36:12.000000000 +0200
-+++ gamera-3.2.4/gamera/classify.py	2010-02-13 18:25:56.000000000 +0100
+--- a/gamera/classify.py
++++ b/gamera/classify.py
 @@ -733,7 +733,7 @@
           return added, removed
  
@@ -189,10 +181,8 @@
        for glyph in glyphs:
           for child in glyph.children_images:
              removed.add(child)
-Index: gamera-3.2.4/gamera/gui/classifier_display.py
-===================================================================
---- gamera-3.2.4.orig/gamera/gui/classifier_display.py	2009-11-13 20:54:24.000000000 +0100
-+++ gamera-3.2.4/gamera/gui/classifier_display.py	2010-02-13 18:25:56.000000000 +0100
+--- a/gamera/gui/classifier_display.py
++++ b/gamera/gui/classifier_display.py
 @@ -318,7 +318,7 @@
                      (-1,0), (0,-1), (1,0), (0,1),   # +
                      (-1,-1), (-1,1), (1,-1), (1,1)) # x

Modified: packages/gamera/trunk/debian/patches/use-system-vigra.diff
===================================================================
--- packages/gamera/trunk/debian/patches/use-system-vigra.diff	2010-04-14 14:31:45 UTC (rev 12607)
+++ packages/gamera/trunk/debian/patches/use-system-vigra.diff	2010-04-14 15:19:58 UTC (rev 12608)
@@ -1,10 +1,8 @@
 Description: Don't use an embedded copy of the VIGRA library.
 Author: Jakub Wilk <jwilk at debian.org>
 
-Index: gamera-3.2.0+svn1154/setup.py
-===================================================================
---- gamera-3.2.0+svn1154.orig/setup.py	2009-09-04 19:26:56.000000000 +0200
-+++ gamera-3.2.0+svn1154/setup.py	2009-09-04 19:27:00.000000000 +0200
+--- a/setup.py
++++ b/setup.py
 @@ -165,8 +165,7 @@
               glob.glob(os.path.join("include", os.path.join(path, ext))))
              for path, ext in

More information about the Python-modules-commits mailing list