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

[jwilk at users.alioth.debian.org]

    Date: Monday, May 2, 2011 @ 19:39:59
  Author: jwilk
Revision: 16863

Use the embedded copy of python-stats again; see bug #620159.

Modified:
  packages/gamera/trunk/debian/changelog
  packages/gamera/trunk/debian/control
  packages/gamera/trunk/debian/patches/use-system-python-modules.diff
  packages/gamera/trunk/debian/rules

Modified: packages/gamera/trunk/debian/changelog
===================================================================
--- packages/gamera/trunk/debian/changelog	2011-05-02 12:51:02 UTC (rev 16862)
+++ packages/gamera/trunk/debian/changelog	2011-05-02 19:39:59 UTC (rev 16863)
@@ -2,8 +2,9 @@
 
   * New upstream release.
     + Refresh patches. 
+  * Use the embedded copy of python-stats again; see bug #620159.
 
- -- Jakub Wilk <jwilk at debian.org>  Mon, 02 May 2011 14:09:03 +0200
+ -- Jakub Wilk <jwilk at debian.org>  Mon, 02 May 2011 21:38:28 +0200
 
 gamera (3.2.7-3) unstable; urgency=low
 

Modified: packages/gamera/trunk/debian/control
===================================================================
--- packages/gamera/trunk/debian/control	2011-05-02 12:51:02 UTC (rev 16862)
+++ packages/gamera/trunk/debian/control	2011-05-02 19:39:59 UTC (rev 16863)
@@ -20,7 +20,7 @@
 
 Package: python-gamera
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-stats
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Replaces: gamera-gui (<< 3.2.3-2~)
 Recommends: python-wxgtk2.8, python-numpy, python-imaging
 Suggests: gamera-doc

Modified: packages/gamera/trunk/debian/patches/use-system-python-modules.diff
===================================================================
--- packages/gamera/trunk/debian/patches/use-system-python-modules.diff	2011-05-02 12:51:02 UTC (rev 16862)
+++ packages/gamera/trunk/debian/patches/use-system-python-modules.diff	2011-05-02 19:39:59 UTC (rev 16863)
@@ -158,6 +158,20 @@
     all_extensions = ";".join(["*.%s" % x for x in extensions])
     types.insert(0, "All images (%s)|%s" % (all_extensions, all_extensions))
     types.append("All files (*.*)|*.*")
+--- a/gamera/stats.py
++++ b/gamera/stats.py
+@@ -3063,9 +3063,8 @@
+ 
+ Usage:  dices(x,y)
+ """
+-    import sets
+-    x = sets.Set(x)
+-    y = sets.Set(y)
++    x = set(x)
++    y = set(y)
+     common = len(x.intersection(y))
+     total = float(len(x) + len(y))
+     return 2*common/total
 --- a/gamera/classify.py
 +++ b/gamera/classify.py
 @@ -758,7 +758,7 @@
@@ -207,26 +221,3 @@
        if classifier:
           glyphs.update(self._classifier.get_glyphs())
        if page:
---- a/gamera/confidence.py
-+++ b/gamera/confidence.py
-@@ -19,7 +19,8 @@
- #
- 
- from gamera.core import *
--from gamera import knn, gamera_xml, cluster, stats
-+from gamera import knn, gamera_xml, cluster
-+import stats
- import math
- init_gamera()
- 
---- a/gamera/roman_text.py
-+++ b/gamera/roman_text.py
-@@ -277,7 +277,7 @@
-         self.agv_line_width = 0
- 
-     def find_tall_glyphs(self, stdev=20):
--        from gamera import stats
-+        import stats
-         tall = []
-         for i in range(len(self.glyphs)):
-             g = self.glyphs[i]

Modified: packages/gamera/trunk/debian/rules
===================================================================
--- packages/gamera/trunk/debian/rules	2011-05-02 12:51:02 UTC (rev 16862)
+++ packages/gamera/trunk/debian/rules	2011-05-02 19:39:59 UTC (rev 16863)
@@ -32,7 +32,6 @@
 	rm -Rf include/zlib*/ src/zlib*/ src/libpng*/ src/libtiff*/
 	rm -Rf include/vigra/
 	rm -Rf src/ga/
-	rm -f gamera/stats.py gamera/pstat.py gamera/io.py
 	$(MAKE) -f debian/rules $(makeflags) build/stamp
 ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
 	set -x -e; \