Control: tags 1067546 + patch
Control: tags 1067546 + pending
Dear maintainer,
I've prepared an NMU for kluppe (versioned as 0.6.20-1.3) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
I've also made several QA improvements to the package, although
I do understand this is generally beyond the scope of an NMU.
Please let me know if you have any concerns.
Kind regards,
Hugh
diff -Nru kluppe-0.6.20/debian/README.source kluppe-0.6.20/debian/README.source
--- kluppe-0.6.20/debian/README.source 2016-11-26 02:42:02.000000000 +1100
+++ kluppe-0.6.20/debian/README.source 1970-01-01 10:00:00.000000000 +1000
@@ -1,5 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-Read more about this on /usr/share/doc/quilt/README.source.
diff -Nru kluppe-0.6.20/debian/changelog kluppe-0.6.20/debian/changelog
--- kluppe-0.6.20/debian/changelog 2022-08-08 22:10:04.000000000 +1000
+++ kluppe-0.6.20/debian/changelog 2025-01-06 21:15:57.000000000 +1100
@@ -1,3 +1,28 @@
+kluppe (0.6.20-1.3) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/changelog: Trim trailing whitespace (lintian).
+ * debian/control:
+ + Build-Depend on pkgconf instead of pkg-config.
+ + Declare Rules-Requires-Root: no (lintian).
+ + Raise Standards-Version to 4.7.0 from 3.9.8 (no changes needed).
+ + Remove Section field from binary package (lintian).
+ * debian/copyright: Convert to DEP-3 format.
+ * debian/kluppe.desktop:
+ + Drop deprecated Encoding key and add Keywords key (lintian).
+ + Drop file extension from Icon field to meet Icon Theme Specification.
+ * debian/patches:
+ + Fix FTBFS due to ‘struct input_event’ API change on some architectures
+ (Closes: #1067546).
+ + Add missing metadata to various patches.
+ * debian/rules:
+ + Set hardening=+all with DEB_BUILD_MAINT_OPTIONS.
+ + Replace calls to dpkg-buildflags with buildflags.mk.
+ * debian/watch: Use secure HTTP (lintian).
+ * Drop debian/README.source.
+
+ -- Hugh McMaster <h...@debian.org> Mon, 06 Jan 2025 21:15:57 +1100
+
kluppe (0.6.20-1.2) unstable; urgency=medium
* Non-maintainer upload.
@@ -18,7 +43,7 @@
kluppe (0.6.20-1.1) unstable; urgency=medium
* Non-maintainer upload.
- * Fix segmentation fauled caused by passing a truncated pointer instead of a
+ * Fix segmentation fault caused by passing a truncated pointer instead of a
GtkType. (Closes: #863421)
-- Chris Lamb <la...@debian.org> Sat, 27 May 2017 09:41:28 +0100
@@ -102,7 +127,7 @@
kluppe (0.6.3-1) unstable; urgency=low
* New upstream release
- * Smaller progress bar width fix window positioning
+ * Smaller progress bar width fix window positioning
-- Paul Brossier <p...@debian.org> Sun, 23 Apr 2006 12:53:56 +0200
@@ -171,4 +196,3 @@
* Initial Release.
-- Paul Brossier <p...@altern.org> Mon, 3 May 2004 16:41:24 +0100
-
diff -Nru kluppe-0.6.20/debian/control kluppe-0.6.20/debian/control
--- kluppe-0.6.20/debian/control 2022-08-01 22:40:09.000000000 +1000
+++ kluppe-0.6.20/debian/control 2025-01-06 21:11:56.000000000 +1100
@@ -11,12 +11,12 @@
libsndfile1-dev,
libusb-dev,
libxml2-dev,
- pkg-config
-Standards-Version: 3.9.8
+ pkgconf
+Standards-Version: 4.7.0
+Rules-Requires-Root: no
Homepage: http://kluppe.klingt.org/
Package: kluppe
-Section: sound
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: jackd
diff -Nru kluppe-0.6.20/debian/copyright kluppe-0.6.20/debian/copyright
--- kluppe-0.6.20/debian/copyright 2016-11-26 03:01:43.000000000 +1100
+++ kluppe-0.6.20/debian/copyright 2025-01-05 22:27:44.000000000 +1100
@@ -1,24 +1,37 @@
-This package was debianized by Paul Brossier <p...@debian.org> on
-Mon, 3 May 2004 16:41:24 +0100.
-
-It was downloaded from http://kluppe.klingt.org/
-
-Upstream Author:
-
- dieb13 <klu...@klingt.org>
-
-Copyright:
-
- The gtk meter, src/frontend/kluppe/gtkmeter.{c,h}, was created by
- Steve Harris:
- Copyright (C) 2003 Steve Harris
-
-License:
-
- The code is released under the terms of the GNU General Public License:
-
- This program is free software; you can redistribute it and/or modify it under
- the terms of the GNU General Public License as published by the Free Software
- Foundation; either version 2, or (at your option) any later version.
-
- The GPL may be found in /usr/share/common-licenses/GPL on a Debian system.
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: kluppe
+Upstream-Contact: Dieter Kovačič
+Source: https://kluppe.klingt.org
+
+Files: *
+Copyright: 2004-2016 Dieter Kovačič
+License: GPL-2+
+
+Files: debian/*
+Copyright: 2004-2009, 2013, 2016 Paul Brossier
+ 2017 Chris Lamb
+ 2022, 2025 Hugh McMaster
+License: GPL-2+
+
+Files: src/frontend/kluppe/gtkmeter.c
+ src/frontend/kluppe/gtkmeter.h
+Copyright: 2003 Steve Harris
+License: GPL-2+
+
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ .
+ On Debian GNU/Linux systems, the full text of the GNU General Public License
+ version 2 can be found in `/usr/share/common-licenses/GPL-2'.
diff -Nru kluppe-0.6.20/debian/kluppe.desktop kluppe-0.6.20/debian/kluppe.desktop
--- kluppe-0.6.20/debian/kluppe.desktop 2016-11-26 02:42:02.000000000 +1100
+++ kluppe-0.6.20/debian/kluppe.desktop 2025-01-05 21:22:52.000000000 +1100
@@ -1,9 +1,10 @@
[Desktop Entry]
-Encoding=UTF-8
+Version=1.1
+Type=Application
Name=Kluppe
Comment=audio loop-player and recorder
Exec=kluppe
-Icon=kluppe.png
+Icon=kluppe
Terminal=false
-Type=Application
Categories=AudioVideo;Audio;Recorder;
+Keywords=audio;loop-player;recorder;
diff -Nru kluppe-0.6.20/debian/patches/30_format_string.diff kluppe-0.6.20/debian/patches/30_format_string.diff
--- kluppe-0.6.20/debian/patches/30_format_string.diff 2016-11-26 02:51:20.000000000 +1100
+++ kluppe-0.6.20/debian/patches/30_format_string.diff 2025-01-05 21:55:07.000000000 +1100
@@ -1,3 +1,8 @@
+Description: Add missing format specifier.
+Author: Paul Brossier
+Forwarded: no, no activity upstream
+Last-Update: 2025-01-05
+
--- a/src/frontend/kluppe/kluppe.c
+++ b/src/frontend/kluppe/kluppe.c
@@ -277,7 +277,7 @@
diff -Nru kluppe-0.6.20/debian/patches/50_g_mutex.diff kluppe-0.6.20/debian/patches/50_g_mutex.diff
--- kluppe-0.6.20/debian/patches/50_g_mutex.diff 2016-11-26 03:19:10.000000000 +1100
+++ kluppe-0.6.20/debian/patches/50_g_mutex.diff 2025-01-05 21:44:43.000000000 +1100
@@ -1,3 +1,7 @@
+Description: Comment out g_mutex_init()
+Author: Paul Brossier
+Last-Update: 2025-01-05
+
Index: kluppe-0.6.14/src/frontend/kluppe/looper.c
===================================================================
--- kluppe-0.6.14.orig/src/frontend/kluppe/looper.c 2013-12-20 13:01:14.877430507 -0500
diff -Nru kluppe-0.6.20/debian/patches/70_cflags.diff kluppe-0.6.20/debian/patches/70_cflags.diff
--- kluppe-0.6.20/debian/patches/70_cflags.diff 2022-08-03 21:06:34.000000000 +1000
+++ kluppe-0.6.20/debian/patches/70_cflags.diff 2025-01-05 21:51:43.000000000 +1100
@@ -1,3 +1,7 @@
+Description: Update *FLAGS and use pkg-config
+Author: Paul Brossier, Hugh McMaster
+Last-Update: 2025-01-05
+
diff --git a/src/frontend/klopfer/Makefile b/src/frontend/klopfer/Makefile
index 691dc28..37543e5 100644
--- a/src/frontend/klopfer/Makefile
diff -Nru kluppe-0.6.20/debian/patches/80_manpage_email.diff kluppe-0.6.20/debian/patches/80_manpage_email.diff
--- kluppe-0.6.20/debian/patches/80_manpage_email.diff 2016-11-26 03:19:10.000000000 +1100
+++ kluppe-0.6.20/debian/patches/80_manpage_email.diff 2025-01-05 21:46:41.000000000 +1100
@@ -1,3 +1,7 @@
+Description: Update author email address in kluppe(1)
+Author: Paul Brossier
+Last-Update: 2025-01-05
+
diff --git a/src/frontend/kluppe/kluppe.1 b/src/frontend/kluppe/kluppe.1
index f3b28d8..a3e3d6a 100644
--- a/src/frontend/kluppe/kluppe.1
diff -Nru kluppe-0.6.20/debian/patches/90_gtkmeter_truncated_pointer.diff kluppe-0.6.20/debian/patches/90_gtkmeter_truncated_pointer.diff
--- kluppe-0.6.20/debian/patches/90_gtkmeter_truncated_pointer.diff 2017-05-27 18:41:28.000000000 +1000
+++ kluppe-0.6.20/debian/patches/90_gtkmeter_truncated_pointer.diff 2025-01-05 21:54:59.000000000 +1100
@@ -1,3 +1,9 @@
+Description: Fix segmentation fault caused by passing a truncated pointer instead of a GtkType
+Author: Chris Lamb
+Bug-Debian: https://bugs.debian.org/863421
+Forwarded: no, no activity upstream
+Last-Update: 2025-01-05
+
--- kluppe-0.6.20.orig/src/frontend/kluppe/gtkmeter.c
+++ kluppe-0.6.20/src/frontend/kluppe/gtkmeter.c
@@ -48,10 +48,10 @@ static float iec_scale(float db);
diff -Nru kluppe-0.6.20/debian/patches/series kluppe-0.6.20/debian/patches/series
--- kluppe-0.6.20/debian/patches/series 2022-08-03 21:20:36.000000000 +1000
+++ kluppe-0.6.20/debian/patches/series 2025-01-05 19:31:29.000000000 +1100
@@ -6,3 +6,4 @@
80_manpage_email.diff
90_gtkmeter_truncated_pointer.diff
cross-build.patch
+struct-input_event.patch
diff -Nru kluppe-0.6.20/debian/patches/struct-input_event.patch kluppe-0.6.20/debian/patches/struct-input_event.patch
--- kluppe-0.6.20/debian/patches/struct-input_event.patch 1970-01-01 10:00:00.000000000 +1000
+++ kluppe-0.6.20/debian/patches/struct-input_event.patch 2025-01-05 21:50:22.000000000 +1100
@@ -0,0 +1,50 @@
+Description: Fix FTBFS due to ‘struct input_event’ API change on some architectures
+Author: Hugh McMaster
+Bug-Debian: https://bugs.debian.org/1067546
+Forwarded: no, no activity upstream
+Last-Update: 2025-01-05
+
+--- a/src/common/shuttle.c
++++ b/src/common/shuttle.c
+@@ -74,6 +74,15 @@
+ }else return -1;
+ }
+
++/* From https://github.com/libsdl-org/SDL/pull/7884 by Simon McVittie */
++#ifndef input_event_sec
++#define input_event_sec time.tv_sec
++#endif
++
++#ifndef input_event_usec
++#define input_event_usec time.tv_usec
++#endif
++
+ int shuttle_poll (shuttle_data_t* shuttle){
+ struct timeval tv;
+ struct input_event ev;
+@@ -139,12 +148,10 @@
+ shuttle->value = value;
+ shuttle->code = code;
+ shuttle->type = type;
+-/* gettimeofday(&tv, NULL);*/
+- tv = ev.time;
+
+ if (shuttle->lastevent.tv_sec || shuttle->lastevent.tv_usec){
+- shuttle->timediff = (tv.tv_sec - shuttle->lastevent.tv_sec) * 1000;
+- shuttle->timediff = tv.tv_usec - shuttle->lastevent.tv_usec;
++ shuttle->timediff = (ev.input_event_sec - shuttle->lastevent.tv_sec) * 1000;
++ shuttle->timediff = ev.input_event_usec - shuttle->lastevent.tv_usec;
+ }
+
+ if (code == SHUTTLE_JOG) {shuttle->jogstate = value;}
+@@ -163,8 +170,8 @@
+ shuttle->shuttlestate = value;
+ }
+
+- shuttle->lastevent.tv_sec = tv.tv_sec;
+- shuttle->lastevent.tv_usec = tv.tv_usec;
++ shuttle->lastevent.tv_sec = ev.input_event_sec;
++ shuttle->lastevent.tv_usec = ev.input_event_usec;
+
+ return code;
+ }
diff -Nru kluppe-0.6.20/debian/rules kluppe-0.6.20/debian/rules
--- kluppe-0.6.20/debian/rules 2022-08-03 21:25:52.000000000 +1000
+++ kluppe-0.6.20/debian/rules 2025-01-05 21:30:11.000000000 +1100
@@ -1,9 +1,9 @@
#!/usr/bin/make -f
-export CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-export CPPFLAGS=$(shell dpkg-buildflags --get CPPFLAGS)
-export CXXFLAGS=$(shell dpkg-buildflags --get CFXXLAGS)
-export LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
%:
dh $@
diff -Nru kluppe-0.6.20/debian/watch kluppe-0.6.20/debian/watch
--- kluppe-0.6.20/debian/watch 2022-08-03 21:55:36.000000000 +1000
+++ kluppe-0.6.20/debian/watch 2025-01-05 21:09:03.000000000 +1100
@@ -1,2 +1,2 @@
version=4
-http://dieb13.klingt.org/downloads/ kluppe-(.*)\.tar\.gz
+https://dieb13.klingt.org/downloads/ kluppe-(.*)\.tar\.gz
