[Pkg-privacy-commits] [vidalia] 19/160: Merging Vern's changes

[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 7da6f00dd45b7396eb16ff75c88eb11bb58e4f4a
Author: Dererk <dererk at madap.com.ar>
Date:   Tue May 18 11:38:41 2010 -0300

    Merging Vern's changes
---
 debian/0.2.x/changelog                 | 11 ++++++++++-
 debian/0.2.x/control                   |  2 +-
 debian/0.2.x/rules                     |  1 +
 debian/0.2.x/source/format             |  1 +
 debian/0.2.x/vidalia.lintian-overrides |  1 +
 5 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/debian/0.2.x/changelog b/debian/0.2.x/changelog
index 81214ac..798fd27 100644
--- a/debian/0.2.x/changelog
+++ b/debian/0.2.x/changelog
@@ -1,4 +1,6 @@
 vidalia (0.2.8-2) unstable; urgency=low
+  
+  [ Ulises Vitulli ]
   * Reviewed Debconf templates by l10n Team (Thanks Christian Perrier):
     - Portuguese, thanks Américo Monteiro (Closes: #579767).
     - Czech, thanks Martin Sin (Closes: #579785).
@@ -14,7 +16,14 @@ vidalia (0.2.8-2) unstable; urgency=low
     - Danish, thanks Joe Hansen (Closes: #580123).
     - Vietnamese, thanks Clytie Siddall (Closes: #581532).
 
- -- Ulises Vitulli <uvitulli at fi.uba.ar>  Thu, 13 May 2010 21:27:02 -0300
+  [ Vern Sun ]
+  * New lintian addition "missing-debian-source-format", Switch package
+    format to 3.0 (quilt).
+  * Add lintian override about unused-debconf-template which are used via
+    variables $question.
+  * Updated Build-Depends: debhelper (>= 6.0.7~) (for dh_lintian).
+
+ -- Ulises Vitulli <uvitulli at fi.uba.ar>  Tue, 18 May 2010 11:37:50 -0300
 
 vidalia (0.2.8-1) unstable; urgency=low
 
diff --git a/debian/0.2.x/control b/debian/0.2.x/control
index a25d506..7b4817b 100644
--- a/debian/0.2.x/control
+++ b/debian/0.2.x/control
@@ -3,7 +3,7 @@ Section: net
 Priority: extra
 Maintainer: Vern Sun <s5unty at gmail.com>
 Uploaders: Ulises Vitulli <uvitulli at fi.uba.ar>, Erinn Clark <erinn at torproject.org>
-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
+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
 Homepage: http://www.vidalia-project.net
 
diff --git a/debian/0.2.x/rules b/debian/0.2.x/rules
index a1ac35f..b0e620d 100755
--- a/debian/0.2.x/rules
+++ b/debian/0.2.x/rules
@@ -80,6 +80,7 @@ binary-arch: build install
 	dh_installmenu
 	dh_link
 	dh_strip
+	dh_lintian
 	dh_compress
 	dh_fixperms
 	dh_installdeb
diff --git a/debian/0.2.x/source/format b/debian/0.2.x/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/0.2.x/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/0.2.x/vidalia.lintian-overrides b/debian/0.2.x/vidalia.lintian-overrides
new file mode 100644
index 0000000..7049838
--- /dev/null
+++ b/debian/0.2.x/vidalia.lintian-overrides
@@ -0,0 +1 @@
+vidalia: unused-debconf-template

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