[PKG-Openstack-devel] Bug#886847: Patch fixing the issue

[Thomas Goirand]

Hi Willem,

Indeed, we shall add a transition package. However, I would prefer to
simply remove the python-pyldap source package, and have the python-ldap
source package to carry it. Once uploaded, we can open a bug against
ftp.debian.org for the removal of the python-pyldap package.

I have attached to this message a debdiff of the proposed changes
against python-ldap. Do you agree that I upload this?

Also, could we maintain python-ldap as a team, so I could upload it?

Cheers,

Thomas Goirand (zigo)
-------------- next part --------------
diff -Nru python-ldap-3.0.0~b4/debian/changelog python-ldap-3.0.0~b4/debian/changelog
--- python-ldap-3.0.0~b4/debian/changelog	2018-01-10 07:38:36.000000000 +0100
+++ python-ldap-3.0.0~b4/debian/changelog	2018-01-24 11:49:33.000000000 +0100
@@ -1,3 +1,11 @@
+python-ldap (3.0.0~b4-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Add Provides, Conflicts, Replaces for python{3,}-pyldap.
+    (Closes: #886847, #886847)
+
+ -- Thomas Goirand <zigo at debian.org>  Wed, 24 Jan 2018 11:49:33 +0100
+
 python-ldap (3.0.0~b4-1) unstable; urgency=medium
 
   * New upstream version.
diff -Nru python-ldap-3.0.0~b4/debian/control python-ldap-3.0.0~b4/debian/control
--- python-ldap-3.0.0~b4/debian/control	2018-01-10 07:38:36.000000000 +0100
+++ python-ldap-3.0.0~b4/debian/control	2018-01-24 11:49:33.000000000 +0100
@@ -20,10 +20,10 @@
 Package: python-ldap
 Architecture: any
 Depends: ${python:Depends}, ${misc:Depends}, ${shlibs:Depends}
-Provides: ${python:Provides}
+Provides: python-pyldap, ${python:Provides}
 Suggests: python-ldap-doc, python-pyasn1
-Conflicts: python2.3-ldap (<< 2.2.0-1.1), python2.4-ldap (<< 2.2.0-1.1), python2.3-ldap-tls
-Replaces: python2.3-ldap (<< 2.2.0-1.1), python2.4-ldap (<< 2.2.0-1.1), python2.3-ldap-tls
+Conflicts: python-pyldap (<< 3), python2.3-ldap (<< 2.2.0-1.1), python2.4-ldap (<< 2.2.0-1.1), python2.3-ldap-tls
+Replaces: python-pyldap, python2.3-ldap (<< 2.2.0-1.1), python2.4-ldap (<< 2.2.0-1.1), python2.3-ldap-tls
 Description: LDAP interface module for Python
  This module provides a Python interface to the OpenLDAP client library
  (LDAP is the Lightweight Directory Access Protocol).
@@ -31,7 +31,9 @@
 Package: python3-ldap
 Architecture: any
 Depends: ${python3:Depends}, ${misc:Depends}, ${shlibs:Depends}
-Provides: ${python3:Provides}
+Provides: python3-pyldap, ${python3:Provides}
+Conflicts: python3-pyldap (<< 3)
+Replaces: python3-pyldap
 Suggests: python-ldap-doc, python3-pyasn1
 Description: LDAP interface module for Python3
  This module provides a Python3 interface to the OpenLDAP client library
@@ -60,3 +62,25 @@
  (LDAP is the Lightweight Directory Access Protocol).
  .
  This package contains the extension built for the Python debug interpreter.
+
+Package: python-pyldap
+Section: oldlib
+Architecture: any
+Depends: python-ldap (>= 3), ${misc:Depends}
+Description: LDAP interface module for Python 2.7 - transition package
+ This module provides a Python3 interface to the OpenLDAP client library
+ (LDAP is the Lightweight Directory Access Protocol).
+ .
+ This transition dummy package for Python 2.7 can be safely removed, since the
+ ldap module has merged changes in the pyldap fork.
+
+Package: python3-pyldap
+Section: oldlib
+Architecture: any
+Depends: python3-ldap (>= 3), ${misc:Depends}
+Description: LDAP interface module for Python 3.x - transition package
+ This module provides a Python3 interface to the OpenLDAP client library
+ (LDAP is the Lightweight Directory Access Protocol).
+ .
+ This transition dummy package for Python 3.x can be safely removed, since the
+ ldap module has merged changes in the pyldap fork.