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

vicho at users.alioth.debian.org vicho at users.alioth.debian.org
Fri Aug 3 11:52:10 UTC 2012 

    Date: Friday, August 3, 2012 @ 11:52:09
  Author: vicho
Revision: 8988

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	2012-08-03 11:51:50 UTC (rev 8987)
+++ packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch	2012-08-03 11:52:09 UTC (rev 8988)
@@ -12,13 +12,11 @@
  
 --- a/setup.py
 +++ b/setup.py
-@@ -381,8 +381,7 @@
-             'build_mo': hgbuildmo,
+@@ -406,7 +406,6 @@ cmdclass = {'build': hgbuild,
              'build_ext': hgbuildext,
              'build_py': hgbuildpy,
--            'build_hgextindex': buildhgextindex,
--            'install_scripts': hginstallscripts}
-+            'build_hgextindex': buildhgextindex}
+             'build_hgextindex': buildhgextindex,
+-            'install_scripts': hginstallscripts,
+             'build_hgexe': buildhgexe,
+             }
  
- packages = ['mercurial', 'mercurial.hgweb',
-             'mercurial.httpclient', 'mercurial.httpclient.tests',

Modified: packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.patch	2012-08-03 11:51:50 UTC (rev 8987)
+++ packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.patch	2012-08-03 11:52:09 UTC (rev 8988)
@@ -2,7 +2,7 @@
 
 --- a/hgext/hgk.py
 +++ b/hgext/hgk.py
-@@ -307,7 +307,7 @@
+@@ -311,7 +311,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	2012-08-03 11:51:50 UTC (rev 8987)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately	2012-08-03 11:52:09 UTC (rev 8988)
@@ -2,7 +2,7 @@
 
 --- a/setup.py
 +++ b/setup.py
-@@ -424,8 +424,7 @@
+@@ -463,8 +463,7 @@ if sys.platform.startswith('linux') and
          extmodules.append(inotify)
          packages.extend(['hgext.inotify', 'hgext.inotify.linux'])
  
@@ -14,7 +14,7 @@
      return p and p[0] != '.' and p[-1] != '~'
 --- a/mercurial/help.py
 +++ b/mercurial/help.py
-@@ -37,9 +37,11 @@
+@@ -124,9 +124,11 @@ def loaddoc(topic):
              module = __file__
          base = os.path.dirname(module)
  

Modified: packages/mercurial/trunk/debian/patches/deb_specific__install-mo-fhs.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__install-mo-fhs.patch	2012-08-03 11:51:50 UTC (rev 8987)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-mo-fhs.patch	2012-08-03 11:52:09 UTC (rev 8988)
@@ -1,7 +1,7 @@
 Look for *.mo files in /usr/share/locale (FHS compliant)
 --- a/mercurial/i18n.py
 +++ b/mercurial/i18n.py
-@@ -15,7 +15,7 @@
+@@ -15,7 +15,7 @@ else:
      module = __file__
  
  base = os.path.dirname(module)
@@ -12,7 +12,7 @@
          break
 --- a/setup.py
 +++ b/setup.py
-@@ -424,7 +424,7 @@
+@@ -463,7 +463,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	2012-08-03 11:51:50 UTC (rev 8987)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately	2012-08-03 11:52:09 UTC (rev 8988)
@@ -2,7 +2,7 @@
 
 --- a/mercurial/templater.py
 +++ b/mercurial/templater.py
-@@ -196,7 +196,7 @@
+@@ -196,7 +196,7 @@ funcs = {
  
  # template engine
  
@@ -13,7 +13,7 @@
  def _flatten(thing):
 --- a/setup.py
 +++ b/setup.py
-@@ -430,14 +430,6 @@
+@@ -469,14 +469,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	2012-08-03 11:51:50 UTC (rev 8987)
+++ packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies	2012-08-03 11:52:09 UTC (rev 8988)
@@ -2,7 +2,7 @@
 
 --- a/hgext/bugzilla.py
 +++ b/hgext/bugzilla.py
-@@ -352,7 +352,8 @@
+@@ -354,7 +354,8 @@ class bzmysql(bzaccess):
              import MySQLdb as mysql
              bzmysql._MySQLdb = mysql
          except ImportError, err:
@@ -14,7 +14,7 @@
  
 --- a/hgext/convert/bzr.py
 +++ b/hgext/convert/bzr.py
-@@ -44,7 +44,8 @@
+@@ -44,7 +44,8 @@ class bzr_source(converter_source):
              # access bzrlib stuff
              bzrdir
          except NameError:
@@ -26,7 +26,7 @@
          self._checkrepotype(path)
 --- a/hgext/convert/common.py
 +++ b/hgext/convert/common.py
-@@ -29,11 +29,12 @@
+@@ -29,11 +29,12 @@ def decodeargs(s):
  class MissingTool(Exception):
      pass
  
@@ -43,7 +43,7 @@
      pass
 --- a/hgext/convert/cvs.py
 +++ b/hgext/convert/cvs.py
-@@ -21,7 +21,7 @@
+@@ -21,7 +21,7 @@ class convert_cvs(converter_source):
          if not os.path.exists(cvs):
              raise NoRepo(_("%s does not look like a CVS checkout") % path)
  
@@ -54,7 +54,7 @@
          self.files = {}
 --- a/hgext/convert/darcs.py
 +++ b/hgext/convert/darcs.py
-@@ -36,14 +36,15 @@
+@@ -36,14 +36,15 @@ class darcs_source(converter_source, com
          if not os.path.exists(os.path.join(path, '_darcs')):
              raise NoRepo(_("%s does not look like a darcs repository") % path)
  
@@ -74,7 +74,7 @@
  
 --- a/hgext/convert/git.py
 +++ b/hgext/convert/git.py
-@@ -52,7 +52,7 @@
+@@ -52,7 +52,7 @@ class convert_git(converter_source):
          if not os.path.exists(path + "/objects"):
              raise NoRepo(_("%s does not look like a Git repository") % path)
  
@@ -85,7 +85,7 @@
  
 --- a/hgext/convert/gnuarch.py
 +++ b/hgext/convert/gnuarch.py
-@@ -42,7 +42,8 @@
+@@ -42,7 +42,8 @@ class gnuarch_source(converter_source, c
              if util.findexe('tla'):
                  self.execmd = 'tla'
              else:
@@ -97,7 +97,7 @@
  
 --- a/hgext/convert/monotone.py
 +++ b/hgext/convert/monotone.py
-@@ -66,7 +66,7 @@
+@@ -66,7 +66,7 @@ class monotone_source(converter_source,
          self.files = None
          self.dirs  = None
  
@@ -108,7 +108,7 @@
          if self.automatestdio:
 --- a/hgext/convert/subversion.py
 +++ b/hgext/convert/subversion.py
-@@ -18,6 +18,7 @@
+@@ -18,6 +18,7 @@ from cStringIO import StringIO
  
  from common import NoRepo, MissingTool, commit, encodeargs, decodeargs
  from common import commandline, converter_source, converter_sink, mapfile
@@ -116,12 +116,12 @@
  
  try:
      from svn.core import SubversionException, Pool
-@@ -227,16 +228,19 @@
+@@ -234,16 +235,19 @@ class svn_source(converter_source):
              raise NoRepo(_("%s does not look like a Subversion repository")
                           % url)
          if svn is None:
--            raise MissingTool(_('Could not load Subversion python bindings'))
-+            raise MissingTool(_('Could not load Subversion python bindings') +
+-            raise MissingTool(_('could not load Subversion python bindings'))
++            raise MissingTool(_('could not load Subversion python bindings') +
 +                              _(' (try installing the %s package)') % 'python-subversion')
  
          try:
@@ -139,7 +139,7 @@
  
          self.lastrevs = {}
  
-@@ -1001,6 +1005,8 @@
+@@ -1010,6 +1014,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 @@
+@@ -194,7 +194,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 @@
+@@ -235,7 +236,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	2012-08-03 11:51:50 UTC (rev 8987)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2012-08-03 11:52:09 UTC (rev 8988)
@@ -13,7 +13,7 @@
          EDITOR="$EDITOR -nw"
 --- a/mercurial/commands.py
 +++ b/mercurial/commands.py
-@@ -1970,8 +1970,8 @@ def debuginstall(ui):
+@@ -2023,8 +2023,8 @@ def debuginstall(ui):
      editor = ui.geteditor()
      cmdpath = util.findexe(editor) or util.findexe(editor.split()[0])
      if not cmdpath:
@@ -26,7 +26,7 @@
          else:
 --- a/mercurial/ui.py
 +++ b/mercurial/ui.py
-@@ -693,7 +693,7 @@ class ui(object):
+@@ -701,7 +701,7 @@ class ui(object):
              # avoid confusion.
              editor = 'E'
          else:
@@ -67,7 +67,7 @@
  msgid ""
 --- a/i18n/de.po
 +++ b/i18n/de.po
-@@ -10140,8 +10140,8 @@ msgstr "(Vorlagen scheinen falsch instal
+@@ -10624,8 +10624,8 @@ msgstr "(Vorlagen scheinen falsch instal
  msgid "Checking commit editor...\n"
  msgstr "Prüfe Editor für Versionsmeldungen...\n"
  
@@ -78,7 +78,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr " (Gib einen Editor in der .hgrc Datei an!)\n"
-@@ -15292,7 +15292,8 @@ msgstr ""
+@@ -15957,7 +15957,8 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -88,7 +88,7 @@
  msgstr ""
  
  msgid ""
-@@ -16050,7 +16051,7 @@ msgid ""
+@@ -16733,7 +16734,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"
@@ -97,12 +97,12 @@
  msgstr ""
  "EDITOR\n"
  "    Manchmal muss Mercurial eine Textdatei in einem Editor öffnen, damit\n"
-@@ -16059,7 +16060,7 @@ msgstr ""
+@@ -16742,7 +16743,7 @@ msgstr ""
  "    variablen HGEDITOR, VISUAL und EDITOR (in dieser Reihenfolge) "
  "ermittelt.\n"
- "    Der erste nicht-leere wird verwendet. Wenn alle Angaben leer sind, wird\n"
--"    der Standard 'vi' verwendet."
-+"    der Standard 'sensible-editor' verwendet."
+ "    Der erste nicht-leere wird verwendet. Wenn alle Angaben leer sind,\n"
+-"    wird die Voreinstellung 'vi' verwendet."
++"    wird die Voreinstellung 'sensible-editor' verwendet."
  
  msgid ""
  "PYTHONPATH\n"
@@ -170,9 +170,9 @@
  msgid ""
 --- a/i18n/ja.po
 +++ b/i18n/ja.po
-@@ -10595,8 +10595,8 @@ msgstr " (テンプレートのインス
- msgid "Checking commit editor...\n"
- msgstr "メッセージ入力用エディタの検証中...\n"
+@@ -11170,8 +11170,8 @@ msgstr " (テンプレートのインス
+ msgid "checking commit editor...\n"
+ msgstr "メッセージ入力用エディタの確認中...\n"
  
 -msgid " No commit editor set and can't find vi in PATH\n"
 -msgstr " エディタが起動できません(vi にも PATH が通っていません)\n"
@@ -181,7 +181,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr " (コミットメッセージ用エディタを設定ファイルで設定してください)\n"
-@@ -16815,11 +16815,12 @@ msgstr ""
+@@ -17457,11 +17457,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -196,7 +196,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -17841,7 +17842,7 @@ msgid ""
+@@ -18497,7 +18498,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"
@@ -204,8 +204,8 @@
 +"    defaults to 'sensible-editor'."
  msgstr ""
  "EDITOR\n"
- "    コミット時のメッセージのように、 エディタでファイルを開き、\n"
-@@ -17849,7 +17850,7 @@ msgstr ""
+ "    コミットログ入力時のように、 エディタでファイルを開き、\n"
+@@ -18505,7 +18506,7 @@ msgstr ""
  "    そこで使用されるエディタは、 HGEDITOR、 VISUAL\n"
  "    あるいは EDITOR 環境変数に設定されたものを(この順序で)使用します。\n"
  "    最初の空で無い値に設定された環境変数の値を使用します。\n"
@@ -216,9 +216,9 @@
  "PYTHONPATH\n"
 --- a/i18n/pt_BR.po
 +++ b/i18n/pt_BR.po
-@@ -10745,10 +10745,10 @@ msgstr " (modelos parecem ter sido insta
- msgid "Checking commit editor...\n"
- msgstr "Verificando editor para consolidação...\n"
+@@ -11325,10 +11325,10 @@ msgstr " (modelos parecem ter sido insta
+ msgid "checking commit editor...\n"
+ msgstr "verificando editor para consolidação...\n"
  
 -msgid " No commit editor set and can't find vi in PATH\n"
 +msgid " No commit editor set and can't find sensible-editor in PATH\n"
@@ -229,7 +229,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr ""
-@@ -17119,10 +17119,12 @@ msgstr ""
+@@ -17774,10 +17774,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -244,7 +244,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -18174,7 +18176,7 @@ msgid ""
+@@ -18843,7 +18845,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"
-@@ -18182,7 +18184,7 @@ msgstr ""
+@@ -18851,7 +18853,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"
@@ -264,9 +264,9 @@
  "PYTHONPATH\n"
 --- a/i18n/sv.po
 +++ b/i18n/sv.po
-@@ -8717,8 +8717,8 @@ msgstr " (mallar verkar vara inkorrekt i
- msgid "Checking commit editor...\n"
- msgstr "Kontrollerar arkiveringseditor...\n"
+@@ -9509,8 +9509,8 @@ msgstr " (mallar verkar vara inkorrekt i
+ msgid "checking commit editor...\n"
+ msgstr "kontrollerar arkiveringseditor...\n"
  
 -msgid " No commit editor set and can't find vi in PATH\n"
 -msgstr " Ingen arkiveringseditor satt och kan inte hitta vi i PATH\n"
@@ -275,7 +275,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr " (specificera en arkiveringseditor i din konfigurationsfil)\n"
-@@ -13794,7 +13794,8 @@ msgstr ""
+@@ -14852,7 +14852,8 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -285,7 +285,7 @@
  msgstr ""
  
  msgid ""
-@@ -14477,7 +14478,7 @@ msgid ""
+@@ -15564,7 +15565,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"
@@ -391,9 +391,9 @@
  msgid ""
 --- a/i18n/ru.po
 +++ b/i18n/ru.po
-@@ -10969,8 +10969,8 @@ msgstr " (шаблоны, похоже,
- msgid "Checking commit editor...\n"
- msgstr "Проверка редактора сообщений фиксации...\n"
+@@ -11555,8 +11555,8 @@ msgstr " (шаблоны, похоже,
+ msgid "checking commit editor...\n"
+ msgstr "проверка редактора сообщений фиксации...\n"
  
 -msgid " No commit editor set and can't find vi in PATH\n"
 -msgstr " Редактор сообщений не установлен и vi не доступен в PATH\n"
@@ -402,7 +402,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr " (задайте редактор сообщений в вашем конфиге)\n"
-@@ -17256,10 +17256,12 @@ msgstr ""
+@@ -17913,10 +17913,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -417,7 +417,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -18290,14 +18292,14 @@ msgid ""
+@@ -18964,14 +18966,14 @@ 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"

More information about the Python-apps-commits mailing list