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

[vdanjean at users.alioth.debian.org]

    Date: Thursday, December 3, 2009 @ 21:20:31
  Author: vdanjean
Revision: 4233

Refresh patches for 1.4.1

Modified:
  packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately
  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	2009-12-03 21:20:26 UTC (rev 4232)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately	2009-12-03 21:20:31 UTC (rev 4233)
@@ -1,6 +1,5 @@
 Support installation of help topics handled by mercurial-common.install.
 
-diff -r fc7206c1290a mercurial/help.py
 --- a/mercurial/help.py
 +++ b/mercurial/help.py
 @@ -70,9 +70,11 @@
@@ -17,10 +16,9 @@
                  break
  
          path = os.path.join(docdir, topic + ".txt")
-diff -r fc7206c1290a setup.py
 --- a/setup.py
 +++ b/setup.py
-@@ -254,7 +254,7 @@
+@@ -256,7 +256,7 @@
          packages.extend(['hgext.inotify', 'hgext.inotify.linux'])
  
  datafiles = []

Modified: packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2009-12-03 21:20:26 UTC (rev 4232)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2009-12-03 21:20:31 UTC (rev 4233)
@@ -217,7 +217,7 @@
  msgstr " (コミットメッセージ用エディタを設定ファイルで設定してください)\n"
 --- a/i18n/pt_BR.po
 +++ b/i18n/pt_BR.po
-@@ -358,7 +358,7 @@
+@@ -357,7 +357,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"
@@ -226,7 +226,7 @@
  "\n"
  "PYTHONPATH\n"
  "    This is used by Python to find imported modules and may need to be\n"
-@@ -440,7 +440,7 @@
+@@ -439,7 +439,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"