[Pkg-privacy-commits] [obfsproxy] 07/17: Merge branch 'master' into tpo-squeeze-backport

[Ximin Luo]

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

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

commit c3dd9e991bb8f3598135d961a8a98156f8123c78
Merge: 426a1d7 ea022ae
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Thu Apr 11 10:02:14 2013 +0000

    Merge branch 'master' into tpo-squeeze-backport
    
    Conflicts:
    	debian/patches/series

 debian/changelog                                   |  6 +++
 ...ibility-hack-to-the-registred-entry-point.patch | 59 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 66 insertions(+)

diff --cc debian/changelog
index cae6cac,64951f0..f13ebf1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,9 +1,18 @@@
+ obfsproxy (0.2.1-2) experimental; urgency=low
+ 
+   * Add a patch to fix the C-obfsproxy compatilibity hack.
+ 
+  -- Jérémy Bobbio <lunar at debian.org>  Thu, 11 Apr 2013 09:39:20 +0000
+ 
 +obfsproxy (0.2.1-1~~squeeze+1) squeeze-backport; urgency=low
 +
 +  * Build for squeeze-backport:
 +    - Add argparse to Build-Depends for Python 2.6.
 +    - Adapt test suite to work under Python 2.6.
 +    - Lower minimum Python version to 2.6.
 +
 + -- Jérémy Bobbio <lunar at debian.org>  Tue, 09 Apr 2013 17:31:26 +0000
 +
  obfsproxy (0.2.1-1) experimental; urgency=low
  
    * New upstream release:
diff --cc debian/patches/series
index 4eeb8e3,893f5ec..a11a4dd
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,1 +1,2 @@@
 +0001-Monkey-patch-twisted.trial.unittest.TestCase-to-add-.patch
+ 0001-Move-compatibility-hack-to-the-registred-entry-point.patch

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