[Python-apps-commits] r11858 - in packages/mercurial/trunk/debian/patches (6 files)

[vicho at users.alioth.debian.org]

    Date: Sunday, April 19, 2015 @ 10:18:35
  Author: vicho
Revision: 11858

refresh patches

Modified:
  packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch
  packages/mercurial/trunk/debian/patches/deb_specific__fix_fhs_paths.patch
  packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.patch
  packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies
  packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
  packages/mercurial/trunk/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch

Modified: packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch	2015-04-19 10:18:30 UTC (rev 11857)
+++ packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch	2015-04-19 10:18:35 UTC (rev 11858)
@@ -11,7 +11,7 @@
 
 --- a/setup.py
 +++ b/setup.py
-@@ -469,7 +469,6 @@ cmdclass = {'build': hgbuild,
+@@ -471,7 +471,6 @@ cmdclass = {'build': hgbuild,
              'build_py': hgbuildpy,
              'build_hgextindex': buildhgextindex,
              'install_lib': hginstalllib,

Modified: packages/mercurial/trunk/debian/patches/deb_specific__fix_fhs_paths.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__fix_fhs_paths.patch	2015-04-19 10:18:30 UTC (rev 11857)
+++ packages/mercurial/trunk/debian/patches/deb_specific__fix_fhs_paths.patch	2015-04-19 10:18:35 UTC (rev 11858)
@@ -9,7 +9,7 @@
 
 --- a/mercurial/util.py
 +++ b/mercurial/util.py
-@@ -616,6 +616,8 @@ def mainfrozen():
+@@ -621,6 +621,8 @@ def mainfrozen():
  if mainfrozen():
      # executable version (py2exe) doesn't support __file__
      datapath = os.path.dirname(sys.executable)

Modified: packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.patch	2015-04-19 10:18:30 UTC (rev 11857)
+++ packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.patch	2015-04-19 10:18:35 UTC (rev 11858)
@@ -2,10 +2,10 @@
 
 --- a/hgext/hgk.py
 +++ b/hgext/hgk.py
-@@ -349,6 +349,6 @@ def view(ui, repo, *etc, **opts):
-     "start interactive history viewer"
-     os.chdir(repo.root)
-     optstr = ' '.join(['--%s %s' % (k, v) for k, v in opts.iteritems() if v])
+@@ -326,6 +326,6 @@ def view(ui, repo, *etc, **opts):
+     if repo.filtername is None:
+         optstr += '--hidden'
+ 
 -    cmd = ui.config("hgk", "path", "hgk") + " %s %s" % (optstr, " ".join(etc))
 +    cmd = ui.config("hgk", "path", "/usr/share/mercurial/hgk") + " %s %s" % (optstr, " ".join(etc))
      ui.debug("running %s\n" % cmd)

Modified: packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies	2015-04-19 10:18:30 UTC (rev 11857)
+++ packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies	2015-04-19 10:18:35 UTC (rev 11858)
@@ -26,7 +26,7 @@
          self._checkrepotype(path)
 --- a/hgext/convert/common.py
 +++ b/hgext/convert/common.py
-@@ -28,11 +28,12 @@ def decodeargs(s):
+@@ -28,14 +28,15 @@ def decodeargs(s):
  class MissingTool(Exception):
      pass
  
@@ -34,7 +34,10 @@
 +def checktool(exe, name=None, abort=True, debname=None):
      name = name or exe
      if not util.findexe(exe):
-         exc = abort and util.Abort or MissingTool
+         if abort:
+             exc = util.Abort
+         else:
+             exc = MissingTool
 -        raise exc(_('cannot find required "%s" tool') % name)
 +        raise exc(_('cannot find required "%s" tool') % name +
 +                  (debname and _(' (try installing the %s package)') % debname or ''))
@@ -139,7 +142,7 @@
  
          self.lastrevs = {}
  
-@@ -1081,6 +1085,8 @@ class svn_sink(converter_sink, commandli
+@@ -1089,6 +1093,8 @@ class svn_sink(converter_sink, commandli
          return self.join('hg-authormap')
  
      def __init__(self, ui, path):

Modified: packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2015-04-19 10:18:30 UTC (rev 11857)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2015-04-19 10:18:35 UTC (rev 11858)
@@ -13,7 +13,7 @@
          EDITOR="$EDITOR -nw"
 --- a/mercurial/commands.py
 +++ b/mercurial/commands.py
-@@ -2331,8 +2331,8 @@ def debuginstall(ui):
+@@ -2372,8 +2372,8 @@ def debuginstall(ui):
      editor = ui.geteditor()
      cmdpath = util.findexe(shlex.split(editor)[0])
      if not cmdpath:
@@ -26,7 +26,7 @@
          else:
 --- a/mercurial/ui.py
 +++ b/mercurial/ui.py
-@@ -865,7 +865,7 @@ class ui(object):
+@@ -869,7 +869,7 @@ class ui(object):
              # avoid confusion.
              editor = 'E'
          else:
@@ -349,7 +349,7 @@
      This is used by Python to find imported modules and may need to be
 --- a/mercurial/help/config.txt
 +++ b/mercurial/help/config.txt
-@@ -1330,7 +1330,8 @@ User interface controls.
+@@ -1359,7 +1359,8 @@ User interface controls.
      Print debugging information. True or False. Default is False.
  
  ``editor``

Modified: packages/mercurial/trunk/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch	2015-04-19 10:18:30 UTC (rev 11857)
+++ packages/mercurial/trunk/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch	2015-04-19 10:18:35 UTC (rev 11858)
@@ -9,7 +9,7 @@
 
 --- a/tests/run-tests.py
 +++ b/tests/run-tests.py
-@@ -1801,7 +1801,7 @@ class TestRunner(object):
+@@ -1858,7 +1858,7 @@ class TestRunner(object):
                   sys.executable)
              mypython = os.path.join(self._tmpbindir, pyexename)
              try: