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

vicho at users.alioth.debian.org vicho at users.alioth.debian.org
Tue Feb 12 20:39:03 UTC 2013 

    Date: Tuesday, February 12, 2013 @ 20:39:01
  Author: vicho
Revision: 9428

Refresh patches

Modified:
  packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch
  packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.patch
  packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately
  packages/mercurial/trunk/debian/patches/deb_specific__install-mo-fhs.patch
  packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately
  packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies
  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	2013-02-12 20:38:55 UTC (rev 9427)
+++ packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch	2013-02-12 20:39:01 UTC (rev 9428)
@@ -12,7 +12,7 @@
  
 --- a/setup.py
 +++ b/setup.py
-@@ -409,7 +409,6 @@ cmdclass = {'build': hgbuild,
+@@ -411,7 +411,6 @@ cmdclass = {'build': hgbuild,
              'build_ext': hgbuildext,
              'build_py': hgbuildpy,
              'build_hgextindex': buildhgextindex,

Modified: packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.patch	2013-02-12 20:38:55 UTC (rev 9427)
+++ packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.patch	2013-02-12 20:39:01 UTC (rev 9428)
@@ -2,7 +2,7 @@
 
 --- a/hgext/hgk.py
 +++ b/hgext/hgk.py
-@@ -311,7 +311,7 @@ def view(ui, repo, *etc, **opts):
+@@ -312,7 +312,7 @@ 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])

Modified: packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately	2013-02-12 20:38:55 UTC (rev 9427)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately	2013-02-12 20:39:01 UTC (rev 9428)
@@ -2,7 +2,7 @@
 
 --- a/setup.py
 +++ b/setup.py
-@@ -467,8 +467,7 @@ if sys.platform.startswith('linux') and
+@@ -469,8 +469,7 @@ if sys.platform.startswith('linux') and
          extmodules.append(inotify)
          packages.extend(['hgext.inotify', 'hgext.inotify.linux'])
  

Modified: packages/mercurial/trunk/debian/patches/deb_specific__install-mo-fhs.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__install-mo-fhs.patch	2013-02-12 20:38:55 UTC (rev 9427)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-mo-fhs.patch	2013-02-12 20:39:01 UTC (rev 9428)
@@ -12,7 +12,7 @@
          break
 --- a/setup.py
 +++ b/setup.py
-@@ -467,7 +467,7 @@ if sys.platform.startswith('linux') and
+@@ -469,7 +469,7 @@ if sys.platform.startswith('linux') and
          extmodules.append(inotify)
          packages.extend(['hgext.inotify', 'hgext.inotify.linux'])
  

Modified: packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately	2013-02-12 20:38:55 UTC (rev 9427)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately	2013-02-12 20:39:01 UTC (rev 9428)
@@ -2,7 +2,7 @@
 
 --- a/mercurial/templater.py
 +++ b/mercurial/templater.py
-@@ -278,7 +278,7 @@ funcs = {
+@@ -294,7 +294,7 @@ funcs = {
  
  # template engine
  
@@ -13,7 +13,7 @@
  def _flatten(thing):
 --- a/setup.py
 +++ b/setup.py
-@@ -473,14 +473,6 @@ packagedata = {'mercurial': ['locale/*/L
+@@ -475,14 +475,6 @@ packagedata = {'mercurial': ['locale/*/L
  def ordinarypath(p):
      return p and p[0] != '.' and p[-1] != '~'
  

Modified: packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies	2013-02-12 20:38:55 UTC (rev 9427)
+++ packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies	2013-02-12 20:39:01 UTC (rev 9428)
@@ -43,7 +43,7 @@
      pass
 --- a/hgext/convert/cvs.py
 +++ b/hgext/convert/cvs.py
-@@ -21,7 +21,7 @@ class convert_cvs(converter_source):
+@@ -22,7 +22,7 @@ class convert_cvs(converter_source):
          if not os.path.exists(cvs):
              raise NoRepo(_("%s does not look like a CVS checkout") % path)
  
@@ -74,7 +74,7 @@
  
 --- a/hgext/convert/git.py
 +++ b/hgext/convert/git.py
-@@ -52,7 +52,7 @@ class convert_git(converter_source):
+@@ -64,7 +64,7 @@ class convert_git(converter_source):
          if not os.path.exists(path + "/objects"):
              raise NoRepo(_("%s does not look like a Git repository") % path)
  
@@ -82,7 +82,7 @@
 +        checktool('git', 'git', debname='git-core')
  
          self.path = path
- 
+         self.submodules = []
 --- a/hgext/convert/gnuarch.py
 +++ b/hgext/convert/gnuarch.py
 @@ -42,7 +42,8 @@ class gnuarch_source(converter_source, c
@@ -108,15 +108,15 @@
          if self.automatestdio:
 --- a/hgext/convert/subversion.py
 +++ b/hgext/convert/subversion.py
-@@ -18,6 +18,7 @@ from cStringIO import StringIO
- 
+@@ -19,6 +19,7 @@ from cStringIO import StringIO
  from common import NoRepo, MissingTool, commit, encodeargs, decodeargs
  from common import commandline, converter_source, converter_sink, mapfile
+ from common import makedatetimestamp
 +from common import checktool
  
  try:
      from svn.core import SubversionException, Pool
-@@ -234,16 +235,19 @@ class svn_source(converter_source):
+@@ -235,16 +236,19 @@ class svn_source(converter_source):
              raise NoRepo(_("%s does not look like a Subversion repository")
                           % url)
          if svn is None:
@@ -139,7 +139,7 @@
  
          self.lastrevs = {}
  
-@@ -1010,6 +1014,8 @@ class svn_sink(converter_sink, commandli
+@@ -1013,6 +1017,8 @@ class svn_sink(converter_sink, commandli
          return self.join('hg-authormap')
  
      def __init__(self, ui, path):
@@ -150,7 +150,7 @@
          commandline.__init__(self, ui, 'svn')
 --- a/mercurial/hgweb/server.py
 +++ b/mercurial/hgweb/server.py
-@@ -194,7 +194,8 @@ class _httprequesthandleropenssl(_httpre
+@@ -204,7 +204,8 @@ class _httprequesthandleropenssl(_httpre
              import OpenSSL
              OpenSSL.SSL.Context
          except ImportError:
@@ -160,7 +160,7 @@
          ctx = OpenSSL.SSL.Context(OpenSSL.SSL.SSLv23_METHOD)
          ctx.use_privatekey_file(ssl_cert)
          ctx.use_certificate_file(ssl_cert)
-@@ -235,7 +236,8 @@ class _httprequesthandlerssl(_httpreques
+@@ -245,7 +246,8 @@ class _httprequesthandlerssl(_httpreques
              import ssl
              ssl.wrap_socket
          except ImportError:

Modified: packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2013-02-12 20:38:55 UTC (rev 9427)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2013-02-12 20:39:01 UTC (rev 9428)
@@ -13,7 +13,7 @@
          EDITOR="$EDITOR -nw"
 --- a/mercurial/commands.py
 +++ b/mercurial/commands.py
-@@ -2045,8 +2045,8 @@ def debuginstall(ui):
+@@ -2061,8 +2061,8 @@ def debuginstall(ui):
      editor = ui.geteditor()
      cmdpath = util.findexe(editor) or util.findexe(editor.split()[0])
      if not cmdpath:
@@ -170,7 +170,7 @@
  msgid ""
 --- a/i18n/ja.po
 +++ b/i18n/ja.po
-@@ -11288,8 +11288,8 @@ msgstr " (テンプレートのインス
+@@ -11335,8 +11335,8 @@ msgstr " (テンプレートのインス
  msgid "checking commit editor...\n"
  msgstr "メッセージ入力用エディタの確認中...\n"
  
@@ -180,8 +180,8 @@
 +msgstr " エディタが起動できません(sensible-editor にも PATH が通っていません)\n"
  
  msgid " (specify a commit editor in your configuration file)\n"
- msgstr " (コミットメッセージ用エディタを設定ファイルで設定してください)\n"
-@@ -17632,11 +17632,12 @@ msgstr ""
+ msgstr " (コミットログ用エディタを設定ファイルで設定してください)\n"
+@@ -17739,11 +17739,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -196,7 +196,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -18681,7 +18682,7 @@ msgid ""
+@@ -18797,7 +18798,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"
-@@ -18689,7 +18690,7 @@ msgstr ""
+@@ -18805,7 +18806,7 @@ msgstr ""
  "    そこで使用されるエディタは、 HGEDITOR、 VISUAL\n"
  "    あるいは EDITOR 環境変数に設定されたものを(この順序で)使用します。\n"
  "    最初の空で無い値に設定された環境変数の値を使用します。\n"
@@ -216,7 +216,7 @@
  "PYTHONPATH\n"
 --- a/i18n/pt_BR.po
 +++ b/i18n/pt_BR.po
-@@ -11432,10 +11432,10 @@ msgstr " (modelos parecem ter sido insta
+@@ -11497,10 +11497,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 ""
-@@ -17944,10 +17944,12 @@ msgstr ""
+@@ -18086,10 +18086,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -244,7 +244,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -19022,7 +19024,7 @@ msgid ""
+@@ -19173,7 +19175,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"
-@@ -19030,7 +19032,7 @@ msgstr ""
+@@ -19181,7 +19183,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
-@@ -1132,7 +1132,8 @@ User interface controls.
+@@ -1137,7 +1137,8 @@ User interface controls.
      Print debugging information. True or False. Default is False.
  
  ``editor``

More information about the Python-apps-commits mailing list