[Pkg-privacy-commits] [obfsproxy] 138/353: Change every pyobfsproxy occurence to obfsproxy

Ximin Luo infinity0 at moszumanska.debian.org
Sat Aug 22 13:01:51 UTC 2015 

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

infinity0 pushed a commit to branch master
in repository obfsproxy.

commit 268eb2c0c96cd0582803fdcb1ea6926394098eee
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Thu Mar 28 10:08:24 2013 +0000

    Change every pyobfsproxy occurence to obfsproxy
    
    Upstream has decided to supersede the C implementation of "obfsproxy" with the
    Python one and to drop the name "pyobfsproxy".
---
 debian/README.Debian                          | 10 +++++-----
 debian/README.source                          |  8 ++++----
 debian/changelog                              |  2 +-
 debian/control                                | 10 +++++-----
 debian/copyright                              |  4 ++--
 debian/{pyobfsproxy.1.txt => obfsproxy.1.txt} | 24 ++++++++++++------------
 debian/{pyobfsproxy.docs => obfsproxy.docs}   |  0
 debian/obfsproxy.manpages                     |  1 +
 debian/pyobfsproxy.manpages                   |  1 -
 debian/rules                                  |  2 +-
 10 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 2ff39eb..ba51827 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,12 +1,12 @@
-pyobfsproxy for Debian
-======================
+obfsproxy for Debian
+====================
 
 Configuring an obfs2/obfs3 bridge
 ---------------------------------
 
 (Inspired by upstream HOWTO.txt)
 
-This is a short guide on how to setup a pyobfsproxy obfs2/obfs3 bridge:
+This is a short guide on how to setup a obfsproxy obfs2/obfs3 bridge:
 
 1. Setup Tor
 
@@ -22,7 +22,7 @@ This is a short guide on how to setup a pyobfsproxy obfs2/obfs3 bridge:
        ## CHANGEME_2 -> provide some email address so we can contact you if there's a problem
        #ContactInfo CHANGEME_2
 
-       ServerTransportPlugin obfs2,obfs3 exec /usr/bin/pyobfsproxy managed
+       ServerTransportPlugin obfs2,obfs3 exec /usr/bin/obfsproxy managed
 
    Don't forget to uncomment and edit the CHANGEME fields.
 
@@ -66,7 +66,7 @@ Using an obfs3 bridge
 
 To use an obfs3, please add the following lines to /etc/tor/torrc:
 
-    ClientTransportPlugin obfs2,obfs3 exec /usr/bin/pyobfsproxy managed
+    ClientTransportPlugin obfs2,obfs3 exec /usr/bin/obfsproxy managed
     UseBridges 1
     Bridge obfs3 192.0.2.42:443 C2A9DC82AA7E85DB6465EC8C4B1B4B1B77787BE0
 
diff --git a/debian/README.source b/debian/README.source
index a50aa66..d8e15f5 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,7 +1,7 @@
-README.source for the pyobfsproxy package
-=========================================
+README.source for the obfsproxy package
+=======================================
 
-pyobfsproxy is managed in a Git repository using git-buildpackage.
+obfsproxy is managed in a Git repository using git-buildpackage.
 
 Upstream tarballs are imported using git-import-orig with:
 
@@ -19,4 +19,4 @@ The branches are organized as follow:
   * patch-queue/*: branches exported to quilt patches (handled by gbp-pq)
   * master: export of patch-queue/* branches and Debian specific changes
 
-[1] <https://git.torproject.org/pluggable-transports/pyobfsproxy.git>
+[1] <https://git.torproject.org/pluggable-transports/obfsproxy.git>
diff --git a/debian/changelog b/debian/changelog
index a7aba5c..6f96aea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-pyobfsproxy (0.0.2-1) unstable; urgency=low
+obfsproxy (0.0.2-1) unstable; urgency=low
 
   * Initial release. (Closes: #699922)
 
diff --git a/debian/control b/debian/control
index 0e1a894..5a02053 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: pyobfsproxy
+Source: obfsproxy
 Maintainer: Jérémy Bobbio <lunar at debian.org>
 Section: python
 Priority: extra
@@ -11,10 +11,10 @@ Build-Depends: asciidoc,
                xsltproc
 Standards-Version: 3.9.4
 X-Python-Version: >= 2.7
-Vcs-Git: git://anonscm.debian.org/collab-maint/pyobfsproxy.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/pyobfsproxy.git
+Vcs-Git: git://anonscm.debian.org/collab-maint/obfsproxy.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/obfsproxy.git
 
-Package: pyobfsproxy
+Package: obfsproxy
 Architecture: all
 Depends: python,
          python-argparse,
@@ -25,7 +25,7 @@ Depends: python,
          ${misc:Depends},
          ${python:Depends}
 Description: pluggable transport proxy for Tor (Python implementation)
- pyobfsproxy is a tool that attempts to circumvent censorship by
+ obfsproxy is a tool that attempts to circumvent censorship by
  transforming the Tor traffic between the client and the bridge. This way
  censors, who usually monitor traffic between the client and the bridge, will
  see innocent-looking transformed traffic instead of the actual Tor traffic.
diff --git a/debian/copyright b/debian/copyright
index 4dd2aa8..6c7a162 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: pyobfsproxy
+Upstream-Name: obfsproxy
 Upstream-Contact: George Kadianakis <desnacked at riseup.net>
-Source: https://git.torproject.org/pluggable-transports/pyobfsproxy.git
+Source: https://git.torproject.org/pluggable-transports/obfsproxy.git
 
 Files: *
 Copyright: Copyright 2012      Brandon Wiley <brandon at blanu.net>
diff --git a/debian/pyobfsproxy.1.txt b/debian/obfsproxy.1.txt
similarity index 80%
rename from debian/pyobfsproxy.1.txt
rename to debian/obfsproxy.1.txt
index 9ebd0d3..31f98d0 100644
--- a/debian/pyobfsproxy.1.txt
+++ b/debian/obfsproxy.1.txt
@@ -1,33 +1,33 @@
-PYOBFSPROXY(1)
-==============
+OBFSPROXY(1)
+============
 :doctype: manpage
 
 
 NAME
 ----
-pyobfsproxy - a pluggable transports proxy
+obfsproxy - a pluggable transports proxy
 
 
 SYNOPSIS
 --------
-pyobfsproxy [--log-file 'log_file']
+obfsproxy [--log-file 'log_file']
             [--log-min-severity 'severity'] [--no-log]
             [--no-safe-logging]
             managed
-pyobfsproxy [--log-file 'log_file']
+obfsproxy [--log-file 'log_file']
             [--log-min-severity 'severity'] [--no-log]
             [--no-safe-logging]
             'transport'
             [-h] [--dest 'dest']
             [--ext-cookie-file 'ext_cookie_file'] ...
             'mode' 'listen_addr'
-pyobfsproxy --help
+obfsproxy --help
 
 
 
 DESCRIPTION
 -----------
-*pyobfsproxy* is a tool that attempts to circumvent censorship, by transforming
+*obfsproxy* is a tool that attempts to circumvent censorship, by transforming
 the Tor traffic between the client and the bridge. This way, censors, who
 usually monitor traffic between the client and the bridge, will see
 innocent-looking transformed traffic instead of the actual Tor traffic.
@@ -51,15 +51,15 @@ OPTIONS
 MANAGED TRANSPORT
 -----------------
 
-Using *managed* as 'TRANSPORT' allows Tor to start and control pyobfsproxy by
+Using *managed* as 'TRANSPORT' allows Tor to start and control obfsproxy by
 itself. Add a line like the following to torrc to use it when acting as a
 bridge:
 
-     ServerTransportPlugin obfs2,obfs3 exec /usr/bin/pyobfsproxy managed
+     ServerTransportPlugin obfs2,obfs3 exec /usr/bin/obfsproxy managed
 
 When connecting to an obfuscated bridge, adapt the following:
 
-     ClientTransportPlugin obfs2,obfs3 exec /usr/bin/pyobfsproxy managed
+     ClientTransportPlugin obfs2,obfs3 exec /usr/bin/obfsproxy managed
 
 DUMMY TRANSPORT
 ---------------
@@ -88,7 +88,7 @@ No extra options.
 OBFS3 TRANSPORT
 ---------------
 Use the *obfs3* protocol. See
-<https://gitweb.torproject.org/pluggable-transports/pyobfsproxy.git/blob/HEAD:/doc/obfs3/obfs3-protocol-spec.txt>
+<https://gitweb.torproject.org/pluggable-transports/obfsproxy.git/blob/HEAD:/doc/obfs3/obfs3-protocol-spec.txt>
 for the specification.
 
 No extra options.
@@ -127,7 +127,7 @@ Options common for all transports:
 
 BUGS
 ----
-Plenty, probably. *pyobfsproxy* is still in development. Please report them.
+Plenty, probably. *obfsproxy* is still in development. Please report them.
 
 
 AUTHOR
diff --git a/debian/pyobfsproxy.docs b/debian/obfsproxy.docs
similarity index 100%
rename from debian/pyobfsproxy.docs
rename to debian/obfsproxy.docs
diff --git a/debian/obfsproxy.manpages b/debian/obfsproxy.manpages
new file mode 100644
index 0000000..b4f5db9
--- /dev/null
+++ b/debian/obfsproxy.manpages
@@ -0,0 +1 @@
+debian/obfsproxy.1
diff --git a/debian/pyobfsproxy.manpages b/debian/pyobfsproxy.manpages
deleted file mode 100644
index 87982ab..0000000
--- a/debian/pyobfsproxy.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/pyobfsproxy.1
diff --git a/debian/rules b/debian/rules
index ee02b5b..0da1b15 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 	dh $@ --buildsystem=python_distutils
 
 override_dh_installman:
-	a2x --no-xmllint --doctype manpage --format manpage debian/pyobfsproxy.1.txt
+	a2x --no-xmllint --doctype manpage --format manpage debian/obfsproxy.1.txt
 	dh_installman -O--buildsystem=python_distutils
 
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))

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

More information about the Pkg-privacy-commits mailing list