* New upstream stable release:

+ debian/patches/90_autotools.patch:
    - Regenerated for the new version.

debian/changelog

@@ -1,3 +1,27 @@
+libgtop2 (2.28.1-1) unstable; urgency=low
+
+  [ Emilio Pozuelo Monfort ]
+  * debian/patches/02_hurd_stub_backend.patch,
+    debian/patches/03_kfreebsd_installdirs.patch,
+    debian/patches/04_kfreebsd_version_check.patch,
+    debian/patches/05_kfreebsd_8.0.patch:
+    - Add headers.
+
+  [ Sebastian Dröge ]
+  * New upstream stable release:
+    + debian/patches/90_autotools.patch:
+      - Regenerated for the new version.
+
+ -- Sebastian Dröge <slomo@debian.org>  Sat, 10 Apr 2010 06:56:34 +0200
+
+libgtop2 (2.28.0-4) unstable; urgency=low
+
+  [ Josselin Mouette ]
+  * 05_kfreebsd_8.0.patch: modified patch from Petr Salinger to make 
+    libgtop2 work correctly with kFreeBSD 8.0. Closes: #559291.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org>  Tue, 15 Dec 2009 12:16:51 +0100
+
 libgtop2 (2.28.0-3) unstable; urgency=low
 
   * Switch to quilt for patch management.

debian/control

@@ -1,3 +1,8 @@
+# This file is autogenerated. DO NOT EDIT!
+# 
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+
 Source: libgtop2
 Section: libs
 Priority: optional

debian/patches/02_hurd_stub_backend.patch

@@ -1,3 +1,9 @@
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=602662
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=557446
+Author: Samuel Thibault <sthibault@debian.org>
+
+Fix the stub backend to build again, making libgtop build on the Hurd.
+
 diff -urN --exclude='*.o' --exclude='*.lo' --exclude='*.in' libgtop2-2.28.0.sav/sysdeps/stub/Makefile.am libgtop2-2.28.0/sysdeps/stub/Makefile.am
 --- libgtop2-2.28.0.sav/sysdeps/stub/Makefile.am	2009-04-18 23:29:49.000000000 +0000
 +++ libgtop2-2.28.0/sysdeps/stub/Makefile.am	2009-11-22 01:07:39.000000000 +0000

debian/patches/03_kfreebsd_installdirs.patch

@@ -1,3 +1,12 @@
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=602664
+Author: Josselin Mouette <joss@debian.org>
+
+The libgtop_server2 binary is launched by the library itself, and has no use
+being launched directly. Therefore, it should go in $(libexecdir) instead.
+
+The patch also adds some missing $(DESTDIR) references in the installation
+hooks.
+
 Index: libgtop-2.28.0/libgtop-sysdeps.m4
 ===================================================================
 --- libgtop-2.28.0.orig/libgtop-sysdeps.m4	2009-11-22 17:31:01.861694527 +0100

debian/patches/04_kfreebsd_version_check.patch

@@ -1,3 +1,10 @@
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=602666
+Author: Josselin Mouette <joss@debian.org>
+
+The server binary refuses to start when it is not run on the same hardware as
+the one where it was built on. This check is utterly and absolutely useless,
+and makes it impossible to produce working binary packages.
+
 Index: libgtop-2.28.0/src/daemon/server.c
 ===================================================================
 --- libgtop-2.28.0.orig/src/daemon/server.c	2009-11-22 21:14:47.613184919 +0100

debian/patches/05_kfreebsd_8.0.patch

@@ -0,0 +1,28 @@
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=608518
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559291
+Author: Petr Salinger <Petr.Salinger@seznam.cz>
+
+Fix a couple of checks for the kFreeBSD kernel.
+
+Index: libgtop-2.28.0/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
+@@ -42,7 +42,7 @@
+ #include <sys/pipe.h>
+ #include <sys/conf.h>
+ #undef _KERNEL
+-#if __FreeBSD_version >= 800038
++#if (__FreeBSD_version >= 800038) || (__FreeBSD_kernel_version >= 800038)
+ #define _WANT_FILE
+ #include <sys/file.h>
+ #undef _WANT_FILE
+@@ -113,7 +113,7 @@ _glibtop_sysdeps_freebsd_dev_inode (glib
+ 
+         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,
+ 		      sizeof (priv))
+ #else

debian/patches/series

@@ -2,5 +2,6 @@
 02_hurd_stub_backend.patch
 03_kfreebsd_installdirs.patch
 04_kfreebsd_version_check.patch
+05_kfreebsd_8.0.patch
 90_autotools.patch
 99_ltmain_as-needed.patch