[Pkg-privacy-commits] [flashproxy] 10/65: node-ws is entering Debian soon so we don't need this hack any more

[Ximin Luo]

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

infinity0 pushed a commit to branch _volatile-rc
in repository flashproxy.

commit 313753a4879f3f74eab6058ac2d88746a37ac55c
Author: Ximin Luo <infinity0 at gmx.com>
Date:   Thu Jan 16 19:14:43 2014 -0500

    node-ws is entering Debian soon so we don't need this hack any more
---
 debian/control                       | 5 +----
 debian/node-flashproxy.README.Debian | 9 ---------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/debian/control b/debian/control
index 2dfa76d..b7f1a85 100644
--- a/debian/control
+++ b/debian/control
@@ -87,7 +87,7 @@ Description: Pluggable transport for ephemeral IP addresses - browser proxy
 
 Package: node-flashproxy
 Architecture: all
-Depends: ${misc:Depends}, flashproxy-proxy, nodejs, node-optimist, node-xmlhttprequest, npm | node-ws
+Depends: ${misc:Depends}, flashproxy-proxy, nodejs, node-optimist, node-xmlhttprequest, node-ws
 Description: Pluggable transport for ephemeral IP addresses - nodejs proxy
  Tor has bridge relays, but in some cases even these can be blocked despite the
  fact that their addresses are handed out only a few at a time. The purpose of
@@ -102,6 +102,3 @@ Description: Pluggable transport for ephemeral IP addresses - nodejs proxy
  that continually switches location, such as a laptop.
  .
  Most end-users do not need to install this package.
- .
- Until node-ws enters Debian, you will need to perform a manual step after
- installing this package; see README.Debian for details.
diff --git a/debian/node-flashproxy.README.Debian b/debian/node-flashproxy.README.Debian
deleted file mode 100644
index f4ba010..0000000
--- a/debian/node-flashproxy.README.Debian
+++ /dev/null
@@ -1,9 +0,0 @@
-node-ws is not yet available in Debian[1], so in order to run flashproxy you
-will need to install a site-local copy of node-ws via npm:
-
-# apt-get install npm
-# npm install -g ws
-# cd /usr/lib/nodejs/flashproxy && npm link ws
-$ flashproxy
-
-[1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=721558

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