Package: src:libffado
Followup-For: Bug #887846

Since suggestions.tar.gz builds in unstable, it most probably also
closes 887781.

The attachment updates the status in patch headers. It should help
packaging 2.4.1, announced within a few weeks.
>From e4d8172f9f4b01f97417ef73094880a9c5e72e61 Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <nicolas.bouleng...@free.fr>
Date: Mon, 22 Jan 2018 11:23:23 +0100
Subject: [PATCH] Update patch status.

---
 debian/patches/desktop-keywords-entry.diff        | 2 +-
 debian/patches/import-module-instead-of-exec.diff | 2 +-
 debian/patches/no-qstring-in-qt5.diff             | 2 +-
 debian/patches/python-consistent-spacing.diff     | 2 +-
 debian/patches/python3.diff                       | 2 +-
 debian/patches/scons-enable-qt5-mixer.diff        | 5 ++++-
 debian/patches/scons-explicit-import-sys.diff     | 2 +-
 debian/patches/typos.diff                         | 2 +-
 8 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/debian/patches/desktop-keywords-entry.diff b/debian/patches/desktop-keywords-entry.diff
index c155804..7768572 100644
--- a/debian/patches/desktop-keywords-entry.diff
+++ b/debian/patches/desktop-keywords-entry.diff
@@ -1,5 +1,5 @@
 Description: Add Keywords entry to desktop file
-Forwarded: no
+Forwarded: yes
 Author: Nicolas Boulenguez <nico...@debian.org>
 
 --- a/support/xdg/ffado.org-ffadomixer.desktop
diff --git a/debian/patches/import-module-instead-of-exec.diff b/debian/patches/import-module-instead-of-exec.diff
index f8feec4..0db5189 100644
--- a/debian/patches/import-module-instead-of-exec.diff
+++ b/debian/patches/import-module-instead-of-exec.diff
@@ -1,5 +1,5 @@
 Description: Avoid exec() and python scoping problems
-Forwarded: no
+ Upstream commit 2724 fully replaces this patch.
 Author: Nicolas Boulenguez <nico...@debian.org>
 
 --- a/support/mixer-qt4/ffado/panelmanager.py
diff --git a/debian/patches/no-qstring-in-qt5.diff b/debian/patches/no-qstring-in-qt5.diff
index 00fd3c9..f7e03f0 100644
--- a/debian/patches/no-qstring-in-qt5.diff
+++ b/debian/patches/no-qstring-in-qt5.diff
@@ -1,5 +1,5 @@
 Description: replace QString with native unicode python3 type
-Forwarded: no
+ Upstream commit 2726 fully replaces this patch.
 Author: Nicolas Boulenguez <nico...@debian.org>
 Author: Benoît Delcour <benoit.delc...@gmail.com>
 
diff --git a/debian/patches/python-consistent-spacing.diff b/debian/patches/python-consistent-spacing.diff
index ef258a4..42a0f84 100644
--- a/debian/patches/python-consistent-spacing.diff
+++ b/debian/patches/python-consistent-spacing.diff
@@ -1,5 +1,5 @@
 Description: sanitize indentation with spaces for python3
-Forwarded: no
+ Upstream commit 2729 fully replaces this patch.
 Author: Nicolas Boulenguez <nico...@debian.org>
 
 --- a/support/mixer-qt4/ffado/mixer/audiofire.py
diff --git a/debian/patches/python3.diff b/debian/patches/python3.diff
index 92ddda1..836714c 100644
--- a/debian/patches/python3.diff
+++ b/debian/patches/python3.diff
@@ -1,4 +1,4 @@
-Description: configure with python3
+Description: configure and run with /usr/bin/python3 instead of /usr/bin/python
 Forwarded: not-needed
 Author: Nicolas Boulenguez <nico...@debian.org>
 
diff --git a/debian/patches/scons-enable-qt5-mixer.diff b/debian/patches/scons-enable-qt5-mixer.diff
index 9da4609..505ff11 100644
--- a/debian/patches/scons-enable-qt5-mixer.diff
+++ b/debian/patches/scons-enable-qt5-mixer.diff
@@ -1,6 +1,9 @@
 Description: allow BUILD_MIXER with qt5
  Also avoid testing twice for pyuic4.
-Forwarded: no
+ .
+ Upstream commit 2725 has the same purpose.
+ This one seems better, and has been forwarded upstream.
+Forwarded: yes
 Author: Nicolas Boulenguez <nico...@debian.org>
 
 --- a/SConstruct
diff --git a/debian/patches/scons-explicit-import-sys.diff b/debian/patches/scons-explicit-import-sys.diff
index 45db554..e3d261c 100644
--- a/debian/patches/scons-explicit-import-sys.diff
+++ b/debian/patches/scons-explicit-import-sys.diff
@@ -1,6 +1,6 @@
 Description: add explicit import for sys in Sconstruct
  The module was probably imported indirectly before.
-Forwarded: no
+ Upstream commit 2724 fully replaces this patch.
 Author: Nicolas Boulenguez <nico...@debian.org>
 
 --- a/SConstruct
diff --git a/debian/patches/typos.diff b/debian/patches/typos.diff
index be00cce..047477d 100644
--- a/debian/patches/typos.diff
+++ b/debian/patches/typos.diff
@@ -1,5 +1,5 @@
 Description: Fix various typos detected by lintian.
-Forwarded: no
+Forwarded: yes
 Author: Nicolas Boulenguez <nico...@debian.org>
 
 --- a/src/bebob/bebob_dl_mgr.cpp
-- 
2.15.1

Reply via email to