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

[vicho at users.alioth.debian.org]

    Date: Sunday, October 23, 2016 @ 15:16:30
  Author: vicho
Revision: 13625

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__use_gpg_21_keys_for_test.patch
  packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch

Modified: packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch	2016-10-23 15:16:10 UTC (rev 13624)
+++ packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch	2016-10-23 15:16:30 UTC (rev 13625)
@@ -11,7 +11,7 @@
 
 --- a/setup.py
 +++ b/setup.py
-@@ -534,7 +534,6 @@ cmdclass = {'build': hgbuild,
+@@ -537,7 +537,6 @@ cmdclass = {'build': hgbuild,
              'build_scripts': hgbuildscripts,
              '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	2016-10-23 15:16:10 UTC (rev 13624)
+++ packages/mercurial/trunk/debian/patches/deb_specific__fix_fhs_paths.patch	2016-10-23 15:16:30 UTC (rev 13625)
@@ -9,7 +9,7 @@
 
 --- a/mercurial/util.py
 +++ b/mercurial/util.py
-@@ -931,6 +931,8 @@ def mainfrozen():
+@@ -935,6 +935,8 @@ def mainfrozen():
  if mainfrozen() and getattr(sys, 'frozen', None) != 'macosx_app':
      # executable version (py2exe) doesn't support __file__
      datapath = os.path.dirname(sys.executable)

Modified: packages/mercurial/trunk/debian/patches/deb_specific__use_gpg_21_keys_for_test.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__use_gpg_21_keys_for_test.patch	2016-10-23 15:16:10 UTC (rev 13624)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_gpg_21_keys_for_test.patch	2016-10-23 15:16:30 UTC (rev 13625)
@@ -8,7 +8,7 @@
 
 --- a/tests/test-gpg.t
 +++ b/tests/test-gpg.t
-@@ -18,6 +18,10 @@ Test the GPG extension
+@@ -35,6 +35,10 @@ and migrate secret keys
    $ hg sigs
  
    $ HGEDITOR=cat hg sign -e 0

Modified: packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2016-10-23 15:16:10 UTC (rev 13624)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2016-10-23 15:16:30 UTC (rev 13625)
@@ -13,7 +13,7 @@
          EDITOR="$EDITOR -nw"
 --- a/mercurial/commands.py
 +++ b/mercurial/commands.py
-@@ -2803,15 +2803,15 @@ def debuginstall(ui, **opts):
+@@ -2761,15 +2761,15 @@ def debuginstall(ui, **opts):
      editor = util.expandpath(editor)
      fm.write('editor', _("checking commit editor... (%s)\n"), editor)
      cmdpath = util.findexe(shlex.split(editor)[0])
@@ -214,7 +214,7 @@
  "PYTHONPATH\n"
 --- a/i18n/pt_BR.po
 +++ b/i18n/pt_BR.po
-@@ -23348,11 +23348,12 @@ msgstr ""
+@@ -23359,11 +23359,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -229,7 +229,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -24851,7 +24852,7 @@ msgid ""
+@@ -24862,7 +24863,7 @@ msgid ""
  "    editor it uses is determined by looking at the environment\n"
  "    variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
  "    non-empty one is chosen. If all of them are empty, the editor\n"
@@ -238,7 +238,7 @@
  msgstr ""
  "EDITOR\n"
  "    Algumas vezes o Mercurial precisa abrir em um editor um arquivo\n"
-@@ -24859,7 +24860,7 @@ msgstr ""
+@@ -24870,7 +24871,7 @@ msgstr ""
  "    mensagens de consolidação. O editor usado é determinado pela\n"
  "    consulta às variáveis de ambiente HGEDITOR, VISUAL e EDITOR,\n"
  "    nessa ordem. O primeiro valor não vazio é escolhido. Se todos\n"
@@ -247,7 +247,7 @@
  
  msgid ""
  "PYTHONPATH\n"
-@@ -34055,10 +34056,10 @@ msgstr "o número de cpus deve ser um in
+@@ -34080,10 +34081,10 @@ msgstr "o número de cpus deve ser um in
  #~ msgid " (check that you compiled the extensions)\n"
  #~ msgstr " (verifique se você compilou as extensões)\n"
  
@@ -347,7 +347,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
-@@ -1722,7 +1722,8 @@ User interface controls.
+@@ -1743,7 +1743,8 @@ User interface controls.
      Print debugging information. (default: False)
  
  ``editor``