Control: tags 936401 + patch
Control: tags 942974 + patch
Dear maintainer,
I've prepared an NMU for dirspec (versioned as 13.10-1.1). The diff
is attached to this message.
Regards.
diff -Nru dirspec-13.10/debian/changelog dirspec-13.10/debian/changelog
--- dirspec-13.10/debian/changelog 2015-09-20 17:50:02.000000000 -0400
+++ dirspec-13.10/debian/changelog 2019-12-22 22:26:02.000000000 -0500
@@ -1,3 +1,10 @@
+dirspec (13.10-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Drop python2 support; Closes: #942974, #936401
+
+ -- Sandro Tosi <mo...@debian.org> Sun, 22 Dec 2019 22:26:02 -0500
+
dirspec (13.10-1) unstable; urgency=medium
* Sync version number with ubuntu (no changes)
diff -Nru dirspec-13.10/debian/control dirspec-13.10/debian/control
--- dirspec-13.10/debian/control 2015-09-20 17:49:41.000000000 -0400
+++ dirspec-13.10/debian/control 2019-12-22 22:26:00.000000000 -0500
@@ -5,28 +5,12 @@
dh-python,
debhelper (>= 7.0.50),
pep8,
- pyflakes,
- python,
- python-all (>= 2.6.6-3),
- python-setuptools,
- python-testtools,
+ pyflakes3,
python3-all,
python3-setuptools,
python3-testtools
Maintainer: Micah Anderson <mi...@debian.org>
Standards-Version: 3.9.4
-X-Python-Version: >= 2.6
-X-Python3-Version: >= 3.1
-
-Package: python-dirspec
-Architecture: all
-Depends: ${misc:Depends},
- ${python:Depends}
-Description: Python User Folders Specification Library
- A library for handling the XDG Base Directory specification, and the
- XDG User Directories for music, videos, etc…
- .
- This package contains the Python 2.x version of the library.
Package: python3-dirspec
Architecture: all
diff -Nru dirspec-13.10/debian/patches/py3k-tests.patch dirspec-13.10/debian/patches/py3k-tests.patch
--- dirspec-13.10/debian/patches/py3k-tests.patch 1969-12-31 19:00:00.000000000 -0500
+++ dirspec-13.10/debian/patches/py3k-tests.patch 2019-12-22 22:24:24.000000000 -0500
@@ -0,0 +1,20 @@
+--- a/run-tests
++++ b/run-tests
+@@ -16,9 +16,6 @@
+
+ set -e -x
+
+-# Run the tests
+-python ./setup.py build test clean
+-
+ # Only run the python3 tests if available
+ if [ -x "`which python3`" ]; then
+ python3 ./setup.py build test clean
+@@ -27,6 +24,6 @@ else
+ fi
+
+ # Run the style checks
+-pyflakes dirspec setup.py
++pyflakes3 dirspec setup.py
+ pep8 --exclude=.pc --repeat . setup.py
+
diff -Nru dirspec-13.10/debian/patches/series dirspec-13.10/debian/patches/series
--- dirspec-13.10/debian/patches/series 2015-09-20 17:33:20.000000000 -0400
+++ dirspec-13.10/debian/patches/series 2019-12-22 22:23:45.000000000 -0500
@@ -1,3 +1,4 @@
pep8_problems
00_ignore_pc.patch
fix_PEP8-E128
+py3k-tests.patch
diff -Nru dirspec-13.10/debian/python3-dirspec.install dirspec-13.10/debian/python3-dirspec.install
--- dirspec-13.10/debian/python3-dirspec.install 2013-03-26 14:02:56.000000000 -0400
+++ dirspec-13.10/debian/python3-dirspec.install 1969-12-31 19:00:00.000000000 -0500
@@ -1,2 +0,0 @@
-usr/lib/python3*/*-packages/*
-
diff -Nru dirspec-13.10/debian/python-dirspec.install dirspec-13.10/debian/python-dirspec.install
--- dirspec-13.10/debian/python-dirspec.install 2013-03-26 14:02:56.000000000 -0400
+++ dirspec-13.10/debian/python-dirspec.install 1969-12-31 19:00:00.000000000 -0500
@@ -1,2 +0,0 @@
-usr/lib/python2*/*-packages/*
-
diff -Nru dirspec-13.10/debian/rules dirspec-13.10/debian/rules
--- dirspec-13.10/debian/rules 2013-03-26 14:02:56.000000000 -0400
+++ dirspec-13.10/debian/rules 2019-12-22 22:23:02.000000000 -0500
@@ -1,26 +1,13 @@
#!/usr/bin/make -f
-PYTHON2=$(shell pyversions -vr)
PYTHON3=$(shell py3versions -vr)
%:
- dh $@ --with python2,python3 --fail-missing
+ dh $@ --with python3 --fail-missing --buildsystem=pybuild
override_dh_auto_test:
./run-tests
-build-python%:
- python$* setup.py build
-
-override_dh_auto_build: $(PYTHON3:%=build-python%)
- dh_auto_build
-
-install-python%:
- python$* setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb
-
-override_dh_auto_install: $(PYTHON3:%=install-python%)
- dh_auto_install
-
override_dh_auto_clean:
dh_auto_clean
rm -rf build
