[Pkg-privacy-commits] [Git][pkg-privacy-team/txtorcon][master] 3 commits: Removes tor from suggests for doc package

[Iain Learmonth]

Iain Learmonth pushed to branch master at Privacy Maintainers / txtorcon


Commits:
2e6ab542 by Iain R. Learmonth at 2018-08-16T11:48:59Z
Removes tor from suggests for doc package

- - - - -
fcde68f4 by Iain R. Learmonth at 2018-08-16T11:49:19Z
No longer builds a package for Python 2

- - - - -
ce99633f by Iain R. Learmonth at 2018-08-16T11:50:16Z
Updates changelog for release

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+txtorcon (18.0.2-2) unstable; urgency=medium
+
+  * No longer builds a Python 2 package (Closes: #905253)
+  * Removes tor from suggests for python-txtorcon-doc
+
+ -- Iain R. Learmonth <irl at debian.org>  Thu, 16 Aug 2018 12:50:11 +0100
+
 txtorcon (18.0.2-1) unstable; urgency=medium
 
   * New upstream version 18.0.2.


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -8,14 +8,6 @@ Build-Depends: debhelper (>= 9),
                dh-python,
                graphviz,
                lsof,
-               python-all,
-               python-geoip,
-               python-ipaddress,
-               python-mock,
-               python-repoze.sphinx.autointerface,
-               python-setuptools,
-               python-sphinx,
-               python-twisted,
                python3-all,
                python3-geoip,
                python3-mock,
@@ -29,29 +21,6 @@ Vcs-Browser: https://salsa.debian.org/pkg-privacy-team/txtorcon
 Vcs-Git: https://salsa.debian.org/pkg-privacy-team/txtorcon.git
 Homepage: https://github.com/meejah/txtorcon
 
-Package: python-txtorcon
-Architecture: all
-Depends: python-geoip,
-         python-ipaddress,
-         python-twisted,
-         python-zope.interface,
-         ${misc:Depends},
-         ${python:Depends}
-Suggests: tor
-Provides: ${python:Provides}
-Description: Twisted-based asynchronous Tor control protocol implementation (Python 2)
- txtorcon main feature is to present an asynchronous API to speak the Tor
- client protocol in Python. It also provides abstractions to track and get
- updates about Tor's state and current configuration (including writing it to
- Tor or disk), along with helpers to asynchronously launch slave instances of
- Tor including Twisted endpoint support.
- .
- Twisted is an event-driven networking engine written in Python and Tor is an
- onion-routing network designed to improve people's privacy and anonymity on the
- Internet.
- .
- This package contains the Python 2 module.
-
 Package: python3-txtorcon
 Architecture: all
 Depends: python3-geoip,
@@ -78,7 +47,6 @@ Section: doc
 Architecture: all
 Depends: ${misc:Depends},
          ${sphinxdoc:Depends}
-Suggests: tor
 Description: Twisted-based asynchronous Tor control protocol implementation (Documentation)
  txtorcon main feature is to present an asynchronous API to speak the Tor
  client protocol in Python. It also provides abstractions to track and get


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 export PYBUILD_NAME=txtorcon
 
 %:
-	dh $@ --with=python2,python3,sphinxdoc --buildsystem=pybuild
+	dh $@ --with=python3,sphinxdoc --buildsystem=pybuild
 
 override_dh_auto_build:
 	PYTHONPATH=. http_proxy='127.0.0.1:9' sphinx-build -N -bhtml docs/ docs/_build/html # HTML generator
@@ -11,26 +11,17 @@ override_dh_auto_build:
 
 override_dh_auto_install:
 	dh_auto_install -O--buildsystem=pybuild
-	mkdir -p debian/python-txtorcon/usr/share/doc/python-txtorcon
 	mkdir -p debian/python3-txtorcon/usr/share/doc/python3-txtorcon
 	set -e && \
 	for data_src in README.rst TODO examples; do \
-		mv debian/python-txtorcon/usr/share/txtorcon/$$data_src \
-			debian/python-txtorcon/usr/share/doc/python-txtorcon; \
-	done
-	set -e && \
-	for data_src in README.rst TODO examples; do \
 		mv debian/python3-txtorcon/usr/share/txtorcon/$$data_src \
 			debian/python3-txtorcon/usr/share/doc/python3-txtorcon; \
 	done
-	chmod 644 debian/python-txtorcon/usr/share/doc/python-txtorcon/examples/*.py
 	chmod 644 debian/python3-txtorcon/usr/share/doc/python3-txtorcon/examples/*.py
-	rm -r debian/python-txtorcon/usr/share/txtorcon
 	rm -r debian/python3-txtorcon/usr/share/txtorcon
 
 override_dh_compress:
 	dh_compress -Xlaunch_tor_with_simplehttpd.py -O--buildsystem=pybuild
 
 override_dh_auto_test:
-	PYTHONPATH=. trial --reporter=text test
 	PYTHONPATH=. trial3 --reporter=text test



View it on GitLab: https://salsa.debian.org/pkg-privacy-team/txtorcon/compare/403cae311ca1b2b1581572e0b82782e02c6525be...ce99633fa4a3f899d5ffaa6c90e01065906cdc94

-- 
View it on GitLab: https://salsa.debian.org/pkg-privacy-team/txtorcon/compare/403cae311ca1b2b1581572e0b82782e02c6525be...ce99633fa4a3f899d5ffaa6c90e01065906cdc94
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-privacy-commits/attachments/20180816/18ef379d/attachment-0001.html>