Source: pybluez
Version: 0.23-3
Followup-For: Bug #997640
X-Debbugs-Cc: iwama...@debian.org, mat...@debian.org

tag -1 patch

Dear colleagues, 

Since this issue puts the whole Kodi ecosystem I maintain at risk of
autoremoval from testing, I decided to modernize the package and
send the patch.

TO solve the build failure, I had to re-import the same source
tarball 0.23 with one upstream patch applied:
https://github.com/pybluez/pybluez/pull/414

Everyone expects the upstream release fixing this bug but from
reading upstream Github I have a feeling it will not happen anytime
soon.

Apart from re-packing the source tarball, I have bumped standards,
moved to debhelper-compat 13 and brushed the file structure of a
Debian package. I am attaching a debdiff with all the fixes.

I can also push the fix to Salsa if I am granted developer rights
at https://salsa.debian.org/bluetooth-team/pybluez or send three
MRs for every affected branch (master, upstream and pristine-tar).

Please let me know if you need more information.

Cheers,
Vasyl

-- System Information:
Debian Release: bookworm/sid
  APT prefers unstable-debug
  APT policy: (500, 'unstable-debug'), (500, 'buildd-unstable'), (500, 
'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 5.10.0-8-amd64 (SMP w/6 CPU threads)
Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=C, LC_CTYPE=C (charmap=UTF-8) (ignored: LC_ALL set to 
en_US.UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /bin/dash
Init: unable to detect
diff -Nru pybluez-0.23/debian/changelog pybluez-0.23+ds1/debian/changelog
--- pybluez-0.23/debian/changelog       2021-02-09 07:17:00.000000000 +0000
+++ pybluez-0.23+ds1/debian/changelog   2021-11-01 08:56:51.000000000 +0000
@@ -1,3 +1,15 @@
+pybluez (0.23+ds1-0.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * New upstream version 0.23+ds1 (Closes: #997640)
+    + Add https://github.com/pybluez/pybluez/pull/414 patch
+      to existing pristine-tar of pybluez_0.23.orig.tar.gz
+      and re-import it because dh_clean step throws an error
+      before the d/pathes are applied.
+  * Modernize package
+
+ -- Vasyl Gello <vasek.ge...@gmail.com>  Mon, 01 Nov 2021 08:56:51 +0000
+
 pybluez (0.23-3) unstable; urgency=medium
 
   * Add python3-gattlib to Depends. (Closes: #930990)
@@ -262,4 +274,3 @@
   * My first debian package.
 
  -- Albert Huang <alb...@csail.mit.edu>  Mon,  4 Apr 2005 01:22:15 -0400
-
diff -Nru pybluez-0.23/debian/compat pybluez-0.23+ds1/debian/compat
--- pybluez-0.23/debian/compat  2021-02-09 07:17:00.000000000 +0000
+++ pybluez-0.23+ds1/debian/compat      1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-11
diff -Nru pybluez-0.23/debian/control pybluez-0.23+ds1/debian/control
--- pybluez-0.23/debian/control 2021-02-09 07:17:00.000000000 +0000
+++ pybluez-0.23+ds1/debian/control     2021-11-01 08:56:51.000000000 +0000
@@ -1,18 +1,19 @@
 Source: pybluez
-Section: python
 Priority: optional
+Section: python
 Maintainer: Debian Bluetooth Maintainers 
<team+pkg-blueto...@tracker.debian.org>
 Uploaders: Albert Huang <alb...@csail.mit.edu>
-Build-Depends: debhelper (>= 11),
+Build-Depends: debhelper-compat (= 13),
  dpkg-dev (>= 1.16.1~),
- libbluetooth-dev,
  dh-python,
+ libbluetooth-dev,
  python3-all-dev,
  python3-setuptools,
+Standards-Version: 4.6.0
+Rules-Requires-Root: no
 Vcs-Git: https://salsa.debian.org/bluetooth-team/pybluez.git
 Vcs-Browser: https://salsa.debian.org/bluetooth-team/pybluez
 Homepage: https://github.com/pybluez/pybluez
-Standards-Version: 4.2.1
 
 Package: python3-bluez
 Architecture: any
diff -Nru pybluez-0.23/debian/copyright pybluez-0.23+ds1/debian/copyright
--- pybluez-0.23/debian/copyright       2021-02-09 07:17:00.000000000 +0000
+++ pybluez-0.23+ds1/debian/copyright   2021-11-01 08:56:51.000000000 +0000
@@ -6,10 +6,15 @@
 Files: *
 Copyright: 2004-2005 Massachusetts Institute of Technology
 License: GPL-2+
+Comment: The source tarball has been re-packaged by adding the
+ upstream patch https://github.com/pybluez/pybluez/pull/414
+ into existing pybluez_0.23.orig.tar.gz because the dh_clean
+ step throws an error before the debian/patches are processed.
 
-Files: debian/
+Files: debian/*
 Copyright: 2004-2005 Massachusetts Institute of Technology
            2018 Diane Trout <di...@ghic.org>
+           2021 Vasyl Gello <vasek.ge...@gmail.com>
 License: GPL-2+
 
 License: GPL-2+
diff -Nru pybluez-0.23/debian/dirs pybluez-0.23+ds1/debian/dirs
--- pybluez-0.23/debian/dirs    2021-02-09 07:17:00.000000000 +0000
+++ pybluez-0.23+ds1/debian/dirs        1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin
diff -Nru pybluez-0.23/debian/docs pybluez-0.23+ds1/debian/docs
--- pybluez-0.23/debian/docs    2021-02-09 07:17:00.000000000 +0000
+++ pybluez-0.23+ds1/debian/docs        1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-README.md
diff -Nru pybluez-0.23/debian/examples pybluez-0.23+ds1/debian/examples
--- pybluez-0.23/debian/examples        2021-02-09 07:17:00.000000000 +0000
+++ pybluez-0.23+ds1/debian/examples    1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-examples/advanced/
-examples/bluezchat/
-examples/simple/
diff -Nru pybluez-0.23/debian/python3-bluez.docs 
pybluez-0.23+ds1/debian/python3-bluez.docs
--- pybluez-0.23/debian/python3-bluez.docs      1970-01-01 00:00:00.000000000 
+0000
+++ pybluez-0.23+ds1/debian/python3-bluez.docs  2021-11-01 08:56:51.000000000 
+0000
@@ -0,0 +1 @@
+README.md
diff -Nru pybluez-0.23/debian/python3-bluez.examples 
pybluez-0.23+ds1/debian/python3-bluez.examples
--- pybluez-0.23/debian/python3-bluez.examples  1970-01-01 00:00:00.000000000 
+0000
+++ pybluez-0.23+ds1/debian/python3-bluez.examples      2021-11-01 
08:56:51.000000000 +0000
@@ -0,0 +1,3 @@
+examples/advanced/
+examples/bluezchat/
+examples/simple/
diff -Nru pybluez-0.23/debian/upstream/metadata 
pybluez-0.23+ds1/debian/upstream/metadata
--- pybluez-0.23/debian/upstream/metadata       1970-01-01 00:00:00.000000000 
+0000
+++ pybluez-0.23+ds1/debian/upstream/metadata   2021-11-01 08:56:51.000000000 
+0000
@@ -0,0 +1,6 @@
+Bug-Database: https://github.com/pybluez/pybluez/issues
+Bug-Submit: https://github.com/pybluez/pybluez/issues/new
+Contact: https://groups.google.com/group/pybluez/
+FAQ: https://github.com/pybluez/pybluez/wiki
+Repository: https://github.com/pybluez/pybluez.git
+Repository-Browse: https://github.com/pybluez/pybluez
diff -Nru pybluez-0.23/debian/watch pybluez-0.23+ds1/debian/watch
--- pybluez-0.23/debian/watch   2021-02-09 07:17:00.000000000 +0000
+++ pybluez-0.23+ds1/debian/watch       2021-11-01 08:56:51.000000000 +0000
@@ -1,3 +1,3 @@
-version=3
+version=4
 opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/<project>-$1\.tar\.gz/ \
 https://github.com/karulis/pybluez/tags .*/v?(\d\S*)\.tar\.gz
diff -Nru pybluez-0.23/setup.py pybluez-0.23+ds1/setup.py
--- pybluez-0.23/setup.py       2019-12-28 00:53:51.000000000 +0000
+++ pybluez-0.23+ds1/setup.py   2021-11-01 08:51:19.000000000 +0000
@@ -124,7 +124,6 @@
       license='GPL',
       extras_require={'ble': ['gattlib==0.20150805']},
       package_dir=package_dir,
-      use_2to3=True,
       install_requires=install_requires,
       package_data=package_data,
       eager_resources=eager_resources,

Reply via email to