have libpam-modules Pre-Depend on ${misc:Depends} and add a debconf question to

the libpam-modules preinst, so we can reliably warn users about xscreensaver
and xlockmore before libpam-modules is unpacked; at the same time, clean up
the text of the libpam0g debconf template to not refer to the screensavers.

1 files changed, 19 insertions, 17 deletions

diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po
index 796eb875..c38adc0d 100644
--- a/debian/po/zh_CN.po
+++ b/debian/po/zh_CN.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam 0.99.7.1-5\n"
 "Report-Msgid-Bugs-To: pam@packages.debian.org\n"
-"POT-Creation-Date: 2008-11-15 23:51-0800\n"
+"POT-Creation-Date: 2008-12-28 01:17-0600\n"
 "PO-Revision-Date: 2007-09-25 23:06-0500\n"
 "Last-Translator: Ming Hua <minghua-guest@users.alioth.debian.org>\n"
 "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
@@ -38,22 +38,6 @@ msgstr ""
 "启动。请复查下面这个需要重新启动的服务所对应的 init.d script 列表，script 名"
 "称之间以半角空格分隔。如列表有误，请直接更正。"
 
-#. Type: string
-#. Description
-#: ../libpam0g.templates:1001
-#, fuzzy
-#| msgid ""
-#| "Some other services such as xscreensaver, gnome-screensaver, and "
-#| "xlockmore cannot be restarted for you.  You will not be able to "
-#| "authenticate to these services until you restart them manually."
-msgid ""
-"Some other services such as xscreensaver and xlockmore cannot be restarted "
-"for you.  You will not be able to authenticate to these services until you "
-"restart them manually."
-msgstr ""
-"无法为您重新启动如 xscreensaver、gnome-screensaver 和 xclockmore 一类的服务。"
-"在您手动重新启动它们之前，将无法在这些服务中验证身份。"
-
 #. Type: error
 #. Description
 #: ../libpam0g.templates:2001
@@ -94,3 +78,21 @@ msgid ""
 "You will need to start these manually by running '/etc/init.d/<service> "
 "start'."
 msgstr "您需要运行“/etc/init.d/<服务> start”来手动启动这些服务。"
+
+#. Type: error
+#. Description
+#: ../libpam-modules.templates:1001
+msgid "xscreensaver and xlockmore must be restarted before upgrading"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../libpam-modules.templates:1001
+msgid ""
+"One or more running instances of xscreensaver or xlockmore have been "
+"detected on this system.  Because of incompatible library changes, the "
+"upgrade of the libpam-modules package will leave you unable to authenticate "
+"to these programs.  You should arrange for these programs to be restarted or "
+"stopped before continuing this upgrade, to avoid locking your users out of "
+"their current sessions."
+msgstr ""