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

[vicho at users.alioth.debian.org]

    Date: Saturday, January 31, 2015 @ 14:25:17
  Author: vicho
Revision: 11688

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
  packages/mercurial/trunk/debian/patches/for_upstream__lenient_test-shelve.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-01-31 14:25:09 UTC (rev 11687)
+++ packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch	2015-01-31 14:25:17 UTC (rev 11688)
@@ -11,7 +11,7 @@
 
 --- a/setup.py
 +++ b/setup.py
-@@ -461,7 +461,6 @@ cmdclass = {'build': hgbuild,
+@@ -469,7 +469,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-01-31 14:25:09 UTC (rev 11687)
+++ packages/mercurial/trunk/debian/patches/deb_specific__fix_fhs_paths.patch	2015-01-31 14:25:17 UTC (rev 11688)
@@ -9,7 +9,7 @@
 
 --- a/mercurial/util.py
 +++ b/mercurial/util.py
-@@ -578,6 +578,8 @@ def mainfrozen():
+@@ -616,6 +616,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-01-31 14:25:09 UTC (rev 11687)
+++ packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.patch	2015-01-31 14:25:17 UTC (rev 11688)
@@ -2,11 +2,11 @@
 
 --- a/hgext/hgk.py
 +++ b/hgext/hgk.py
-@@ -347,6 +347,6 @@ def view(ui, repo, *etc, **opts):
+@@ -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])
 -    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)
-     util.system(cmd)
+     ui.system(cmd)

Modified: packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies	2015-01-31 14:25:09 UTC (rev 11687)
+++ packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies	2015-01-31 14:25:17 UTC (rev 11688)
@@ -139,7 +139,7 @@
  
          self.lastrevs = {}
  
-@@ -1077,6 +1081,8 @@ class svn_sink(converter_sink, commandli
+@@ -1081,6 +1085,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-01-31 14:25:09 UTC (rev 11687)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2015-01-31 14:25:17 UTC (rev 11688)
@@ -13,7 +13,7 @@
          EDITOR="$EDITOR -nw"
 --- a/mercurial/commands.py
 +++ b/mercurial/commands.py
-@@ -2291,8 +2291,8 @@ def debuginstall(ui):
+@@ -2331,8 +2331,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
-@@ -859,7 +859,7 @@ class ui(object):
+@@ -865,7 +865,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
-@@ -1317,7 +1317,8 @@ User interface controls.
+@@ -1330,7 +1330,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-01-31 14:25:09 UTC (rev 11687)
+++ packages/mercurial/trunk/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch	2015-01-31 14:25:17 UTC (rev 11688)
@@ -9,7 +9,7 @@
 
 --- a/tests/run-tests.py
 +++ b/tests/run-tests.py
-@@ -1776,7 +1776,7 @@ class TestRunner(object):
+@@ -1798,7 +1798,7 @@ class TestRunner(object):
                   sys.executable)
              mypython = os.path.join(self._tmpbindir, pyexename)
              try:

Modified: packages/mercurial/trunk/debian/patches/for_upstream__lenient_test-shelve.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/for_upstream__lenient_test-shelve.patch	2015-01-31 14:25:09 UTC (rev 11687)
+++ packages/mercurial/trunk/debian/patches/for_upstream__lenient_test-shelve.patch	2015-01-31 14:25:17 UTC (rev 11688)
@@ -7,7 +7,7 @@
 
 --- a/tests/test-shelve.t
 +++ b/tests/test-shelve.t
-@@ -79,11 +79,11 @@ the common case - no options or filename
+@@ -81,11 +81,11 @@ the common case - no options or filename
  ensure that our shelved changes exist
  
    $ hg shelve -l