From b142a82f652c1b141c1d96284c1d0b4be359eddd Mon Sep 17 00:00:00 2001
From: Sandro Tosi <morph@debian.org>
Date: Tue, 17 Mar 2020 11:54:19 -0400
Subject: [PATCH] Drop python2 support; Closes: #938073

---
 debian/changelog                           |  6 +++++
 debian/control                             | 26 ----------------------
 debian/rules                               |  4 +---
 debian/tests/run-testsuite-if-acls-enabled |  4 ----
 debian/tests/simple                        |  2 --
 5 files changed, 7 insertions(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f45a0ec..71d6d79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-pylibacl (0.5.4-2) UNRELEASED; urgency=medium
+
+  * Drop python2 support; Closes: #938073
+
+ -- Sandro Tosi <morph@debian.org>  Tue, 17 Mar 2020 11:48:33 -0400
+
 python-pylibacl (0.5.4-1) unstable; urgency=medium
 
   * New upstream release, switching build system to Python 3.
diff --git a/debian/control b/debian/control
index 83dafe2..0a8b4e5 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,6 @@ Section: python
 Priority: optional
 Maintainer: Iustin Pop <iustin@debian.org>
 Build-Depends: debhelper-compat (= 12), dh-python,
- python (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~), python-all-dbg,
  python3-all, python3-all-dev, python3-all-dbg,
  libacl1-dev, python-setuptools, python3-setuptools,
  python3-sphinx
@@ -13,31 +12,6 @@ Vcs-Browser: https://salsa.debian.org/debian/python-pylibacl
 Vcs-Git: https://salsa.debian.org/debian/python-pylibacl.git
 Rules-Requires-Root: no
 
-Package: python-pylibacl
-Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Provides: ${python:Provides}
-Suggests: python-pylibacl-dbg, python-pylibacl-doc
-Description: module for manipulating POSIX.1e ACLs
- pylibacl is a Python interface to the libacl library. It allows
- manipulation of the POSIX.1e-compliant filesystem ACLs present
- in some operating systems (GNU/Linux included).
- .
- This package contains the library for Python 2.
-
-Package: python-pylibacl-dbg
-Section: debug
-Architecture: any
-Depends: python-pylibacl (= ${binary:Version}), python-dbg, ${shlibs:Depends},
- ${misc:Depends}, ${python:Depends}
-Provides: ${python:Provides}
-Description: module for manipulating POSIX.1e ACLs (debug extension)
- pylibacl is a Python interface to the libacl library. It allows
- manipulation of the POSIX.1e-compliant filesystem ACLs present
- in some operating systems (GNU/Linux included).
- .
- This package contains the library for the Python 2 debug interpreter.
-
 Package: python3-pylibacl
 Architecture: any
 Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}
diff --git a/debian/rules b/debian/rules
index 8cd7d33..a8be67f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
 %:
-	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
+	dh $@ --with python3,sphinxdoc --buildsystem=pybuild
 
 # Also build the documentation
 override_dh_auto_build:
@@ -27,11 +27,9 @@ override_dh_auto_clean:
 	$(MAKE) clean
 
 override_dh_strip:
-	dh_strip -ppython-pylibacl --dbg-package=python-pylibacl-dbg
 	dh_strip -ppython3-pylibacl --dbg-package=python3-pylibacl-dbg
 
 override_dh_installdocs:
-	dh_installdocs --link-doc=python-pylibacl -ppython-pylibacl-dbg
 	dh_installdocs --link-doc=python3-pylibacl -ppython3-pylibacl-dbg
 	dh_installdocs -A --remaining-packages README.rst
 
diff --git a/debian/tests/run-testsuite-if-acls-enabled b/debian/tests/run-testsuite-if-acls-enabled
index a3019f3..1ba2e95 100755
--- a/debian/tests/run-testsuite-if-acls-enabled
+++ b/debian/tests/run-testsuite-if-acls-enabled
@@ -7,10 +7,6 @@ touch "$TESTFILE"
 if setfacl -m u:root:r "$TESTFILE"; then
   echo "Temporary directory '$AUTOPKGTEST_TMP' has ACLs enabled, running tests"
   export TEST_DIR="$AUTOPKGTEST_TMP"
-  echo "* testing Python 2"
-  python2 test/test_acls.py
-  echo "* testing Python 2 debug package"
-  python2-dbg test/test_acls.py
   echo "* testing Python 3"
   python3 test/test_acls.py
   echo "* testing Python 3 debug package"
diff --git a/debian/tests/simple b/debian/tests/simple
index 4bdfcfc..9133887 100755
--- a/debian/tests/simple
+++ b/debian/tests/simple
@@ -1,6 +1,4 @@
 #!/bin/sh
 
-python2 -c 'import posix1e; print posix1e'
-python2-dbg -c 'import posix1e; print posix1e'
 python3 -c 'import posix1e; print(posix1e)'
 python3-dbg -c 'import posix1e; print(posix1e)'
-- 
2.39.5