Package: webcalendar
Version: 1.0.4-1
Severity: normal
Tags: patch
Hi,
Attached is the diff for my webcalendar 1.0.4-1.1 NMU.
diff -Nru /tmp/g4IvTRJzFn/webcalendar-1.0.4/debian/changelog
/tmp/Miw13sFu2z/webcalendar-1.0.4/debian/changelog
--- /tmp/g4IvTRJzFn/webcalendar-1.0.4/debian/changelog 2006-09-26
12:52:56.000000000 +0200
+++ /tmp/Miw13sFu2z/webcalendar-1.0.4/debian/changelog 2006-09-26
12:52:56.000000000 +0200
@@ -1,3 +1,12 @@
+webcalendar (1.0.4-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Make webcalendar.config and webcalendar.postrm depend only on essential
+ packages, by checking for the existence of dbconfig-common and ucf before
+ attempting to use them. (Closes: #388239)
+
+ -- Steinar H. Gunderson <[EMAIL PROTECTED]> Tue, 26 Sep 2006 12:51:42 +0200
+
webcalendar (1.0.4-1) unstable; urgency=high
* New upstream release (closes: #363914)
diff -Nru /tmp/g4IvTRJzFn/webcalendar-1.0.4/debian/webcalendar.config
/tmp/Miw13sFu2z/webcalendar-1.0.4/debian/webcalendar.config
--- /tmp/g4IvTRJzFn/webcalendar-1.0.4/debian/webcalendar.config 2006-09-26
12:52:56.000000000 +0200
+++ /tmp/Miw13sFu2z/webcalendar-1.0.4/debian/webcalendar.config 2006-09-26
12:52:56.000000000 +0200
@@ -14,7 +14,9 @@
dbc_dbtypes="mysql, pgsql"
-. /usr/share/dbconfig-common/dpkg/config
+if [ -f /usr/share/dbconfig-common/dpkg/config ]; then
+ . /usr/share/dbconfig-common/dpkg/config
+fi
db_input high webcalendar/status/debconf_managed || true
@@ -22,7 +24,9 @@
db_get webcalendar/status/debconf_managed
if [ "$RET" = true ]; then
- dbc_go webcalendar $@
+ if [ -f /usr/share/dbconfig-common/dpkg/config ]; then
+ dbc_go webcalendar $@
+ fi
db_input medium webcalendar/conf/httpd_conf || true
db_input medium webcalendar/conf/db_persistent || true
db_input medium webcalendar/conf/use_http_auth || true
diff -Nru /tmp/g4IvTRJzFn/webcalendar-1.0.4/debian/webcalendar.postrm
/tmp/Miw13sFu2z/webcalendar-1.0.4/debian/webcalendar.postrm
--- /tmp/g4IvTRJzFn/webcalendar-1.0.4/debian/webcalendar.postrm 2006-09-26
12:52:56.000000000 +0200
+++ /tmp/Miw13sFu2z/webcalendar-1.0.4/debian/webcalendar.postrm 2006-09-26
12:52:56.000000000 +0200
@@ -8,9 +8,11 @@
dbc_dbtypes="mysql, pgsql"
. /usr/share/debconf/confmodule
-. /usr/share/dbconfig-common/dpkg/postrm
-dbc_go webcalendar $@
+if [ -f /usr/share/dbconfig-common/dpkg/postrm ]; then
+ . /usr/share/dbconfig-common/dpkg/postrm
+ dbc_go webcalendar $@
+fi
unlinkapache() {
db_get webcalendar/conf/httpd_conf || true
@@ -43,7 +45,9 @@
case "$1" in
purge)
unlinkapache
- ucf --purge /etc/webcalendar/settings.conf
+ if [ -x /usr/bin/ucf ]; then
+ ucf --purge /etc/webcalendar/settings.conf
+ fi
rm -f /etc/webcalendar/settings.conf
db_purge
;;
diff -Nru /tmp/g4IvTRJzFn/webcalendar-1.0.4/debian/po/cs.po
/tmp/Miw13sFu2z/webcalendar-1.0.4/debian/po/cs.po
--- /tmp/g4IvTRJzFn/webcalendar-1.0.4/debian/po/cs.po 2006-09-26
12:52:56.000000000 +0200
+++ /tmp/Miw13sFu2z/webcalendar-1.0.4/debian/po/cs.po 2006-09-26
12:52:56.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webcalendar\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2006-03-23 08:00-0500\n"
+"POT-Creation-Date: 2006-09-26 12:52+0200\n"
"PO-Revision-Date: 2006-05-25 17:17+0200\n"
"Last-Translator: Miroslav Kure <[EMAIL PROTECTED]>\n"
"Language-Team: Czech <[EMAIL PROTECTED]>\n"
@@ -17,13 +17,13 @@
#. Type: boolean
#. Description
-#: ../webcalendar.templates:4
+#: ../webcalendar.templates:1001
msgid "Use persistent connections?"
msgstr "Používat perzistentní spojení?"
#. Type: boolean
#. Description
-#: ../webcalendar.templates:4
+#: ../webcalendar.templates:1001
msgid ""
"Using persistent connections can improve performance on heavily loaded "
"websites by using a previously opened sql connection."
@@ -33,13 +33,13 @@
#. Type: boolean
#. Description
-#: ../webcalendar.templates:11
+#: ../webcalendar.templates:2001
msgid "Use HTTP auth?"
msgstr "Používat http autentizaci?"
#. Type: boolean
#. Description
-#: ../webcalendar.templates:11
+#: ../webcalendar.templates:2001
msgid ""
"Webcalendar by default uses the database's webcal_user table for "
"authenticating users. You can use HTTP auth logins instead and use Apache "
@@ -52,13 +52,13 @@
#. Type: boolean
#. Description
-#: ../webcalendar.templates:19
+#: ../webcalendar.templates:3001
msgid "Should webcalendar be installed in single user mode?"
msgstr "Má se Webcalendar nainstalovat v jednouživatelském režimu?"
#. Type: boolean
#. Description
-#: ../webcalendar.templates:19
+#: ../webcalendar.templates:3001
msgid ""
"Webcalendar can be installed in single user mode or multiuser mode. If it is "
"installed in single user mode, you won't need to login. It isn't "
@@ -72,13 +72,13 @@
#. Type: string
#. Description
-#: ../webcalendar.templates:27
+#: ../webcalendar.templates:4001
msgid "Name of the webcalendar user:"
msgstr "Jméno uživatele Webcalendaru:"
#. Type: string
#. Description
-#: ../webcalendar.templates:27
+#: ../webcalendar.templates:4001
msgid ""
"If you have installed webcalendar in single user mode, you need to specify "
"the name of the user to connect as."
@@ -88,13 +88,13 @@
#. Type: boolean
#. Description
-#: ../webcalendar.templates:34
+#: ../webcalendar.templates:5001
msgid "Allow debconf to manage settings.conf?"
msgstr "Povolit správu settings.conf pomocí debconfu?"
#. Type: boolean
#. Description
-#: ../webcalendar.templates:34
+#: ../webcalendar.templates:5001
msgid ""
"You can allow debconf to manage your settings.conf or you can manage your "
"settings manually."
@@ -104,13 +104,13 @@
#. Type: note
#. Description
-#: ../webcalendar.templates:40
+#: ../webcalendar.templates:6001
msgid "Webcalendar administrative user"
msgstr "Administrátor Webcalendaru"
#. Type: note
#. Description
-#: ../webcalendar.templates:40
+#: ../webcalendar.templates:6001
msgid ""
"After installing the tables for your sql database you will have access to "
"webcalendar using the standard admin user. It is STRONGLY suggested that "
@@ -123,19 +123,19 @@
#. Type: multiselect
#. Choices
-#: ../webcalendar.templates:48
+#: ../webcalendar.templates:7001
msgid "apache2, apache, apache-ssl, other"
msgstr "apache2, apache, apache-ssl, jiný"
#. Type: multiselect
#. Description
-#: ../webcalendar.templates:50
+#: ../webcalendar.templates:7002
msgid "Web server to configure:"
msgstr "Nastavit webový server:"
#. Type: multiselect
#. Description
-#: ../webcalendar.templates:50
+#: ../webcalendar.templates:7002
msgid ""
"Apache can be automatically configured to use webcalendar by creating links "
"in /etc/{apache-version}/conf.d/. Select all the versions of Apache you "
diff -Nru /tmp/g4IvTRJzFn/webcalendar-1.0.4/debian/po/fr.po
/tmp/Miw13sFu2z/webcalendar-1.0.4/debian/po/fr.po
--- /tmp/g4IvTRJzFn/webcalendar-1.0.4/debian/po/fr.po 2006-09-26
12:52:56.000000000 +0200
+++ /tmp/Miw13sFu2z/webcalendar-1.0.4/debian/po/fr.po 2006-09-26
12:52:56.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webcalendar 1.0.2-2\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2006-03-23 08:00-0500\n"
+"POT-Creation-Date: 2006-09-26 12:52+0200\n"
"PO-Revision-Date: 2006-04-27 08:07+0100\n"
"Last-Translator: Steve Petruzzello <[EMAIL PROTECTED]>\n"
"Language-Team: French <[EMAIL PROTECTED]>\n"
@@ -18,13 +18,13 @@
#. Type: boolean
#. Description
-#: ../webcalendar.templates:4
+#: ../webcalendar.templates:1001
msgid "Use persistent connections?"
msgstr "Faut-il utiliser des connexions persistantes�?"
#. Type: boolean
#. Description
-#: ../webcalendar.templates:4
+#: ../webcalendar.templates:1001
msgid ""
"Using persistent connections can improve performance on heavily loaded "
"websites by using a previously opened sql connection."
@@ -35,13 +35,13 @@
#. Type: boolean
#. Description
-#: ../webcalendar.templates:11
+#: ../webcalendar.templates:2001
msgid "Use HTTP auth?"
msgstr "Faut-il utiliser l'authentification HTTP�?"
#. Type: boolean
#. Description
-#: ../webcalendar.templates:11
+#: ../webcalendar.templates:2001
msgid ""
"Webcalendar by default uses the database's webcal_user table for "
"authenticating users. You can use HTTP auth logins instead and use Apache "
@@ -54,13 +54,13 @@
#. Type: boolean
#. Description
-#: ../webcalendar.templates:19
+#: ../webcalendar.templates:3001
msgid "Should webcalendar be installed in single user mode?"
msgstr "Faut-il installer webcalendar en mode mono-utilisateur�?"
#. Type: boolean
#. Description
-#: ../webcalendar.templates:19
+#: ../webcalendar.templates:3001
msgid ""
"Webcalendar can be installed in single user mode or multiuser mode. If it is "
"installed in single user mode, you won't need to login. It isn't "
@@ -74,13 +74,13 @@
#. Type: string
#. Description
-#: ../webcalendar.templates:27
+#: ../webcalendar.templates:4001
msgid "Name of the webcalendar user:"
msgstr "Identifiant autoris� pour webcalendar�:"
#. Type: string
#. Description
-#: ../webcalendar.templates:27
+#: ../webcalendar.templates:4001
msgid ""
"If you have installed webcalendar in single user mode, you need to specify "
"the name of the user to connect as."
@@ -90,14 +90,14 @@
#. Type: boolean
#. Description
-#: ../webcalendar.templates:34
+#: ../webcalendar.templates:5001
#, fuzzy
msgid "Allow debconf to manage settings.conf?"
msgstr "Faut-il g�rer settings.php automatiquement�?"
#. Type: boolean
#. Description
-#: ../webcalendar.templates:34
+#: ../webcalendar.templates:5001
#, fuzzy
msgid ""
"You can allow debconf to manage your settings.conf or you can manage your "
@@ -108,13 +108,13 @@
#. Type: note
#. Description
-#: ../webcalendar.templates:40
+#: ../webcalendar.templates:6001
msgid "Webcalendar administrative user"
msgstr "Administrateur de webcalendar"
#. Type: note
#. Description
-#: ../webcalendar.templates:40
+#: ../webcalendar.templates:6001
msgid ""
"After installing the tables for your sql database you will have access to "
"webcalendar using the standard admin user. It is STRONGLY suggested that "
@@ -128,19 +128,19 @@
#. Type: multiselect
#. Choices
-#: ../webcalendar.templates:48
+#: ../webcalendar.templates:7001
msgid "apache2, apache, apache-ssl, other"
msgstr "Apache2, Apache, Apache-SSL, Autre(s)"
#. Type: multiselect
#. Description
-#: ../webcalendar.templates:50
+#: ../webcalendar.templates:7002
msgid "Web server to configure:"
msgstr "Serveur web � configurer�:"
#. Type: multiselect
#. Description
-#: ../webcalendar.templates:50
+#: ../webcalendar.templates:7002
msgid ""
"Apache can be automatically configured to use webcalendar by creating links "
"in /etc/{apache-version}/conf.d/. Select all the versions of Apache you "
diff -Nru /tmp/g4IvTRJzFn/webcalendar-1.0.4/debian/po/templates.pot
/tmp/Miw13sFu2z/webcalendar-1.0.4/debian/po/templates.pot
--- /tmp/g4IvTRJzFn/webcalendar-1.0.4/debian/po/templates.pot 2006-09-26
12:52:56.000000000 +0200
+++ /tmp/Miw13sFu2z/webcalendar-1.0.4/debian/po/templates.pot 2006-09-26
12:52:56.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2006-03-23 08:00-0500\n"
+"POT-Creation-Date: 2006-09-26 12:52+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
@@ -18,13 +18,13 @@
#. Type: boolean
#. Description
-#: ../webcalendar.templates:4
+#: ../webcalendar.templates:1001
msgid "Use persistent connections?"
msgstr ""
#. Type: boolean
#. Description
-#: ../webcalendar.templates:4
+#: ../webcalendar.templates:1001
msgid ""
"Using persistent connections can improve performance on heavily loaded "
"websites by using a previously opened sql connection."
@@ -32,13 +32,13 @@
#. Type: boolean
#. Description
-#: ../webcalendar.templates:11
+#: ../webcalendar.templates:2001
msgid "Use HTTP auth?"
msgstr ""
#. Type: boolean
#. Description
-#: ../webcalendar.templates:11
+#: ../webcalendar.templates:2001
msgid ""
"Webcalendar by default uses the database's webcal_user table for "
"authenticating users. You can use HTTP auth logins instead and use Apache "
@@ -47,13 +47,13 @@
#. Type: boolean
#. Description
-#: ../webcalendar.templates:19
+#: ../webcalendar.templates:3001
msgid "Should webcalendar be installed in single user mode?"
msgstr ""
#. Type: boolean
#. Description
-#: ../webcalendar.templates:19
+#: ../webcalendar.templates:3001
msgid ""
"Webcalendar can be installed in single user mode or multiuser mode. If it is "
"installed in single user mode, you won't need to login. It isn't "
@@ -63,13 +63,13 @@
#. Type: string
#. Description
-#: ../webcalendar.templates:27
+#: ../webcalendar.templates:4001
msgid "Name of the webcalendar user:"
msgstr ""
#. Type: string
#. Description
-#: ../webcalendar.templates:27
+#: ../webcalendar.templates:4001
msgid ""
"If you have installed webcalendar in single user mode, you need to specify "
"the name of the user to connect as."
@@ -77,13 +77,13 @@
#. Type: boolean
#. Description
-#: ../webcalendar.templates:34
+#: ../webcalendar.templates:5001
msgid "Allow debconf to manage settings.conf?"
msgstr ""
#. Type: boolean
#. Description
-#: ../webcalendar.templates:34
+#: ../webcalendar.templates:5001
msgid ""
"You can allow debconf to manage your settings.conf or you can manage your "
"settings manually."
@@ -91,13 +91,13 @@
#. Type: note
#. Description
-#: ../webcalendar.templates:40
+#: ../webcalendar.templates:6001
msgid "Webcalendar administrative user"
msgstr ""
#. Type: note
#. Description
-#: ../webcalendar.templates:40
+#: ../webcalendar.templates:6001
msgid ""
"After installing the tables for your sql database you will have access to "
"webcalendar using the standard admin user. It is STRONGLY suggested that "
@@ -107,19 +107,19 @@
#. Type: multiselect
#. Choices
-#: ../webcalendar.templates:48
+#: ../webcalendar.templates:7001
msgid "apache2, apache, apache-ssl, other"
msgstr ""
#. Type: multiselect
#. Description
-#: ../webcalendar.templates:50
+#: ../webcalendar.templates:7002
msgid "Web server to configure:"
msgstr ""
#. Type: multiselect
#. Description
-#: ../webcalendar.templates:50
+#: ../webcalendar.templates:7002
msgid ""
"Apache can be automatically configured to use webcalendar by creating links "
"in /etc/{apache-version}/conf.d/. Select all the versions of Apache you "
