# HG changeset patch
# User Paul Crowley <paul@lshift.net>
# Date 1292681446 0
# Node ID 2e956ebc2500c0cd073f9d49184d5e1cb779bed0
# Parent  451236a387a0859a2473fca6b7e4f8538931c872# Parent  8642d6884d3843a61bd92e2e418a5070a64f546a
Merge in NMU

diff -r 451236a387a0 -r 2e956ebc2500 debian/changelog
--- a/debian/changelog	Sat Dec 18 13:51:17 2010 +0000
+++ b/debian/changelog	Sat Dec 18 14:10:46 2010 +0000
@@ -3,16 +3,23 @@
   * New upstream version
   * Fix "leaves unowned files on purge": Delete user/group only
     when purging data (Closes: #605584)
-  * Add translations for pt_BR, vi  (Closes: #576134, #607407)
+  * Add translation for pt_BR  (Closes: #607407)
 
  -- Paul Crowley <paul@lshift.net>  Sat, 18 Dec 2010 13:32:26 +0000
 
-mercurial-server (1.0.1-2) unstable; urgency=low
+mercurial-server (1.0.1-1.1) unstable; urgency=medium
 
-  * Add translations for es, pt, ru, fi, fr
-    (Closes: #561921, #562243, #562637, #564505, #564594)
+  * Non-maintainer upload.
+  * Explicitly use 1.0 source format
+  * Fix pending l10n issues. Debconf translations:
+    - Spanish (Francisco Javier Cuadrado).  Closes: #561921
+    - Portuguese (Pedro Ribeiro).  Closes: #562243
+    - Russian (Yuri Kozlov).  Closes: #562637
+    - Finnish (Esko Arajärvi).  Closes: #564505
+    - French (Christian Perrier).  Closes: #564594
+    - Vietnamese (Clytie Siddall).  Closes: #576134
 
- -- Paul Crowley <paul@lshift.net>  Thu, 04 Mar 2010 16:13:50 +0000
+ -- Christian Perrier <bubulle@debian.org>  Fri, 16 Apr 2010 19:57:05 +0200
 
 mercurial-server (1.0.1-1) unstable; urgency=medium
 
diff -r 451236a387a0 -r 2e956ebc2500 debian/po/es.po
--- a/debian/po/es.po	Sat Dec 18 13:51:17 2010 +0000
+++ b/debian/po/es.po	Sat Dec 18 14:10:46 2010 +0000
@@ -39,6 +39,6 @@
 #. Type: boolean
 #. Description
 #: ../templates:1001
-msgid "Do you want the repositories to be removed when mercurial-server is purged?"
+msgid ""
+"Do you want the repositories to be removed when mercurial-server is purged?"
 msgstr "¿Desea borrar los repositorios cuando mercurial-server sea purgado?"
-
diff -r 451236a387a0 -r 2e956ebc2500 debian/po/fi.po
--- a/debian/po/fi.po	Sat Dec 18 13:51:17 2010 +0000
+++ b/debian/po/fi.po	Sat Dec 18 14:10:46 2010 +0000
@@ -24,4 +24,3 @@
 msgstr ""
 "Haluatko, että tietokannat poistetaan, kun paketti mercurial-server "
 "siivotaan?"
-
diff -r 451236a387a0 -r 2e956ebc2500 debian/po/ru.po
--- a/debian/po/ru.po	Sat Dec 18 13:51:17 2010 +0000
+++ b/debian/po/ru.po	Sat Dec 18 14:10:46 2010 +0000
@@ -15,11 +15,12 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Type: boolean
 #. Description
 #: ../templates:1001
-msgid "Do you want the repositories to be removed when mercurial-server is purged?"
+msgid ""
+"Do you want the repositories to be removed when mercurial-server is purged?"
 msgstr "Удалять репозитории при вычистке пакета mercurial-server?"
-
diff -r 451236a387a0 -r 2e956ebc2500 debian/po/vi.po
--- a/debian/po/vi.po	Sat Dec 18 13:51:17 2010 +0000
+++ b/debian/po/vi.po	Sat Dec 18 14:10:46 2010 +0000
@@ -16,9 +16,9 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.8\n"
 
-#: ../templates:1001
 #. Type: boolean
 #. Description
+#: ../templates:1001
 msgid ""
 "Do you want the repositories to be removed when mercurial-server is purged?"
 msgstr "Khi tẩy gói này thì cũng nên gỡ bỏ các kho lưu ?"
diff -r 451236a387a0 -r 2e956ebc2500 debian/rules
diff -r 451236a387a0 -r 2e956ebc2500 debian/source/format