diff -Nru comedilib-0.10.2/debian/changelog comedilib-0.10.2/debian/changelog
--- comedilib-0.10.2/debian/changelog	2016-01-16 20:34:24.000000000 +0000
+++ comedilib-0.10.2/debian/changelog	2018-12-31 08:09:15.000000000 +0000
@@ -1,3 +1,10 @@
+comedilib (0.10.2-4+rpi1) buster-staging; urgency=medium
+
+  * Raspbian uploaded based on 0.10.2-4ubuntu1 by Adam Conrad
+  * 04_glibc2.28_fix.patch: Cherrypick fix to define minor() with new glibc.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Mon, 31 Dec 2018 08:09:15 +0000
+
 comedilib (0.10.2-4) unstable; urgency=medium
 
   * Update build dependencies for GSL 2, change libgsl0-dev to libgsl-dev.
diff -Nru comedilib-0.10.2/debian/control comedilib-0.10.2/debian/control
--- comedilib-0.10.2/debian/control	2016-01-12 05:59:01.000000000 +0000
+++ comedilib-0.10.2/debian/control	2016-11-01 16:14:34.000000000 +0000
@@ -1,7 +1,8 @@
 Source: comedilib
 Section: devel
 Priority: optional
-Maintainer: Gudjon I. Gudjonsson <gudjon@gudjon.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Gudjon I. Gudjonsson <gudjon@gudjon.org>
 Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), autotools-dev,
  swig, docbook-utils, dblatex, bison, flex, libtool, xmlto, imagemagick, fop,
  libboost-program-options-dev, libgsl-dev,
diff -Nru comedilib-0.10.2/debian/patches/04_glibc2.28_fix.patch comedilib-0.10.2/debian/patches/04_glibc2.28_fix.patch
--- comedilib-0.10.2/debian/patches/04_glibc2.28_fix.patch	1970-01-01 00:00:00.000000000 +0000
+++ comedilib-0.10.2/debian/patches/04_glibc2.28_fix.patch	2018-11-06 17:53:34.000000000 +0000
@@ -0,0 +1,30 @@
+From 3f8514739a2d799d2e6dbb6cd43a7f6bb624a319 Mon Sep 17 00:00:00 2001
+From: Ian Abbott <abbotti@mev.co.uk>
+Date: Mon, 10 Apr 2017 19:02:55 +0100
+Subject: [PATCH] lib/calib.c: Include <sys/sysmacros.h> for fstat()
+
+Relying on <sys/types.h> to define major(), minor() and makedev() is
+deprecated, so include <sys/sysmacros.h> to define them.
+
+Als include <sys/types.h> and <unistd.h> as the Linux man page for
+fstat() has them in the synopsys.
+---
+ lib/calib.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/lib/calib.c b/lib/calib.c
+index ee823bc..d60bf2c 100644
+--- a/lib/calib.c
++++ b/lib/calib.c
+@@ -27,7 +27,11 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
++#include <sys/types.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
++#include <unistd.h>
++
+ #include "libinternal.h"
+ 
+ static int set_calibration( comedi_t *dev, const comedi_calibration_t *parsed_file,
diff -Nru comedilib-0.10.2/debian/patches/series comedilib-0.10.2/debian/patches/series
--- comedilib-0.10.2/debian/patches/series	2015-08-03 04:33:18.000000000 +0000
+++ comedilib-0.10.2/debian/patches/series	2018-11-06 17:54:00.000000000 +0000
@@ -1,3 +1,4 @@
 01_fix_spelling.patch
 02_configure.patch
 03_manpages.patch
+04_glibc2.28_fix.patch