[Python-apps-commits] r12523 - in packages/mercurial/branches/jessie-backports/debian (10 files)

vicho at users.alioth.debian.org vicho at users.alioth.debian.org
Sun Oct 25 12:24:33 UTC 2015 

    Date: Sunday, October 25, 2015 @ 12:24:31
  Author: vicho
Revision: 12523

merge trunk 12083:12498 into jessie-backports

Added:
  packages/mercurial/branches/jessie-backports/debian/mercurial-common.maintscript
    (from rev 12498, packages/mercurial/trunk/debian/mercurial-common.maintscript)
Modified:
  packages/mercurial/branches/jessie-backports/debian/changelog
  packages/mercurial/branches/jessie-backports/debian/control
  packages/mercurial/branches/jessie-backports/debian/copyright
  packages/mercurial/branches/jessie-backports/debian/mercurial-common.bash-completion
  packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__fix_fhs_paths.patch
  packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__hgk.py.patch
  packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__optional-dependencies
  packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__use_sensible-editor.patch
  packages/mercurial/branches/jessie-backports/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch

Modified: packages/mercurial/branches/jessie-backports/debian/changelog
===================================================================
--- packages/mercurial/branches/jessie-backports/debian/changelog	2015-10-24 00:51:36 UTC (rev 12522)
+++ packages/mercurial/branches/jessie-backports/debian/changelog	2015-10-25 12:24:31 UTC (rev 12523)
@@ -1,3 +1,50 @@
+mercurial (3.5.2-2) unstable; urgency=medium
+
+  * Fix "bash completion broken" by installing at as "hg" instead of
+    "mercurial".  Thanks Matthew Gabeler-Lee <cheetah at fastcat.org> for the
+    fix (Closes: #801079)
+
+ -- Javi Merino <vicho at debian.org>  Sun, 18 Oct 2015 14:14:20 +0100
+
+mercurial (3.5.2-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Javi Merino <vicho at debian.org>  Fri, 02 Oct 2015 08:14:57 +0100
+
+mercurial (3.5.1-2) unstable; urgency=medium
+
+  * Fix "obsolete conffile /etc/bash_completion.d/mercurial" by removing
+    it.  Bash completion is now installed in
+    /usr/share/bash_completion/completions (Closes: #799052)
+
+ -- Javi Merino <vicho at debian.org>  Sun, 20 Sep 2015 13:23:46 +0100
+
+mercurial (3.5.1-1) unstable; urgency=medium
+
+  * Update hgsubversion breaks. 1.8.2-1 is compatible with mercurial 3.5-1
+  * Update breaks of mercurial-git.  0.8.1-3 works with mercurial 3.5-1
+  * New upstream release
+
+ -- Javi Merino <vicho at debian.org>  Mon, 14 Sep 2015 22:05:21 +0100
+
+mercurial (3.5-1) unstable; urgency=medium
+
+  * New upstream release
+  * Update hgsubversion breaks to 1.8.1-1
+  * Upload to unstable
+
+ -- Javi Merino <vicho at debian.org>  Mon, 03 Aug 2015 20:18:33 +0100
+
+mercurial (3.5~rc1-1) experimental; urgency=medium
+
+  * New upstream release
+  * Update debian/copyright to match copyright-format 1.0
+  * New version breaks the current versions of mercurial-git and
+    hgsubversion in sid
+
+ -- Javi Merino <vicho at debian.org>  Wed, 22 Jul 2015 10:30:00 +0200
+
 mercurial (3.4.2-1~bpo8+1) jessie-backports; urgency=medium
 
   * Rebuild for jessie-backports.

Modified: packages/mercurial/branches/jessie-backports/debian/control
===================================================================
--- packages/mercurial/branches/jessie-backports/debian/control	2015-10-24 00:51:36 UTC (rev 12522)
+++ packages/mercurial/branches/jessie-backports/debian/control	2015-10-25 12:24:31 UTC (rev 12523)
@@ -50,9 +50,9 @@
 Recommends: openssh-client,
 Suggests: qct,
  kdiff3 | kdiff3-qt | kompare | meld | tkcvs | mgdiff
-Breaks: hgsubversion (<< 1.8-1),
+Breaks: hgsubversion (<< 1.8.2-1),
  hgview-common (<< 1.8.1),
- mercurial-git (<= 0.6.1-2),
+ mercurial-git (<< 0.8.1-3),
  qct (<< 1.7-2~),
 Description: easy-to-use, scalable distributed version control system
  Mercurial is a fast, lightweight Source Control Management system designed

Modified: packages/mercurial/branches/jessie-backports/debian/copyright
===================================================================
--- packages/mercurial/branches/jessie-backports/debian/copyright	2015-10-24 00:51:36 UTC (rev 12522)
+++ packages/mercurial/branches/jessie-backports/debian/copyright	2015-10-25 12:24:31 UTC (rev 12523)
@@ -1,33 +1,33 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: mercurial
-Upstream-Source: http://www.selenic.com/mercurial/
+Source: http://www.selenic.com/mercurial/
 
 Files: *
-Copyright: Copyright 2005 Matt Mackall <mpm at selenic.com> and others.
+Copyright: 2005-2015, Matt Mackall <mpm at selenic.com> and others.
 License: GPL-2+
- You can redistribute this software and/or modify it under the terms of
- the GNU General Public License as published by the Free Software
- Foundation; version 2 or any later version.
+ This program is free software; you can redistribute it
+ and/or modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later
+ version.
  .
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied
+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the GNU General Public License for more
+ details.
  .
- On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-2 file.
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
 
 Files: debian/*
-Copyright: Copyright 2005-2010, Vincent Danjean <vdanjean at debian.org>
+Copyright: 2005-2010, Vincent Danjean <vdanjean at debian.org>
+           2011-2015, Javi Merino <vicho at debian.org>
 License: GPL-2+
- You can redistribute this software and/or modify it under the terms of
- the GNU General Public License as published by the Free Software
- Foundation; version 2 or any later version.
- .
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
- .
- On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-2 file.
+ [LICENSE TEXT]

Modified: packages/mercurial/branches/jessie-backports/debian/mercurial-common.bash-completion
===================================================================
--- packages/mercurial/branches/jessie-backports/debian/mercurial-common.bash-completion	2015-10-24 00:51:36 UTC (rev 12522)
+++ packages/mercurial/branches/jessie-backports/debian/mercurial-common.bash-completion	2015-10-25 12:24:31 UTC (rev 12523)
@@ -1 +1 @@
-contrib/bash_completion mercurial
+contrib/bash_completion hg

Copied: packages/mercurial/branches/jessie-backports/debian/mercurial-common.maintscript (from rev 12498, packages/mercurial/trunk/debian/mercurial-common.maintscript)
===================================================================
--- packages/mercurial/branches/jessie-backports/debian/mercurial-common.maintscript	                        (rev 0)
+++ packages/mercurial/branches/jessie-backports/debian/mercurial-common.maintscript	2015-10-25 12:24:31 UTC (rev 12523)
@@ -0,0 +1 @@
+rm_conffile /etc/bash_completion.d/mercurial 3.5.1-2~ mercurial-common

Modified: packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__fix_fhs_paths.patch
===================================================================
--- packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__fix_fhs_paths.patch	2015-10-24 00:51:36 UTC (rev 12522)
+++ packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__fix_fhs_paths.patch	2015-10-25 12:24:31 UTC (rev 12523)
@@ -9,7 +9,7 @@
 
 --- a/mercurial/util.py
 +++ b/mercurial/util.py
-@@ -621,6 +621,8 @@ def mainfrozen():
+@@ -697,6 +697,8 @@ def mainfrozen():
  if mainfrozen():
      # executable version (py2exe) doesn't support __file__
      datapath = os.path.dirname(sys.executable)

Modified: packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__hgk.py.patch
===================================================================
--- packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__hgk.py.patch	2015-10-24 00:51:36 UTC (rev 12522)
+++ packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__hgk.py.patch	2015-10-25 12:24:31 UTC (rev 12523)
@@ -2,7 +2,7 @@
 
 --- a/hgext/hgk.py
 +++ b/hgext/hgk.py
-@@ -326,6 +326,6 @@ def view(ui, repo, *etc, **opts):
+@@ -330,6 +330,6 @@ def view(ui, repo, *etc, **opts):
      if repo.filtername is None:
          optstr += '--hidden'
  

Modified: packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__optional-dependencies
===================================================================
--- packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__optional-dependencies	2015-10-24 00:51:36 UTC (rev 12522)
+++ packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__optional-dependencies	2015-10-25 12:24:31 UTC (rev 12523)
@@ -2,10 +2,10 @@
 
 --- a/hgext/bugzilla.py
 +++ b/hgext/bugzilla.py
-@@ -354,7 +354,8 @@ class bzmysql(bzaccess):
+@@ -358,7 +358,8 @@ class bzmysql(bzaccess):
              import MySQLdb as mysql
              bzmysql._MySQLdb = mysql
-         except ImportError, err:
+         except ImportError as err:
 -            raise util.Abort(_('python mysql support not available: %s') % err)
 +            raise util.Abort(_('python mysql support not available: %s') % err +
 +                             _(' (try installing the %s package)') % 'python-mysqldb')
@@ -100,7 +100,7 @@
  
 --- a/hgext/convert/monotone.py
 +++ b/hgext/convert/monotone.py
-@@ -66,7 +66,7 @@ class monotone_source(converter_source,
+@@ -69,7 +69,7 @@ class monotone_source(converter_source,
          self.files = None
          self.dirs  = None
  
@@ -142,7 +142,7 @@
  
          self.lastrevs = {}
  
-@@ -1089,6 +1093,8 @@ class svn_sink(converter_sink, commandli
+@@ -1094,6 +1098,8 @@ class svn_sink(converter_sink, commandli
          return self.join('hg-authormap')
  
      def __init__(self, ui, path):

Modified: packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__use_sensible-editor.patch	2015-10-24 00:51:36 UTC (rev 12522)
+++ packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__use_sensible-editor.patch	2015-10-25 12:24:31 UTC (rev 12523)
@@ -13,7 +13,7 @@
          EDITOR="$EDITOR -nw"
 --- a/mercurial/commands.py
 +++ b/mercurial/commands.py
-@@ -2373,8 +2373,8 @@ def debuginstall(ui):
+@@ -2385,8 +2385,8 @@ def debuginstall(ui):
      editor = util.expandpath(editor)
      cmdpath = util.findexe(shlex.split(editor)[0])
      if not cmdpath:
@@ -26,7 +26,7 @@
          else:
 --- a/mercurial/ui.py
 +++ b/mercurial/ui.py
-@@ -879,7 +879,7 @@ class ui(object):
+@@ -882,7 +882,7 @@ class ui(object):
              # avoid confusion.
              editor = 'E'
          else:
@@ -170,7 +170,7 @@
  msgid ""
 --- a/i18n/ja.po
 +++ b/i18n/ja.po
-@@ -12448,8 +12448,8 @@ msgstr " (テンプレートのインス
+@@ -12627,8 +12627,8 @@ msgstr " (テンプレートのインス
  msgid "checking commit editor...\n"
  msgstr "メッセージ入力用エディタの確認中...\n"
  
@@ -181,7 +181,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr " (コミットログ用エディタを設定ファイルで設定してください)\n"
-@@ -19985,11 +19985,12 @@ msgstr ""
+@@ -20372,11 +20372,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -196,7 +196,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -21208,7 +21209,7 @@ msgid ""
+@@ -21619,7 +21620,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"
@@ -205,7 +205,7 @@
  msgstr ""
  "EDITOR\n"
  "    コミットログ入力時のように、 エディタでファイルを開き、\n"
-@@ -21216,7 +21217,7 @@ msgstr ""
+@@ -21627,7 +21628,7 @@ msgstr ""
  "    そこで使用されるエディタは、 HGEDITOR、 VISUAL\n"
  "    あるいは EDITOR 環境変数に設定されたものを(この順序で)使用します。\n"
  "    最初の空で無い値に設定された環境変数の値を使用します。\n"
@@ -216,7 +216,7 @@
  "PYTHONPATH\n"
 --- a/i18n/pt_BR.po
 +++ b/i18n/pt_BR.po
-@@ -12637,10 +12637,10 @@ msgstr " (modelos parecem ter sido insta
+@@ -12814,10 +12814,10 @@ msgstr " (modelos parecem ter sido insta
  msgid "checking commit editor...\n"
  msgstr "verificando editor para consolidação...\n"
  
@@ -229,7 +229,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr ""
-@@ -20377,10 +20377,12 @@ msgstr ""
+@@ -20777,10 +20777,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -244,7 +244,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -21631,7 +21633,7 @@ msgid ""
+@@ -22058,7 +22060,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"
@@ -253,7 +253,7 @@
  msgstr ""
  "EDITOR\n"
  "    Algumas vezes o Mercurial precisa abrir em um editor um arquivo\n"
-@@ -21639,7 +21641,7 @@ msgstr ""
+@@ -22066,7 +22068,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"
@@ -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
-@@ -1359,7 +1359,8 @@ User interface controls.
+@@ -1409,7 +1409,8 @@ User interface controls.
      Print debugging information. True or False. Default is False.
  
  ``editor``

Modified: packages/mercurial/branches/jessie-backports/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch
===================================================================
--- packages/mercurial/branches/jessie-backports/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch	2015-10-24 00:51:36 UTC (rev 12522)
+++ packages/mercurial/branches/jessie-backports/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch	2015-10-25 12:24:31 UTC (rev 12523)
@@ -9,7 +9,7 @@
 
 --- a/tests/run-tests.py
 +++ b/tests/run-tests.py
-@@ -1858,7 +1858,7 @@ class TestRunner(object):
+@@ -1994,7 +1994,7 @@ class TestRunner(object):
                   sys.executable)
              mypython = os.path.join(self._tmpbindir, pyexename)
              try:
@@ -17,4 +17,4 @@
 +                if (mypython == sys.executable) or (os.readlink(mypython) == sys.executable):
                      return
                  os.unlink(mypython)
-             except OSError, err:
+             except OSError as err:

More information about the Python-apps-commits mailing list