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

[jwilk at users.alioth.debian.org]

    Date: Monday, May 2, 2011 @ 12:51:02
  Author: jwilk
Revision: 16862

New upstream release.

Modified:
  packages/gamera/trunk/debian/changelog
  packages/gamera/trunk/debian/patches/use-system-galib.diff
  packages/gamera/trunk/debian/patches/use-system-vigra.diff

Modified: packages/gamera/trunk/debian/changelog
===================================================================
--- packages/gamera/trunk/debian/changelog	2011-05-02 10:47:05 UTC (rev 16861)
+++ packages/gamera/trunk/debian/changelog	2011-05-02 12:51:02 UTC (rev 16862)
@@ -1,3 +1,10 @@
+gamera (3.3.0-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+    + Refresh patches. 
+
+ -- Jakub Wilk <jwilk at debian.org>  Mon, 02 May 2011 14:09:03 +0200
+
 gamera (3.2.7-3) unstable; urgency=low
 
   * Move python-stats from Build-Depends to Build-Depends-Indep.

Modified: packages/gamera/trunk/debian/patches/use-system-galib.diff
===================================================================
--- packages/gamera/trunk/debian/patches/use-system-galib.diff	2011-05-02 10:47:05 UTC (rev 16861)
+++ packages/gamera/trunk/debian/patches/use-system-galib.diff	2011-05-02 12:51:02 UTC (rev 16862)
@@ -25,7 +25,7 @@
 -ga_files = glob.glob("src/ga/*.cpp")
 -ga_files.append("src/knncoremodule.cpp")
 +ga_files = ["src/knncoremodule.cpp"]
- graph_files = glob.glob("src/graph/*.cpp")
+ graph_files = glob.glob("src/graph/*.cpp") + glob.glob("src/graph/graphmodule/*.cpp")
  kdtree_files = ["src/kdtreemodule.cpp", "src/geostructs/kdtree.cpp"]
  
 @@ -146,7 +145,7 @@
@@ -36,7 +36,7 @@
 +                        include_dirs=["include", "src"],
                          **gamera_setup.extras),
                Extension("gamera.graph", graph_files,
-                         include_dirs=["include", "src", "src/graph"],
+                         include_dirs=["include", "src", "include/graph", "src/graph/graphmodule"],
 --- a/src/knncoremodule.cpp
 +++ b/src/knncoremodule.cpp
 @@ -34,10 +34,11 @@

Modified: packages/gamera/trunk/debian/patches/use-system-vigra.diff
===================================================================
--- packages/gamera/trunk/debian/patches/use-system-vigra.diff	2011-05-02 10:47:05 UTC (rev 16861)
+++ packages/gamera/trunk/debian/patches/use-system-vigra.diff	2011-05-02 12:51:02 UTC (rev 16862)
@@ -10,6 +10,6 @@
              ("", "*.hpp"),
              ("plugins", "*.hpp"),
 -            ("vigra", "*.hxx"),
-             ("geostructs", "*.hpp")]
+             ("geostructs", "*.hpp"),
+             ("graph", "*.hpp")]
  
- srcfiles = [(os.path.join(gamera_setup.lib_path,path),