From 0ae4f5ef3f6e28fdcb15d49da0a2bfdf1dff15c3 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Sat, 15 Nov 2008 23:58:41 -0800 Subject: Don't refer to gnome-screensaver in the debconf template; it isn't actually affected by the libpam symbol issue because it forks a separate process to display the screensaver dialog. --- debian/po/templates.pot | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'debian/po/templates.pot') diff --git a/debian/po/templates.pot b/debian/po/templates.pot index 0d388eec..e838c9ca 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -1,14 +1,14 @@ -# Debconf questions for the Linux-PAM package. -# Copyright (C) 2007 Steve Langasek -# This file is distributed under the same license as the pam package. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: pam 0.99.7.1-5\n" -"Report-Msgid-Bugs-To: vorlon@debian.org\n" -"POT-Creation-Date: 2007-09-24 17:06-0700\n" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: pam@packages.debian.org\n" +"POT-Creation-Date: 2008-11-15 23:51-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -36,9 +36,9 @@ msgstr "" #. Description #: ../libpam0g.templates:1001 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." +"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 "" #. Type: error -- cgit v1.2.3 From 65f06c6f86c3c538b4fb9e971b72246c4066f517 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Sun, 28 Dec 2008 01:31:21 -0600 Subject: 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. --- debian/po/templates.pot | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) (limited to 'debian/po/templates.pot') diff --git a/debian/po/templates.pot b/debian/po/templates.pot index e838c9ca..bd39ab78 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\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: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -32,15 +32,6 @@ msgid "" "needed." msgstr "" -#. Type: string -#. Description -#: ../libpam0g.templates:1001 -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 "" - #. Type: error #. Description #: ../libpam0g.templates:2001 @@ -77,3 +68,21 @@ msgid "" "You will need to start these manually by running '/etc/init.d/ " "start'." msgstr "" + +#. 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 "" -- cgit v1.2.3