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

Mon Dec 13 21:35:12 UTC 2010

Date: Monday, December 13, 2010 @ 21:35:11
  Author: vicho-guest
Revision: 6395

Refresh patches

Modified:
  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__install-help-separately
===================================================================

--- packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately	2010-12-13 21:35:03 UTC (rev 6394)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately	2010-12-13 21:35:11 UTC (rev 6395)
@@ -2,7 +2,7 @@
 
 --- a/setup.py
 +++ b/setup.py
-@@ -280,8 +280,7 @@
+@@ -340,8 +340,7 @@
          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	2010-12-13 21:35:03 UTC (rev 6394)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-mo-fhs.patch	2010-12-13 21:35:11 UTC (rev 6395)
@@ -12,7 +12,7 @@
          break
 --- a/setup.py
 +++ b/setup.py
-@@ -280,7 +280,7 @@
+@@ -340,7 +340,7 @@
          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	2010-12-13 21:35:03 UTC (rev 6394)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately	2010-12-13 21:35:11 UTC (rev 6395)
@@ -13,7 +13,7 @@
  def _flatten(thing):
 --- a/setup.py
 +++ b/setup.py
-@@ -286,14 +286,6 @@
+@@ -346,14 +346,6 @@
  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	2010-12-13 21:35:03 UTC (rev 6394)
+++ packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies	2010-12-13 21:35:11 UTC (rev 6395)
@@ -74,7 +74,7 @@
  
 --- a/hgext/convert/git.py
 +++ b/hgext/convert/git.py
-@@ -43,7 +43,7 @@
+@@ -44,7 +44,7 @@
          if not os.path.exists(path + "/objects"):
              raise NoRepo(_("%s does not look like a Git repository") % path)
  
@@ -139,7 +139,7 @@
  
          self.lastrevs = {}
  
-@@ -953,6 +957,9 @@
+@@ -960,6 +964,9 @@
          return self.join('hg-authormap')
  
      def __init__(self, ui, path):
@@ -151,13 +151,23 @@
          self.delete = []
 --- a/mercurial/hgweb/server.py
 +++ b/mercurial/hgweb/server.py
-@@ -225,7 +225,8 @@
-                 from OpenSSL import SSL
-                 ctx = SSL.Context(SSL.SSLv23_METHOD)
-             except ImportError:
--                raise util.Abort(_("SSL support is unavailable"))
-+                raise util.Abort(_("SSL support is unavailable") +
-+                                 _(" (try installing the %s package)") % 'python-openssl')
-             ctx.use_privatekey_file(ssl_cert)
-             ctx.use_certificate_file(ssl_cert)
-             sock = socket.socket(self.address_family, self.socket_type)
+@@ -184,7 +184,8 @@
+             import OpenSSL
+             OpenSSL.SSL.Context
+         except ImportError:
+-            raise util.Abort(_("SSL support is unavailable"))
++            raise util.Abort(_("SSL support is unavailable") +
++                             _(" (try installing the %s package)") % 'python-openssl')
+         ctx = OpenSSL.SSL.Context(OpenSSL.SSL.SSLv23_METHOD)
+         ctx.use_privatekey_file(ssl_cert)
+         ctx.use_certificate_file(ssl_cert)
+@@ -225,7 +226,8 @@
+             import ssl
+             ssl.wrap_socket
+         except ImportError:
+-            raise util.Abort(_("SSL support is unavailable"))
++            raise util.Abort(_("SSL support is unavailable") +
++                             _(" (try installing the %s package)") % 'python-openssl')
+         httpserver.socket = ssl.wrap_socket(httpserver.socket, server_side=True,
+             certfile=ssl_cert, ssl_version=ssl.PROTOCOL_SSLv23)
+ 

Modified: packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2010-12-13 21:35:03 UTC (rev 6394)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2010-12-13 21:35:11 UTC (rev 6395)
@@ -2,7 +2,7 @@
 
 --- a/doc/hgrc.5.txt
 +++ b/doc/hgrc.5.txt
-@@ -831,7 +831,8 @@
+@@ -861,7 +861,8 @@
  ``debug``
      Print debugging information. True or False. Default is False.
  ``editor``
@@ -25,7 +25,7 @@
          EDITOR="$EDITOR -nw"
 --- a/mercurial/commands.py
 +++ b/mercurial/commands.py
-@@ -1356,8 +1356,8 @@
+@@ -1405,8 +1405,8 @@
      editor = ui.geteditor()
      cmdpath = util.find_exe(editor) or util.find_exe(editor.split()[0])
      if not cmdpath:
@@ -38,7 +38,7 @@
          else:
 --- a/mercurial/ui.py
 +++ b/mercurial/ui.py
-@@ -559,7 +559,7 @@
+@@ -570,7 +570,7 @@
          return (os.environ.get("HGEDITOR") or
                  self.config("ui", "editor") or
                  os.environ.get("VISUAL") or
@@ -49,7 +49,7 @@
          '''show a progress message
 --- a/i18n/da.po
 +++ b/i18n/da.po
-@@ -7103,7 +7103,7 @@
+@@ -7355,7 +7355,7 @@
  msgid "Checking commit editor...\n"
  msgstr ""
  
@@ -57,8 +57,8 @@
 +msgid " No commit editor set and can't find sensible-editor in PATH\n"
  msgstr ""
  
- msgid " (specify a commit editor in your .hgrc file)\n"
-@@ -10199,7 +10199,7 @@
+ msgid " (specify a commit editor in your configuration file)\n"
+@@ -10567,7 +10567,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"
@@ -69,26 +69,35 @@
  msgid ""
 --- a/i18n/de.po
 +++ b/i18n/de.po
-@@ -340,7 +340,7 @@
+@@ -8301,8 +8301,8 @@
+ msgid "Checking commit editor...\n"
+ msgstr "PrÃ¼fe Editor fÃ¼r Versionsmeldungen...\n"
+ 
+-msgid " No commit editor set and can't find vi in PATH\n"
+-msgstr " Kein Editor fÃ¼r Versionsmeldungen angegeben und vi nicht im PATH\n"
++msgid " No commit editor set and can't find sensible-editor in PATH\n"
++msgstr " Kein Editor fÃ¼r Versionsmeldungen angegeben und sensible-editor nicht im PATH\n"
+ 
+ #, fuzzy
+ msgid " (specify a commit editor in your configuration file)\n"
+@@ -13003,7 +13003,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"
 -"    defaults to 'vi'."
 +"    defaults to 'sensible-editor'."
  msgstr ""
+ "EDITOR\n"
+ "    Manchmal muss Mercurial eine Textdatei in einem Editor Ã¶ffnen, damit\n"
+@@ -13011,7 +13011,7 @@
+ "    Nachricht geschrieben wird. Der verwendete Editor wird aus den drei\n"
+ "    Umgebungsvariablen HGEDITOR, VISUAL und EDITOR (in dieser Reihenfolge)\n"
+ "    ermittelt. Der erste nicht-leere wird verwendet. Wenn alle Angaben\n"
+-"    leer sind, wird der Standard 'vi' verwendet."
++"    leer sind, wird der Standard 'sensible-editor' verwendet."
  
  msgid ""
-@@ -16177,8 +16177,8 @@
- msgid "Checking commit editor...\n"
- msgstr "PrÃ¼fe Editor fÃ¼r Versionsmeldungen...\n"
- 
--msgid " No commit editor set and can't find vi in PATH\n"
--msgstr " Kein Editor fÃ¼r Versionsmeldungen angegeben und vi nicht im PATH\n"
-+msgid " No commit editor set and can't find sensible-editor in PATH\n"
-+msgstr " Kein Editor fÃ¼r Versionsmeldungen angegeben und sensible-editor nicht im PATH\n"
- 
- msgid " (specify a commit editor in your .hgrc file)\n"
- msgstr " (Gib einen Editor in der .hgrc Datei an!)\n"
+ "PYTHONPATH\n"
 --- a/i18n/el.po
 +++ b/i18n/el.po
 @@ -274,7 +274,7 @@
@@ -153,7 +162,7 @@
  msgid ""
 --- a/i18n/ja.po
 +++ b/i18n/ja.po
-@@ -7414,8 +7414,8 @@
+@@ -7608,8 +7608,8 @@
  msgid "Checking commit editor...\n"
  msgstr "ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸å…¥åŠ›ç”¨ã‚¨ãƒ‡ã‚£ã‚¿ã®æ¤œè¨¼ä¸...\n"
  
@@ -164,7 +173,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr " (ã‚³ãƒŸãƒƒãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ç”¨ã‚¨ãƒ‡ã‚£ã‚¿ã‚’è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã§è¨å®šã—ã¦ãã ã•ã„)\n"
-@@ -10847,14 +10847,14 @@
+@@ -11136,7 +11136,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"
@@ -172,18 +181,19 @@
 +"    defaults to 'sensible-editor'."
  msgstr ""
  "EDITOR\n"
- "    ã‚³ãƒŸãƒƒãƒˆæ™‚ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã®ã‚ˆã†ã«ã€ã‚¨ãƒ‡ã‚£ã‚¿ã§ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é–‹ãã€ãƒ¦ãƒ¼ã‚¶ã«ã‚ˆã‚‹\n"
- "    ç·¨é›†ã‚’ä¿ƒã™çŠ¶æ³ãŒã‚ã‚Šã¾ã™ã€‚ãã“ã§ä½¿ç”¨ã•ã‚Œã‚‹ã‚¨ãƒ‡ã‚£ã‚¿ã¯ã€HGEDITORã€VISUAL\n"
+ "    ã‚³ãƒŸãƒƒãƒˆæ™‚ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã®ã‚ˆã†ã«ã€ ã‚¨ãƒ‡ã‚£ã‚¿ã§ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é–‹ãã€ ãƒ¦ãƒ¼ã‚¶ã«ã‚ˆ"
+@@ -11145,7 +11145,7 @@
+ "VISUAL\n"
  "    ã‚ã‚‹ã„ã¯ EDITOR ç’°å¢ƒå¤‰æ•°ã«è¨å®šã•ã‚ŒãŸã‚‚ã®ã‚’(ã“ã®é †åºã§)ä½¿ç”¨ã—ã¾ã™ã€‚\n"
- "    æœ€åˆã®ç©ºã§ç„¡ã„å€¤ã«è¨å®šã•ã‚ŒãŸç’°å¢ƒå¤‰æ•°ã®å€¤ã‚’ä½¿ç”¨ã—ã¾ã™ã€‚ã„ãšã‚Œã‚‚æœªè¨å®š\n"
--"    (ã‚ã‚‹ã„ã¯ç©º)ã®å ´åˆã¯ã€'vi' ãŒä½¿ç”¨ã•ã‚Œã¾ã™ã€‚"
-+"    (ã‚ã‚‹ã„ã¯ç©º)ã®å ´åˆã¯ã€'sensible-editor' ãŒä½¿ç”¨ã•ã‚Œã¾ã™ã€‚"
+ "    æœ€åˆã®ç©ºã§ç„¡ã„å€¤ã«è¨å®šã•ã‚ŒãŸç’°å¢ƒå¤‰æ•°ã®å€¤ã‚’ä½¿ç”¨ã—ã¾ã™ã€‚ ã„ãšã‚Œã‚‚æœªè¨å®š\n"
+-"    (ã‚ã‚‹ã„ã¯ç©º)ã®å ´åˆã¯ã€ 'vi' ãŒä½¿ç”¨ã•ã‚Œã¾ã™ã€‚"
++"    (ã‚ã‚‹ã„ã¯ç©º)ã®å ´åˆã¯ã€ 'sensible-editor' ãŒä½¿ç”¨ã•ã‚Œã¾ã™ã€‚"
  
  msgid ""
  "PYTHONPATH\n"
 --- a/i18n/pt_BR.po
 +++ b/i18n/pt_BR.po
-@@ -8236,8 +8236,8 @@
+@@ -8443,8 +8443,8 @@
  msgid "Checking commit editor...\n"
  msgstr "Verificando editor para consolidaÃ§Ã£o...\n"
  
@@ -194,7 +204,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr " (especifique um editor para consolidaÃ§Ã£o em seu arquivo de configuraÃ§Ã£o)\n"
-@@ -11716,7 +11716,7 @@
+@@ -12013,7 +12013,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"
@@ -203,7 +213,7 @@
  msgstr ""
  "EDITOR\n"
  "    Algumas vezes o Mercurial precisa abrir em um editor um arquivo\n"
-@@ -11724,7 +11724,7 @@
+@@ -12021,7 +12021,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"
@@ -214,7 +224,7 @@
  "PYTHONPATH\n"
 --- a/i18n/sv.po
 +++ b/i18n/sv.po
-@@ -6799,7 +6799,7 @@
+@@ -7068,7 +7068,7 @@
  msgid "Checking commit editor...\n"
  msgstr ""
  
@@ -222,8 +232,8 @@
 +msgid " No commit editor set and can't find sensible-editor in PATH\n"
  msgstr ""
  
- msgid " (specify a commit editor in your .hgrc file)\n"
-@@ -10095,7 +10095,7 @@
+ msgid " (specify a commit editor in your configuration file)\n"
+@@ -10460,7 +10460,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"
@@ -254,7 +264,18 @@
  msgid ""
 --- a/i18n/zh_TW.po
 +++ b/i18n/zh_TW.po
-@@ -219,7 +219,7 @@
+@@ -6760,8 +6760,8 @@
+ msgid "Checking commit editor...\n"
+ msgstr "æª¢æŸ¥æäº¤è¨Šæ¯ç·¨è¼¯å™¨...\n"
+ 
+-msgid " No commit editor set and can't find vi in PATH\n"
+-msgstr "æ²’æœ‰è¨å®šæäº¤è¨Šæ¯ç·¨è¼¯å™¨,ç„¶å¾Œåœ¨PATHä¸ä¹Ÿæ²’æœ‰vi\n"
++msgid " No commit editor set and can't find sensible-editor in PATH\n"
++msgstr "æ²’æœ‰è¨å®šæäº¤è¨Šæ¯ç·¨è¼¯å™¨,ç„¶å¾Œåœ¨PATHä¸ä¹Ÿæ²’æœ‰sensible-editor\n"
+ 
+ msgid " (specify a commit editor in your configuration file)\n"
+ msgstr "(åœ¨ä½ çš„è¨å®šæª”æŒ‡æ˜Žä¸€å€‹ç”¨ä¾†ç·¨è¼¯æäº¤è¨Šæ¯çš„ç·¨è¼¯å™¨)\n"
+@@ -9710,7 +9710,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"
@@ -263,18 +284,9 @@
  msgstr ""
  
  msgid ""
-@@ -6828,7 +6828,7 @@
- msgid "Checking commit editor...\n"
- msgstr ""
- 
--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"
- msgstr ""
- 
- msgid " (specify a commit editor in your .hgrc file)\n"
 --- a/mercurial/help/environment.txt
 +++ b/mercurial/help/environment.txt
-@@ -79,7 +79,7 @@
+@@ -86,7 +86,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


