[vidalia-svn] r3973: sync() with debian pkg. Finally fixing debconf scripts issue (in vidalia/trunk/debian: . po)

[dererk@xxxxxxxxxxxxxxxxxxx]

Author: dererk
Date: 2009-07-23 18:06:11 -0400 (Thu, 23 Jul 2009)
New Revision: 3973

Modified:
   vidalia/trunk/debian/changelog
   vidalia/trunk/debian/config
   vidalia/trunk/debian/control
   vidalia/trunk/debian/po/sv.po
   vidalia/trunk/debian/postinst
Log:
sync() with debian pkg. Finally fixing debconf scripts issue, adding .cz and .sv debconf l10n.


Modified: vidalia/trunk/debian/changelog
===================================================================
--- vidalia/trunk/debian/changelog	2009-07-22 23:28:58 UTC (rev 3972)
+++ vidalia/trunk/debian/changelog	2009-07-23 22:06:11 UTC (rev 3973)
@@ -1,3 +1,13 @@
+vidalia (0.1.15-1) unstable; urgency=low
+
+  * New upstream release.
+  * Debconf translations:
+    - Czech (Closes: #535973).
+  * Really fix debconf script issue.
+  * Update Standard-version to 3.8.2 (no changes needed)
+
+ -- Ulises Vitulli <uvitulli@xxxxxxxxx>  Tue, 21 Jul 2009 06:00:49 -0300
+
 vidalia (0.1.13-3) unstable; urgency=low
 
   * Fixing debconf scripts issue that output twice the same message.

Modified: vidalia/trunk/debian/config
===================================================================
--- vidalia/trunk/debian/config	2009-07-22 23:28:58 UTC (rev 3972)
+++ vidalia/trunk/debian/config	2009-07-23 22:06:11 UTC (rev 3973)
@@ -1,14 +1,13 @@
 #!/bin/sh
+
 set -e
+if [ -f /usr/share/debconf/confmodule ]; then
+        . /usr/share/debconf/confmodule
+fi
 
-#DEBHELPER#
-
-. /usr/share/debconf/confmodule
-
-if [ "$1" = "configure" ]; then
-	db_fset vidalia/info seen false
-	db_input high vidalia/info || true
-	db_go 
+if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ]; then
+        db_input high vidalia/info || true
+        db_go
 fi
 
-exit 0
+#DEBHELPER#

Modified: vidalia/trunk/debian/control
===================================================================
--- vidalia/trunk/debian/control	2009-07-22 23:28:58 UTC (rev 3972)
+++ vidalia/trunk/debian/control	2009-07-23 22:06:11 UTC (rev 3973)
@@ -4,7 +4,7 @@
 Maintainer: Vern Sun <s5unty@xxxxxxxxx>
 Uploaders: Ulises Vitulli <uvitulli@xxxxxxxxx>
 Build-Depends: debhelper (>= 5), autotools-dev, libqt4-dev (>= 4.1.0), po-debconf (>= 1.0), cmake (>= 2.4.8), libssl-dev (>= 0.9.8g), quilt
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
 Homepage: http://www.vidalia-project.net
 
 Package: vidalia

Modified: vidalia/trunk/debian/po/sv.po
===================================================================
--- vidalia/trunk/debian/po/sv.po	2009-07-22 23:28:58 UTC (rev 3972)
+++ vidalia/trunk/debian/po/sv.po	2009-07-23 22:06:11 UTC (rev 3973)
@@ -1,7 +1,6 @@
-# translation of vidalia.po to swedish
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the vidalia package.
 #
+# translation of vidalia.po to swedish
 # Martin Bagge <brother@xxxxxxxx>, 2008.
 msgid ""
 msgstr ""

Modified: vidalia/trunk/debian/postinst
===================================================================
--- vidalia/trunk/debian/postinst	2009-07-22 23:28:58 UTC (rev 3972)
+++ vidalia/trunk/debian/postinst	2009-07-23 22:06:11 UTC (rev 3973)
@@ -1,33 +1,26 @@
 #!/bin/sh 
 set -e
+if [ -f /usr/share/debconf/confmodule ]; then
+	. /usr/share/debconf/confmodule
+fi
 
-#DEBHELPER#
-
-. /usr/share/debconf/confmodule
-
-
-seen='false'
-askuser() {
-	db_get vidalia/info
-}
-
-if [ "$1" = "configure" ]; then
+if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ]; then
 	if dpkg -l tor > /dev/null 2>&1; then
 	    # installed
 	    if [ -e '/var/run/tor/tor.pid' ]; then
 		# and already running
-		askuser
-        	seen='true'
+		db_get vidalia/info
 		if [ "$RET" = "true" ]; then
 		    invoke-rc.d --force tor stop
 		fi
+        	seen='true'
 	    fi
 	fi
 
 	if pgrep -x tor > /dev/null 2>&1; then 
 		# still running?? (e.g. chroot)
-    		if [ "$seen" = "false" ]; then
-			askuser
+   		if [ "$seen" = "false" ]; then
+			db_get vidalia/info
 			if [ "$RET" = "true" ]; then
 			    echo -n "Stopping tor daemon: "
 			    pkill -x tor > /dev/null && echo "tor." || echo 'Failed!'
@@ -37,4 +30,4 @@
 	db_stop
 fi
 
-exit 0
+#DEBHELPER#