[Pkg-privacy-commits] [obfsproxy] 09/12: Merge tag 'debian/0.2.3-1_bpo70+1' into tpo-wheezy-backport

[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 6e5abbc94cf5257d652b8a69666f2c7234ae0d93
Merge: a6c8d0d 774171f
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Sat Oct 5 17:49:41 2013 +0200

    Merge tag 'debian/0.2.3-1_bpo70+1' into tpo-wheezy-backport
    
    Format: 1.8
    Date: Sat, 05 Oct 2013 17:35:28 +0200
    Source: obfsproxy
    Binary: obfsproxy
    Architecture: source all
    Version: 0.2.3-1~bpo70+1
    Distribution: wheezy-backports
    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~bpo70+1) wheezy-backports; urgency=low
     .
       * Rebuild for wheezy-backports.
     .
     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.
     .
     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.
    Checksums-Sha1:
     f2a3f6a2832e3a65aac7e13dd67ab982fcec8346 1174 obfsproxy_0.2.3-1~bpo70+1.dsc
     c7d6cf74b24edd8e165eac7cf80037a6c74e7556 6280 obfsproxy_0.2.3-1~bpo70+1.debian.tar.gz
     d4e9e5b00f44a1d311f396a6de78bbf162d34ea4 40872 obfsproxy_0.2.3-1~bpo70+1_all.deb
    Checksums-Sha256:
     def39a421fcd57ddba90497bfbd55409ebbf7a18bb675020adee628732afe6a0 1174 obfsproxy_0.2.3-1~bpo70+1.dsc
     e2624e30a93319622969d27e76a1ec7e74e3e0aa2a70bfef0b744f01927469b7 6280 obfsproxy_0.2.3-1~bpo70+1.debian.tar.gz
     51b78e85fce24629950bee4fe2fcf4ab41346cd2098ffb1afd6aac279ebdcdc4 40872 obfsproxy_0.2.3-1~bpo70+1_all.deb
    Files:
     8024ef42ec6b262b478a852f7cdf74a5 1174 net extra obfsproxy_0.2.3-1~bpo70+1.dsc
     831e3977a181a3908c9cf03dff9c04a1 6280 net extra obfsproxy_0.2.3-1~bpo70+1.debian.tar.gz
     0475b7efef512f081a64c1e671c4fc9c 40872 net extra obfsproxy_0.2.3-1~bpo70+1_all.deb
    
    Conflicts:
    	debian/gbp.conf

 ChangeLog                                          |  20 +
 INSTALL                                            |   4 +-
 LICENSE                                            | 193 -----
 PKG-INFO                                           |   2 +-
 README                                             |   3 +-
 TODO                                               |   2 +-
 bin/obfsproxy                                      |  18 +-
 debian/changelog                                   |  38 +
 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, 285 insertions(+), 1178 deletions(-)

diff --cc debian/changelog
index e4814ed,ab0605c..66a1160
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,41 +1,47 @@@
+ obfsproxy (0.2.3-1~bpo70+1) wheezy-backports; urgency=low
+ 
+   * Rebuild for wheezy-backports.
+ 
+  -- Jérémy Bobbio <lunar at debian.org>  Sat, 05 Oct 2013 17:35:28 +0200
+ 
+ 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.
+ 
+  -- Jérémy Bobbio <lunar at debian.org>  Sun, 05 May 2013 20:53:53 +0200
+ 
 +obfsproxy (0.2.1-2~wheezy+1) wheezy-backport; urgency=low
 +
 +  * Build for wheezy-backport.
 +
 + -- Jérémy Bobbio <lunar at debian.org>  Thu, 11 Apr 2013 09:59:03 +0000
 +
  obfsproxy (0.2.1-2) experimental; urgency=low
  
    * Add a patch to fix the C-obfsproxy compatilibity hack.

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