[Python-modules-commits] r13339 - in packages/gamera/trunk/debian (4 files)

[jwilk at users.alioth.debian.org]

    Date: Tuesday, June 8, 2010 @ 19:28:24
  Author: jwilk
Revision: 13339

Refresh patches.

Modified:
  packages/gamera/trunk/debian/changelog
  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

Modified: packages/gamera/trunk/debian/changelog
===================================================================
--- packages/gamera/trunk/debian/changelog	2010-06-08 19:07:54 UTC (rev 13338)
+++ packages/gamera/trunk/debian/changelog	2010-06-08 19:28:24 UTC (rev 13339)
@@ -1,6 +1,7 @@
 gamera (3.2.6-1) UNRELEASED; urgency=low
 
   * New upstream release.
+    + Refresh patches.
   * Fix FTBFS with nostrip build option.
 
  -- Jakub Wilk <jwilk at debian.org>  Tue, 08 Jun 2010 21:06:03 +0200

Modified: packages/gamera/trunk/debian/patches/use-system-galib.diff
===================================================================
--- packages/gamera/trunk/debian/patches/use-system-galib.diff	2010-06-08 19:07:54 UTC (rev 13338)
+++ packages/gamera/trunk/debian/patches/use-system-galib.diff	2010-06-08 19:28:24 UTC (rev 13339)
@@ -15,7 +15,7 @@
  # This depends on the platform.
 --- a/setup.py
 +++ b/setup.py
-@@ -121,8 +121,7 @@
+@@ -122,8 +122,7 @@
  ########################################
  # Non-plugin extensions
  
@@ -23,9 +23,9 @@
 -ga_files.append("src/knncoremodule.cpp")
 +ga_files = ["src/knncoremodule.cpp"]
  graph_files = glob.glob("src/graph/*.cpp")
- kdtree_files = glob.glob("src/kdtree/*.cpp")
+ kdtree_files = ["src/kdtreemodule.cpp", "src/geostructs/kdtree.cpp"]
  
-@@ -145,7 +144,7 @@
+@@ -146,7 +145,7 @@
                          **gamera_setup.extras
                          ),
                Extension("gamera.knncore", ga_files,

Modified: packages/gamera/trunk/debian/patches/use-system-python-modules.diff
===================================================================
--- packages/gamera/trunk/debian/patches/use-system-python-modules.diff	2010-06-08 19:07:54 UTC (rev 13338)
+++ packages/gamera/trunk/debian/patches/use-system-python-modules.diff	2010-06-08 19:28:24 UTC (rev 13339)
@@ -172,8 +172,8 @@
      return 2*common/total
 --- a/gamera/classify.py
 +++ b/gamera/classify.py
-@@ -733,7 +733,7 @@
-          return added, removed
+@@ -737,7 +737,7 @@
+             raise ClassifierError("Grouping of only a single glyph is not allowed.")
  
        added = []
 -      removed = util.sets.Set()
@@ -201,7 +201,7 @@
           for i in self.GetSelectedIndices():
              selected.add(i)
           new_matches = matches.symmetric_difference(selected)
-@@ -989,7 +989,7 @@
+@@ -995,7 +995,7 @@
        if directory == None:
           gui_util.message("You must provide a directory to load.")
           return
@@ -210,7 +210,7 @@
        if settings:
           try:
              self._SaveClassifierSettings(
-@@ -1088,7 +1088,7 @@
+@@ -1094,7 +1094,7 @@
  
        self._save_by_criteria_dialog = results
  

Modified: packages/gamera/trunk/debian/patches/use-system-vigra.diff
===================================================================
--- packages/gamera/trunk/debian/patches/use-system-vigra.diff	2010-06-08 19:07:54 UTC (rev 13338)
+++ packages/gamera/trunk/debian/patches/use-system-vigra.diff	2010-06-08 19:28:24 UTC (rev 13339)
@@ -3,13 +3,11 @@
 
 --- a/setup.py
 +++ b/setup.py
-@@ -165,8 +165,7 @@
-              glob.glob(os.path.join("include", os.path.join(path, ext))))
+@@ -167,7 +167,6 @@
              for path, ext in
              ("", "*.hpp"),
--            ("plugins", "*.hpp"),
--            ("vigra", "*.hxx")]
-+            ("plugins", "*.hpp")]
+             ("plugins", "*.hpp"),
+-            ("vigra", "*.hxx"),
+             ("geostructs", "*.hpp")]
  
- packages = ['gamera', 'gamera.gui', 'gamera.plugins', 'gamera.toolkits',
-             'gamera.backport']
+ srcfiles = [(os.path.join(get_python_lib(),"gamera",path),