Control: tags -1 +patch +pending

Dear maintainer,

I've prepared an NMU for latencytop (versioned as 0.5-0.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru latencytop-0.5/debian/changelog latencytop-0.5/debian/changelog
--- latencytop-0.5/debian/changelog     2021-08-17 00:27:59.000000000 -0400
+++ latencytop-0.5/debian/changelog     2021-08-17 00:21:33.000000000 -0400
@@ -1,3 +1,23 @@
+latencytop (0.5-0.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Convert to "3.0 (quilt)" source format for a sanity.
+    (Closes: #947051)
+  * debian/rules: Convert to dh sequencer.
+  * debian/patches/0001-Convert-to-autoconf.patch: Convert buildsystem
+    to autotools for better compatibility.
+    + Fixes cross compilation. (Closes: #900303)
+  * debian/patches/0002-Fix-FTBFS-in-fsync.c.patch: Fix FTBFS with
+    clang. (Closes: #760285)
+  * debian/patches/0003-typo-fix.patch: Fix typo in man page.
+    (Closes: #619490)
+  * debian/control:
+    + Add packaging VCS field (Debian Salsa GitLab).
+    + Bump debhelper compat to v13. Closes: #965618
+    + Bump Standards-Version to 4.5.1.
+
+ -- Boyuan Yang <by...@debian.org>  Tue, 17 Aug 2021 00:21:33 -0400
+
 latencytop (0.5) unstable; urgency=low
 
   * New upstream version (
diff -Nru latencytop-0.5/debian/compat latencytop-0.5/debian/compat
--- latencytop-0.5/debian/compat        2021-08-17 00:27:59.000000000 -0400
+++ latencytop-0.5/debian/compat        1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-5
diff -Nru latencytop-0.5/debian/control latencytop-0.5/debian/control
--- latencytop-0.5/debian/control       2021-08-17 00:27:59.000000000 -0400
+++ latencytop-0.5/debian/control       2021-08-17 00:18:49.000000000 -0400
@@ -1,11 +1,13 @@
 Source: latencytop
 Section: utils
-Priority: extra
+Priority: optional
 Maintainer: Giacomo Catenazzi <c...@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), pkg-config, libncursesw5-dev,
+Build-Depends: debhelper-compat (= 13), pkg-config, libncurses-dev,
   libglib2.0-dev, libgtk2.0-dev
-Standards-Version: 3.8.2
+Standards-Version: 4.5.1
 Homepage: http://www.latencytop.org/
+Vcs-Git: https://salsa.debian.org/debian/latencytop.git
+Vcs-Browser: https://salsa.debian.org/debian/latencytop
 
 Package: latencytop
 Architecture: any
diff -Nru latencytop-0.5/debian/latencytop.dirs latencytop-
0.5/debian/latencytop.dirs
--- latencytop-0.5/debian/latencytop.dirs       2021-08-17 00:27:59.000000000
-0400
+++ latencytop-0.5/debian/latencytop.dirs       1969-12-31 19:00:00.000000000
-0500
@@ -1,2 +0,0 @@
-usr/sbin
-usr/share/latencytop
diff -Nru latencytop-0.5/debian/patches/0001-Convert-to-autoconf.patch
latencytop-0.5/debian/patches/0001-Convert-to-autoconf.patch
--- latencytop-0.5/debian/patches/0001-Convert-to-autoconf.patch        1969-
12-31 19:00:00.000000000 -0500
+++ latencytop-0.5/debian/patches/0001-Convert-to-autoconf.patch        2021-
08-17 00:18:49.000000000 -0400
@@ -0,0 +1,72 @@
+From: Boyuan Yang <by...@debian.org>
+Date: Mon, 16 Aug 2021 12:10:37 -0400
+Subject: Convert to autoconf
+
+---
+ Makefile.am     | 11 +++++++++++
+ configure.ac    | 33 +++++++++++++++++++++++++++++++++
+ m4/.placeholder |  0
+ 3 files changed, 44 insertions(+)
+ create mode 100644 Makefile.am
+ create mode 100644 configure.ac
+ create mode 100644 m4/.placeholder
+
+diff --git a/Makefile.am b/Makefile.am
+new file mode 100644
+index 0000000..5fb764d
+--- /dev/null
++++ b/Makefile.am
+@@ -0,0 +1,11 @@
++ACLOCAL_AMFLAGS = -I m4
++
++sbin_PROGRAMS = latencytop
++
++latencytop_CFLAGS = -DHAS_GTK_GUI
++latencytop_CFLAGS += $(GLIB_CFLAGS) $(GTK2_CFLAGS)
++latencytop_SOURCES = latencytop.c text_display.c translate.c fsync.c
gtk_display.c
++latencytop_LDADD = $(GLIB_LIBS) $(GTK2_LIBS)
++
++latencytopdatadir = $(datadir)/latencytop
++latencytopdata_DATA = latencytop.trans global.png kernel_thread.png
user_process.png
+diff --git a/configure.ac b/configure.ac
+new file mode 100644
+index 0000000..96063a1
+--- /dev/null
++++ b/configure.ac
+@@ -0,0 +1,33 @@
++#                                               -*- Autoconf -*-
++# Process this file with autoconf to produce a configure script.
++
++AC_PREREQ([2.69])
++AC_INIT([latencytop], [0.5], [http://www.latencytop.org/])
++AC_CONFIG_SRCDIR([gtk_display.c])
++AC_CONFIG_HEADERS([config.h])
++AC_CONFIG_AUX_DIR([build-aux])
++
++AM_INIT_AUTOMAKE([foreign])
++
++# Checks for programs.
++AC_PROG_CC
++AC_PROG_INSTALL
++
++# Checks for libraries.
++AC_CHECK_LIB([ncursesw], [initscr])
++
++PKG_CHECK_MODULES([GLIB], [glib-2.0])
++PKG_CHECK_MODULES([GTK2], [gtk+-2.0])
++
++# Checks for header files.
++AC_CHECK_HEADERS([stdlib.h string.h sys/time.h unistd.h wchar.h])
++
++# Checks for typedefs, structures, and compiler characteristics.
++AC_TYPE_SIZE_T
++
++# Checks for library functions.
++AC_FUNC_MALLOC
++AC_CHECK_FUNCS([atexit gettimeofday memset select strchr strdup strstr
strtoull])
++
++AC_CONFIG_FILES([Makefile])
++AC_OUTPUT
+diff --git a/m4/.placeholder b/m4/.placeholder
+new file mode 100644
+index 0000000..e69de29
diff -Nru latencytop-0.5/debian/patches/0002-Fix-FTBFS-in-fsync.c.patch
latencytop-0.5/debian/patches/0002-Fix-FTBFS-in-fsync.c.patch
--- latencytop-0.5/debian/patches/0002-Fix-FTBFS-in-fsync.c.patch       1969-
12-31 19:00:00.000000000 -0500
+++ latencytop-0.5/debian/patches/0002-Fix-FTBFS-in-fsync.c.patch       2021-
08-17 00:18:49.000000000 -0400
@@ -0,0 +1,35 @@
+From: =?utf-8?q?Nicolas_S=C3=A9velin-Radiguet?= <nic...@free.fr>
+Date: Tue, 2 Sep 2014 16:48:11 +0200
+Subject: Fix FTBFS in fsync.c
+
+Your package fails to build with clang instead of gcc. [-Wreturn-type]
+The attached diff fixes it.
+
+Forwarded: no
+Bug-Debian: https://bugs.debian.org/760285
+---
+ fsync.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/fsync.c b/fsync.c
+index 1706571..a5b0feb 100644
+--- a/fsync.c
++++ b/fsync.c
+@@ -51,7 +51,7 @@ struct fsync_files {
+ static GList *fsync_data;
+ 
+ 
+-static chain_file(struct fsync_process *proc, char *filename)
++static void chain_file(struct fsync_process *proc, char *filename)
+ {
+       struct fsync_files *file;
+       GList *item;
+@@ -75,7 +75,7 @@ static chain_file(struct fsync_process *proc, char
*filename)
+       proc->files = g_list_append(proc->files, file);
+ }
+ 
+-static report_file(char *process, char *file)
++static void report_file(char *process, char *file)
+ {
+       struct fsync_process *proc;
+       GList *item;
diff -Nru latencytop-0.5/debian/patches/0003-typo-fix.patch latencytop-
0.5/debian/patches/0003-typo-fix.patch
--- latencytop-0.5/debian/patches/0003-typo-fix.patch   1969-12-31
19:00:00.000000000 -0500
+++ latencytop-0.5/debian/patches/0003-typo-fix.patch   2021-08-17
00:18:49.000000000 -0400
@@ -0,0 +1,22 @@
+From: Boyuan Yang <by...@debian.org>
+Date: Mon, 16 Aug 2021 12:19:24 -0400
+Subject: typo fix
+
+Bug-Debian: https://bugs.debian.org/619490
+---
+ latencytop.8 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/latencytop.8 b/latencytop.8
+index db544a5..35d1f6c 100644
+--- a/latencytop.8
++++ b/latencytop.8
+@@ -38,7 +38,7 @@ see what's happening to the system, and which process is
suffering
+ and/or causing the delays. 
+ 
+ You can walk the processes by using the cursor keys. If you press \fBs\fP 
+-followed by a letter, then only active processes starting with that lettter
++followed by a letter, then only active processes starting with that letter
+ are displayed and walked. If you press \fBs\fP followed by \fB0\fP then
+ that filter is reset.
+ 
diff -Nru latencytop-0.5/debian/patches/series latencytop-
0.5/debian/patches/series
--- latencytop-0.5/debian/patches/series        1969-12-31 19:00:00.000000000
-0500
+++ latencytop-0.5/debian/patches/series        2021-08-17 00:18:49.000000000
-0400
@@ -0,0 +1,3 @@
+0001-Convert-to-autoconf.patch
+0002-Fix-FTBFS-in-fsync.c.patch
+0003-typo-fix.patch
diff -Nru latencytop-0.5/debian/rules latencytop-0.5/debian/rules
--- latencytop-0.5/debian/rules 2021-08-17 00:27:59.000000000 -0400
+++ latencytop-0.5/debian/rules 2021-08-17 00:18:49.000000000 -0400
@@ -1,10 +1,7 @@
 #!/usr/bin/make -f
-  
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/makefile.mk
-
-DEB_MAKE_CLEAN_TARGET   = clean
-DEB_MAKE_BUILD_TARGET   = latencytop
-DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/latencytop
-DEB_MAKE_CHECK_TARGET   =
 
+export DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+  
+%:
+       dh $@
diff -Nru latencytop-0.5/debian/source/format latencytop-
0.5/debian/source/format
--- latencytop-0.5/debian/source/format 1969-12-31 19:00:00.000000000 -0500
+++ latencytop-0.5/debian/source/format 2021-08-17 00:18:49.000000000 -0400
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru latencytop-0.5/Makefile latencytop-0.5/Makefile
--- latencytop-0.5/Makefile     2021-08-17 00:27:59.000000000 -0400
+++ latencytop-0.5/Makefile     2009-04-28 09:37:54.000000000 -0400
@@ -3,7 +3,7 @@
 
 DESTDIR =
 SBINDIR = /usr/sbin
-XCFLAGS = -W  -g `pkg-config --cflags glib-2.0` -D_FORTIFY_SOURCE=2 -Wno-
sign-compare -I/usr/include/ncursesw
+XCFLAGS = -W  -g `pkg-config --cflags glib-2.0` -D_FORTIFY_SOURCE=2 -Wno-
sign-compare
 LDF = -Wl,--as-needed `pkg-config --libs glib-2.0`   -lncursesw 
 
 OBJS= latencytop.o text_display.o translate.o fsync.o

Attachment: signature.asc
Description: This is a digitally signed message part

Reply via email to