diff options
| author | Peter Palfrader <peter@palfrader.org> | 2006-01-03 14:07:34 +0000 |
|---|---|---|
| committer | Peter Palfrader <peter@palfrader.org> | 2006-01-03 14:07:34 +0000 |
| commit | d10f2b726769ed22e6ead8a58ead9e5c4f645f8c (patch) | |
| tree | 3e2448774beae243e2585bcb94ff0cab4c1f72df /debian | |
| parent | f6f65c66b5194ac01f3eeb720284878e20e3f4e3 (diff) | |
| download | tor-d10f2b726769ed22e6ead8a58ead9e5c4f645f8c.tar tor-d10f2b726769ed22e6ead8a58ead9e5c4f645f8c.tar.gz | |
Forward port 0.1.0.16 changelog and change to copyright file
svn:r5722
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 21 | ||||
| -rw-r--r-- | debian/copyright | 11 |
2 files changed, 22 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog index a505af2ec..4c02c59d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ tor (0.1.1.10-alpha-cvs-1) experimental; urgency=low * CVS snapshot * forward port patches/07_log_to_file_by_default. + * Forward port 0.1.0.16 changelog and change to copyright file. - -- Peter Palfrader <weasel@debian.org> Sun, 11 Dec 2005 14:06:03 +0100 + -- Peter Palfrader <weasel@debian.org> Tue, 3 Jan 2006 15:06:03 +0100 tor (0.1.1.10-alpha-1) experimental; urgency=low @@ -77,7 +78,21 @@ tor (0.1.1.5-alpha-1) UNRELEASED; urgency=low -- Peter Palfrader <weasel@debian.org> Fri, 12 Aug 2005 17:02:23 +0200 -tor (0.1.0.14+XXXX) UNRELEASED; urgency=low +tor (0.1.0.16-1) unstable; urgency=low + + * New upstream version. + * Update copyright file for 2006. + + -- Peter Palfrader <weasel@debian.org> Tue, 3 Jan 2006 13:59:34 +0100 + +tor (0.1.0.15-1) unstable; urgency=low + + * New upstream release. + * Forward port 03_tor_manpage_in_section_8. + + -- Peter Palfrader <weasel@debian.org> Sat, 24 Sep 2005 15:15:34 +0200 + +tor (0.1.0.14-2) unstable; urgency=low * Ship debugging information in a separate package now, instead of simply not stripping tor. This is still useful while tor is @@ -90,7 +105,7 @@ tor (0.1.0.14+XXXX) UNRELEASED; urgency=low it to the wrong IP. We now catch such cases in debian/rules, shout at the buildd maintainer, and ignore the result of our test suite. - -- Peter Palfrader <weasel@debian.org> Tue, 13 Sep 2005 19:18:39 +0200 + -- Peter Palfrader <weasel@debian.org> Wed, 21 Sep 2005 10:23:25 +0200 tor (0.1.0.14-1) unstable; urgency=high diff --git a/debian/copyright b/debian/copyright index 91c268e27..bc32eadc3 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,20 +5,17 @@ It was downloaded from http://tor.eff.org/ Upstream Authors: Roger Dingledine <arma@freehaven.net> Nick Mathewson <nickm@freehaven.net> - Matej Pfajfar <badbytes@freehaven.net> - -Copyright (c) 2001-2005 Roger Dingledine -Copyright (c) 2002-2005 Nick Mathewson -Copyright (c) 2001-2003 Matej Pfajfar +Copyright (c) 2001-2004, Roger Dingledine +Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson strlcat, strlcpy: Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com> tree.h: Copyright (c) 2002 Niels Provos <provos@citi.umich.edu> -Modifications for Debian: Copyright (c) 2004, 2005 Peter Palfrader +Modifications for Debian: Copyright (c) 2004, 2005, 2006 Peter Palfrader The tor code is under this license: =============================================================================== Copyright (c) 2001-2004, Roger Dingledine -Copyright (c) 2004-2005, Roger Dingledine, Nick Mathewson +Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are |