From e76cc391faccba25625b7061dfad1078c0db72b3 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 6 Sep 2011 12:05:30 +0000 Subject: [PATCH] * New upstream bug fix release. * 05_kfreebsd_8.0.patch: Update for new version. --- debian/changelog | 4 +++- debian/patches/05_kfreebsd_8.0.patch | 14 +++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 21572dbd..574ac88d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ -libgtop2 (2.28.3-3) UNRELEASED; urgency=low +libgtop2 (2.28.4-1) UNRELEASED; urgency=low [ Martin Pitt ] + * New upstream bug fix release. + * 05_kfreebsd_8.0.patch: Update for new version. * debian/control.in: Fix section of gir1.2-gtop-2.0, should be "libs" (and was set like that by ftpmasters). * debian/watch: Fix regexp syntax, and watch for *.tar.bz2. diff --git a/debian/patches/05_kfreebsd_8.0.patch b/debian/patches/05_kfreebsd_8.0.patch index d1eb580c..41300e56 100644 --- a/debian/patches/05_kfreebsd_8.0.patch +++ b/debian/patches/05_kfreebsd_8.0.patch @@ -4,10 +4,10 @@ Author: Petr Salinger Fix a couple of checks for the kFreeBSD kernel. -Index: libgtop-2.28.0/sysdeps/freebsd/procmap.c +Index: libgtop2/sysdeps/freebsd/procmap.c =================================================================== ---- libgtop-2.28.0.orig/sysdeps/freebsd/procmap.c 2009-12-03 13:59:57.866694125 +0100 -+++ libgtop-2.28.0/sysdeps/freebsd/procmap.c 2009-12-03 14:03:16.298688337 +0100 +--- libgtop2.orig/sysdeps/freebsd/procmap.c 2011-07-24 21:13:56.000000000 +0200 ++++ libgtop2/sysdeps/freebsd/procmap.c 2011-09-06 14:03:04.705871157 +0200 @@ -42,7 +42,7 @@ #include #include @@ -17,12 +17,12 @@ Index: libgtop-2.28.0/sysdeps/freebsd/procmap.c #define _WANT_FILE #include #undef _WANT_FILE -@@ -113,7 +113,7 @@ _glibtop_sysdeps_freebsd_dev_inode (glib +@@ -113,7 +113,7 @@ + return; + } - if (kvm_read (server->machine.kd, (gulong) inode.i_dev, (char *) &si, - sizeof (si)) != sizeof (si) || -#if __FreeBSD_version >= 800039 +#if (__FreeBSD_version >= 800039) || (__FreeBSD_kernel_version >= 800039) - kvm_read (server->machine.kd, (gulong) cdev2priv(&si), (char *) &priv, + if (kvm_read (server->machine.kd, (gulong) cdev2priv(inode.i_dev), (char *) &priv, sizeof (priv)) #else