diffstat of debian/ for lsof_4.91+dfsg-1 lsof_4.91+dfsg-1ubuntu1

 changelog          |    7 +++++++
 control            |    3 ++-
 patches/majorminor |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 patches/series     |    1 +
 4 files changed, 57 insertions(+), 1 deletion(-)

diff -Nru lsof-4.91+dfsg/debian/changelog lsof-4.91+dfsg/debian/changelog
--- lsof-4.91+dfsg/debian/changelog	2019-01-12 09:23:59.000000000 +0000
+++ lsof-4.91+dfsg/debian/changelog	2019-04-09 14:53:38.000000000 +0000
@@ -1,3 +1,10 @@
+lsof (4.91+dfsg-1ubuntu1) disco; urgency=medium
+
+  * debian/patches/majorminor: Fix ftbfs due to missing major/minor macros in
+    tests; by including sysmacros.h where appropriate. (LP: #1823430)
+
+ -- Mathieu Trudel-Lapierre <cyphermox@ubuntu.com>  Tue, 09 Apr 2019 10:53:38 -0400
+
 lsof (4.91+dfsg-1) unstable; urgency=low
 
   * New upstream release (closes: #911818).
diff -Nru lsof-4.91+dfsg/debian/control lsof-4.91+dfsg/debian/control
--- lsof-4.91+dfsg/debian/control	2019-01-12 09:23:59.000000000 +0000
+++ lsof-4.91+dfsg/debian/control	2019-04-09 14:53:38.000000000 +0000
@@ -1,7 +1,8 @@
 Source: lsof
 Section: utils
 Priority: standard
-Maintainer: Andres Salomon <dilinger@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Andres Salomon <dilinger@debian.org>
 Build-Depends: debhelper (>= 8.0.0), libselinux1-dev [linux-any]
 Standards-Version: 3.9.6
 Homepage: http://people.freebsd.org/~abe/
diff -Nru lsof-4.91+dfsg/debian/patches/majorminor lsof-4.91+dfsg/debian/patches/majorminor
--- lsof-4.91+dfsg/debian/patches/majorminor	1970-01-01 00:00:00.000000000 +0000
+++ lsof-4.91+dfsg/debian/patches/majorminor	2019-04-09 14:53:38.000000000 +0000
@@ -0,0 +1,47 @@
+From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
+Subject: Include sys/sysmacros.h for major() and minor()
+
+Make sure sysmacros.h is imported when necessary. Multiple imports are fine
+here; sysmacros accounts for it.
+
+Forwarded: yes
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=926716
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/lsof/+bug/1823430
+
+Index: lsof-4.91+dfsg/tests/LTlib.c
+===================================================================
+--- lsof-4.91+dfsg.orig/tests/LTlib.c
++++ lsof-4.91+dfsg/tests/LTlib.c
+@@ -231,26 +231,32 @@ _PROTOTYPE(static X2DEV_T x2dev,(char *x
+  */
+ 
+ #if	!defined(major_S)
++#include <sys/sysmacros.h>
+ #define	major_S		major
+ #endif	/* defined(major_S) */
+ 
+ #if	!defined(minor_S)
++#include <sys/sysmacros.h>
+ #define	minor_S		minor
+ #endif	/* defined(minor_S) */
+ 
+ #if	!defined(unit_S)
++#include <sys/sysmacros.h>
+ #define	unit_S(x)	0
+ #endif	/* defined(unit_S) */
+ 
+ #if	!defined(major_X)
++#include <sys/sysmacros.h>
+ #define	major_X(dp, em)	major(x2dev(dp, em))
+ #endif	/* defined(major_X) */
+ 
+ #if	!defined(minor_X)
++#include <sys/sysmacros.h>
+ #define	minor_X(dp, em)	minor(x2dev(dp, em))
+ #endif	/* defined(minor_X) */
+ 
+ #if	!defined(unit_X)
++#include <sys/sysmacros.h>
+ #define	unit_X(dp, em)	0
+ #endif	/* defined(unit_X) */
+ 
diff -Nru lsof-4.91+dfsg/debian/patches/series lsof-4.91+dfsg/debian/patches/series
--- lsof-4.91+dfsg/debian/patches/series	2015-09-13 21:37:47.000000000 +0000
+++ lsof-4.91+dfsg/debian/patches/series	2019-04-09 14:52:45.000000000 +0000
@@ -3,3 +3,4 @@
 tests
 obsolete
 preset-ccdate
+majorminor