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

vicho-guest at users.alioth.debian.org vicho-guest at users.alioth.debian.org
Tue May 10 19:59:50 UTC 2011 

    Date: Tuesday, May 10, 2011 @ 19:59:48
  Author: vicho-guest
Revision: 7084

Refresh patches

Modified:
  packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.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	2011-05-10 19:44:35 UTC (rev 7083)
+++ packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch	2011-05-10 19:59:48 UTC (rev 7084)
@@ -12,7 +12,7 @@
  
 --- a/setup.py
 +++ b/setup.py
-@@ -310,7 +310,7 @@
+@@ -315,7 +315,7 @@
  cmdclass = {'build_mo': hgbuildmo,
              'build_ext': hgbuildext,
              'build_py': hgbuildpy,

Modified: packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately	2011-05-10 19:44:35 UTC (rev 7083)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately	2011-05-10 19:59:48 UTC (rev 7084)
@@ -2,7 +2,7 @@
 
 --- a/setup.py
 +++ b/setup.py
-@@ -344,8 +344,7 @@
+@@ -349,8 +349,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	2011-05-10 19:44:35 UTC (rev 7083)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-mo-fhs.patch	2011-05-10 19:59:48 UTC (rev 7084)
@@ -12,7 +12,7 @@
          break
 --- a/setup.py
 +++ b/setup.py
-@@ -344,7 +344,7 @@
+@@ -349,7 +349,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	2011-05-10 19:44:35 UTC (rev 7083)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately	2011-05-10 19:59:48 UTC (rev 7084)
@@ -13,7 +13,7 @@
  def _flatten(thing):
 --- a/setup.py
 +++ b/setup.py
-@@ -350,14 +350,6 @@
+@@ -355,14 +355,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	2011-05-10 19:44:35 UTC (rev 7083)
+++ packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies	2011-05-10 19:59:48 UTC (rev 7084)
@@ -139,7 +139,7 @@
  
          self.lastrevs = {}
  
-@@ -961,6 +965,8 @@
+@@ -963,6 +967,8 @@
          return self.join('hg-authormap')
  
      def __init__(self, ui, path):

Modified: packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2011-05-10 19:44:35 UTC (rev 7083)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2011-05-10 19:59:48 UTC (rev 7084)
@@ -2,7 +2,7 @@
 
 --- a/doc/hgrc.5.txt
 +++ b/doc/hgrc.5.txt
-@@ -886,7 +886,8 @@
+@@ -891,7 +891,8 @@
  ``debug``
      Print debugging information. True or False. Default is False.
  ``editor``
@@ -49,7 +49,7 @@
          '''show a progress message
 --- a/i18n/da.po
 +++ b/i18n/da.po
-@@ -7408,7 +7408,7 @@
+@@ -7437,7 +7437,7 @@
  msgid "Checking commit editor...\n"
  msgstr ""
  
@@ -58,7 +58,7 @@
  msgstr ""
  
  msgid " (specify a commit editor in your configuration file)\n"
-@@ -10714,7 +10714,7 @@
+@@ -10749,7 +10749,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,7 +69,7 @@
  msgid ""
 --- a/i18n/de.po
 +++ b/i18n/de.po
-@@ -8447,8 +8447,8 @@
+@@ -8573,8 +8573,8 @@
  msgid "Checking commit editor...\n"
  msgstr "Prüfe Editor für Versionsmeldungen...\n"
  
@@ -80,7 +80,7 @@
  
  #, fuzzy
  msgid " (specify a commit editor in your configuration file)\n"
-@@ -13289,7 +13289,7 @@
+@@ -13430,7 +13430,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"
@@ -89,7 +89,7 @@
  msgstr ""
  "EDITOR\n"
  "    Manchmal muss Mercurial eine Textdatei in einem Editor öffnen, damit\n"
-@@ -13297,7 +13297,7 @@
+@@ -13438,7 +13438,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"
@@ -140,7 +140,7 @@
  msgid " (specify a commit editor in your .hgrc file)\n"
 --- a/i18n/it.po
 +++ b/i18n/it.po
-@@ -6842,8 +6842,8 @@
+@@ -7154,8 +7154,8 @@
  msgid "Checking commit editor...\n"
  msgstr "Sto controllando l'editor per il commit...\n"
  
@@ -149,9 +149,9 @@
 +msgid " No commit editor set and can't find sensible-editor in PATH\n"
 +msgstr "Nessun editor per il commit trovato e non trovo sensible-editor in PATH\n"
  
- msgid " (specify a commit editor in your .hgrc file)\n"
- msgstr " (specificare un editore per il commit nel proprio file .hgrc)\n"
-@@ -10271,7 +10271,7 @@
+ msgid " (specify a commit editor in your configuration file)\n"
+ msgstr ""
+@@ -10459,7 +10459,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"
@@ -193,7 +193,7 @@
  "PYTHONPATH\n"
 --- a/i18n/pt_BR.po
 +++ b/i18n/pt_BR.po
-@@ -8484,8 +8484,8 @@
+@@ -8490,8 +8490,8 @@
  msgid "Checking commit editor...\n"
  msgstr "Verificando editor para consolidação...\n"
  
@@ -204,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"
-@@ -12155,7 +12155,7 @@
+@@ -12177,7 +12177,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"
@@ -213,7 +213,7 @@
  msgstr ""
  "EDITOR\n"
  "    Algumas vezes o Mercurial precisa abrir em um editor um arquivo\n"
-@@ -12163,7 +12163,7 @@
+@@ -12185,7 +12185,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"

More information about the Python-apps-commits mailing list