[Pkg-privacy-commits] [obfs4proxy] 149/151: go.net has been updated, drop obsolete patch and tighten build-dep

[Ximin Luo]

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

infinity0 pushed a commit to branch master
in repository obfs4proxy.

commit 39b3574b54b54bb714719bf0a7e56d98b356282a
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Sun Jun 28 00:14:42 2015 +0200

    go.net has been updated, drop obsolete patch and tighten build-dep
---
 debian/control                                     |  2 +-
 ...-Revert-Change-the-import-path-for-go.net.patch | 68 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 1 insertion(+), 70 deletions(-)

diff --git a/debian/control b/debian/control
index 6ed00c2..43e4b32 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 9),
                golang-go,
                golang-goptlib-dev,
                golang-go.crypto-dev (>= 1:0.0~git20150608),
-               golang-go.net-dev,
+               golang-go.net-dev (>= 0.0+git20150226.3d87fd6),
                golang-siphash-dev
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/collab-maint/obfs4proxy.git
diff --git a/debian/patches/0002-Revert-Change-the-import-path-for-go.net.patch b/debian/patches/0002-Revert-Change-the-import-path-for-go.net.patch
deleted file mode 100644
index 20d25b9..0000000
--- a/debian/patches/0002-Revert-Change-the-import-path-for-go.net.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From: =?utf-8?q?J=C3=A9r=C3=A9my_Bobbio?= <lunar at debian.org>
-Date: Thu, 30 Apr 2015 19:50:49 +0200
-Subject: Revert "Change the import path for go.net."
-
-This reverts commit aed4b723891db1be34eb866a03c62806b58ac148.
-
-Conflicts:
-	ChangeLog
-	README.md
----
- README.md                  | 2 +-
- obfs4proxy/obfs4proxy.go   | 2 +-
- obfs4proxy/proxy_http.go   | 2 +-
- obfs4proxy/proxy_socks4.go | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/README.md b/README.md
-index 0b32127..a510287 100644
---- a/README.md
-+++ b/README.md
-@@ -35,7 +35,7 @@ listed for clarity.
-  * Go 1.2.0 or later.   Prior versions of Go (Eg: 1.0.2) are missing certain
-    important parts of the runtime library like a SHA256 implementation.
-  * go.crypto (https://code.google.com/p/go.crypto)
-- * go.net (https://golang.org/x/net)
-+ * go.net (https://code.google.com/p/go.net)
-  * ed25519/extra25519 (https://github.com/agl/ed25519/extra25519)
-  * SipHash-2-4 (https://github.com/dchest/siphash)
-  * goptlib (https://git.torproject.org/pluggable-transports/goptlib.git)
-diff --git a/obfs4proxy/obfs4proxy.go b/obfs4proxy/obfs4proxy.go
-index 5d13b32..8848dda 100644
---- a/obfs4proxy/obfs4proxy.go
-+++ b/obfs4proxy/obfs4proxy.go
-@@ -41,7 +41,7 @@ import (
- 	"sync"
- 	"syscall"
- 
--	"golang.org/x/net/proxy"
-+	"code.google.com/p/go.net/proxy"
- 
- 	"git.torproject.org/pluggable-transports/goptlib.git"
- 	"git.torproject.org/pluggable-transports/obfs4.git/common/log"
-diff --git a/obfs4proxy/proxy_http.go b/obfs4proxy/proxy_http.go
-index 6f11790..2db6ca0 100644
---- a/obfs4proxy/proxy_http.go
-+++ b/obfs4proxy/proxy_http.go
-@@ -36,7 +36,7 @@ import (
- 	"net/url"
- 	"time"
- 
--	"golang.org/x/net/proxy"
-+	"code.google.com/p/go.net/proxy"
- )
- 
- // httpProxy is a HTTP connect proxy.
-diff --git a/obfs4proxy/proxy_socks4.go b/obfs4proxy/proxy_socks4.go
-index 536dd96..9d6bd4d 100644
---- a/obfs4proxy/proxy_socks4.go
-+++ b/obfs4proxy/proxy_socks4.go
-@@ -41,7 +41,7 @@ import (
- 	"net/url"
- 	"strconv"
- 
--	"golang.org/x/net/proxy"
-+	"code.google.com/p/go.net/proxy"
- )
- 
- // socks4Proxy is a SOCKS4 proxy.
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index f341028..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0002-Revert-Change-the-import-path-for-go.net.patch

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