[Pkg-privacy-commits] [obfsproxy] 07/12: Merge tag 'debian/0.2.3-1' into wheezy-backports

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch tpo-wheezy-backport
in repository obfsproxy.

commit 047b4dfeab6f44cbd0effbc061944f5e3586421d
Merge: ba4b03b 773c8d6
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Sat Oct 5 17:33:34 2013 +0200

    Merge tag 'debian/0.2.3-1' into wheezy-backports
    
    Format: 1.8
    Date: Fri, 20 Sep 2013 17:05:42 +0200
    Source: obfsproxy
    Binary: obfsproxy
    Architecture: source all
    Version: 0.2.3-1
    Distribution: unstable
    Urgency: low
    Maintainer: Jérémy Bobbio <lunar at debian.org>
    Changed-By: Jérémy Bobbio <lunar at debian.org>
    Description:
     obfsproxy  - pluggable transport proxy for Tor
    Changes:
     obfsproxy (0.2.3-1) unstable; urgency=low
     .
       * New upstream release.
       * Adjust Build-Depends to match new requirements.
       * Generate proper Depends for the new upstream version using pydist.
       * Drop obsolete patch.
       * Add watch file.
    Checksums-Sha1:
     519344f2819dbe5eda474e1abe2105fe95778cf3 1142 obfsproxy_0.2.3-1.dsc
     19053f2e7b391e5b9bf400daff4434d1bad1084c 49554 obfsproxy_0.2.3.orig.tar.gz
     0349e9609b948317f957e24af0e1d1698a2a6152 6184 obfsproxy_0.2.3-1.debian.tar.gz
     0ee0a365da9825c16fd717080e39dfb68584c650 36860 obfsproxy_0.2.3-1_all.deb
    Checksums-Sha256:
     d99c7655199dabedff615b35d5c0a375f49b76f46e8ea5734c1d65e977f08eeb 1142 obfsproxy_0.2.3-1.dsc
     935e38693d5fc51287005511a7d2cee5c607d9a87e8063675fe3603930cbcd1e 49554 obfsproxy_0.2.3.orig.tar.gz
     4313be71fcca8831dd05d5d09f9982a711b4e7f83f4c51810c36a5ff64d04593 6184 obfsproxy_0.2.3-1.debian.tar.gz
     7f6c20fdf5ed2de5bfe44f2fcaaee8c31170f8168e81fb0cf74591704aee9874 36860 obfsproxy_0.2.3-1_all.deb
    Files:
     0b94915029ccc494decff97bbc3bf5c2 1142 net extra obfsproxy_0.2.3-1.dsc
     c539514ee4be26e98bef989cd32e81bf 49554 net extra obfsproxy_0.2.3.orig.tar.gz
     3aa84e02b5d64d77f3326676be9392ea 6184 net extra obfsproxy_0.2.3-1.debian.tar.gz
     c1fd90d1ded0b90465a11e646c61bfe8 36860 net extra obfsproxy_0.2.3-1_all.deb

 ChangeLog                                          |  20 +
 INSTALL                                            |   4 +-
 LICENSE                                            | 193 -----
 PKG-INFO                                           |   2 +-
 README                                             |   3 +-
 TODO                                               |   2 +-
 bin/obfsproxy                                      |  18 +-
 debian/changelog                                   |  20 +
 debian/control                                     |  16 +-
 ...ibility-hack-to-the-registred-entry-point.patch |  59 --
 debian/patches/series                              |   1 -
 debian/pydist-overrides                            |   1 +
 debian/rules                                       |   2 +-
 debian/tests/control                               |   1 +
 debian/tests/upstream-tests                        |  12 +
 debian/watch                                       |   3 +
 doc/HOWTO.txt                                      |  50 +-
 doc/licenses/LICENSE.PYTHON                        | 773 ---------------------
 obfsproxy/_version.py                              |   4 +-
 obfsproxy/common/argparser.py                      |  12 +
 obfsproxy/managed/client.py                        |  17 +-
 obfsproxy/managed/server.py                        |  28 +-
 obfsproxy/network/extended_orport.py               | 150 ++--
 obfsproxy/network/launch_transport.py              |   2 +-
 obfsproxy/network/socks.py                         |  19 +-
 obfsproxy/pyobfsproxy.py                           |  22 +-
 setup.py                                           |  11 +-
 27 files changed, 267 insertions(+), 1178 deletions(-)

diff --cc debian/changelog
index 397a94b,3b81e36..00b1977
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,23 +1,29 @@@
+ obfsproxy (0.2.3-1) unstable; urgency=low
+ 
+   * New upstream release.
+   * Adjust Build-Depends to match new requirements.
+   * Generate proper Depends for the new upstream version using pydist.
+   * Drop obsolete patch.
+   * Add watch file.
+ 
+  -- Jérémy Bobbio <lunar at debian.org>  Fri, 20 Sep 2013 17:05:42 +0200
+ 
+ obfsproxy (0.2.1-4) unstable; urgency=low
+ 
+   * Fix Vcs-Git URL.
+   * Adjust Section to match the archive override.
+   * Migrate to dh_python2.
+   * Run upstream test suite using autopkgtest.
+   * Add Homepage field.
+ 
+  -- Jérémy Bobbio <lunar at debian.org>  Wed, 28 Aug 2013 21:14:23 +0200
+ 
 +obfsproxy (0.2.1-3~bpo70+1) wheezy-backports; urgency=low
 +
 +  * Rebuild for wheezy-backports.
 +
 + -- Jérémy Bobbio <lunar at debian.org>  Fri, 17 May 2013 16:04:05 +0200
 +
  obfsproxy (0.2.1-3) unstable; urgency=low
  
    * Upload to unstable.

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