>From 2eeca169f6ce4d1a1a90d5fe6121cb2e4ccf2f63 Mon Sep 17 00:00:00 2001
From: Frank Lin PIAT <fpiat@klabs.be>
Date: Mon, 12 Jan 2009 21:54:42 +0100
Subject: [PATCH] 1.5.3-1.2etch2

---
 debian/changelog                               |   12 ++++++++++++
 debian/patches/021_password_reminder_url.patch |   17 +++++++++++++++++
 debian/patches/022_fix_spanish_TOC.patch       |   21 +++++++++++++++++++++
 3 files changed, 50 insertions(+), 0 deletions(-)
 create mode 100644 debian/patches/021_password_reminder_url.patch
 create mode 100644 debian/patches/022_fix_spanish_TOC.patch

diff --git a/debian/changelog b/debian/changelog
index feb9932..e0a6a6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+moin (1.5.3-1.2etch2) stable-proposed-updates; urgency=low
+
+  * Non-maintainer upload.
+  * Fix the forgotten password email's login URL (backported from
+    upstream http://hg.moinmo.in/moin/1.5/rev/50c7a0cc1791 )
+    (Closes: #511416)
+  * Fix a serious bug in translation, which cause all pages that use
+    TableOfContent to be ugly to Spanish speaking visitors.
+    (Closes: #504562, #511355, thanks to Luis Saavedra)
+
+ -- Frank Lin PIAT <fpiat@klabs.be>  Sat, 10 Jan 2009 17:11:49 +0100
+
 moin (1.5.3-1.2etch1) stable-security; urgency=high
 
   * Non-maintainer upload.
diff --git a/debian/patches/021_password_reminder_url.patch b/debian/patches/021_password_reminder_url.patch
new file mode 100644
index 0000000..dac9ca3
--- /dev/null
+++ b/debian/patches/021_password_reminder_url.patch
@@ -0,0 +1,17 @@
+# modified HG changeset patch
+# Orig User Thomas Waldmann <tw AT waldmann-edv DOT de>
+# 	Sun May 07 13:17:04 2006 +0200 (2 years ago)
+# changeset 618	  50c7a0cc1791
+# parent    617	  42958bb7e500
+diff -Nur a/MoinMoin/user.py b/MoinMoin/user.py
+--- a/MoinMoin/user.py	2009-01-10 16:27:32.000000000 +0100
++++ b/MoinMoin/user.py	2009-01-10 16:52:48.000000000 +0100
+@@ -969,7 +969,7 @@
+ 
+ Login Password: %s
+ 
+-Login URL: %s/%s
++Login URL: %s/%s?action=login
+ """, formatted=False) % (
+                         self.name, self.enc_password, self._request.getBaseURL(), getSysPage(self._request, 'UserPreferences').page_name)
+ 
diff --git a/debian/patches/022_fix_spanish_TOC.patch b/debian/patches/022_fix_spanish_TOC.patch
new file mode 100644
index 0000000..6945fb4
--- /dev/null
+++ b/debian/patches/022_fix_spanish_TOC.patch
@@ -0,0 +1,21 @@
+diff -Nur -x '*.orig' -x '*~' moin-1.5.3/MoinMoin/i18n/es.py moin-1.5.3.new/MoinMoin/i18n/es.py
+--- moin-1.5.3/MoinMoin/i18n/es.py	2006-04-15 23:33:12.000000000 +0200
++++ moin-1.5.3.new/MoinMoin/i18n/es.py	2009-01-12 21:50:02.000000000 +0100
+@@ -924,7 +924,7 @@
+ '''SiteNavigation''':
+ '''NavegaciónDelSitio''',
+ '''HelpContents''':
+-'''ContenidosDeAyuda''',
++'''AyudaDeContenidos''',
+ '''HelpOnFormatting''':
+ '''AyudaSobreFormato''',
+ '''UserPreferences''':
+@@ -1000,7 +1000,7 @@
+ '''[Bookmark reached]''':
+ '''[enlace personal alcanzado]''',
+ '''Contents''':
+-'''AyudaDeContenidos''',
++'''Contenidos''',
+ '''No wanted pages in this wiki.''':
+ '''No existen páginas-por-crear en este wiki.''',
+ '''Invalid include arguments "%s"!''':
-- 
1.5.6.5