[Pkg-privacy-commits] [pt-websocket] 01/03: Change import to new golang.org/x/net/websocket

[Ximin Luo]

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

infinity0 pushed a commit to branch master
in repository pt-websocket.

commit e3cea345dc0715ddb7167dba636cc413327e75fc
Author: Ximin Luo <infinity0 at debian.org>
Date:   Thu May 12 18:31:25 2016 +0200

    Change import to new golang.org/x/net/websocket
---
 debian/changelog                   |  6 ++++++
 debian/control                     |  2 +-
 debian/patches/series              |  1 +
 debian/patches/update-import.patch | 35 +++++++++++++++++++++++++++++++++++
 4 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 53d3fd8..7d02bba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pt-websocket (0.2-2) UNRELEASED; urgency=medium
+
+  * Change import to new golang.org/x/net/websocket. (Closes: #822385)
+
+ -- Ximin Luo <infinity0 at debian.org>  Thu, 12 May 2016 18:30:52 +0200
+
 pt-websocket (0.2-1) unstable; urgency=low
 
   * Initial release (Closes: #739626)
diff --git a/debian/control b/debian/control
index 446c211..ec55dba 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Privacy Tools Maintainers <pkg-privacy-maintainers at lists.alioth.debian.org>
 Uploaders: Ximin Luo <infinity0 at debian.org>
 Build-Depends: debhelper (>= 9.0.0), dh-golang, golang-go, help2man,
- golang-goptlib-dev,
+ golang-goptlib-dev, golang-go.net-dev
 Standards-Version: 3.9.5
 Vcs-Git: https://anonscm.debian.org/git/pkg-privacy/packages/pt-websocket.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-privacy/packages/pt-websocket.git
diff --git a/debian/patches/series b/debian/patches/series
index 2e2a039..b2a9ce8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 use-dh-golang.patch
+update-import.patch
diff --git a/debian/patches/update-import.patch b/debian/patches/update-import.patch
new file mode 100644
index 0000000..7bb01e5
--- /dev/null
+++ b/debian/patches/update-import.patch
@@ -0,0 +1,35 @@
+Description: Change import to new golang.org/x/net/websocket.
+ https://groups.google.com/forum/#!msg/golang-nuts/eD8dh3T9yyA/l5Ail-xfMiAJ
+Author: David Fifield <david at bamsoftware.com>
+Applied-Upstream: 7fbabe47b0fdb51c1573221024da7786cbf7ebe1
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff --git a/websocket-client/websocket-client.go b/websocket-client/websocket-client.go
+index 859d98e..8943a97 100644
+--- a/pt-websocket-client/pt-websocket-client.go
++++ b/pt-websocket-client/pt-websocket-client.go
+@@ -7,7 +7,7 @@
+ package main
+ 
+ import (
+-	"code.google.com/p/go.net/websocket"
++	"golang.org/x/net/websocket"
+ 	"flag"
+ 	"fmt"
+ 	"io"
+diff --git a/websocket/websocket.go b/websocket/websocket.go
+index 5786fdf..7c649e3 100644
+--- a/websocket/websocket.go
++++ b/websocket/websocket.go
+@@ -5,7 +5,7 @@
+ // maximum buffering of messages.
+ //
+ // The reason for using this custom implementation instead of
+-// code.google.com/p/go.net/websocket is that the latter has problems with long
++// golang.org/x/net/websocket is that the latter has problems with long
+ // messages and does not support server subprotocols.
+ //   "Denial of Service Protection in Go HTTP Servers"
+ //   https://code.google.com/p/go/issues/detail?id=2093
+-- 
+cgit v0.10.2
+

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