[Python-modules-commits] [gamera] 08/14: dropped applied patches

Fri May 8 12:42:28 UTC 2015

This is an automated email from the git hooks/post-receive script.

danstender-guest pushed a commit to branch master
in repository gamera.

commit f7caf64f5aecc98d0abb26f6920b3c491d333b03
Author: Daniel Stender <debian at danielstender.com>
Date:   Fri May 8 12:00:39 2015 +0200

    dropped applied patches
---
 debian/changelog                                   |  8 +++-
 debian/patches/avoid_mktemp.diff                   | 16 --------
 debian/patches/gendoc-version-parsing.diff         | 29 --------------
 debian/patches/series                              |  4 --
 .../suppress-wxdebug-assertion-messages.diff       | 18 ---------
 debian/patches/wxpython3.0-transition.diff         | 46 ----------------------
 6 files changed, 6 insertions(+), 115 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e08ced1..d732288 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,10 +5,14 @@ gamera (3.4.2-1) UNRELEASED; urgency=medium
      by using constant seed for generation of example/documentation
      images (Closes: #775228).
    * deb/control: updated Vcs fields (moved to git).
-   * deb/patches/fix-typos.diff: corrected path error.
+   * deb/patches:
+     + fix-typos.diff: corrected path error.
+     + dropped avoid_mktemp.diff, gendoc-version-parsing.diff, suppress-
+       wxdebug-assertion-messages.diff, wxpython3.0-transition.diff (applied
+       upstream).
    * Added deb/gbp.conf.
 
- -- Daniel Stender <debian at danielstender.com>  Fri, 08 May 2015 11:55:49 +0200
+ -- Daniel Stender <debian at danielstender.com>  Fri, 08 May 2015 11:58:51 +0200
 
 gamera (3.4.1+svn1423-4) unstable; urgency=medium
 
diff --git a/debian/patches/avoid_mktemp.diff b/debian/patches/avoid_mktemp.diff
deleted file mode 100644
index 3bfc17e..0000000
--- a/debian/patches/avoid_mktemp.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fixed security hole because of usage of tmpfile.mktemp()
-Bug: http://bugs.debian.org/737324
-Forwarded: http://sourceforge.net/p/gamera/code/1424/tree//trunk/gamera/gamera/io.py?diff=50c1e1f034309d0a1716b4b0:1423
-Author: Daniel Stender <debian at danielstender.com>
-Last-Update: 2014-07-09
---- a/gamera/io.py
-+++ b/gamera/io.py
-@@ -944,7 +944,7 @@ Returns: numpy array of specified type
-         raise ValueError, "type can be 'i', 'f' or 'd' in load()"
- 
-     ## STRIP OUT % AND # LINES
--    tmpname = tempfile.mktemp()
-+    tmpname = tempfile.NamedTemporaryFile(delete=False).name
-     if sys.platform == 'win32':
-         # NT VERSION OF GREP DOESN'T DO THE STRIPPING ... SIGH
-         cmd = "grep.exe -v \'%\' "+fname+" > "+tmpname
diff --git a/debian/patches/gendoc-version-parsing.diff b/debian/patches/gendoc-version-parsing.diff
deleted file mode 100644
index 72ffc94..0000000
--- a/debian/patches/gendoc-version-parsing.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: fix invalid version number ValueError
- the 'anarchic' version numbering of Pygments (currently in Sid: '2.0rc1') doesn't
- fit into the needs for distutils.version.StrictVersion. LooseVersion isn't perfect,
- but fulfills what's needed here
-Author: Daniel Stender <debian at danielstender.com>
-Bug: http://bugs.debian.org/767158
-Forwarded: http://sourceforge.net/p/gamera/code/1424/tree//trunk/gamera/gamera/gendoc.py?diff=50c1e1f034309d0a1716b4b0:1423
-Last-Update: 2014-10-29
-
---- a/gamera/gendoc.py
-+++ b/gamera/gendoc.py
-@@ -29,7 +29,7 @@
- import locale
- import traceback
- import warnings
--from distutils.version import StrictVersion
-+from distutils.version import StrictVersion, LooseVersion
- from gamera.util import dedent
- try:
-    locale.setlocale(locale.LC_ALL, '')
-@@ -57,7 +57,7 @@
-    import pygments.lexers
-    import pygments.formatters
-    source_highlighter = 'pygments'
--   if StrictVersion(pygments.__version__) < StrictVersion('0.6'):
-+   if LooseVersion(pygments.__version__) < LooseVersion('0.6'):
-       print "pygments version (" + pygments.__version__ + ") too old"
-       raise ImportError()
- except ImportError, e:
diff --git a/debian/patches/series b/debian/patches/series
index d9b7a9b..bd4ea53 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-suppress-wxdebug-assertion-messages.diff
-wxpython3.0-transition.diff
 gendoc-use-wxversion.diff
 gendoc-draw-text.diff
 fix-paths.diff
@@ -9,6 +7,4 @@ namespace-package.diff
 nosetests.diff
 trap-errors-from-pclose.diff
 fix-typos.diff
-avoid_mktemp.diff
-gendoc-version-parsing.diff
 constant-seed-for-docs.diff
diff --git a/debian/patches/suppress-wxdebug-assertion-messages.diff b/debian/patches/suppress-wxdebug-assertion-messages.diff
deleted file mode 100644
index 2ffcf05..0000000
--- a/debian/patches/suppress-wxdebug-assertion-messages.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: suppress wxdebug assertion messages
- gamera-gui: prevent warning on not properly closed event handlers
- on exit
-Author: Daniel Stender <debian at danielstender.com>
-Bug: http://bugs.debian.org/758578
-Forwarded: http://sourceforge.net/p/gamera/code/1424/tree//trunk/gamera/gamera/gui/gui.py?diff=50c1e1f034309d0a1716b4b0:1423
-Last-Update: 2014-08-26
-
---- a/gamera/gui/gui.py
-+++ b/gamera/gui/gui.py
-@@ -569,6 +569,7 @@ def run(startup=_show_shell):
- 
-       # wxWindows calls this method to initialize the application
-       def OnInit(self):
-+         self.SetAssertMode(wx.PYAPP_ASSERT_SUPPRESS)
-          self.SetAppName("Gamera")
-          self.splash = GameraSplash()
-          self.splash.Show()
diff --git a/debian/patches/wxpython3.0-transition.diff b/debian/patches/wxpython3.0-transition.diff
deleted file mode 100644
index 3f86965..0000000
--- a/debian/patches/wxpython3.0-transition.diff
+++ /dev/null
@@ -1,46 +0,0 @@
-Description: updates for the wxpython3.0-transition
- The call of wx.InitAllImageHandlers() is no-op in 2.8 anyway,
- cf. http://bugs.debian.org/758578, so completely disabled here
-Bug: http://bugs.debian.org/757208
-Author: Daniel Stender <debian at danielstender.com>
-Forwarded: http://sourceforge.net/p/gamera/code/1424/tree//trunk/gamera/gamera/gui/gui_util.py?diff=50c1e1f034309d0a1716b4b0:1423
-Last-Update: 2014-08-26
-
---- a/gamera/gui/gamera_display.py
-+++ b/gamera/gui/gamera_display.py
-@@ -39,8 +39,8 @@ import gamera.plugins.gui_support  # Gam
- ##############################################################################
- 
- # we want this done on import
--if int(wx.__version__.split('.')[1]) < 9:
--    wx.InitAllImageHandlers() # deprecated since wxPython 2.9
-+# if int(wx.__version__.split('.')[1]) < 9:
-+#     wx.InitAllImageHandlers() # deprecated since wxPython 2.9
- 
- def _sort_by_nrows(a, b):
-    return cmp(a.nrows, b.nrows)
-
---- a/gamera/gui/gui_util.py
-+++ b/gamera/gui/gui_util.py
-@@ -94,7 +94,7 @@ class FileDialog(wx.FileDialog):
-       if cls.last_directory is None:
-          cls.last_directory = path.abspath(config.get("default_dir"))
-       if multiple:
--         self._flags |= wx.MULTIPLE
-+         self._flags |= wx.FD_MULTIPLE
-          self._multiple = True
-       else:
-          self._multiple = False
-@@ -121,10 +121,10 @@ class FileDialog(wx.FileDialog):
-          return filename
- 
- class OpenFileDialog(FileDialog):
--   _flags = wx.OPEN
-+   _flags = wx.FD_OPEN
- 
- class SaveFileDialog(FileDialog):
--   _flags = wx.SAVE|wx.OVERWRITE_PROMPT
-+   _flags = wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT
- 
- def open_file_dialog(parent, extensions="*.*", multiple=0):
-    return OpenFileDialog(parent, extensions, multiple).show()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/gamera.git

