[Pkg-mailman-hackers] Pkg-mailman commit - rev 749 - in branches/experimental/debian: . patches

Thorsten Glaser tg at moszumanska.debian.org
Sun Dec 29 01:45:06 UTC 2013 

Author: tg
Date: 2013-12-29 01:45:06 +0000 (Sun, 29 Dec 2013)
New Revision: 749

Added:
   branches/experimental/debian/patches/90_gettext_errors.patch
   branches/experimental/debian/patches/91_utf8.patch
Modified:
   branches/experimental/debian/changelog
   branches/experimental/debian/control
   branches/experimental/debian/copyright
   branches/experimental/debian/patches/series
Log:
take tarent?\226?\128?\153s gettext patch (with input from Andreas Gockel) and re-work it on top of current mailman from sid

Modified: branches/experimental/debian/changelog
===================================================================
--- branches/experimental/debian/changelog	2013-12-29 01:02:44 UTC (rev 748)
+++ branches/experimental/debian/changelog	2013-12-29 01:45:06 UTC (rev 749)
@@ -1,3 +1,9 @@
+mailman (1:2.1.16-1exp1) experimental; urgency=low
+
+  * Convert to UTF-8. (Closes: #398777, #535296, #732929)
+
+ -- Thorsten Glaser <tg at mirbsd.de>  Sun, 29 Dec 2013 01:43:26 +0000
+
 mailman (1:2.1.16-1) unstable; urgency=low
 
   * New upstream release.

Modified: branches/experimental/debian/control
===================================================================
--- branches/experimental/debian/control	2013-12-29 01:02:44 UTC (rev 748)
+++ branches/experimental/debian/control	2013-12-29 01:45:06 UTC (rev 749)
@@ -6,7 +6,7 @@
  Thijs Kinkhorst <thijs at debian.org>,
  Thorsten Glaser <tg at mirbsd.de>,
  Hector Garcia <hector at debian.org>
-Build-Depends: debhelper (>= 7), autoconf, python-dev (>= 2.6.6-3~)
+Build-Depends: debhelper (>= 7), autoconf, python-dev (>= 2.6.6-3~), gettext
 Standards-Version: 3.9.4
 Homepage: http://www.list.org/
 Vcs-Svn: svn://anonscm.debian.org/pkg-mailman/branches/experimental

Modified: branches/experimental/debian/copyright
===================================================================
--- branches/experimental/debian/copyright	2013-12-29 01:02:44 UTC (rev 748)
+++ branches/experimental/debian/copyright	2013-12-29 01:45:06 UTC (rev 749)
@@ -26,8 +26,9 @@
 
 
 Modifications for Debian are copyright (C) 1998 Johnie Ingram, (C)
-1999 Gergely Madarasz, (C) 2001 Tollef Fog Heen and (C) 2005 Lionel
-Elie Mamane, and also released under the terms of the GPL -- version
+1999 Gergely Madarasz, (C) 2001 Tollef Fog Heen, (C) 2005 Lionel
+Elie Mamane, © 2010, 2012, 2013 Thorsten Glaser (partially sponsored
+by tarent) and also released under the terms of the GPL -- version
 2, or any later version.
 
 On Debian GNU/Linux systems, the text of the GPL can be found in

Added: branches/experimental/debian/patches/90_gettext_errors.patch
===================================================================
--- branches/experimental/debian/patches/90_gettext_errors.patch	                        (rev 0)
+++ branches/experimental/debian/patches/90_gettext_errors.patch	2013-12-29 01:45:06 UTC (rev 749)
@@ -0,0 +1,263 @@
+Author: Thorsten Glaser <tg at debian.org>
+Description: Fix bugs in translation files
+Forwarded: no
+
+--- a/messages/es/LC_MESSAGES/mailman.po
++++ b/messages/es/LC_MESSAGES/mailman.po
+@@ -11460,7 +11460,6 @@ msgid ""
+ "\n"
+ "This script is provided for convenience purposes only.  It isn't supported.\n"
+ msgstr ""
+-"\n"
+ "Reduce el espacio usado en disco de los archivos de pipermail.\n"
+ "\n"
+ "Sintaxis: %(PROGRAM)s [opciones] fichero ...\n"
+@@ -11486,7 +11485,7 @@ msgstr ""
+ "guión cuando esté satisfecho con los resultados.\n"
+ "\n"
+ "Este guión se suministra únicamente por motivos de conveniencia. No\n"
+-"está soportado."
++"está soportado.\n"
+ 
+ #: bin/remove_members:20
+ #, fuzzy
+@@ -11630,7 +11629,7 @@ msgstr ""
+ "\n"
+ "Opciones:\n"
+ "    -v / --verbose\n"
+-"         Muestra que es lo que está haciendo el guión."
++"         Muestra que es lo que está haciendo el guión.\n"
+ 
+ #: bin/reset_pw.py:77
+ msgid "Changing passwords for list: %(listname)s"
+@@ -11750,7 +11749,7 @@ msgstr ""
+ "     -h / --help\n"
+ "        Muestra este texto y termina.\n"
+ "\n"
+-"Ejemplo: show_qfiles qfiles/shunt/*.pck"
++"Ejemplo: show_qfiles qfiles/shunt/*.pck\n"
+ 
+ #: bin/sync_members:19
+ msgid ""
+--- a/messages/fr/LC_MESSAGES/mailman.po
++++ b/messages/fr/LC_MESSAGES/mailman.po
+@@ -7290,7 +7290,7 @@ msgid ""
+ "                Incomplete filter rules will be ignored."
+ msgstr ""
+ "Les règles de filtrage d'en têtes requièrent un motif.\n"
+-"\t\t Les règles de filtrage incomplètes seront ignorées.\n"
++"\t\t Les règles de filtrage incomplètes seront ignorées."
+ 
+ #: Mailman/Gui/Privacy.py:500
+ msgid ""
+--- a/messages/hr/LC_MESSAGES/mailman.po
++++ b/messages/hr/LC_MESSAGES/mailman.po
+@@ -1776,7 +1776,7 @@ msgstr ""
+ "    proces potvrde.\n"
+ "\n"
+ "    <p>Ili stisnite <em>Zanemari odbaci</em> da biste zanemarili ovu "
+-"promjenu adrese\n"
++"promjenu adrese"
+ 
+ #: Mailman/Cgi/confirm.py:602
+ msgid "Change address"
+@@ -1812,7 +1812,7 @@ msgstr ""
+ "            <em>%(subject)s</em> u zaglavlju nije pronaðena.  Vjerovatno je\n"
+ "            tome razlog taj ¹to je moderator liste veæ odobrio ili odbacio "
+ "poruku.\n"
+-"            Niste bili u moguænosti zanemariti istu na vrijeme.\n"
++"            Niste bili u moguænosti zanemariti istu na vrijeme."
+ 
+ #: Mailman/Cgi/confirm.py:657
+ msgid "Posted message canceled"
+@@ -4628,7 +4628,7 @@ msgstr ""
+ msgid ""
+ "Remove message attachments that have a matching content\n"
+ "             type."
+-msgstr "Ukloni privitke poruka koji se podudaraju s tipovima sadr¾aja.\n"
++msgstr "Ukloni privitke poruka koji se podudaraju s tipovima sadr¾aja."
+ 
+ #: Mailman/Gui/ContentFilter.py:82
+ msgid ""
+--- a/messages/ia/LC_MESSAGES/mailman.po
++++ b/messages/ia/LC_MESSAGES/mailman.po
+@@ -68,7 +68,7 @@ msgstr "Texto%(sz)s"
+ 
+ #: Mailman/Archiver/HyperArch.py:913
+ msgid "figuring article archives\n"
+-msgstr "recerca in le archivo pro iste articulo"
++msgstr "recerca in le archivo pro iste articulo\n"
+ 
+ #: Mailman/Archiver/HyperArch.py:923
+ msgid "April"
+@@ -1539,7 +1539,7 @@ msgstr ""
+ "lista\n"
+ "            <em>%(listname)s</em>, ma illo debe esser approbate per le\n"
+ "            moderator del lista. Tu requesta ha essite reinviate al "
+-"moderator,            e tu essera notificate super su decision.\n"
++"moderator,            e tu essera notificate super su decision."
+ 
+ #: Mailman/Cgi/confirm.py:371 Mailman/Cgi/confirm.py:436
+ #: Mailman/Cgi/confirm.py:525 Mailman/Cgi/confirm.py:762
+@@ -1891,7 +1891,7 @@ msgstr ""
+ "            Tu ha rehabilitate con successo tu abonamento al\n"
+ "            lista %(listname)s.  Tu pote nunc <a\n"
+ "            href=\"%(optionsurl)s\">visitar tu pagina de optiones de "
+-"abonato</a>.\n"
++"abonato</a>."
+ 
+ #: Mailman/Cgi/confirm.py:784
+ msgid "Re-enable mailing list membership"
+@@ -2565,7 +2565,7 @@ msgstr ""
+ "Tu ha essite disabonate con successo del lista %(fqdn_listname)s.\n"
+ "            Si tu recipeva summarios, tu forsan va reciper ancora uno.\n"
+ "            Si tu ha alicun question super tu disabonamento, per favor\n"
+-"            contacta le proprietarios del lista a %(owneraddr)s.\n"
++"            contacta le proprietarios del lista a %(owneraddr)s."
+ 
+ #: Mailman/Cgi/options.py:676
+ msgid ""
+@@ -3206,11 +3206,11 @@ msgstr "Plus informationes: %(listurl)s"
+ 
+ #: Mailman/Commands/cmd_join.py:17
+ msgid "The `join' command is synonymous with `subscribe'.\n"
+-msgstr "Le commando 'join' (in anglese) es synonyme con 'subscribe'."
++msgstr "Le commando 'join' (in anglese) es synonyme con 'subscribe'.\n"
+ 
+ #: Mailman/Commands/cmd_leave.py:17
+ msgid "The `leave' command is synonymous with `unsubscribe'.\n"
+-msgstr "Le commando 'leave' (in anglese) es synonyme a 'unsubscribe'."
++msgstr "Le commando 'leave' (in anglese) es synonyme a 'unsubscribe'.\n"
+ 
+ #: Mailman/Commands/cmd_lists.py:17
+ msgid ""
+@@ -3303,7 +3303,7 @@ msgstr ""
+ 
+ #: Mailman/Commands/cmd_remove.py:17
+ msgid "The `remove' command is synonymous with `unsubscribe'.\n"
+-msgstr "Le commando 'remove' (in anglese) es synonyme con 'unsubscribe'."
++msgstr "Le commando 'remove' (in anglese) es synonyme con 'unsubscribe'.\n"
+ 
+ #: Mailman/Commands/cmd_set.py:26
+ msgid ""
+@@ -3598,7 +3598,7 @@ msgstr "fixa option de rememoration"
+ 
+ #: Mailman/Commands/cmd_stop.py:17
+ msgid "stop is synonymous with the end command.\n"
+-msgstr "'stop' es synonyme con le commando 'end' (fin)."
++msgstr "'stop' es synonyme con le commando 'end' (fin).\n"
+ 
+ #: Mailman/Commands/cmd_subscribe.py:17
+ msgid ""
+@@ -10976,7 +10976,7 @@ msgstr ""
+ "\n"
+ "Optiones:\n"
+ "    -v / --verbose\n"
+-"        Imprime lo que le scripto face."
++"        Imprime lo que le scripto face.\n"
+ 
+ #: bin/reset_pw.py:77
+ msgid "Changing passwords for list: %(listname)s"
+--- /dev/null
++++ b/messages/checkpo.sh
+@@ -0,0 +1,6 @@
++#!/bin/sh
++rv=0
++for x in */LC_MESSAGES/*.po; do
++	msgfmt -o - "$x" >/dev/null || rv=1
++done
++exit $rv
+--- a/messages/ja/LC_MESSAGES/mailman.po
++++ b/messages/ja/LC_MESSAGES/mailman.po
+@@ -2175,7 +2175,7 @@ msgstr ""
+ "¤¢¤Ê¤¿¤¬Êݸ¤·¤¿¥Ú¡¼¥¸¤Ë¤Ï, ¥æ¡¼¥¶¤ò¥¯¥í¥¹¥µ¥¤¥È¥¹¥¯¥ê¥×¥È¹¶·â¤Ë\n"
+ "¤µ¤é¤¹¤è¤¦¤Êµ¿¤ï¤·¤¤ HTML¥³¡¼¥É¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹.¤½¤Î¤¿¤á, Êѹ¹¤ÏµÑ²¼¤·¤Þ¤·"
+ "¤¿. ¤â¤·, ¤É¤¦¤·¤Æ¤âÊѹ¹¤¬É¬ÍפǤ¢¤ì¤Ð, \n"
+-"Mailman ¥µ¡¼¥Ð¤Ë¥·¥§¥ë¥¢¥¯¥»¥¹¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó.\n"
++"Mailman ¥µ¡¼¥Ð¤Ë¥·¥§¥ë¥¢¥¯¥»¥¹¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó."
+ 
+ #: Mailman/Cgi/edithtml.py:172
+ msgid "See "
+@@ -5516,7 +5516,7 @@ msgstr ""
+ "°ìÊý¤Ç¤¢¤ë¥á¡¼¥ë¥ê¡¼¥À¤Ï¤³¤Î¥Ø¥Ã¥À¤¬ÀßÄꤵ¤ì¤Æ¤¤¤ë¤È´üÂԤϤº¤ì¤ÎÆ°ºî¤ò¤¹¤ë.\n"
+ "(Î㤨¤Ð, žÁ÷¤·¤¿¤È¤­¤Ë¥¢¥É¥ì¥¹¤¬¶õÇò¤Ë¤Ê¤ë¤È¤«, ¡ÖÁ´°÷¤ËÊÖ¿®¡×¤·¤¿¤È¤­¤Ë\n"
+ "¤³¤Î¥¨¥é¡¼ÄÌÃÎ¥¢¥É¥ì¥¹¤Ë¤âÁ÷¿®¤¹¤ë¤È¤«) ½¾¤Ã¤Æ, ¤³¤³¤Ç̵¸ú¤Ë¤Ç¤­¤ë¤è¤¦¤Ë¤·"
+-"¤¿.\n"
++"¤¿."
+ 
+ #: Mailman/Gui/General.py:463
+ msgid ""
+@@ -5553,7 +5553,7 @@ msgstr ""
+ "¤¿. ¤â¤·, ¤É¤¦¤·¤Æ¤âÊѹ¹¤¬É¬ÍפǤ¢¤ì¤Ð, \n"
+ "Mailman ¥µ¡¼¥Ð¤Ë¥·¥§¥ë¥¢¥¯¥»¥¹¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó.\n"
+ "Êѹ¹¤Ë¤Ï bin/withlist Ëô¤Ï bin/config_list ¤ò»È¤Ã¤Æ\n"
+-"mlist.info ¤òÀßÄꤷ¤Þ¤¹.\n"
++"mlist.info ¤òÀßÄꤷ¤Þ¤¹."
+ 
+ #: Mailman/Gui/General.py:512
+ msgid ""
+@@ -6362,7 +6362,7 @@ msgstr ""
+ "»Ê²ñ¥×¥í¥»¥¹¤ÏɬÍפȤ·¤Þ¤»¤ó. 1¹Ô¤Ë¤Ä¤­1¤Ä¤Î¥¢¥É¥ì¥¹¤ò\n"
+ "µ­Æþ¤·¤Æ¤¯¤À¤µ¤¤; Àµµ¬É½¸½¤ò»È¤¦¤Ë¤Ï¹Ô¤ÎºÇ½é¤ò ^ ¤Ç»Ï¤á¤Æ¤¯¤À¤µ¤¤.\n"
+ "¹Ô¤ÎºÇ½é¤ò @ ʸ»ú¤Ë¤·¤Æ, ¸å¤Ë¤³¤Î Mailman ¥·¥¹¥Æ¥à¤Î¥ê¥¹¥È̾¤ò³¤±¤ë¤È,\n"
+-"¤½¤Î¥ê¥¹¥È²ñ°÷Á´°÷¤¬¾µÇ§¤µ¤ì¤Þ¤¹.\n"
++"¤½¤Î¥ê¥¹¥È²ñ°÷Á´°÷¤¬¾µÇ§¤µ¤ì¤Þ¤¹."
+ 
+ #: Mailman/Gui/Privacy.py:257
+ msgid ""
+@@ -8571,7 +8571,7 @@ msgstr ""
+ "·Ù¹ð: ¸ÂÄê¸ø³«Êݸ½ñ¸Ë¥Ç¥£¥ì¥¯¥È¥ê¤¬ other-executable (o+x) ¤Ë\n"
+ "      ¤Ê¤Ã¤Æ¤¤¤Þ¤¹. ¤¢¤Ê¤¿¤Î¥·¥¹¥Æ¥à¤Î¥·¥§¥ë¥æ¡¼¥¶¤¬¤³¤ÎÊݸ½ñ¸Ë\n"
+ "      ¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤¹. ¥¤¥ó¥¹¥È¡¼¥ë¥Þ¥Ë¥å¥¢¥ë¤Ë¤Ï, ¤³¤ì¤ò\n"
+-"      ¤É¤¦¤·¤¿¤é½¤Àµ¤Ç¤­¤ë¤«½ñ¤¤¤Æ¤¢¤ê¤Þ¤¹¤Î¤Ç, »²¹Í¤Ë¤·¤Æ¤¯¤À¤µ¤¤.\n"
++"      ¤É¤¦¤·¤¿¤é½¤Àµ¤Ç¤­¤ë¤«½ñ¤¤¤Æ¤¢¤ê¤Þ¤¹¤Î¤Ç, »²¹Í¤Ë¤·¤Æ¤¯¤À¤µ¤¤."
+ 
+ #: bin/check_perms:240
+ msgid "mbox file must be at least 0660:"
+--- a/messages/nl/LC_MESSAGES/mailman.po
++++ b/messages/nl/LC_MESSAGES/mailman.po
+@@ -2267,6 +2267,7 @@ msgstr ""
+ "wijziging\n"
+ "is daarom geweigerd.  Als u toch deze wijzigingen wilt aanbrengen, heeft u\n"
+ "shell access nodig voor uw Mailman server.\n"
++"             "
+ 
+ #: Mailman/Cgi/edithtml.py:172
+ msgid "See "
+@@ -3771,7 +3772,7 @@ msgstr ""
+ "        en zonder aanhalingstekens!) uw lidmaatschapsadres. Als u het \n"
+ "        wachtwoord van de lijstbeheerder of moderator opgeeft, zullen ook "
+ "de\n"
+-"        verborgen leden worden vermeld."
++"        verborgen leden worden vermeld.\n"
+ 
+ #: Mailman/Commands/cmd_who.py:46
+ msgid ""
+@@ -5999,6 +6000,7 @@ msgstr ""
+ "Deze wijziiging kan gemaakt worden met bin/withlist of met bin/config_list "
+ "door het\n"
+ "instellen van mlist.info.\n"
++"                        "
+ 
+ #: Mailman/Gui/General.py:512
+ msgid ""
+--- a/messages/pl/LC_MESSAGES/mailman.po
++++ b/messages/pl/LC_MESSAGES/mailman.po
+@@ -1389,7 +1389,7 @@ msgid ""
+ "    confirmation step."
+ msgstr ""
+ "Wprowad¼ kod potwierdzaj±cy,\n"
+-"    który otrzyma³e¶ w emailu. Nastêpnie naci¶nij <em>OK</em>,\n"
++"    który otrzyma³e¶ w emailu. Nastêpnie naci¶nij <em>OK</em>,"
+ 
+ #: Mailman/Cgi/confirm.py:214
+ msgid "Confirmation string:"
+@@ -1629,7 +1629,7 @@ msgstr ""
+ "    Naci¶nij <em>Wypisz</em>, aby potwierdziæ\n"
+ "    wypisanie siê.\n"
+ "\n"
+-"    <p>Kliknij <em>Anuluj</em>, aby zrezygnowaæ.\n"
++"    <p>Kliknij <em>Anuluj</em>, aby zrezygnowaæ."
+ 
+ #: Mailman/Cgi/confirm.py:491 Mailman/Cgi/options.py:767
+ #: Mailman/Cgi/options.py:911 Mailman/Cgi/options.py:921

Added: branches/experimental/debian/patches/91_utf8.patch
===================================================================
--- branches/experimental/debian/patches/91_utf8.patch	                        (rev 0)
+++ branches/experimental/debian/patches/91_utf8.patch	2013-12-29 01:45:06 UTC (rev 749)
@@ -0,0 +1,126 @@
+Author: Thorsten Glaser <tg at debian.org>
+Description: Switch mailman to UTF-8 (release goal)
+Bug-Debian: #398777
+Forwarded: no
+
+--- a/Mailman/Defaults.py.in
++++ b/Mailman/Defaults.py.in
+@@ -410,7 +410,7 @@ ARCHIVER_OBSCURES_EMAILADDRS = Yes
+ # is used in MIME to refer to a method of converting a sequence of
+ # octets into a sequence of characters.  If you change the default
+ # charset, you might need to add it to VERBATIM_ENCODING below.
+-DEFAULT_CHARSET = None
++DEFAULT_CHARSET = 'utf-8'
+ 
+ # Most character set encodings require special HTML entity characters to be
+ # quoted, otherwise they won't look right in the Pipermail archives.  However
+@@ -419,7 +419,7 @@ DEFAULT_CHARSET = None
+ # encodings where the octet 0x26 does not always represent the & character.
+ # This variable contains a list of such characters sets which are not
+ # HTML-quoted in the archives.
+-VERBATIM_ENCODING = ['iso-2022-jp']
++VERBATIM_ENCODING = ['utf-8', 'iso-2022-jp']
+ 
+ # When the archive is public, should Mailman also make the raw Unix mbox file
+ # publically available?
+@@ -1537,7 +1537,7 @@ def _(s):
+ LC_DESCRIPTIONS = {}
+ 
+ def add_language(code, description, charset, direction='ltr'):
+-    LC_DESCRIPTIONS[code] = (description, charset, direction)
++    LC_DESCRIPTIONS[code] = (description, 'utf-8', direction)
+ 
+ add_language('ar',    _('Arabic'),              'utf-8',       'rtl')
+ add_language('ast',   _('Asturian'),            'iso-8859-1',  'ltr')
+--- a/messages/Makefile.in
++++ b/messages/Makefile.in
+@@ -68,7 +68,7 @@ PROG=		@PYTHON@ build/bin/pygettext.py
+ 
+ .SUFFIXES:	.po .mo
+ .po.mo:
+-	-$(MSGFMT) -o $@ $<
++	-msgconv -t utf-8 $< | tee $<.utf-8 | msgfmt -o $@ -
+ 
+ # Rules
+ 
+@@ -107,7 +107,7 @@ doinstall: mofiles
+ 	    po=$(srcdir)/$$d/LC_MESSAGES/mailman.po; \
+ 	    mo=$(srcdir)/$$d/LC_MESSAGES/mailman.mo; \
+ 	    dir=$(DESTDIR)$(prefix)/messages/$$d/LC_MESSAGES; \
+-	    $(INSTALL) -m $(FILEMODE) $$po $$dir; \
++	    $(INSTALL) -m $(FILEMODE) $$po.utf-8 $$dir/mailman.po; \
+  	    $(INSTALL) -m $(FILEMODE) $$mo $$dir; \
+ 	done
+ 
+@@ -117,6 +117,7 @@ finish:
+ 
+ clean:
+ 	-rm -f */LC_MESSAGES/mailman.mo
++	-rm -f */LC_MESSAGES/mailman.po.utf-8
+ 
+ fileclean:
+ 	-rm -f marked.files docstring.files
+--- a/templates/Makefile.in
++++ b/templates/Makefile.in
+@@ -60,12 +60,60 @@ INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
+ all:
+ 
+ install:
++	# charsets taken from Mailman/Defaults.py.in (all calls to add_language)
++	CHARSET_ar=utf-8; \
++	CHARSET_ast=iso-8859-1; \
++	CHARSET_ca=utf-8; \
++	CHARSET_cs=iso-8859-2; \
++	CHARSET_da=iso-8859-1; \
++	CHARSET_de=iso-8859-1; \
++	CHARSET_en=us-ascii; \
++	CHARSET_es=iso-8859-1; \
++	CHARSET_et=iso-8859-15; \
++	CHARSET_eu=iso-8859-15; \
++	CHARSET_fa=utf-8; \
++	CHARSET_fi=iso-8859-1; \
++	CHARSET_fr=iso-8859-1; \
++	CHARSET_gl=utf-8; \
++	CHARSET_el=iso-8859-7; \
++	CHARSET_he=utf-8; \
++	CHARSET_hr=iso-8859-2; \
++	CHARSET_hu=iso-8859-2; \
++	CHARSET_ia=iso-8859-15; \
++	CHARSET_it=iso-8859-1; \
++	CHARSET_ja=euc-jp; \
++	CHARSET_ko=euc-kr; \
++	CHARSET_lt=iso-8859-13; \
++	CHARSET_nl=iso-8859-1; \
++	CHARSET_no=iso-8859-1; \
++	CHARSET_pl=iso-8859-2; \
++	CHARSET_pt=iso-8859-1; \
++	CHARSET_pt_BR=iso-8859-1; \
++	CHARSET_ro=iso-8859-2; \
++	CHARSET_ru=koi8-r; \
++	CHARSET_sk=utf-8; \
++	CHARSET_sl=iso-8859-2; \
++	CHARSET_sr=utf-8; \
++	CHARSET_sv=iso-8859-1; \
++	CHARSET_tr=iso-8859-9; \
++	CHARSET_uk=utf-8; \
++	CHARSET_vi=utf-8; \
++	CHARSET_zh_CN=utf-8; \
++	CHARSET_zh_TW=utf-8; \
+ 	for d in $(LANGUAGES); \
+ 	do \
++	    eval cs='$$CHARSET_'$$d; \
++	    test -n "$$cs" || cs=cp1252; \
+ 	    $(srcdir)/../mkinstalldirs $(DESTDIR)$(TEMPLATEDIR)/$$d; \
+ 	    for f in $(srcdir)/$$d/*.html $(srcdir)/$$d/*.txt; \
+ 	    do \
+-	    	$(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(TEMPLATEDIR)/$$d; \
++		bn=$$(basename $$f); \
++		if ! iconv -f $$cs -t utf-8 <$$f; then \
++			echo >&2 Warning: broken encoding in $$f; \
++			iconv -c -f cp1252 -t utf-8 <$$f; \
++		fi >$$f.utf-8; \
++	    	$(INSTALL) -m $(FILEMODE) $$f.utf-8 $(DESTDIR)$(TEMPLATEDIR)/$$d/$$bn; \
++		rm -f $$f.utf-8; \
+ 	    done; \
+ 	done
+ 

Modified: branches/experimental/debian/patches/series
===================================================================
--- branches/experimental/debian/patches/series	2013-12-29 01:02:44 UTC (rev 748)
+++ branches/experimental/debian/patches/series	2013-12-29 01:45:06 UTC (rev 749)
@@ -9,3 +9,5 @@
 63_update_default_server_language.patch
 66_donot_let_cache_html_pages.patch
 79_archiver_slash.patch
+90_gettext_errors.patch
+91_utf8.patch

More information about the Pkg-mailman-hackers mailing list