From afabbfc1f59972cf177b07ab970c3f55763aa2f1 Mon Sep 17 00:00:00 2001 From: Jackson Doak Date: Tue, 1 Jul 2014 22:50:12 +0000 Subject: [PATCH] * New upstream release. * Drop 06_kfreebsd_sys_pipe.patch. Fixed upstream. --- debian/changelog | 7 +++++++ debian/patches/06_kfreebsd_sys_pipe.patch | 22 ---------------------- debian/patches/series | 1 - 3 files changed, 7 insertions(+), 23 deletions(-) delete mode 100644 debian/patches/06_kfreebsd_sys_pipe.patch diff --git a/debian/changelog b/debian/changelog index 39f179cd..8d3c8ec5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libgtop2 (2.30.0-1) UNRELEASED; urgency=medium + + * New upstream release. + * Drop 06_kfreebsd_sys_pipe.patch. Fixed upstream. + + -- Jackson Doak Wed, 02 Jul 2014 08:45:13 +1000 + libgtop2 (2.28.5-2) unstable; urgency=low * Add explicit Build-Depends on libbsd-dev for kfreebsd. diff --git a/debian/patches/06_kfreebsd_sys_pipe.patch b/debian/patches/06_kfreebsd_sys_pipe.patch deleted file mode 100644 index 94e3f06a..00000000 --- a/debian/patches/06_kfreebsd_sys_pipe.patch +++ /dev/null @@ -1,22 +0,0 @@ -Description: Don't include sys/pipe.h on kFreeBSD - Defining _KERNEL to include sys/pipe.h subsequently breaks sys/conf.h; - since sys/pipe.h is not meant to be used in userland, and libgtop2 builds - anyway on kFreeBSD without it, don't include it. -Author: Steven Chamberlain -Bug-Debian: http://bugs.debian.org/667984 - -Index: libgtop2-2.28.4/sysdeps/freebsd/procmap.c -=================================================================== ---- libgtop2-2.28.4.orig/sysdeps/freebsd/procmap.c 2012-04-07 22:49:20.000000000 +0100 -+++ libgtop2-2.28.4/sysdeps/freebsd/procmap.c 2012-04-07 22:51:00.163079809 +0100 -@@ -38,10 +38,7 @@ - #include - #undef _KVM_VNODE - --#define _KERNEL --#include - #include --#undef _KERNEL - #if (__FreeBSD_version >= 800038) || (__FreeBSD_kernel_version >= 800038) - #define _WANT_FILE - #include diff --git a/debian/patches/series b/debian/patches/series index a9baa102..6560c681 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ 02_hurd_stub_backend.patch 03_kfreebsd_installdirs.patch -06_kfreebsd_sys_pipe.patch