[Pkg-privacy-commits] [vidalia] 24/26: Merge branch 'master' into experimental, keeping upstream source untouched.
Ximin Luo
infinity0 at moszumanska.debian.org
Sat Aug 22 13:15:34 UTC 2015
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch experimental
in repository vidalia.
commit 1fef6c0802bfc755a6c8e81665c32a753f46d1da
Merge: a80bfbc ec38637
Author: intrigeri <intrigeri at boum.org>
Date: Mon Aug 18 08:39:08 2014 +0000
Merge branch 'master' into experimental, keeping upstream source untouched.
Conflicts:
debian/NEWS
debian/README.Debian
debian/apparmor-profile
debian/changelog
debian/control
debian/gbp.conf
debian/patches/series
debian/patches/use-control-socket.patch
debian/po/it.po
debian/rules
debian/vidalia.dirs
.gitignore | 4 +-
debian/NEWS | 31 +++-
debian/README.Debian | 50 +++++-
debian/apparmor-profile | 3 +
debian/changelog | 175 +++++++++++++++++++++
debian/control | 18 +--
...name-of-the-cookie-authentication-file-to.patch | 73 +++++++++
debian/patches/series | 1 +
debian/patches/use-control-socket.patch | 10 +-
debian/po/it.po | 94 +++++------
debian/po/{fi.po => ja.po} | 26 +--
debian/po/{id.po => pl.po} | 28 ++--
debian/po/{it.po => tr.po} | 25 +--
debian/rules | 7 +-
debian/vidalia.dirs | 1 +
15 files changed, 438 insertions(+), 108 deletions(-)
diff --cc debian/changelog
index 647f64d,98f57f9..bdda053
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,81 -1,178 +1,256 @@@
+vidalia (0.3.3~alpha-2) experimental; urgency=low
+
+ * Grant some more AppArmor credentials to Vidalia:
+ - writing its own configuration (Closes: #681365).
+ - reading system-wide GTK themes (Closes: #682431).
+ - reading same-owner /proc/PID/cmdline and /proc/PID/fd/.
+ - accessing the session's D-Bus.
+ * Add myself to Uploaders, as already done in the testing/unstable branch.
+
+ -- intrigeri <intrigeri at debian.org> Thu, 12 Jul 2012 10:57:00 -0600
+
+vidalia (0.3.3~alpha-1) experimental; urgency=low
+
+ [ Ulises Vitulli ]
+ * New alpha upstream release:
+ - Fix FTBFS: error: '::sleep' has not been declared (Closes: #676865).
+ - Implemented SafeCookie authen method (not used on Debian by default).
+ * Remove missintended NEWS block for 0.2.17, instead 0.3.1.
+ * Cleanly refresh local patches.
+
+ [ intrigeri ]
+ * Install AppArmor profile.
+ * Enable hardening flags.
+
+ -- Ulises Vitulli <dererk at debian.org> Sun, 10 Jun 2012 18:53:20 +0200
+
+vidalia (0.3.1-1) experimental; urgency=low
+
+ * New upstream release, experimental branched.
+ * Bumped up to Standards-Version 3.9.3. No changes required.
+
+ -- Ulises Vitulli <dererk at debian.org> Wed, 07 Mar 2012 11:13:58 -0300
+
+vidalia (0.3.0alpha-4) experimental; urgency=low
+
+ * Modifications introduced on Debconf templates, translation round:
+ - Swedish, thanks Martin Bagge (Closes: #631971).
+ - Dutch, thanks Jeroen Schot (Closes: #632626).
+ - Spanish, thanks Francisco Javier Cuadrado (Closes: #632645).
+ * Pkg building instructions at README.source (Closes: #623690).
+
+ -- Ulises Vitulli <dererk at debian.org> Sat, 30 Jul 2011 07:50:18 -0300
+
+vidalia (0.3.0alpha-3) experimental; urgency=low
+
+ [ Vern Sun ]
+ * Modifications introduced on Debconf templates, translation round:
+ - Updated Chinese translations.
+
+ * Fixes automatically retrieving bridges functionality (Closes: #625799).
+ * Depend on Tor's version firstly introducing Control Socket for
+ handling the interaction completely out-of-the-box.
+ * Modifications introduced on Debconf templates, translation round:
+ - Czech, thanks Michal Šimůnek (Closes: #631532).
+
+ -- Ulises Vitulli <dererk at debian.org> Sun, 26 Jun 2011 21:12:54 -0300
+
+vidalia (0.3.0alpha-2) experimental; urgency=low
+
+ * The 'uipiiii' dupload.
+ * Apply local patch for using 'Control Socket' by default.
+ This will allow users to use Tor with zero conf (adopt wicd's
+ debconf scripts to add Vidalia users into Tor's group).
+ * Modifications introduced on Debconf templates, translation round:
+ - Portuguese, thanks Américo Monteiro.
+ - Russian, thanks Yuri Kozlov (Closes: #631418).
+ * Improve building targets for simplifying portscripts.
+ * Implement NEWS.Debian, quick pkg updates will be reported there.
+
+ -- Ulises Vitulli <dererk at debian.org> Thu, 23 Jun 2011 14:49:26 -0300
+
+vidalia (0.3.0alpha-1) experimental; urgency=low
+
+ * The 'that-seems-nice!' dupload.
+ * Technology previewing 0.3.0 alpha release.
+
+ -- Ulises Vitulli <dererk at debian.org> Mon, 20 Jun 2011 14:01:45 -0300
+
+ vidalia (0.2.21-5) unstable; urgency=medium
+
+ * Put under the umbrella of the Anonymity Tools Debian Maintainers team.
+ * AppArmor: allow Vidalia to browse directories up to /{var/,}run/tor,
+ that contains the control port authentication cookie by default.
+ * Adjust-filename-of-the-cookie-authentication-file-to.patch:
+ new patch that adjusts the filename of the Tor cookie authentication file
+ to match Debian's default.
+ * Update README.Debian to match default location of the Tor authentication
+ cookie.
+
+ -- intrigeri <intrigeri at debian.org> Thu, 14 Aug 2014 11:32:11 +0200
+
+ vidalia (0.2.21-4) unstable; urgency=medium
+
+ * Add Turkish translation of debconf messages (Closes: #757501).
+ Thanks to Mert Dirik <mertdirik at gmail.com> for the patch!
+ * Drop Suggests on iceweasel-torbutton, that was removed from Debian.
+
+ -- intrigeri <intrigeri at debian.org> Thu, 14 Aug 2014 09:50:50 +0200
+
+ vidalia (0.2.21-3) unstable; urgency=medium
+
+ * Disable miniupnpc support: it uses a very old embedded copy of that library.
+ * Remove spurious trailing whitespace in debian/rules.
+
+ -- intrigeri <intrigeri at debian.org> Mon, 24 Feb 2014 11:48:47 +0100
+
+ vidalia (0.2.21-2) unstable; urgency=medium
+
+ * Import Japanese translation of debconf templates,
+ thanks to victory <victory.deb at gmail.com>. Closes: #718999.
+ * Import Polish translation of debconf templates,
+ thanks to Magdalena Zofia Kubot <magdalena.kubot at gmail.com>.
+ Closes: #731336.
+ * AppArmor profile improvements:
+ - allow reading same-owner /proc/PID/cmdline
+ - allow reading same-owner /proc/PID/fd/
+ - allow access to the session's D-Bus
+ - allow reading system-wide GTK themes (Closes: #682431)
+ * Don't version dependencies that are satisfied on oldstable (Squeeze).
+ * Use canonical URL for Vcs-*.
+ * Declare compatibility with standards version 3.9.5.
+ * Drop obsolete Lintian override.
+
+ -- intrigeri <intrigeri at debian.org> Tue, 18 Feb 2014 10:19:08 +0100
+
+ vidalia (0.2.21-1) unstable; urgency=low
+
+ [ Ulises Vitulli ]
+ * Un-hold locked new upstream release: fixes several bugs:
+ - Avoid waiting to reload router list if ns/all returned empty.
+ - Stop trying to load router information if torControl is not connected.
+ - Fix RouterDescriptor's bandwidth and uptime values when defined from the
+ consensus.
+ - Save ControlPortWriteToFile using relative path.
+ * Updated Debconf template translations:
+ - Italian, thanks Fabio Pirola (Closes: #699082).
+ * Updated Standard-version to 3.9.4 (no changes needed).
+
+ [ intrigeri ]
+ * Drop the patches that were taken from upstream 0.2.21:
+ - Fix-wrong-uptime-bandwidth-in-relay-list.patch
+ - Populate-the-relay-list-at-startup.patch
+
+ -- Ulises Vitulli <dererk at debian.org> Sat, 11 May 2013 11:07:13 -0300
+
+ vidalia (0.2.20-2) unstable; urgency=low
+
+ * New patches cherry-picked from upstream 0.2.21:
+ - Fix-wrong-uptime-bandwidth-in-relay-list.patch (Closes: #699178)
+ This is upstream commit b3d4f7f with the changes/* file removed.
+ - Populate-the-relay-list-at-startup.patch (Closes: #699179)
+ This is taken from upstream commit b00f51dc, but with the fix for
+ upstream Trac#6482 (that doesn't seem worth a freeze exception) and
+ the changes/* file removed.
+
+ -- intrigeri <intrigeri at debian.org> Sat, 02 Feb 2013 17:02:01 +0100
+
+ vidalia (0.2.20-1) unstable; urgency=low
+
+ [ Ulises Vitulli ]
+ * New upstream release, fixes several bugs:
+ - Append router status information if Tor is using microdescriptors, this
+ bug produced empty nodes lists and their interactions (Closes: #680489).
+ - Display paths with their native separators. (Fixes upstream Trac#4337).
+ - Do not ignore the Show on Startup checkbox. (Fixes upstream Trac#5351).
+ - Do not add relative root to DataDirectory if it is empty.
+ (Fixes upstream Trac#6178).
+
+ [ intrigeri ]
+ * AppArmor profile: add a missing credential, allow Vidalia
+ to write its own configuration (Closes: #681365).
+
+ -- Ulises Vitulli <dererk at debian.org> Fri, 13 Jul 2012 20:20:45 -0300
+
+ vidalia (0.2.19-2) unstable; urgency=low
+
+ * Moved apparmor from runtime dep to a suggested one (Closes: #678549).
+ * Clarify apparmor current Wheezy state at README.Debian (Closes: #678550).
+ * Added intrigeri as Uploader.
+
+ -- Ulises Vitulli <dererk at debian.org> Sat, 23 Jun 2012 19:00:41 -0300
+
+ vidalia (0.2.19-1) unstable; urgency=low
+
+ [ intrigeri ]
+ * Imported Upstream version 0.2.19
+ * Install AppArmor profile.
+ * Enable hardening flags.
+
+ [ Ulises Vitulli ]
+ * Added runtime dependency on apparmor.
+ * Updated d/NEWS and d/README.Debian to reflect new features.
+ * Move dirs from d/rules to d/vidalia.dir.
+ * Updated Standard-version to 3.9.3 (no changes needed).
+
+ -- Ulises Vitulli <dererk at debian.org> Fri, 22 Jun 2012 07:18:44 -0300
+
+ vidalia (0.2.17-1) unstable; urgency=low
+
+ * New upstream release.
+ * Updated debian/NEWS with a known release point bug.
+ * Updated debian/README.Debian documentation (Closes: #654642).
+ * Debconf templates improves, translation round called:
+ - Czech, thanks Martin.Šín (Closes: #654709).
+ - Danish, thanks Joe.Dalton (Closes: #654820).
+ - Russian, thanks Yuri.Kozlov (Closes: #654842).
+ - Portuguese, thanks Miguel.Figueiredo (Closes: #654981).
+ - Swedish, thanks Martin.Bagge (Closes: #655046).
+ - Dutch, thanks Jeroen.Schot (Closes: #655319).
+ - French, thanks Christian.Perrier (Closes: #655546).
+ - German, thanks Martin.E.Schauer (Closes: #656123).
+ - Indonesian, new translation added, thanks Mahyuddin.Susanto
+ (Closes: #658705).
+ - Simplified and Traditional Chinese, thanks Vern.Sun.
+ - Spanish.
+ * Updated Maintainer/Uploader fields.
+
+ -- Ulises Vitulli <dererk at debian.org> Sat, 11 Feb 2012 22:26:58 -0300
+
+ vidalia (0.2.15-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Ulises Vitulli <dererk at debian.org> Tue, 15 Nov 2011 17:14:07 -0300
+
+ vidalia (0.2.14-3) unstable; urgency=low
+
+ * Moved debconf actions from config to postinst script (Closes: #641044).
+ * Remove deprecated files that enforced Tor not to start after having
+ chosen to do so. This comes from the older approach to control Tor
+ (Closes: #642223).
+ * Added debconf templates translations:
+ - French, thanks Christian Perrier (Closes: #640769).
+ - German, thanks Martin.E.Schauer (Closes: #641920).
+
+ -- Ulises Vitulli <dererk at debian.org> Mon, 19 Sep 2011 12:05:30 -0300
+
+ vidalia (0.2.14-2) unstable; urgency=low
+
+ * The 'Napoleon-Of-Crime' dupload.
+ * Tor's ControlSocket enabled version upload allowed to port exp
+ changes to handle socket com out of the box (Closes: #640077).
+
+ -- Ulises Vitulli <dererk at debian.org> Sat, 03 Sep 2011 15:47:23 -0300
+
+ vidalia (0.2.14-1) unstable; urgency=low
+
+ * The 'Monday-Rocking-Skiing' dupload.
+ * New upstream release.
+ * Improve building targets for simplifying portscripts.
+
+ -- Ulises Vitulli <dererk at debian.org> Mon, 29 Aug 2011 09:43:47 -0300
+
vidalia (0.2.12-2) unstable; urgency=low
* The 'It-is-a-nice-day-for-barbacue' dupload.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/vidalia.git
More information about the Pkg-privacy-commits
mailing list