Your message dated Wed, 19 Dec 2012 20:09:16 +0100
with message-id <[email protected]>
and subject line Re: Bug#691428: unblock: scuttle/0.7.4-8
has caused the Debian Bug report #691428,
regarding unblock: scuttle/0.7.4-8
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
691428: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=691428
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: [email protected]
Usertags: unblock
Please unblock package scuttle.
Attached is a debdiff of changes made to fix bug#688500.
Cheers,
--
Marcelo Jorge Vieira
xmpp:[email protected]
http://metaldot.alucinados.com
diff -u scuttle-0.7.4/debian/control scuttle-0.7.4/debian/control
--- scuttle-0.7.4/debian/control
+++ scuttle-0.7.4/debian/control
@@ -17,7 +17,8 @@
wwwconfig-common,
dbconfig-common,
php-gettext,
- mysql-client
+ mysql-client,
+ ucf
Suggests: mysql-server
Description: Web-based social bookmarking system
Allows multiple users to store, share and tag their favourite links online.
diff -u scuttle-0.7.4/debian/changelog scuttle-0.7.4/debian/changelog
--- scuttle-0.7.4/debian/changelog
+++ scuttle-0.7.4/debian/changelog
@@ -1,3 +1,10 @@
+scuttle (0.7.4-8) unstable; urgency=high
+
+ * Fixed configuration file in /var (policy 10.7) (Closes: #688500)
+ - Moving config_debconf.inc.php from /var/lib to /etc
+
+ -- Marcelo Jorge Vieira (metal) <[email protected]> Mon, 22 Oct 2012 02:18:10 -0200
+
scuttle (0.7.4-7) unstable; urgency=low
* Added Italian debconf template translation (Closes: #665703)
diff -u scuttle-0.7.4/debian/scuttle.install scuttle-0.7.4/debian/scuttle.install
--- scuttle-0.7.4/debian/scuttle.install
+++ scuttle-0.7.4/debian/scuttle.install
@@ -22 +22 @@
-debian/config_debconf.inc.php var/lib/scuttle/
+debian/config_debconf.inc.php usr/share/scuttle/
diff -u scuttle-0.7.4/debian/config.inc.php.diff scuttle-0.7.4/debian/config.inc.php.diff
--- scuttle-0.7.4/debian/config.inc.php.diff
+++ scuttle-0.7.4/debian/config.inc.php.diff
@@ -21,7 +21,7 @@
+# $locale and $adminemail at
+# /var/cache/scuttle/config_debconf.php
-+include_once('/var/lib/scuttle/config_debconf.inc.php');
++include_once('/etc/scuttle/config_debconf.inc.php');
+
$sitename = 'Scuttle';
-$locale = 'en_GB';
diff -u scuttle-0.7.4/debian/config_debconf.inc.php scuttle-0.7.4/debian/config_debconf.inc.php
--- scuttle-0.7.4/debian/config_debconf.inc.php
+++ scuttle-0.7.4/debian/config_debconf.inc.php
@@ -1,13 +1,6 @@
<?
-### This file is automatically generated by scuttle
-#
-# Please do not edit this file directly. If you want to change or add
-# anything please take a look at /etc/scuttle/config.inc.php
-#
-###
-
$adminemail = '[email protected]';
-$locale = 'en_GB'
+$locale = 'en_GB';
?>
diff -u scuttle-0.7.4/debian/scuttle.postrm scuttle-0.7.4/debian/scuttle.postrm
--- scuttle-0.7.4/debian/scuttle.postrm
+++ scuttle-0.7.4/debian/scuttle.postrm
@@ -43,12 +43,17 @@
fi
# permissions - config file
- CONFIG_FILE="/var/lib/scuttle/config_debconf.inc.php"
+ CONFIG_FILE="/etc/scuttle/config_debconf.inc.php"
CONFIG_AUX=$(dpkg-statoverride --list | grep $CONFIG_FILE) || true
if [ -z "$CONFIG_AUX" ]; then
dpkg-statoverride --remove $CONFIG_FILE
fi
+ rm -f $CONFIG_FILE
+ if which ucf >/dev/null 2>&1; then
+ ucf --purge $CONFIG_FILE
+ fi
+
# remove scuttle cache dir
rm -rf /var/cache/scuttle
fi
diff -u scuttle-0.7.4/debian/scuttle.postinst scuttle-0.7.4/debian/scuttle.postinst
--- scuttle-0.7.4/debian/scuttle.postinst
+++ scuttle-0.7.4/debian/scuttle.postinst
@@ -18,19 +18,16 @@
if [ -z "$CACHE_AUX" ]; then
dpkg-statoverride --update --add root www-data 0774 $CACHE_DIR
fi
-
- # config file debconf
- CONFIG_FILE="/var/lib/scuttle/config_debconf.inc.php"
- CONFIG_AUX=$(dpkg-statoverride --list | grep $CONFIG_FILE) || true
- if [ -z "$CONFIG_AUX" ]; then
- dpkg-statoverride --update --add root www-data 0640 $CONFIG_FILE
- fi
+ # config file debconf
+ CONFIG_TEMPLATE="/usr/share/scuttle/config_debconf.inc.php"
+ CONFIG_FILE="/etc/scuttle/config_debconf.inc.php"
+ CONFIG_TMP="/etc/scuttle/config_debconf.inc.php.dpkg-new"
# set admin email in config file
ADMIN_EMAIL="\$_SERVER['SERVER_ADMIN']";
if [ -n "$ADMIN_EMAIL" ] ; then
- sed -e "s/adminemail[^;]*/adminemail = $ADMIN_EMAIL/" -i $CONFIG_FILE
+ sed -e "s/adminemail[^;]*/adminemail = $ADMIN_EMAIL/" $CONFIG_TEMPLATE > $CONFIG_TMP
fi
# debconf messages
@@ -39,7 +36,14 @@
# set locale in config file
if [ -n "$LOCALE" ] ; then
- sed -e "s/locale[^;]*/locale = '$LOCALE'/" -i $CONFIG_FILE
+ sed -e "s/locale[^;]*/locale = '$LOCALE'/" $CONFIG_TEMPLATE > $CONFIG_TMP
+ fi
+
+ ucf --debconf-ok $CONFIG_TMP $CONFIG_FILE && rm -f $CONFIG_TMP
+
+ CONFIG_AUX=$(dpkg-statoverride --list | grep $CONFIG_FILE) || true
+ if [ -z "$CONFIG_AUX" ]; then
+ dpkg-statoverride --update --add root www-data 0640 $CONFIG_FILE
fi
# source dbconfig-common stuff
signature.asc
Description: This is a digitally signed message part
--- End Message ---
--- Begin Message ---
On Thu, Oct 25, 2012 at 13:12:25 -0200, Marcelo Jorge Vieira wrote:
>
> Package: release.debian.org
> Severity: normal
> User: [email protected]
> Usertags: unblock
>
> Please unblock package scuttle.
>
> Attached is a debdiff of changes made to fix bug#688500.
>
Looks like this migrated a month ago, closing.
Thanks,
Julien
signature.asc
Description: Digital signature
--- End Message ---
