[Pkg-privacy-commits] [vidalia] 07/160: Add updated changelog and config script.

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository vidalia.

commit dd0856d359e0ea47775e754a7041a2954f891c70
Author: Erinn Clark <erinn at torproject.org>
Date:   Wed Apr 7 19:29:56 2010 -0700

    Add updated changelog and config script.
---
 debian/0.2.x/changelog | 6 ++++++
 debian/0.2.x/config    | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/0.2.x/changelog b/debian/0.2.x/changelog
index 1dbc5fa..7a85b80 100644
--- a/debian/0.2.x/changelog
+++ b/debian/0.2.x/changelog
@@ -1,3 +1,9 @@
+vidalia (0.2.7-3) unstable; urgency=low
+
+  * Fix broken config script.
+
+ -- Erinn Clark <erinn at torproject.org>  Mon, 05 Apr 2010 02:56:03 -0700
+
 vidalia (0.2.7-2) unstable; urgency=low
 
   * Add option to debconf question to disable Tor on boot in concert with Tor's
diff --git a/debian/0.2.x/config b/debian/0.2.x/config
index b50e7ff..7504c7a 100644
--- a/debian/0.2.x/config
+++ b/debian/0.2.x/config
@@ -17,19 +17,19 @@ askuser() {
 if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ]; then
         if dpkg -l tor > /dev/null 2>&1; then
             # installed
-            if [ -e '/var/run/tor/tor.pid' ]; then
+            if [ -e '/var/run/tor/tor.pid' ] || [ "$1" = "reconfigure" ]; then
                 # and already running
                 askuser
                 seen='true'
 		case "$RET" in
 			(no)
-			if [ -x /etc/default/tor.vidalia ]; then
+			if [ -f /etc/default/tor.vidalia ]; then
 			ucf --debconf-ok --three-way /usr/share/vidalia/default.tor-on /etc/default/tor.vidalia
 			fi
 		;;
 			(yes-now) 
                     	invoke-rc.d --force tor stop
-			if [ -x /etc/default/tor.vidalia ]; then
+			if [ -f /etc/default/tor.vidalia ]; then
 			ucf --debconf-ok --three-way /usr/share/vidalia/default.tor-on /etc/default/tor.vidalia
 			fi
 		;;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/vidalia.git