[Python-modules-team] Bug#933143: FTBFS, not Django 2.2 ready

[Thomas Goirand]

Package: python-django-mptt
Version: 0.8.7-1
Severity: serious
Tags: patch

Hi,

Please find attached patch to do the Python 2 removal.
After this patch, your package continues to FTBFS. Please
get a fix for it.

Cheers,

Thomas Goirand (zigo)
-------------- next part --------------
From 373d818427a37e26e91b5e39084c634ce1d3c613 Mon Sep 17 00:00:00 2001
From: Thomas Goirand <zigo at debian.org>
Date: Fri, 26 Jul 2019 23:21:21 +0200
Subject: [PATCH]   * Team upload.   * Removed Breaks+Replaces:
 python-django-mptt (<< 0.6.1-1~) after Buster     release.   * Removed Python
 2 support.

---
 debian/changelog | 11 ++++++++--
 debian/control   | 52 +++++++++++++++++++++++-------------------------
 debian/links     |  1 -
 debian/rules     |  2 +-
 4 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 19ded1a..9cbaf5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
-python-django-mptt (0.8.7-2) UNRELEASED; urgency=medium
+python-django-mptt (0.8.7-2) unstable; urgency=medium
 
+  [ Ondřej Nový ]
   * Use debhelper-compat instead of debian/compat.
 
- -- Ondřej Nový <onovy at debian.org>  Sat, 20 Jul 2019 00:11:07 +0200
+  [ Thomas Goirand ]
+  * Team upload.
+  * Removed Breaks+Replaces: python-django-mptt (<< 0.6.1-1~) after Buster
+    release.
+  * Removed Python 2 support.
+
+ -- Thomas Goirand <zigo at debian.org>  Fri, 26 Jul 2019 23:19:09 +0200
 
 python-django-mptt (0.8.7-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 8abd33b..aaea1a8 100644
--- a/debian/control
+++ b/debian/control
@@ -2,20 +2,25 @@ Source: python-django-mptt
 Section: python
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Brian May <bam at debian.org>
-Build-Depends: debhelper-compat (= 9), dh-python, python3-sphinx,
- python-all (>= 2.6.6-3~), python-setuptools, python-django (>= 1.6),
- python3-all, python3-setuptools, python3-django (>= 1.6),
+Uploaders:
+ Brian May <bam at debian.org>,
+Build-Depends:
+ debhelper-compat (= 9),
+ dh-python,
+ python3-all,
+ python3-django (>= 1.6),
+ python3-setuptools,
+ python3-sphinx,
 Standards-Version: 3.9.7
 Homepage: https://github.com/django-mptt/django-mptt
 Vcs-Git: https://salsa.debian.org/python-team/modules/python-django-mptt.git
 Vcs-Browser: https://salsa.debian.org/python-team/modules/python-django-mptt
 
-Package: python-django-mptt
+Package: python-django-mptt-doc
+Section: doc
 Architecture: all
-Suggests: python-django-mptt-doc
-Depends: ${misc:Depends}, ${python:Depends}, libjs-jquery, python-django, libjs-underscore
-Provides: ${python:Provides}
+Depends:
+ ${misc:Depends},
 Description: Modified Preorder Tree Traversal Django application
  Django MPTT is a reusable/standalone Django application which aims to
  make it easy for you to use Modified Preorder Tree Traversal with your
@@ -23,26 +28,21 @@ Description: Modified Preorder Tree Traversal Django application
  .
  It takes care of the details of managing a database table as a tree
  structure and provides tools for working with trees of model instances.
-
-Package: python3-django-mptt
-Architecture: all
-Suggests: python-django-mptt-doc
-Depends: ${misc:Depends}, ${python3:Depends}, libjs-jquery, python3-django, libjs-underscore
-Provides: ${python3:Provides}
-Description: Modified Preorder Tree Traversal Django application
- Django MPTT is a reusable/standalone Django application which aims to
- make it easy for you to use Modified Preorder Tree Traversal with your
- own Django models in your own applications.
  .
- It takes care of the details of managing a database table as a tree
- structure and provides tools for working with trees of model instances.
+ This package contains the documentation.
 
-Package: python-django-mptt-doc
-Section: doc
+Package: python3-django-mptt
 Architecture: all
-Depends: ${misc:Depends}
-Breaks: python-django-mptt (<< 0.6.1-1~)
-Replaces: python-django-mptt (<< 0.6.1-1~)
+Suggests:
+ python-django-mptt-doc,
+Depends:
+ libjs-jquery,
+ libjs-underscore,
+ python3-django,
+ ${misc:Depends},
+ ${python3:Depends},
+Provides:
+ ${python3:Provides},
 Description: Modified Preorder Tree Traversal Django application
  Django MPTT is a reusable/standalone Django application which aims to
  make it easy for you to use Modified Preorder Tree Traversal with your
@@ -50,5 +50,3 @@ Description: Modified Preorder Tree Traversal Django application
  .
  It takes care of the details of managing a database table as a tree
  structure and provides tools for working with trees of model instances.
- .
- This package contains the documentation.
diff --git a/debian/links b/debian/links
index bf454c2..ab7e0de 100644
--- a/debian/links
+++ b/debian/links
@@ -1,3 +1,2 @@
 /usr/share/javascript/jquery/jquery.js usr/share/doc/python-django-mptt/html/static/jquery.js
 /usr/share/javascript/underscore/underscore.js usr/share/doc/python-django-mptt/html/static/underscore.js
-
diff --git a/debian/rules b/debian/rules
index 97b51ee..f7154df 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 export PYBUILD_NAME=django-mptt
 
 %:
-	dh $@ --with python2,python3 --buildsystem=pybuild
+	dh $@ --with python3 --buildsystem=pybuild
 
 override_dh_auto_build:
 	dh_auto_build
-- 
2.20.1