Control: tags 916026 + patch
Control: tags 916026 + pending

Dear maintainer,

I've prepared an NMU for bootchart2 (versioned as 0.14.4-3.1) and
uploaded it to DELAYED/8. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru bootchart2-0.14.4/debian/bootchart2.lintian-overrides bootchart2-
0.14.4/debian/bootchart2.lintian-overrides
--- bootchart2-0.14.4/debian/bootchart2.lintian-overrides       2012-12-12
15:25:52.000000000 -0500
+++ bootchart2-0.14.4/debian/bootchart2.lintian-overrides       2019-09-11
10:19:48.000000000 -0400
@@ -1,2 +1,4 @@
 # it's intentional, indeed.
 bootchart2: package-contains-empty-directory lib/bootchart/tmpfs/
+# Broken as provided by upstream, keep as is
+bootchart2: init.d-script-depends-on-all-virtual-facility
etc/init.d/bootchart-done required-start
diff -Nru bootchart2-0.14.4/debian/changelog bootchart2-
0.14.4/debian/changelog
--- bootchart2-0.14.4/debian/changelog  2012-12-12 15:25:52.000000000 -0500
+++ bootchart2-0.14.4/debian/changelog  2019-09-11 10:19:53.000000000 -0400
@@ -1,3 +1,23 @@
+bootchart2 (0.14.4-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/control:
+    + Bump Standards-Version to 4.4.0.
+    + Update Vcs-* fields to use git package repo under Salsa Debian
+      group.
+    + Use secure URI in homepage field.
+  * debian/patches: Add patch 0006 from upstream to fix FTBFS against
+    glibc 2.28. (Closes: #916026)
+  * debian/watch: Correctly monitor GitHub upstream.
+  * debian/copyright:
+    + Use secure URI.
+    - Delete fields for missing files.
+  * debian/bootchart2.lintian-overrides: Add lintian override for
+    init.d-script-depends-on-all-virtual-facility (suppress warning
+    for now).
+
+ -- Boyuan Yang <by...@debian.org>  Wed, 11 Sep 2019 10:19:53 -0400
+
 bootchart2 (0.14.4-3) unstable; urgency=low
 
   * Added missing dependency on lsb-base (>= 3.0-6). Thanks to Adam D.
diff -Nru bootchart2-0.14.4/debian/control bootchart2-0.14.4/debian/control
--- bootchart2-0.14.4/debian/control    2012-12-12 15:25:52.000000000 -0500
+++ bootchart2-0.14.4/debian/control    2019-09-11 10:13:22.000000000 -0400
@@ -6,10 +6,10 @@
 Build-Depends:
  debhelper (>= 8~)
  , python (>= 2.6.6-3~)
-Standards-Version: 3.9.3
-Homepage: http://github.com/mmeeks/bootchart
-Vcs-Git: git://git.debian.org/collab-maint/bootchart2.git
-Vcs-Browser: http://git.debian.org/?p=collab-maint/bootchart2.git
+Standards-Version: 4.4.0
+Homepage: https://github.com/mmeeks/bootchart
+Vcs-Git: https://salsa.debian.org/debian/bootchart2.git
+Vcs-Browser: https://salsa.debian.org/debian/bootchart2
 X-Python-Version: >= 2.6
 
 Package: bootchart2
diff -Nru bootchart2-0.14.4/debian/copyright bootchart2-
0.14.4/debian/copyright
--- bootchart2-0.14.4/debian/copyright  2012-12-12 15:25:52.000000000 -0500
+++ bootchart2-0.14.4/debian/copyright  2019-09-11 10:15:28.000000000 -0400
@@ -1,5 +1,6 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Source: http://github.com/mmeeks/bootchart
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: bootchart2
+Source: https://github.com/mmeeks/bootchart
 
 Files: *
 Copyright: © Anders Norgaard <anders.norga...@gmail.com>
@@ -32,10 +33,6 @@
 Copyright: © 2010-2012, David Paleino <da...@debian.org>
 License: GPL-2+
 
-Files: debian/manpages/*
-Copyright: © 2011, Francesca Ciceri <madame...@yahoo.it>
-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
diff -Nru bootchart2-0.14.4/debian/patches/0006-include-sys-sysmacros.h-for-
major-minor-makedev.patch bootchart2-0.14.4/debian/patches/0006-include-sys-
sysmacros.h-for-major-minor-makedev.patch
--- bootchart2-0.14.4/debian/patches/0006-include-sys-sysmacros.h-for-major-
minor-makedev.patch     1969-12-31 19:00:00.000000000 -0500
+++ bootchart2-0.14.4/debian/patches/0006-include-sys-sysmacros.h-for-major-
minor-makedev.patch     2019-09-11 09:59:14.000000000 -0400
@@ -0,0 +1,23 @@
+From: Mike Frysinger <vap...@gentoo.org>
+Date: Thu, 21 Apr 2016 00:19:32 -0400
+Subject: include sys/sysmacros.h for major/minor/makedev
+
+These funcs are defined in the sys/sysmacros.h header, not sys/types.h.
+Linux C libraries are updating to drop the implicit include, so we need
+to include it explicitly.
+---
+ collector/collector.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/collector/collector.c b/collector/collector.c
+index 7a746f8..5ca4cd6 100644
+--- a/collector/collector.c
++++ b/collector/collector.c
+@@ -33,6 +33,7 @@
+ #include "common.h"
+ 
+ #include <sys/mount.h>
++#include <sys/sysmacros.h>
+ #include <linux/fs.h>
+ #include <linux/genetlink.h>
+ #include <linux/taskstats.h>
diff -Nru bootchart2-0.14.4/debian/patches/series bootchart2-
0.14.4/debian/patches/series
--- bootchart2-0.14.4/debian/patches/series     2012-12-12 15:25:52.000000000
-0500
+++ bootchart2-0.14.4/debian/patches/series     2019-09-11 09:59:14.000000000
-0400
@@ -3,3 +3,4 @@
 0002-pybootchartgui-skip-malformed-taskstats-lines.patch
 0003-pybootchartgui-ensure-a-MemSample-is-valid-before-st.patch
 0004-pybootchartgui-be-more-tolerant-when-parsing-proc_me.patch
+0006-include-sys-sysmacros.h-for-major-minor-makedev.patch
diff -Nru bootchart2-0.14.4/debian/watch bootchart2-0.14.4/debian/watch
--- bootchart2-0.14.4/debian/watch      2012-12-12 15:25:52.000000000 -0500
+++ bootchart2-0.14.4/debian/watch      2019-09-11 10:01:57.000000000 -0400
@@ -1,2 +1,4 @@
-version=3
-http://githubredir.debian.net/github/mmeeks/bootchart/(\d+.*)\.tar\.gz
+version=4
+opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%bootchart2-$1.tar.gz%" \
+ https://github.com/mmeeks/bootchart2/releases \
+ (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian uupdate

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

Reply via email to