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

mithrandi at users.alioth.debian.org mithrandi at users.alioth.debian.org
Sun Feb 11 05:37:25 UTC 2018 

    Date: Sunday, February 11, 2018 @ 05:37:25
  Author: mithrandi
Revision: 14592

Refresh quilt 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/proposed_upstream__correct-zeroconf-doc

Modified: packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch	2018-02-11 05:19:39 UTC (rev 14591)
+++ packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch	2018-02-11 05:37:25 UTC (rev 14592)
@@ -9,11 +9,11 @@
 Bug-Ubuntu: https://bugs.launchpad.net/bugs/745250
 Forwarded: not-needed
 
-Index: mercurial-4.4.1/setup.py
+Index: mercurial-4.5/setup.py
 ===================================================================
---- mercurial-4.4.1.orig/setup.py	2017-11-13 07:05:05.674348183 +0200
-+++ mercurial-4.4.1/setup.py	2017-11-13 07:05:05.670348114 +0200
-@@ -753,7 +753,6 @@
+--- mercurial-4.5.orig/setup.py	2018-02-11 07:36:52.182893969 +0200
++++ mercurial-4.5/setup.py	2018-02-11 07:36:52.182893969 +0200
+@@ -778,7 +778,6 @@
              'build_hgextindex': buildhgextindex,
              'install': hginstall,
              '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	2018-02-11 05:19:39 UTC (rev 14591)
+++ packages/mercurial/trunk/debian/patches/deb_specific__fix_fhs_paths.patch	2018-02-11 05:37:25 UTC (rev 14592)
@@ -7,11 +7,11 @@
  testsuite when building the package.
 Author: Javi Merino <vicho at debian.org>
 
-Index: mercurial-4.4.1/mercurial/util.py
+Index: mercurial-4.5/mercurial/util.py
 ===================================================================
---- mercurial-4.4.1.orig/mercurial/util.py	2017-11-13 07:05:09.546415215 +0200
-+++ mercurial-4.4.1/mercurial/util.py	2017-11-13 07:05:09.542415144 +0200
-@@ -1094,6 +1094,8 @@
+--- mercurial-4.5.orig/mercurial/util.py	2018-02-11 07:36:56.134963830 +0200
++++ mercurial-4.5/mercurial/util.py	2018-02-11 07:36:56.130963759 +0200
+@@ -1106,6 +1106,8 @@
  if mainfrozen() and getattr(sys, 'frozen', None) != 'macosx_app':
      # executable version (py2exe) doesn't support __file__
      datapath = os.path.dirname(pycompat.sysexecutable)

Modified: packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.patch	2018-02-11 05:19:39 UTC (rev 14591)
+++ packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.patch	2018-02-11 05:37:25 UTC (rev 14592)
@@ -1,10 +1,10 @@
 Set default hgk path for hgk outside bin.
 
-Index: mercurial-4.4.1/hgext/hgk.py
+Index: mercurial-4.5/hgext/hgk.py
 ===================================================================
---- mercurial-4.4.1.orig/hgext/hgk.py	2017-11-13 07:03:35.564787794 +0200
-+++ mercurial-4.4.1/hgext/hgk.py	2017-11-13 07:04:16.637499141 +0200
-@@ -65,7 +65,7 @@
+--- mercurial-4.5.orig/hgext/hgk.py	2018-02-11 07:35:22.497308614 +0200
++++ mercurial-4.5/hgext/hgk.py	2018-02-11 07:35:22.493308544 +0200
+@@ -66,7 +66,7 @@
  configitem = registrar.configitem(configtable)
  
  configitem('hgk', 'path',

Modified: packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies	2018-02-11 05:19:39 UTC (rev 14591)
+++ packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies	2018-02-11 05:37:25 UTC (rev 14592)
@@ -1,9 +1,9 @@
 Suggest Debian packages for some optional dependencies.
 
-Index: mercurial-4.4.1/hgext/bugzilla.py
+Index: mercurial-4.5/hgext/bugzilla.py
 ===================================================================
---- mercurial-4.4.1.orig/hgext/bugzilla.py	2017-11-13 07:04:57.794211761 +0200
-+++ mercurial-4.4.1/hgext/bugzilla.py	2017-11-13 07:04:57.786211622 +0200
+--- mercurial-4.5.orig/hgext/bugzilla.py	2018-02-11 07:35:32.369483121 +0200
++++ mercurial-4.5/hgext/bugzilla.py	2018-02-11 07:35:32.365483051 +0200
 @@ -451,7 +451,8 @@
              import MySQLdb as mysql
              bzmysql._MySQLdb = mysql
@@ -14,10 +14,10 @@
  
          bzaccess.__init__(self, ui)
  
-Index: mercurial-4.4.1/hgext/convert/bzr.py
+Index: mercurial-4.5/hgext/convert/bzr.py
 ===================================================================
---- mercurial-4.4.1.orig/hgext/convert/bzr.py	2017-11-13 07:04:57.794211761 +0200
-+++ mercurial-4.4.1/hgext/convert/bzr.py	2017-11-13 07:04:57.790211691 +0200
+--- mercurial-4.5.orig/hgext/convert/bzr.py	2018-02-11 07:35:32.369483121 +0200
++++ mercurial-4.5/hgext/convert/bzr.py	2018-02-11 07:35:32.365483051 +0200
 @@ -55,7 +55,8 @@
              # access bzrlib stuff
              bzrdir
@@ -28,10 +28,10 @@
  
          path = os.path.abspath(path)
          self._checkrepotype(path)
-Index: mercurial-4.4.1/hgext/convert/common.py
+Index: mercurial-4.5/hgext/convert/common.py
 ===================================================================
---- mercurial-4.4.1.orig/hgext/convert/common.py	2017-11-13 07:04:57.794211761 +0200
-+++ mercurial-4.4.1/hgext/convert/common.py	2017-11-13 07:04:57.790211691 +0200
+--- mercurial-4.5.orig/hgext/convert/common.py	2018-02-11 07:35:32.369483121 +0200
++++ mercurial-4.5/hgext/convert/common.py	2018-02-11 07:35:32.365483051 +0200
 @@ -40,14 +40,15 @@
  class MissingTool(Exception):
      pass
@@ -50,10 +50,10 @@
  
  class NoRepo(Exception):
      pass
-Index: mercurial-4.4.1/hgext/convert/cvs.py
+Index: mercurial-4.5/hgext/convert/cvs.py
 ===================================================================
---- mercurial-4.4.1.orig/hgext/convert/cvs.py	2017-11-13 07:04:57.794211761 +0200
-+++ mercurial-4.4.1/hgext/convert/cvs.py	2017-11-13 07:04:57.790211691 +0200
+--- mercurial-4.5.orig/hgext/convert/cvs.py	2018-02-11 07:35:32.369483121 +0200
++++ mercurial-4.5/hgext/convert/cvs.py	2018-02-11 07:35:32.365483051 +0200
 @@ -39,7 +39,7 @@
          if not os.path.exists(cvs):
              raise NoRepo(_("%s does not look like a CVS checkout") % path)
@@ -63,10 +63,10 @@
  
          self.changeset = None
          self.files = {}
-Index: mercurial-4.4.1/hgext/convert/darcs.py
+Index: mercurial-4.5/hgext/convert/darcs.py
 ===================================================================
---- mercurial-4.4.1.orig/hgext/convert/darcs.py	2017-11-13 07:04:57.794211761 +0200
-+++ mercurial-4.4.1/hgext/convert/darcs.py	2017-11-13 07:04:57.790211691 +0200
+--- mercurial-4.5.orig/hgext/convert/darcs.py	2018-02-11 07:35:32.369483121 +0200
++++ mercurial-4.5/hgext/convert/darcs.py	2018-02-11 07:35:32.365483051 +0200
 @@ -49,14 +49,15 @@
          if not os.path.exists(os.path.join(path, '_darcs')):
              raise NoRepo(_("%s does not look like a darcs repository") % path)
@@ -85,10 +85,10 @@
  
          self.path = os.path.realpath(path)
  
-Index: mercurial-4.4.1/hgext/convert/git.py
+Index: mercurial-4.5/hgext/convert/git.py
 ===================================================================
---- mercurial-4.4.1.orig/hgext/convert/git.py	2017-11-13 07:04:57.794211761 +0200
-+++ mercurial-4.4.1/hgext/convert/git.py	2017-11-13 07:04:57.790211691 +0200
+--- mercurial-4.5.orig/hgext/convert/git.py	2018-02-11 07:35:32.369483121 +0200
++++ mercurial-4.5/hgext/convert/git.py	2018-02-11 07:35:32.365483051 +0200
 @@ -95,7 +95,7 @@
          else:
              self.simopt = []
@@ -98,10 +98,10 @@
  
          self.path = path
          self.submodules = []
-Index: mercurial-4.4.1/hgext/convert/gnuarch.py
+Index: mercurial-4.5/hgext/convert/gnuarch.py
 ===================================================================
---- mercurial-4.4.1.orig/hgext/convert/gnuarch.py	2017-11-13 07:04:57.794211761 +0200
-+++ mercurial-4.4.1/hgext/convert/gnuarch.py	2017-11-13 07:04:57.790211691 +0200
+--- mercurial-4.5.orig/hgext/convert/gnuarch.py	2018-02-11 07:35:32.369483121 +0200
++++ mercurial-4.5/hgext/convert/gnuarch.py	2018-02-11 07:35:32.365483051 +0200
 @@ -51,7 +51,8 @@
              if util.findexe('tla'):
                  self.execmd = 'tla'
@@ -112,10 +112,10 @@
  
          common.commandline.__init__(self, ui, self.execmd)
  
-Index: mercurial-4.4.1/hgext/convert/monotone.py
+Index: mercurial-4.5/hgext/convert/monotone.py
 ===================================================================
---- mercurial-4.4.1.orig/hgext/convert/monotone.py	2017-11-13 07:04:57.794211761 +0200
-+++ mercurial-4.4.1/hgext/convert/monotone.py	2017-11-13 07:04:57.790211691 +0200
+--- mercurial-4.5.orig/hgext/convert/monotone.py	2018-02-11 07:35:32.369483121 +0200
++++ mercurial-4.5/hgext/convert/monotone.py	2018-02-11 07:35:32.365483051 +0200
 @@ -75,7 +75,7 @@
          self.files = None
          self.dirs  = None
@@ -125,10 +125,10 @@
  
      def mtnrun(self, *args, **kwargs):
          if self.automatestdio:
-Index: mercurial-4.4.1/hgext/convert/subversion.py
+Index: mercurial-4.5/hgext/convert/subversion.py
 ===================================================================
---- mercurial-4.4.1.orig/hgext/convert/subversion.py	2017-11-13 07:04:57.794211761 +0200
-+++ mercurial-4.4.1/hgext/convert/subversion.py	2017-11-13 07:04:57.790211691 +0200
+--- mercurial-4.5.orig/hgext/convert/subversion.py	2018-02-11 07:35:32.369483121 +0200
++++ mercurial-4.5/hgext/convert/subversion.py	2018-02-11 07:36:44.178752480 +0200
 @@ -295,16 +295,19 @@
              raise NoRepo(_("%s does not look like a Subversion repository")
                           % url)
@@ -155,16 +155,16 @@
 @@ -1113,6 +1116,8 @@
          return self.join('hg-authormap')
  
-     def __init__(self, ui, path):
+     def __init__(self, ui, repotype, path):
 +        common.checktool('svn', debname='subversion')
 +        common.checktool('svnadmin', debname='subversion')
  
-         converter_sink.__init__(self, ui, path)
+         converter_sink.__init__(self, ui, repotype, path)
          commandline.__init__(self, ui, 'svn')
-Index: mercurial-4.4.1/mercurial/hgweb/server.py
+Index: mercurial-4.5/mercurial/hgweb/server.py
 ===================================================================
---- mercurial-4.4.1.orig/mercurial/hgweb/server.py	2017-11-13 07:04:57.794211761 +0200
-+++ mercurial-4.4.1/mercurial/hgweb/server.py	2017-11-13 07:04:57.790211691 +0200
+--- mercurial-4.5.orig/mercurial/hgweb/server.py	2018-02-11 07:35:32.369483121 +0200
++++ mercurial-4.5/mercurial/hgweb/server.py	2018-02-11 07:35:32.369483121 +0200
 @@ -240,7 +240,8 @@
              from .. import sslutil
              sslutil.modernssl
@@ -175,11 +175,11 @@
  
          certfile = ui.config('web', 'certificate')
  
-Index: mercurial-4.4.1/mercurial/sslutil.py
+Index: mercurial-4.5/mercurial/sslutil.py
 ===================================================================
---- mercurial-4.4.1.orig/mercurial/sslutil.py	2017-11-13 07:04:57.794211761 +0200
-+++ mercurial-4.4.1/mercurial/sslutil.py	2017-11-13 07:04:57.790211691 +0200
-@@ -247,7 +247,9 @@
+--- mercurial-4.5.orig/mercurial/sslutil.py	2018-02-11 07:35:32.369483121 +0200
++++ mercurial-4.5/mercurial/sslutil.py	2018-02-11 07:35:32.369483121 +0200
+@@ -248,7 +248,9 @@
                  cafile = util.expandpath(cafile)
                  if not os.path.exists(cafile):
                      raise error.Abort(_('could not find web.cacerts: %s') %
@@ -190,10 +190,10 @@
              elif s['allowloaddefaultcerts']:
                  # CAs not defined in config. Try to find system bundles.
                  cafile = _defaultcacerts(ui)
-Index: mercurial-4.4.1/tests/test-https.t
+Index: mercurial-4.5/tests/test-https.t
 ===================================================================
---- mercurial-4.4.1.orig/tests/test-https.t	2017-11-13 07:04:57.794211761 +0200
-+++ mercurial-4.4.1/tests/test-https.t	2017-11-13 07:04:57.790211691 +0200
+--- mercurial-4.5.orig/tests/test-https.t	2018-02-11 07:35:32.369483121 +0200
++++ mercurial-4.5/tests/test-https.t	2018-02-11 07:35:32.369483121 +0200
 @@ -29,7 +29,7 @@
  
    $ hg in --config web.cacerts=no-such.pem https://localhost:$HGPORT/

Modified: packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2018-02-11 05:19:39 UTC (rev 14591)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2018-02-11 05:37:25 UTC (rev 14592)
@@ -1,9 +1,9 @@
 Use sensible-editor as default instead of vi.
 
-Index: mercurial-4.4.1/hgeditor
+Index: mercurial-4.5/hgeditor
 ===================================================================
---- mercurial-4.4.1.orig/hgeditor	2017-11-13 07:03:25.728617412 +0200
-+++ mercurial-4.4.1/hgeditor	2017-11-13 07:03:25.708617065 +0200
+--- mercurial-4.5.orig/hgeditor	2018-02-11 07:35:18.805243352 +0200
++++ mercurial-4.5/hgeditor	2018-02-11 07:35:18.781242928 +0200
 @@ -7,7 +7,7 @@
  # only for Mercurial, modify this:
  case "${EDITOR}" in
@@ -13,11 +13,11 @@
          ;;
      emacs)
          EDITOR="$EDITOR -nw"
-Index: mercurial-4.4.1/mercurial/ui.py
+Index: mercurial-4.5/mercurial/ui.py
 ===================================================================
---- mercurial-4.4.1.orig/mercurial/ui.py	2017-11-13 07:03:25.728617412 +0200
-+++ mercurial-4.4.1/mercurial/ui.py	2017-11-13 07:03:25.708617065 +0200
-@@ -1512,7 +1512,7 @@
+--- mercurial-4.5.orig/mercurial/ui.py	2018-02-11 07:35:18.805243352 +0200
++++ mercurial-4.5/mercurial/ui.py	2018-02-11 07:35:18.781242928 +0200
+@@ -1524,7 +1524,7 @@
              # avoid confusion.
              editor = 'E'
          else:
@@ -26,10 +26,10 @@
          return (encoding.environ.get("HGEDITOR") or
                  self.config("ui", "editor", editor))
  
-Index: mercurial-4.4.1/i18n/da.po
+Index: mercurial-4.5/i18n/da.po
 ===================================================================
---- mercurial-4.4.1.orig/i18n/da.po	2017-11-13 07:03:25.728617412 +0200
-+++ mercurial-4.4.1/i18n/da.po	2017-11-13 07:03:25.708617065 +0200
+--- mercurial-4.5.orig/i18n/da.po	2018-02-11 07:35:18.805243352 +0200
++++ mercurial-4.5/i18n/da.po	2018-02-11 07:35:18.781242928 +0200
 @@ -8752,7 +8752,7 @@
  msgid "Checking commit editor...\n"
  msgstr ""
@@ -58,11 +58,11 @@
  msgstr ""
  
  msgid ""
-Index: mercurial-4.4.1/i18n/de.po
+Index: mercurial-4.5/i18n/de.po
 ===================================================================
---- mercurial-4.4.1.orig/i18n/de.po	2017-11-13 07:03:25.728617412 +0200
-+++ mercurial-4.4.1/i18n/de.po	2017-11-13 07:03:25.712617135 +0200
-@@ -11683,8 +11683,8 @@
+--- mercurial-4.5.orig/i18n/de.po	2018-02-11 07:35:18.805243352 +0200
++++ mercurial-4.5/i18n/de.po	2018-02-11 07:35:18.785242998 +0200
+@@ -11606,8 +11606,8 @@
  msgid "checking commit editor...\n"
  msgstr "Prüfe Editor für Versionsmeldungen...\n"
  
@@ -73,7 +73,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr " (Gib einen Editor in der .hgrc Datei an!)\n"
-@@ -17242,7 +17242,8 @@
+@@ -17165,7 +17165,8 @@
  
  msgid ""
  "``editor``\n"
@@ -83,7 +83,7 @@
  msgstr ""
  
  msgid ""
-@@ -18120,7 +18121,7 @@
+@@ -18043,7 +18044,7 @@
  "    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"
@@ -92,7 +92,7 @@
  msgstr ""
  "EDITOR\n"
  "    Manchmal muss Mercurial eine Textdatei in einem Editor öffnen, damit\n"
-@@ -18129,7 +18130,7 @@
+@@ -18052,7 +18053,7 @@
  "    variablen HGEDITOR, VISUAL und EDITOR (in dieser Reihenfolge) "
  "ermittelt.\n"
  "    Der erste nicht-leere wird verwendet. Wenn alle Angaben leer sind,\n"
@@ -101,10 +101,10 @@
  
  msgid ""
  "PYTHONPATH\n"
-Index: mercurial-4.4.1/i18n/el.po
+Index: mercurial-4.5/i18n/el.po
 ===================================================================
---- mercurial-4.4.1.orig/i18n/el.po	2017-11-13 07:03:25.728617412 +0200
-+++ mercurial-4.4.1/i18n/el.po	2017-11-13 07:03:25.712617135 +0200
+--- mercurial-4.5.orig/i18n/el.po	2018-02-11 07:35:18.805243352 +0200
++++ mercurial-4.5/i18n/el.po	2018-02-11 07:35:18.785242998 +0200
 @@ -274,7 +274,7 @@
  "    editor it uses is determined by looking at the environment\n"
  "    variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
@@ -123,10 +123,10 @@
  msgstr ""
  
  msgid " (specify a commit editor in your .hgrc file)\n"
-Index: mercurial-4.4.1/i18n/fr.po
+Index: mercurial-4.5/i18n/fr.po
 ===================================================================
---- mercurial-4.4.1.orig/i18n/fr.po	2017-11-13 07:03:25.728617412 +0200
-+++ mercurial-4.4.1/i18n/fr.po	2017-11-13 07:03:25.712617135 +0200
+--- mercurial-4.5.orig/i18n/fr.po	2018-02-11 07:35:18.805243352 +0200
++++ mercurial-4.5/i18n/fr.po	2018-02-11 07:35:18.785242998 +0200
 @@ -299,7 +299,7 @@
  "    editor it uses is determined by looking at the environment\n"
  "    variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
@@ -145,10 +145,10 @@
  msgstr ""
  
  msgid " (specify a commit editor in your .hgrc file)\n"
-Index: mercurial-4.4.1/i18n/it.po
+Index: mercurial-4.5/i18n/it.po
 ===================================================================
---- mercurial-4.4.1.orig/i18n/it.po	2017-11-13 07:03:25.728617412 +0200
-+++ mercurial-4.4.1/i18n/it.po	2017-11-13 07:03:25.716617204 +0200
+--- mercurial-4.5.orig/i18n/it.po	2018-02-11 07:35:18.805243352 +0200
++++ mercurial-4.5/i18n/it.po	2018-02-11 07:35:18.785242998 +0200
 @@ -7156,8 +7156,8 @@
  msgid "Checking commit editor...\n"
  msgstr "Sto controllando l'editor per il commit...\n"
@@ -169,10 +169,10 @@
  msgstr ""
  
  msgid ""
-Index: mercurial-4.4.1/i18n/ja.po
+Index: mercurial-4.5/i18n/ja.po
 ===================================================================
---- mercurial-4.4.1.orig/i18n/ja.po	2017-11-13 07:03:25.728617412 +0200
-+++ mercurial-4.4.1/i18n/ja.po	2017-11-13 07:03:25.720617274 +0200
+--- mercurial-4.5.orig/i18n/ja.po	2018-02-11 07:35:18.805243352 +0200
++++ mercurial-4.5/i18n/ja.po	2018-02-11 07:35:18.789243068 +0200
 @@ -23224,10 +23224,12 @@
  
  msgid ""
@@ -206,11 +206,11 @@
  
  msgid ""
  "PYTHONPATH\n"
-Index: mercurial-4.4.1/i18n/pt_BR.po
+Index: mercurial-4.5/i18n/pt_BR.po
 ===================================================================
---- mercurial-4.4.1.orig/i18n/pt_BR.po	2017-11-13 07:03:25.728617412 +0200
-+++ mercurial-4.4.1/i18n/pt_BR.po	2017-11-13 07:03:25.720617274 +0200
-@@ -26089,11 +26089,12 @@
+--- mercurial-4.5.orig/i18n/pt_BR.po	2018-02-11 07:35:18.805243352 +0200
++++ mercurial-4.5/i18n/pt_BR.po	2018-02-11 07:35:18.793243140 +0200
+@@ -26859,11 +26859,12 @@
  
  msgid ""
  "``editor``\n"
@@ -225,7 +225,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -27663,7 +27664,7 @@
+@@ -28490,7 +28491,7 @@
  "    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"
@@ -234,7 +234,7 @@
  msgstr ""
  "EDITOR\n"
  "    Algumas vezes o Mercurial precisa abrir em um editor um arquivo\n"
-@@ -27671,7 +27672,7 @@
+@@ -28498,7 +28499,7 @@
  "    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"
@@ -243,7 +243,7 @@
  
  msgid ""
  "PYTHONPATH\n"
-@@ -39019,10 +39020,10 @@
+@@ -40457,10 +40458,10 @@
  #~ msgid " (check that you compiled the extensions)\n"
  #~ msgstr " (verifique se você compilou as extensões)\n"
  
@@ -256,10 +256,10 @@
  
  #~ msgid " Can't find editor '%s' in PATH\n"
  #~ msgstr " Não é possível localizar editor '%s' no PATH\n"
-Index: mercurial-4.4.1/i18n/sv.po
+Index: mercurial-4.5/i18n/sv.po
 ===================================================================
---- mercurial-4.4.1.orig/i18n/sv.po	2017-11-13 07:03:25.728617412 +0200
-+++ mercurial-4.4.1/i18n/sv.po	2017-11-13 07:03:25.724617343 +0200
+--- mercurial-4.5.orig/i18n/sv.po	2018-02-11 07:35:18.805243352 +0200
++++ mercurial-4.5/i18n/sv.po	2018-02-11 07:35:18.793243140 +0200
 @@ -9509,8 +9509,8 @@
  msgid "checking commit editor...\n"
  msgstr "kontrollerar arkiveringseditor...\n"
@@ -290,10 +290,10 @@
  msgstr ""
  
  msgid ""
-Index: mercurial-4.4.1/i18n/zh_CN.po
+Index: mercurial-4.5/i18n/zh_CN.po
 ===================================================================
---- mercurial-4.4.1.orig/i18n/zh_CN.po	2017-11-13 07:03:25.728617412 +0200
-+++ mercurial-4.4.1/i18n/zh_CN.po	2017-11-13 07:03:25.724617343 +0200
+--- mercurial-4.5.orig/i18n/zh_CN.po	2018-02-11 07:35:18.805243352 +0200
++++ mercurial-4.5/i18n/zh_CN.po	2018-02-11 07:35:18.793243140 +0200
 @@ -5778,7 +5778,7 @@
  msgid "Checking commit editor...\n"
  msgstr ""
@@ -312,10 +312,10 @@
  msgstr ""
  
  msgid ""
-Index: mercurial-4.4.1/i18n/zh_TW.po
+Index: mercurial-4.5/i18n/zh_TW.po
 ===================================================================
---- mercurial-4.4.1.orig/i18n/zh_TW.po	2017-11-13 07:03:25.728617412 +0200
-+++ mercurial-4.4.1/i18n/zh_TW.po	2017-11-13 07:03:25.724617343 +0200
+--- mercurial-4.5.orig/i18n/zh_TW.po	2018-02-11 07:35:18.805243352 +0200
++++ mercurial-4.5/i18n/zh_TW.po	2018-02-11 07:35:18.797243210 +0200
 @@ -6759,8 +6759,8 @@
  msgid "Checking commit editor...\n"
  msgstr "檢查提交訊息編輯器...\n"
@@ -336,11 +336,11 @@
  msgstr ""
  
  msgid ""
-Index: mercurial-4.4.1/mercurial/help/environment.txt
+Index: mercurial-4.5/mercurial/help/environment.txt
 ===================================================================
---- mercurial-4.4.1.orig/mercurial/help/environment.txt	2017-11-13 07:03:25.728617412 +0200
-+++ mercurial-4.4.1/mercurial/help/environment.txt	2017-11-13 07:03:25.724617343 +0200
-@@ -104,7 +104,7 @@
+--- mercurial-4.5.orig/mercurial/help/environment.txt	2018-02-11 07:35:18.805243352 +0200
++++ mercurial-4.5/mercurial/help/environment.txt	2018-02-11 07:35:18.797243210 +0200
+@@ -114,7 +114,7 @@
      editor it uses is determined by looking at the environment
      variables HGEDITOR, VISUAL and EDITOR, in that order. The first
      non-empty one is chosen. If all of them are empty, the editor
@@ -349,11 +349,11 @@
  
  PYTHONPATH
      This is used by Python to find imported modules and may need to be
-Index: mercurial-4.4.1/mercurial/help/config.txt
+Index: mercurial-4.5/mercurial/help/config.txt
 ===================================================================
---- mercurial-4.4.1.orig/mercurial/help/config.txt	2017-11-13 07:03:25.728617412 +0200
-+++ mercurial-4.4.1/mercurial/help/config.txt	2017-11-13 07:03:25.724617343 +0200
-@@ -2051,7 +2051,8 @@
+--- mercurial-4.5.orig/mercurial/help/config.txt	2018-02-11 07:35:18.805243352 +0200
++++ mercurial-4.5/mercurial/help/config.txt	2018-02-11 07:35:18.797243210 +0200
+@@ -2059,7 +2059,8 @@
      Print debugging information. (default: False)
  
  ``editor``
@@ -363,10 +363,10 @@
  
  ``fallbackencoding``
      Encoding to try if it's not possible to decode the changelog using
-Index: mercurial-4.4.1/i18n/ro.po
+Index: mercurial-4.5/i18n/ro.po
 ===================================================================
---- mercurial-4.4.1.orig/i18n/ro.po	2017-11-13 07:03:25.728617412 +0200
-+++ mercurial-4.4.1/i18n/ro.po	2017-11-13 07:03:25.724617343 +0200
+--- mercurial-4.5.orig/i18n/ro.po	2018-02-11 07:35:18.805243352 +0200
++++ mercurial-4.5/i18n/ro.po	2018-02-11 07:35:18.797243210 +0200
 @@ -7722,7 +7722,7 @@
  msgid "Checking commit editor...\n"
  msgstr "Se verifică editorul pentru commit...\n"
@@ -395,10 +395,10 @@
  msgstr ""
  
  msgid ""
-Index: mercurial-4.4.1/i18n/ru.po
+Index: mercurial-4.5/i18n/ru.po
 ===================================================================
---- mercurial-4.4.1.orig/i18n/ru.po	2017-11-13 07:03:25.728617412 +0200
-+++ mercurial-4.4.1/i18n/ru.po	2017-11-13 07:03:25.728617412 +0200
+--- mercurial-4.5.orig/i18n/ru.po	2018-02-11 07:35:18.805243352 +0200
++++ mercurial-4.5/i18n/ru.po	2018-02-11 07:35:18.801243280 +0200
 @@ -12451,8 +12451,8 @@
  msgid "checking commit editor...\n"
  msgstr "проверка редактора сообщений фиксации...\n"
@@ -442,11 +442,11 @@
  
  msgid ""
  "PYTHONPATH\n"
-Index: mercurial-4.4.1/mercurial/debugcommands.py
+Index: mercurial-4.5/mercurial/debugcommands.py
 ===================================================================
---- mercurial-4.4.1.orig/mercurial/debugcommands.py	2017-11-13 07:03:25.728617412 +0200
-+++ mercurial-4.4.1/mercurial/debugcommands.py	2017-11-13 07:03:25.728617412 +0200
-@@ -1098,15 +1098,15 @@
+--- mercurial-4.5.orig/mercurial/debugcommands.py	2018-02-11 07:35:18.805243352 +0200
++++ mercurial-4.5/mercurial/debugcommands.py	2018-02-11 07:35:18.801243280 +0200
+@@ -1241,15 +1241,15 @@
      editor = util.expandpath(editor)
      fm.write('editor', _("checking commit editor... (%s)\n"), editor)
      cmdpath = util.findexe(pycompat.shlexsplit(editor)[0])

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	2018-02-11 05:19:39 UTC (rev 14591)
+++ packages/mercurial/trunk/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch	2018-02-11 05:37:25 UTC (rev 14592)
@@ -7,11 +7,11 @@
  This fixes it at least in Debian.  I'm unsure about other systems.
 Bug: http://bz.selenic.com/show_bug.cgi?id=4045
 
-Index: mercurial-4.4.1/tests/run-tests.py
+Index: mercurial-4.5/tests/run-tests.py
 ===================================================================
---- mercurial-4.4.1.orig/tests/run-tests.py	2017-11-13 07:05:07.614381768 +0200
-+++ mercurial-4.4.1/tests/run-tests.py	2017-11-13 07:05:07.610381699 +0200
-@@ -2670,7 +2670,7 @@
+--- mercurial-4.5.orig/tests/run-tests.py	2018-02-11 07:36:54.158928900 +0200
++++ mercurial-4.5/tests/run-tests.py	2018-02-11 07:36:54.154928828 +0200
+@@ -2757,7 +2757,7 @@
                   sys.executable)
              mypython = os.path.join(self._tmpbindir, pyexename)
              try:

Modified: packages/mercurial/trunk/debian/patches/proposed_upstream__correct-zeroconf-doc
===================================================================
--- packages/mercurial/trunk/debian/patches/proposed_upstream__correct-zeroconf-doc	2018-02-11 05:19:39 UTC (rev 14591)
+++ packages/mercurial/trunk/debian/patches/proposed_upstream__correct-zeroconf-doc	2018-02-11 05:37:25 UTC (rev 14592)
@@ -1,9 +1,9 @@
 Correct the documentation for the zeroconf extension.
 
-Index: mercurial-4.4.1/hgext/zeroconf/__init__.py
+Index: mercurial-4.5/hgext/zeroconf/__init__.py
 ===================================================================
---- mercurial-4.4.1.orig/hgext/zeroconf/__init__.py	2017-11-13 07:05:02.206288143 +0200
-+++ mercurial-4.4.1/hgext/zeroconf/__init__.py	2017-11-13 07:05:02.202288075 +0200
+--- mercurial-4.5.orig/hgext/zeroconf/__init__.py	2018-02-11 07:36:48.718832734 +0200
++++ mercurial-4.5/hgext/zeroconf/__init__.py	2018-02-11 07:36:48.718832734 +0200
 @@ -6,9 +6,9 @@
  # GNU General Public License version 2 or any later version.
  '''discover and advertise repositories on the local network

More information about the Python-apps-commits mailing list