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

Sun Feb 24 20:29:58 UTC 2013

Date: Sunday, February 24, 2013 @ 20:29:54
  Author: jwilk
Revision: 23576

New upstream release.

Modified:
  packages/gamera/trunk/debian/changelog
  packages/gamera/trunk/debian/control
  packages/gamera/trunk/debian/patches/series
Deleted:
  packages/gamera/trunk/debian/patches/pil-import.diff
  packages/gamera/trunk/debian/patches/use-system-galib.diff

Modified: packages/gamera/trunk/debian/changelog
===================================================================

--- packages/gamera/trunk/debian/changelog	2013-02-24 17:50:33 UTC (rev 23575)
+++ packages/gamera/trunk/debian/changelog	2013-02-24 20:29:54 UTC (rev 23576)
@@ -1,3 +1,13 @@
+gamera (3.4.0-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+    + Drop pil-import.diff; applied upstream.
+    + Drop use-system-galib.diff; no longer needed.
+    + Drop libga-dev from Build-Depends; no longer needed.
+    + Bump minimum required Python version to 2.5.
+
+ -- Jakub Wilk <jwilk at debian.org>  Sun, 24 Feb 2013 21:15:23 +0100
+
 gamera (3.3.3-2) unstable; urgency=low
 
   * DEP-8 tests: use $ADTTMP.

Modified: packages/gamera/trunk/debian/control
===================================================================
--- packages/gamera/trunk/debian/control	2013-02-24 17:50:33 UTC (rev 23575)
+++ packages/gamera/trunk/debian/control	2013-02-24 20:29:54 UTC (rev 23576)
@@ -6,17 +6,17 @@
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/gamera/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/gamera/trunk/
 Build-Depends: debhelper (>= 7.3.5~), dpkg-dev (>= 1.15.7~),
- python-support (>= 0.90), python-all-dev, python-all-dbg,
+ python-support (>= 0.90),
+ python-all-dev (>= 2.5), python-all-dbg (>= 2.5),
  python-nose, procps, python-docutils, python-pygments,
  python-imaging, python-imaging-dbg,
  libtiff4-dev, libpng-dev,
  libvigraimpex-dev (>= 1.6.0-1~),
- libga-dev
 Build-Depends-Indep:
  python-numpy, python-wxgtk2.8,
  help2man, netpbm,
  python (>= 2.5), rdfind
-XS-Python-Version: >= 2.4
+XS-Python-Version: >= 2.5
 Standards-Version: 3.9.3
 Homepage: http://gamera.sourceforge.net/
 

Deleted: packages/gamera/trunk/debian/patches/pil-import.diff
===================================================================
--- packages/gamera/trunk/debian/patches/pil-import.diff	2013-02-24 17:50:33 UTC (rev 23575)
+++ packages/gamera/trunk/debian/patches/pil-import.diff	2013-02-24 20:29:54 UTC (rev 23576)
@@ -1,16 +0,0 @@
-Description: fix compatibility with PIL â‰¥ 1.2
-Author: Jakub Wilk <jwilk at debian.org>
-Forwarded: http://mail.python.org/pipermail/image-sig/2011-January/006650.html
-Last-Update: 2012-05-26
-
---- a/gamera/plugins/pil_io.py
-+++ b/gamera/plugins/pil_io.py
-@@ -22,7 +22,7 @@
- from gamera import config
- 
- try:
--    import Image as PIL
-+    from PIL import Image as PIL
- except ImportError:
-     try:
-         verbose = config.get("verbosity_level")

Modified: packages/gamera/trunk/debian/patches/series
===================================================================
--- packages/gamera/trunk/debian/patches/series	2013-02-24 17:50:33 UTC (rev 23575)
+++ packages/gamera/trunk/debian/patches/series	2013-02-24 20:29:54 UTC (rev 23576)
@@ -1,11 +1,9 @@
 gendoc-use-wxversion.diff
 gendoc-draw-text.diff
 fix-paths.diff
-use-system-galib.diff
 use-system-vigra.diff
 use-system-python-modules.diff
 setup-no-import-wx.diff
 namespace-package.diff
 nosetests.diff
 trap-errors-from-pclose.diff
-pil-import.diff

Deleted: packages/gamera/trunk/debian/patches/use-system-galib.diff
===================================================================
--- packages/gamera/trunk/debian/patches/use-system-galib.diff	2013-02-24 17:50:33 UTC (rev 23575)
+++ packages/gamera/trunk/debian/patches/use-system-galib.diff	2013-02-24 20:29:54 UTC (rev 23576)
@@ -1,63 +0,0 @@
-Description: don't use the embedded copy of the GAlib library
- Use the system-wide GAlib library, rather than the copy embedded in Gamera
- source tarball. See also Debian bug #544693.
-Author: Jakub Wilk <jwilk at debian.org>
-Forwarded: not-needed
-Last-Update: 2012-04-18
-
---- 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.
---- a/setup.py
-+++ b/setup.py
-@@ -122,8 +122,7 @@
- ########################################
- # Non-plugin extensions
- 
--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") + glob.glob("src/graph/graphmodule/*.cpp")
- kdtree_files = ["src/kdtreemodule.cpp", "src/geostructs/kdtree.cpp"]
- 
-@@ -146,7 +145,7 @@
-                         **gamera_setup.extras
-                         ),
-               Extension("gamera.knncore", ga_files,
--                        include_dirs=["include", "src/ga", "src"],
-+                        include_dirs=["include", "src"],
-                         **gamera_setup.extras),
-               Extension("gamera.graph", graph_files,
-                         include_dirs=["include", "src", "include/graph", "src/graph/graphmodule"],
---- a/src/knncoremodule.cpp
-+++ b/src/knncoremodule.cpp
-@@ -34,10 +34,11 @@
- #include <assert.h>
- #include <stdio.h>
- // for ga optimization
-+#include <ga/gaconfig.h>
-+#undef GALIB_USE_COMP_OPERATOR_TEMPLATES
- #include <ga/ga.h>
- #include <ga/GASimpleGA.h>
- #include <ga/GA1DArrayGenome.h>
--#include <ga/GA1DArrayGenome.cpp>
- // for rand
- #include <stdlib.h>
- #include <time.h>
-@@ -1527,7 +1528,7 @@
-   GA1DArrayGenome<double> & genome = (GA1DArrayGenome<double> &)g;
-   KnnObject* knn = (KnnObject*)genome.userData();
- 
--  std::pair<int,int> ans = leave_one_out(knn, std::numeric_limits<int>::max(), genome());
-+  std::pair<int,int> ans = leave_one_out(knn, std::numeric_limits<int>::max(), static_cast<double*>(genome));
- 
-   return (float)ans.first / ans.second;
- }


