diff -Nru pacparser-1.3.6/debian/changelog pacparser-1.3.6/debian/changelog --- pacparser-1.3.6/debian/changelog 2020-02-20 10:50:29.000000000 +0000 +++ pacparser-1.3.6/debian/changelog 2020-03-02 05:22:40.000000000 +0000 @@ -1,51 +1,9 @@ -pacparser (1.3.6-1.1ubuntu1) focal; urgency=medium +pacparser (1.3.6-1.2) unstable; urgency=medium - * Build-depend on python-all-dev. - * Use python2 in the build. + * Non-maintainer upload. + * Drup python-pacparser - obsolete, no rdepends (Closes: #937229) - -- Matthias Klose Thu, 20 Feb 2020 11:50:29 +0100 - -pacparser (1.3.6-1.1build7) focal; urgency=medium - - * No-change rebuild to drop python3.7. - - -- Matthias Klose Tue, 18 Feb 2020 10:21:14 +0100 - -pacparser (1.3.6-1.1build6) focal; urgency=medium - - * No-change rebuild to build with python3.8. - - -- Matthias Klose Fri, 18 Oct 2019 18:08:48 +0000 - -pacparser (1.3.6-1.1build5) disco; urgency=medium - - * No-change rebuild to build without python3.6 support. - - -- Matthias Klose Sat, 03 Nov 2018 12:07:58 +0000 - -pacparser (1.3.6-1.1build4) cosmic; urgency=medium - - * No-change rebuild to build for python3.7. - - -- Matthias Klose Thu, 28 Jun 2018 06:54:01 +0000 - -pacparser (1.3.6-1.1build3) artful; urgency=medium - - * No change rebuild to drop Python 3.5 support. - - -- Michael Hudson-Doyle Fri, 04 Aug 2017 16:27:03 +1200 - -pacparser (1.3.6-1.1build2) artful; urgency=medium - - * No change rebuild to add Python 3.6 support. - - -- Michael Hudson-Doyle Fri, 12 May 2017 12:09:47 +1200 - -pacparser (1.3.6-1.1build1) xenial; urgency=medium - - * No-change rebuild to drop python3.4 support. - - -- Matthias Klose Mon, 18 Jan 2016 19:39:23 +0000 + -- Scott Kitterman Mon, 02 Mar 2020 00:22:40 -0500 pacparser (1.3.6-1.1) unstable; urgency=medium diff -Nru pacparser-1.3.6/debian/control pacparser-1.3.6/debian/control --- pacparser-1.3.6/debian/control 2020-02-20 10:49:54.000000000 +0000 +++ pacparser-1.3.6/debian/control 2020-03-02 05:22:40.000000000 +0000 @@ -3,7 +3,7 @@ Priority: extra Maintainer: Manu Garg Uploaders: Andrew Pollock -Build-Depends: debhelper (>= 5), python-all-dev, python3-all-dev, dh-python +Build-Depends: debhelper (>= 5), python3-all-dev, dh-python Standards-Version: 3.9.6 Package: libpacparser1 @@ -51,27 +51,6 @@ . This package contains the header files to build against the shared library. -Package: python-pacparser -Section: python -Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends} -Architecture: any -Description: Python module to parse proxy auto-config files - a library to parse proxy auto-config (PAC) files. Proxy auto-config files are - a vastly used proxy configuration method these days. Web browsers can use a PAC - file to determine which proxy server to use or whether to go direct for a given - URL. PAC files are written in JavaScript and can be programmed to return - different proxy methods (e.g. "PROXY proxy1:port; DIRECT") depending upon URL, - source IP address, protocol, time of the day etc. PAC files introduce a lot of - possibilities. - . - Needless to say, PAC files are now a widely accepted method for proxy - configuration management and companies all over are using them in corporate - environments. Almost all popular web browsers support PAC files. The idea - behind pacparser is to make it easy to add this PAC file parsing capability to - any program (C and Python supported right now). - . - This package contains the Python bindings for the shared library - Package: python3-pacparser Section: python Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends} diff -Nru pacparser-1.3.6/debian/patches/py3only.patch pacparser-1.3.6/debian/patches/py3only.patch --- pacparser-1.3.6/debian/patches/py3only.patch 1970-01-01 00:00:00.000000000 +0000 +++ pacparser-1.3.6/debian/patches/py3only.patch 2020-03-02 05:22:40.000000000 +0000 @@ -0,0 +1,28 @@ +Description: Use python3 instead of python + * Drup python-pacparser - obsolete, no rdepends (Closes: #937229) +Author: Scott Kitterman +Bug-Debian: https://bugs.debian.org/937229 +Origin: vendor +Forwarded: not-needed +Last-Update: 2020-03-02 + +Index: pacparser-1.3.6/src/Makefile +=================================================================== +--- pacparser-1.3.6.orig/src/Makefile ++++ pacparser-1.3.6/src/Makefile +@@ -58,7 +58,7 @@ endif + CFLAGS = -g -DXP_UNIX -Wall -DVERSION=$(VERSION) + + ifndef PYTHON +- PYTHON = python ++ PYTHON = python3 + endif + + # Spidermonkey library. +@@ -134,5 +134,5 @@ install-pymod: pymod + + clean: + rm -f $(LIBRARY_LINK) $(LIBRARY) libjs.a pacparser.o pactester pymod/pacparser_o_buildstamp jsapi_buildstamp +- cd pymod && python setup.py clean --all ++ cd pymod && $(PYTHON) setup.py clean --all + cd spidermonkey && $(MAKE) clean diff -Nru pacparser-1.3.6/debian/patches/python2.diff pacparser-1.3.6/debian/patches/python2.diff --- pacparser-1.3.6/debian/patches/python2.diff 2020-02-20 10:50:29.000000000 +0000 +++ pacparser-1.3.6/debian/patches/python2.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -Index: b/src/Makefile -=================================================================== ---- a/src/Makefile -+++ b/src/Makefile -@@ -58,7 +58,7 @@ endif - CFLAGS = -g -DXP_UNIX -Wall -DVERSION=$(VERSION) - - ifndef PYTHON -- PYTHON = python -+ PYTHON = python2 - endif - - # Spidermonkey library. -@@ -134,5 +134,5 @@ install-pymod: pymod - - clean: - rm -f $(LIBRARY_LINK) $(LIBRARY) libjs.a pacparser.o pactester pymod/pacparser_o_buildstamp jsapi_buildstamp -- cd pymod && python setup.py clean --all -+ cd pymod && $(PYTHON) setup.py clean --all - cd spidermonkey && $(MAKE) clean diff -Nru pacparser-1.3.6/debian/patches/series pacparser-1.3.6/debian/patches/series --- pacparser-1.3.6/debian/patches/series 2020-02-20 10:50:29.000000000 +0000 +++ pacparser-1.3.6/debian/patches/series 2020-03-02 05:22:40.000000000 +0000 @@ -1 +1 @@ -python2.diff +py3only.patch diff -Nru pacparser-1.3.6/debian/python3-pacparser.examples pacparser-1.3.6/debian/python3-pacparser.examples --- pacparser-1.3.6/debian/python3-pacparser.examples 1970-01-01 00:00:00.000000000 +0000 +++ pacparser-1.3.6/debian/python3-pacparser.examples 2015-09-04 20:06:41.000000000 +0000 @@ -0,0 +1,2 @@ +examples/*.py +examples/wpad.dat diff -Nru pacparser-1.3.6/debian/python-pacparser.examples pacparser-1.3.6/debian/python-pacparser.examples --- pacparser-1.3.6/debian/python-pacparser.examples 2015-09-04 20:06:41.000000000 +0000 +++ pacparser-1.3.6/debian/python-pacparser.examples 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -examples/*.py -examples/wpad.dat diff -Nru pacparser-1.3.6/debian/python-pacparser.install pacparser-1.3.6/debian/python-pacparser.install --- pacparser-1.3.6/debian/python-pacparser.install 2015-09-04 20:06:41.000000000 +0000 +++ pacparser-1.3.6/debian/python-pacparser.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -debian/tmp/usr/lib/python2*/* diff -Nru pacparser-1.3.6/debian/rules pacparser-1.3.6/debian/rules --- pacparser-1.3.6/debian/rules 2020-02-20 10:50:29.000000000 +0000 +++ pacparser-1.3.6/debian/rules 2020-03-02 05:22:40.000000000 +0000 @@ -32,7 +32,7 @@ dh_testroot rm -f build-stamp rm -rf src/pymod/build/ - PYTHON=python2 $(MAKE) -C src clean + $(MAKE) -C src clean dh_clean install: @@ -43,13 +43,11 @@ # Install to debian/tmp NO_INTERNET=yes $(MAKE) -C src DESTDIR=$(CURDIR)/debian/tmp install - NO_INTERNET=yes $(MAKE) -C src DESTDIR=$(CURDIR)/debian/tmp install-pymod EXTRA_ARGS=--install-layout=deb set -e && for i in $(build3vers); do \ NO_INTERNET=yes $(MAKE) -C src DESTDIR=$(CURDIR)/debian/tmp install-pymod EXTRA_ARGS=--install-layout=deb PYTHON=python$$i; \ done dh_install -s --autodest - dh_python2 -s dh_python3 -s # Must not depend on anything. This is to be called by