[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: vidalia l10n fixes to t-p-u

Dear release team,

I'm asking for a pre-approval to upload vidalia to t-p-u.
The package in unstable includes a new upstream release, and basically this pkg version deals just with improving user experience (#592773). It went through exhaustive l10n English review and l10n translation round.

This patch is minimal excluding the debconf template and pkg documentation files changes, also improved. Please find the full diff gziped attached.


Thanks in advance!


Greetings,

Dererk

-- 
BOFH excuse #370:
Virus due to computers having unsafe sex.

Attachment: vidalia-tpu_full.patch.gz
Description: application/gzip

diff -ruN -xpo '-xREADME.*' -xtemplates vidalia-0.2.9/debian/changelog vidalia-0.2.9-1+squeeze1/debian/changelog
--- vidalia-0.2.9/debian/changelog	2010-05-21 16:47:53.000000000 -0300
+++ vidalia-0.2.9-1+squeeze1/debian/changelog	2010-10-09 06:26:28.000000000 -0300
@@ -1,3 +1,13 @@
+vidalia (0.2.9-1+squeeze1) testing-proposed-updates; urgency=low
+
+  * Improved debconf templates and set a default answer case 
+    (Closes: #592773, #598240, #599050).
+  * Cleaning unrequired build-deps, since we know use quilt source format.
+  * Update Standard-version to 3.9.1 (no changes needed).
+  * Include Vcs-* fields on control file.
+
+ -- Ulises Vitulli <dererk@debian.org>  Sat, 25 Sep 2010 07:30:17 -0300
+
 vidalia (0.2.9-1) unstable; urgency=low
  
   [ Vern Sun ]
diff -ruN -xpo '-xREADME.*' -xtemplates vidalia-0.2.9/debian/config vidalia-0.2.9-1+squeeze1/debian/config
--- vidalia-0.2.9/debian/config	2010-05-20 21:56:39.000000000 -0300
+++ vidalia-0.2.9-1+squeeze1/debian/config	2010-09-26 23:52:51.000000000 -0300
@@ -5,10 +5,9 @@
         . /usr/share/debconf/confmodule
 fi
 
-
 seen='false'
 askuser() {
-    question='vidalia/info'
+    question='vidalia/tor-daemon-interaction'
     db_input high $question || true
     db_go || true
     db_get $question
@@ -22,18 +21,18 @@
                 askuser
                 seen='true'
 		case "$RET" in
-			(no)
+			(nothing)
 			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) 
+			(one-off) 
                     	invoke-rc.d --force tor stop
 			if [ -f /etc/default/tor.vidalia ]; then
 			ucf --debconf-ok --three-way /usr/share/vidalia/default.tor-on /etc/default/tor.vidalia
 			fi
 		;;
-			(yes-always)
+			(permanent)
 			invoke-rc.d --force tor stop
 			ucf --debconf-ok --three-way /usr/share/vidalia/default.tor-off /etc/default/tor.vidalia
 		;;
@@ -45,7 +44,7 @@
                 # still running?? (e.g. chroot)
                 if [ "$seen" = "false" ]; then
                         askuser
-                        if [ "$RET" = "true" ]; then
+                        if [ "$RET" = "nothing" ] || [ "$RET" = "one-off" ]; then
                             echo -n "Stopping tor daemon: "
                             pkill -x tor > /dev/null && echo "tor." || echo 'Failed!'
                         fi
diff -ruN -xpo '-xREADME.*' -xtemplates vidalia-0.2.9/debian/control vidalia-0.2.9-1+squeeze1/debian/control
--- vidalia-0.2.9/debian/control	2010-05-20 21:56:39.000000000 -0300
+++ vidalia-0.2.9-1+squeeze1/debian/control	2010-09-25 07:29:32.000000000 -0300
@@ -2,10 +2,12 @@
 Section: net
 Priority: extra
 Maintainer: Vern Sun <s5unty@gmail.com>
-Uploaders: Ulises Vitulli <uvitulli@fi.uba.ar>, Erinn Clark <erinn@torproject.org>
-Build-Depends: debhelper (>= 6.0.7~), 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.4
+Uploaders: Ulises Vitulli <dererk@debian.org>, Erinn Clark <erinn@torproject.org>
+Build-Depends: debhelper (>= 6.0.7~), autotools-dev, libqt4-dev (>= 4.1.0), po-debconf (>= 1.0), cmake (>= 2.4.8), libssl-dev (>= 0.9.8g)
+Standards-Version: 3.9.1
 Homepage: http://www.vidalia-project.net
+Vcs-Git: git://git.debian.org/collab-maint/vidalia.git/
+Vcs-Browser: http://git.debian.org/?p=collab-maint/vidalia.git
 
 Package: vidalia
 Architecture: any
diff -ruN -xpo '-xREADME.*' -xtemplates vidalia-0.2.9/debian/postrm vidalia-0.2.9-1+squeeze1/debian/postrm
--- vidalia-0.2.9/debian/postrm	2010-05-20 21:56:39.000000000 -0300
+++ vidalia-0.2.9-1+squeeze1/debian/postrm	2010-09-25 07:29:32.000000000 -0300
@@ -1,8 +1,6 @@
 #!/bin/sh
 set -e
 
-#DEBHELPER#
-
 if [ "$1" = "purge" ]; then
   echo " Removing /etc/default/tor.vidalia"
   rm -f /etc/default/tor.vidalia
@@ -11,4 +9,4 @@
   fi
 fi
 
-exit 0
+#DEBHELPER#
diff -ruN -xpo '-xREADME.*' -xtemplates vidalia-0.2.9/debian/rules vidalia-0.2.9-1+squeeze1/debian/rules
--- vidalia-0.2.9/debian/rules	2010-05-20 21:56:39.000000000 -0300
+++ vidalia-0.2.9-1+squeeze1/debian/rules	2010-09-25 07:29:32.000000000 -0300
@@ -14,10 +14,6 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-# Used for repacking upstream tarball
-UPVERSION=$(shell echo `head -n 1 debian/changelog|sed -e 's/^[^(]*(\([^)]*\)).*/\1/'`|sed -e 's/-.*//')
-
-
 CFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))

Attachment: signature.asc
Description: OpenPGP digital signature

Reply to: