Release version 2.28.5-2 to unstable

let's code expecting bsd headers on bsd work without patching. Thanks
Julien Cristau for the suggestion. Closes: #721886

debian/changelog

@@ -1,3 +1,142 @@
+libgtop2 (2.28.5-2) unstable; urgency=low
+
+  * Add explicit Build-Depends on libbsd-dev for kfreebsd.
+  * Add `pkg-config --cflags libbsd-overlay` to CPPFLAGS on kfreebsd. This
+    let's code expecting bsd headers on bsd work without patching. Thanks
+    Julien Cristau for the suggestion. Closes: #721886
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 08 Sep 2013 14:31:03 +0200
+
+libgtop2 (2.28.5-1) unstable; urgency=low
+
+  * New upstream release.
+  * Remove those kfreebsd patches which have been merged upstream.
+  * Drop 99_ltmain_as-needed.patch and use dh_autoreconf --as-needed instead.
+  * Bump Standards-Version to 3.9.4. No further changes.
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 05 Sep 2013 02:53:46 +0200
+
+libgtop2 (2.28.4-3) unstable; urgency=low
+
+  * debian/patches/06_kfreebsd_sys_pipe.patch: 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.
+    Thanks to Steven Chamberlain for the patch. Closes: #667984
+  * Update Vcs-* URLs.
+  * Drop Build-Depends on gir1.2-glib-2.0 and let libgirepository1.0-dev pull
+    this dependency.
+  * Bump Standards-Version to 3.9.3.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 13 Apr 2012 20:13:21 +0200
+
+libgtop2 (2.28.4-2) unstable; urgency=low
+
+  * debian/watch: Track .xz tarballs.
+  * Bump debhelper compatibility level to 8.
+    - Strip debian/tmp/ from .install files.
+    - Bump Build-Depends on debhelper.
+  * debian/control.in:
+    - Drop obsolete versioned Build-Depends on dpkg-dev.
+    - Tighten dependency between libgtop2-dev and gir1.2-gtop-2.0.
+    - Change section of gir1.2-gtop-2.0 to introspection.
+    - Drop obsolete Replaces.
+    - Set pkg-gnome-maintainers@lists.alioth.debian.org as Maintainer.
+  * debian/libgtop2-7.symbols:
+    - Add symbols file for improved shlibs dependencies.
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 14 Dec 2011 21:20:53 +0100
+
+libgtop2 (2.28.4-1) unstable; urgency=low
+
+  [ Martin Pitt ]
+  * New upstream bug fix release.
+  * 03_kfreebsd_installdirs.patch, 05_kfreebsd_8.0.patch,
+    99_ltmain_as-needed.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.
+  * debian/source/format, debian/control, debian/rules: Switch to "3.0
+    (quilt)" source format to support bzip2 orig tarballs. Drop quilt build
+    dependency and usage in debian/rules.
+
+  [ Josselin Mouette ]
+  * Use kfreebsd-any wildcard. Closes: #634623.
+
+ -- Martin Pitt <mpitt@debian.org>  Tue, 06 Sep 2011 14:19:01 +0200
+
+libgtop2 (2.28.3-2) unstable; urgency=low
+
+  * debian/control.in, debian/gir1.2-gtop-2.0.install: Add gir1.2-gtop-2.0
+    package to add GI support.
+  * debian/libgtop2-dev.install: Install .gir.
+  * debian/control.in: Bump Standards-Version to 3.9.2. No changes necessary.
+
+ -- Martin Pitt <mpitt@debian.org>  Fri, 27 May 2011 09:56:48 +0200
+
+libgtop2 (2.28.3-1) unstable; urgency=low
+
+  * Team upload.
+
+  * New upstream release.
+    - Fixes linking with strict linkers (Closes: #555183)
+  * Use dh-autoreconf instead of manually updating 90_autotools.patch
+  * Add Vcs fields to debian/control*
+
+ -- Andreas Henriksson <andreas@fatal.se>  Mon, 02 May 2011 16:00:40 +0200
+
+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.
+  * 02_hurd_stub_backend.patch: re-add an implementation of the stub 
+    backend, for the Hurd. Closes: #557446.
+  * 03_kfreebsd_installdirs.patch: patch to install binaries in 
+    libexecdir so that we can version the installation directory. Also 
+    use DESTDIR in the installation hooks.
+  * 04_kfreebsd_version_check.patch: drop brain-dead runtime version 
+    check.
+  * Rename 90_autoconf.patch to 90_autotools.patch, re-run all the 
+    autotools on top of that.
+  * Pass a versioned libexecdir to the configure arguments.
+  * Install the server binary on kfreebsd.
+  * Exclude it from dh_fixperms.
+
+ -- Josselin Mouette <joss@debian.org>  Sun, 22 Nov 2009 21:17:18 +0100
+
+libgtop2 (2.28.0-2) unstable; urgency=low
+
+  * debian/patches/01_kfreebsd_kvm_libs.patch:
+    - Patch from Petr Salinger to let libgtop2 build on kFreeBSD again.
+      Closes: #555316.
+  * debian/patches/90_autoconf.patch:
+    - Run autoconf on top of the above patch.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org>  Mon, 09 Nov 2009 23:04:50 +0100
+
 libgtop2 (2.28.0-1) unstable; urgency=low
 
   * New upstream release.

debian/compat

@@ -1 +1 @@
-5
+8

debian/control

@@ -1,28 +1,39 @@
+# 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
-Maintainer: Sebastien Bacher <seb128@debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Josselin Mouette <joss@debian.org>, Sebastian Dröge <slomo@debian.org>
-Build-Depends: debhelper (>= 5),
+Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Uploaders: Andreas Henriksson <andreas@fatal.se>, Emilio Pozuelo Monfort <pochu@debian.org>, Josselin Mouette <joss@debian.org>, Martin Pitt <mpitt@debian.org>, Michael Biebl <biebl@debian.org>, Sebastian Dröge <slomo@debian.org>
+Build-Depends: debhelper (>= 8),
                gettext,
                pkg-config,
                libxau-dev,
                libglib2.0-dev (>= 2.6.0),
                gnome-pkg-tools (>= 0.10),
+               dh-autoreconf,
                cdbs,
                texinfo,
-               dpkg-dev (>= 1.13.19),
                intltool (>= 0.35.0),
                libxt-dev,
-               libgeom-dev [kfreebsd-i386 kfreebsd-amd64],
-               libdevstat-dev [kfreebsd-i386 kfreebsd-amd64],
-               libkvm-dev [kfreebsd-i386 kfreebsd-amd64],
-               gtk-doc-tools (>= 1.4)
-Standards-Version: 3.8.3
+               libgeom-dev [kfreebsd-any],
+               libdevstat-dev [kfreebsd-any],
+               libkvm-dev [kfreebsd-any],
+               libbsd-dev [kfreebsd-any],
+               gtk-doc-tools (>= 1.4),
+               gobject-introspection (>= 0.6.7),
+               libgirepository1.0-dev (>= 0.10.7-1~)
+Standards-Version: 3.9.4
+Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/libgtop2
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/libgtop2
 
 Package: libgtop2-7
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
          libgtop2-common (>= ${source:Version})
 Description: gtop system monitoring library (shared)
  The gtop library reads information about processes and the state of the
@@ -35,6 +46,7 @@ Architecture: any
 Section: libdevel
 Depends: ${misc:Depends},
          libgtop2-7 (= ${binary:Version}),
+         gir1.2-gtop-2.0 (= ${binary:Version}),
          libglib2.0-dev
 Description: gtop system monitoring library (devel)
  The gtop library reads information about processes and the state of the
@@ -45,10 +57,6 @@ Description: gtop system monitoring library (devel)
 Package: libgtop2-common
 Architecture: all
 Depends: ${misc:Depends},
-Replaces: libgtop2-5,
-          libgtop2-4,
-          libgtop2-2,
-          libgtop2
 Description: gtop system monitoring library (common)
  The gtop library reads information about processes and the state of the
  system. It is used by the GNOME desktop environment.
@@ -65,3 +73,16 @@ Description: gtop system monitoring library (documentation)
  system. It is used by the GNOME desktop environment.
  .
  This package contains the documentation.
+
+Package: gir1.2-gtop-2.0
+Architecture: any
+Section: introspection
+Depends: ${misc:Depends},
+         ${gir:Depends}
+Description: gtop system monitoring library (gir bindings)
+ The gtop library reads information about processes and the state of the
+ system. It is used by the GNOME desktop environment.
+ .
+ This package can be used by other packages using the GIRepository format to
+ generate dynamic bindings.
+

debian/control.in

@@ -1,28 +1,34 @@
 Source: libgtop2
 Section: libs
 Priority: optional
-Maintainer: Sebastien Bacher <seb128@debian.org>
+Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 5),
+Build-Depends: debhelper (>= 8),
                gettext,
                pkg-config,
                libxau-dev,
                libglib2.0-dev (>= 2.6.0),
                gnome-pkg-tools (>= 0.10),
+               dh-autoreconf,
                cdbs,
                texinfo,
-               dpkg-dev (>= 1.13.19),
                intltool (>= 0.35.0),
                libxt-dev,
-               libgeom-dev [kfreebsd-i386 kfreebsd-amd64],
-               libdevstat-dev [kfreebsd-i386 kfreebsd-amd64],
-               libkvm-dev [kfreebsd-i386 kfreebsd-amd64],
-               gtk-doc-tools (>= 1.4)
-Standards-Version: 3.8.3
+               libgeom-dev [kfreebsd-any],
+               libdevstat-dev [kfreebsd-any],
+               libkvm-dev [kfreebsd-any],
+               libbsd-dev [kfreebsd-any],
+               gtk-doc-tools (>= 1.4),
+               gobject-introspection (>= 0.6.7),
+               libgirepository1.0-dev (>= 0.10.7-1~)
+Standards-Version: 3.9.4
+Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/libgtop2
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/libgtop2
 
 Package: libgtop2-7
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
          libgtop2-common (>= ${source:Version})
 Description: gtop system monitoring library (shared)
  The gtop library reads information about processes and the state of the
@@ -35,6 +41,7 @@ Architecture: any
 Section: libdevel
 Depends: ${misc:Depends},
          libgtop2-7 (= ${binary:Version}),
+         gir1.2-gtop-2.0 (= ${binary:Version}),
          libglib2.0-dev
 Description: gtop system monitoring library (devel)
  The gtop library reads information about processes and the state of the
@@ -45,10 +52,6 @@ Description: gtop system monitoring library (devel)
 Package: libgtop2-common
 Architecture: all
 Depends: ${misc:Depends},
-Replaces: libgtop2-5,
-          libgtop2-4,
-          libgtop2-2,
-          libgtop2
 Description: gtop system monitoring library (common)
  The gtop library reads information about processes and the state of the
  system. It is used by the GNOME desktop environment.
@@ -65,3 +68,16 @@ Description: gtop system monitoring library (documentation)
  system. It is used by the GNOME desktop environment.
  .
  This package contains the documentation.
+
+Package: gir1.2-gtop-2.0
+Architecture: any
+Section: introspection
+Depends: ${misc:Depends},
+         ${gir:Depends}
+Description: gtop system monitoring library (gir bindings)
+ The gtop library reads information about processes and the state of the
+ system. It is used by the GNOME desktop environment.
+ .
+ This package can be used by other packages using the GIRepository format to
+ generate dynamic bindings.
+

debian/gir1.2-gtop-2.0.install

@@ -0,0 +1 @@
+usr/lib/girepository-*

debian/libgtop2-7.install

@@ -1 +1 @@
-debian/tmp/usr/lib/*.so.*
+usr/lib/*.so.*

debian/libgtop2-7.symbols

@@ -0,0 +1,71 @@
+libgtop-2.0.so.7 libgtop2-7 #MINVER#
+ glibtop_call_l@Base 2.22.3
+ glibtop_close@Base 2.22.3
+ glibtop_close_r@Base 2.22.3
+ glibtop_get_cpu@Base 2.22.3
+ glibtop_get_cpu_l@Base 2.22.3
+ glibtop_get_fsusage@Base 2.22.3
+ glibtop_get_fsusage_l@Base 2.22.3
+ glibtop_get_loadavg@Base 2.22.3
+ glibtop_get_loadavg_l@Base 2.22.3
+ glibtop_get_mem@Base 2.22.3
+ glibtop_get_mem_l@Base 2.22.3
+ glibtop_get_mountlist@Base 2.22.3
+ glibtop_get_mountlist_l@Base 2.22.3
+ glibtop_get_msg_limits@Base 2.22.3
+ glibtop_get_msg_limits_l@Base 2.22.3
+ glibtop_get_netlist@Base 2.22.3
+ glibtop_get_netlist_l@Base 2.22.3
+ glibtop_get_netload@Base 2.22.3
+ glibtop_get_netload_l@Base 2.22.3
+ glibtop_get_parameter_l@Base 2.22.3
+ glibtop_get_ppp@Base 2.22.3
+ glibtop_get_ppp_l@Base 2.22.3
+ glibtop_get_proc_affinity@Base 2.24.0
+ glibtop_get_proc_affinity_l@Base 2.24.0
+ glibtop_get_proc_args@Base 2.22.3
+ glibtop_get_proc_args_l@Base 2.22.3
+ glibtop_get_proc_argv@Base 2.22.3
+ glibtop_get_proc_argv_l@Base 2.22.3
+ glibtop_get_proc_kernel@Base 2.22.3
+ glibtop_get_proc_kernel_l@Base 2.22.3
+ glibtop_get_proc_map@Base 2.22.3
+ glibtop_get_proc_map_l@Base 2.22.3
+ glibtop_get_proc_mem@Base 2.22.3
+ glibtop_get_proc_mem_l@Base 2.22.3
+ glibtop_get_proc_open_files@Base 2.22.3
+ glibtop_get_proc_open_files_l@Base 2.22.3
+ glibtop_get_proc_segment@Base 2.22.3
+ glibtop_get_proc_segment_l@Base 2.22.3
+ glibtop_get_proc_signal@Base 2.22.3
+ glibtop_get_proc_signal_l@Base 2.22.3
+ glibtop_get_proc_state@Base 2.22.3
+ glibtop_get_proc_state_l@Base 2.22.3
+ glibtop_get_proc_time@Base 2.22.3
+ glibtop_get_proc_time_l@Base 2.22.3
+ glibtop_get_proc_uid@Base 2.22.3
+ glibtop_get_proc_uid_l@Base 2.22.3
+ glibtop_get_proc_wd@Base 2.22.3
+ glibtop_get_proc_wd_l@Base 2.22.3
+ glibtop_get_proclist@Base 2.22.3
+ glibtop_get_proclist_l@Base 2.22.3
+ glibtop_get_sem_limits@Base 2.22.3
+ glibtop_get_sem_limits_l@Base 2.22.3
+ glibtop_get_shm_limits@Base 2.22.3
+ glibtop_get_shm_limits_l@Base 2.22.3
+ glibtop_get_swap@Base 2.22.3
+ glibtop_get_swap_l@Base 2.22.3
+ glibtop_get_sysdeps@Base 2.22.3
+ glibtop_get_sysdeps_r@Base 2.22.3
+ glibtop_get_sysinfo@Base 2.22.3
+ glibtop_get_uptime@Base 2.22.3
+ glibtop_get_uptime_l@Base 2.22.3
+ glibtop_global_server@Base 2.22.3
+ glibtop_init@Base 2.22.3
+ glibtop_init_r@Base 2.22.3
+ glibtop_internet_addr@Base 2.22.3
+ glibtop_make_connection@Base 2.22.3
+ glibtop_open_l@Base 2.22.3
+ glibtop_server_features@Base 2.22.3
+ glibtop_set_parameter_l@Base 2.22.3
+ glibtop_sys_siglist@Base 2.22.3

debian/libgtop2-common.install

@@ -1 +1 @@
-debian/tmp/usr/share/locale
+usr/share/locale

debian/libgtop2-dev.install

@@ -1,4 +1,5 @@
-debian/tmp/usr/include/libgtop-2.0
-debian/tmp/usr/lib/libgtop-2.0.a
-debian/tmp/usr/lib/libgtop-2.0.so
-debian/tmp/usr/lib/pkgconfig
+usr/include/libgtop-2.0
+usr/lib/libgtop-2.0.a
+usr/lib/libgtop-2.0.so
+usr/lib/pkgconfig
+usr/share/gir-*

debian/libgtop2-doc.install

@@ -1 +1 @@
-debian/tmp/usr/share/gtk-doc
+usr/share/gtk-doc

debian/patches/02_hurd_stub_backend.patch

@@ -0,0 +1,178 @@
+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
+@@ -8,7 +8,8 @@
+ 				  sem_limits.c proclist.c procstate.c procuid.c \
+ 				  proctime.c procmem.c procsignal.c prockernel.c \
+ 				  procsegment.c procargs.c procmap.c netload.c \
+-				  ppp.c netlist.c procopenfiles.c
++				  ppp.c netlist.c procopenfiles.c procwd.c \
++				  procaffinity.c sysinfo.c
+ 
+ libgtop_sysdeps_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
+ 
+diff -urN --exclude='*.o' --exclude='*.lo' --exclude='*.in' libgtop2-2.28.0.sav/sysdeps/stub/glibtop_server.h libgtop2-2.28.0/sysdeps/stub/glibtop_server.h
+--- libgtop2-2.28.0.sav/sysdeps/stub/glibtop_server.h	2009-04-18 23:29:49.000000000 +0000
++++ libgtop2-2.28.0/sysdeps/stub/glibtop_server.h	2009-11-22 01:02:16.000000000 +0000
+@@ -45,6 +45,8 @@
+ #define GLIBTOP_SUID_NETLOAD		0
+ #define GLIBTOP_SUID_NETLIST		0
+ #define GLIBTOP_SUID_PPP		0
++#define GLIBTOP_SUID_PROC_WD		0
++#define GLIBTOP_SUID_PROC_AFFINITY	0
+ 
+ G_END_DECLS
+ 
+diff -urN --exclude='*.o' --exclude='*.lo' --exclude='*.in' libgtop2-2.28.0.sav/sysdeps/stub/procaffinity.c libgtop2-2.28.0/sysdeps/stub/procaffinity.c
+--- libgtop2-2.28.0.sav/sysdeps/stub/procaffinity.c	1970-01-01 00:00:00.000000000 +0000
++++ libgtop2-2.28.0/sysdeps/stub/procaffinity.c	2009-11-22 01:06:58.000000000 +0000
+@@ -0,0 +1,44 @@
++/*
++
++   This file is part of LibGTop 2.
++
++   LibGTop is free software; you can redistribute it and/or modify it
++   under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 2 of the License,
++   or (at your option) any later version.
++
++   LibGTop is distributed in the hope that it will be useful, but WITHOUT
++   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
++   for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with LibGTop; see the file COPYING. If not, write to the
++   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++   Boston, MA 02111-1307, USA.
++*/
++
++#include <config.h>
++#include <glibtop/procaffinity.h>
++#include <glibtop/error.h>
++
++#include <sys/param.h>
++
++void
++_glibtop_init_proc_affinity_s(glibtop *server)
++{
++  server->sysdeps.proc_affinity =
++    (1 << GLIBTOP_PROC_AFFINITY_NUMBER) |
++    (1 << GLIBTOP_PROC_AFFINITY_ALL);
++
++}
++
++
++guint16 *
++glibtop_get_proc_affinity_s(glibtop *server, glibtop_proc_affinity *buf, pid_t pid)
++{
++  memset(buf, 0, sizeof *buf);
++
++  return NULL;
++}
++
+diff -urN --exclude='*.o' --exclude='*.lo' --exclude='*.in' libgtop2-2.28.0.sav/sysdeps/stub/proclist.c libgtop2-2.28.0/sysdeps/stub/proclist.c
+--- libgtop2-2.28.0.sav/sysdeps/stub/proclist.c	2009-04-18 23:29:49.000000000 +0000
++++ libgtop2-2.28.0/sysdeps/stub/proclist.c	2009-11-22 01:30:53.000000000 +0000
+@@ -42,7 +42,7 @@
+  *   On success, it returnes a pointer to a list of buf->number elements
+  *   each buf->size big. The total size is stored in buf->total. */
+ 
+-unsigned *
++pid_t *
+ glibtop_get_proclist_s (glibtop *server, glibtop_proclist *buf,
+ 			gint64 which, gint64 arg)
+ {
+diff -urN --exclude='*.o' --exclude='*.lo' --exclude='*.in' libgtop2-2.28.0.sav/sysdeps/stub/procwd.c libgtop2-2.28.0/sysdeps/stub/procwd.c
+--- libgtop2-2.28.0.sav/sysdeps/stub/procwd.c	1970-01-01 00:00:00.000000000 +0000
++++ libgtop2-2.28.0/sysdeps/stub/procwd.c	2009-11-22 01:46:06.000000000 +0000
+@@ -0,0 +1,48 @@
++/*
++   This file is part of LibGTop 2.0.
++
++   LibGTop is free software; you can redistribute it and/or modify it
++   under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 2 of the License,
++   or (at your option) any later version.
++
++   LibGTop is distributed in the hope that it will be useful, but WITHOUT
++   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
++   for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with LibGTop; see the file COPYING. If not, write to the
++   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++   Boston, MA 02111-1307, USA.
++*/
++
++#include <config.h>
++#include <glibtop/procwd.h>
++#include <glibtop/error.h>
++
++#include <unistd.h>
++#include <dirent.h>
++#include <sys/types.h>
++
++static const unsigned long _glibtop_sysdeps_proc_wd = 0;
++
++/* Init function. */
++
++void
++_glibtop_init_proc_wd_s (glibtop *server)
++{
++	server->sysdeps.proc_wd = _glibtop_sysdeps_proc_wd;
++}
++
++/* Provides detailed information about a process. */
++
++char **
++glibtop_get_proc_wd_s (glibtop *server, glibtop_proc_wd *buf,
++			pid_t pid)
++{
++	glibtop_init_s (&server, GLIBTOP_SYSDEPS_PROC_WD, 0);
++
++	memset (buf, 0, sizeof (glibtop_proc_wd));
++	return NULL;
++}
+diff -urN --exclude='*.o' --exclude='*.lo' --exclude='*.in' libgtop2-2.28.0.sav/sysdeps/stub/sysinfo.c libgtop2-2.28.0/sysdeps/stub/sysinfo.c
+--- libgtop2-2.28.0.sav/sysdeps/stub/sysinfo.c	1970-01-01 00:00:00.000000000 +0000
++++ libgtop2-2.28.0/sysdeps/stub/sysinfo.c	2009-11-22 02:08:44.000000000 +0000
+@@ -0,0 +1,31 @@
++/*
++   This file is part of LibGTop 2.0.
++
++   LibGTop is free software; you can redistribute it and/or modify it
++   under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 2 of the License,
++   or (at your option) any later version.
++
++   LibGTop is distributed in the hope that it will be useful, but WITHOUT
++   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
++   for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with LibGTop; see the file COPYING. If not, write to the
++   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++   Boston, MA 02111-1307, USA.
++*/
++
++#include <config.h>
++#include <glibtop/cpu.h>
++#include <glibtop/sysinfo.h>
++
++static glibtop_sysinfo sysinfo = { };
++const glibtop_sysinfo *
++glibtop_get_sysinfo_s (glibtop *server)
++{
++	glibtop_init_s (&server, GLIBTOP_SYSDEPS_CPU, 0);
++
++	return &sysinfo;
++}

debian/patches/03_kfreebsd_installdirs.patch

@@ -0,0 +1,82 @@
+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: libgtop2/libgtop-sysdeps.m4
+===================================================================
+--- libgtop2.orig/libgtop-sysdeps.m4	2011-09-06 14:12:33.925874923 +0200
++++ libgtop2/libgtop-sysdeps.m4	2011-09-06 14:12:37.175874943 +0200
+@@ -73,7 +73,7 @@
+ 	  libgtop_sysdeps_dir=bsd
+ 	  libgtop_use_machine_h=yes
+ 	  libgtop_need_server=yes
+-	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server2'
++	  libgtop_postinstall='chgrp kmem $(DESTDIR)$(libexecdir)/libgtop_server2 && chmod 2755 $(DESTDIR)$(libexecdir)/libgtop_server2'
+ 	  ;;
+ 	openbsd*)
+ 	  libgtop_sysdeps_dir=openbsd
+@@ -87,27 +87,27 @@
+ 	  libgtop_need_server=yes
+ 	  libgtop_sysdeps_private_mountlist=yes
+ 	  libgtop_sysdeps_private_fsusage=yes
+-	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server2'
++	  libgtop_postinstall='chgrp kmem $(DESTDIR)$(libexecdir)/libgtop_server2 && chmod 2755 $(DESTDIR)$(libexecdir)/libgtop_server2'
+ 	  ;;
+ 	solaris*)
+ 	  libgtop_sysdeps_dir=solaris
+ 	  libgtop_use_machine_h=yes
+ 	  libgtop_need_server=yes
+-	  libgtop_postinstall='chgrp sys $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server'
++	  libgtop_postinstall='chgrp sys $(DESTDIR)$(libexecdir)/libgtop_server && chmod 2755 $(DESTDIR)$(libexecdir)/libgtop_server'
+ 	  ;;
+ 	aix*)
+ 	  libgtop_sysdeps_dir=aix
+ 	  libgtop_use_machine_h=yes
+ 	  libgtop_need_server=yes
+ 	  libgtop_have_sysinfo=yes
+-	  libgtop_postinstall='chgrp system $(bindir)/libgtop_server && chmod g+s $(bindir)/libgtop_server2'
++	  libgtop_postinstall='chgrp system $(DESTDIR)$(libexecdir)/libgtop_server && chmod g+s $(DESTDIR)$(libexecdir)/libgtop_server2'
+ 	  ;;
+ 	darwin*)
+ 	  libgtop_sysdeps_dir=darwin
+ 	  libgtop_use_machine_h=yes
+ 	  libgtop_need_server=yes
+ 	  libgtop_have_sysinfo=yes
+-	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod g+s $(bindir)/libgtop_server2'
++	  libgtop_postinstall='chgrp kmem $(DESTDIR)$(libexecdir)/libgtop_server2 && chmod g+s $(DESTDIR)$(libexecdir)/libgtop_server2'
+ 	  ;;
+ 	cygwin*)
+ 	  libgtop_sysdeps_dir=cygwin
+Index: libgtop2/src/daemon/Makefile.am
+===================================================================
+--- libgtop2.orig/src/daemon/Makefile.am	2011-06-01 17:40:47.000000000 +0200
++++ libgtop2/src/daemon/Makefile.am	2011-09-06 14:12:37.175874943 +0200
+@@ -28,7 +28,7 @@
+ suid_common			=
+ endif
+ 
+-bin_PROGRAMS			= libgtop_daemon2 @server_programs@
++libexec_PROGRAMS		= libgtop_daemon2 @server_programs@
+ 
+ EXTRA_PROGRAMS			= libgtop_server2
+ 
+Index: libgtop2/configure.in
+===================================================================
+--- libgtop2.orig/configure.in	2011-08-30 13:25:29.000000000 +0200
++++ libgtop2/configure.in	2011-09-06 14:12:37.175874943 +0200
+@@ -290,8 +290,8 @@
+ libgtop_save_exec_prefix="$exec_prefix"
+ test "x$prefix" = xNONE && prefix=$ac_default_prefix
+ test "x$exec_prefix" = xNONE && exec_prefix=$prefix
+-LIBGTOP_BINDIR=`eval echo "${bindir}"`
+-LIBGTOP_SERVER=`eval echo "${bindir}/libgtop_server2"`
++LIBGTOP_BINDIR=`eval echo "${libexecdir}"`
++LIBGTOP_SERVER=`eval echo "${libexecdir}/libgtop_server2"`
+ prefix="$libgtop_save_prefix"
+ exec_prefix="$libgtop_save_exec_prefix"
+ 

debian/patches/06_kfreebsd_sys_pipe.patch

@@ -0,0 +1,22 @@
+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 <steven@pyro.eu.org>
+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 <sys/vnode.h>
+ #undef _KVM_VNODE
+ 
+-#define _KERNEL
+-#include <sys/pipe.h>
+ #include <sys/conf.h>
+-#undef _KERNEL
+ #if (__FreeBSD_version >= 800038) || (__FreeBSD_kernel_version >= 800038)
+ #define _WANT_FILE
+ #include <sys/file.h>

debian/patches/99_ltmain_as-needed.patch

@@ -1,30 +0,0 @@
---- ltmain.sh.old	2007-10-09 07:38:25.000000000 +0200
-+++ ltmain.sh	2007-10-09 07:39:25.000000000 +0200
-@@ -1794,6 +1794,11 @@
- 	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
- 	;;
- 
-+      -Wl,--as-needed)
-+	deplibs="$deplibs $arg"
-+	continue
-+	;;
-+
-       -Wl,*)
- 	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
- 	arg=
-@@ -2137,6 +2142,15 @@
- 	lib=
- 	found=no
- 	case $deplib in
-+	-Wl,--as-needed)
-+	  if test "$linkmode,$pass" = "prog,link"; then
-+	    compile_deplibs="$deplib $compile_deplibs"
-+	    finalize_deplibs="$deplib $finalize_deplibs"
-+	  else
-+	    deplibs="$deplib $deplibs"
-+	  fi
-+	  continue
-+	  ;;
- 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
- 	  if test "$linkmode,$pass" = "prog,link"; then
- 	    compile_deplibs="$deplib $compile_deplibs"

debian/patches/series

@@ -0,0 +1,3 @@
+02_hurd_stub_backend.patch
+03_kfreebsd_installdirs.patch
+06_kfreebsd_sys_pipe.patch

debian/rules

@@ -1,13 +1,34 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
 
 GNOME_MODULE := libgtop
 
+SHARED_PKG := libgtop2-7
+
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-DEB_DH_MAKESHLIBS_ARGS_ALL += -V 'libgtop2-7 (>= 2.23.2)'
+
+ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
+CPPFLAGS += $(shell pkg-config --cflags libbsd-overlay)
+endif
+
+DEB_DH_AUTORECONF_ARGS = --as-needed
+
+DEB_DH_MAKESHLIBS_ARGS_ALL += -V '$(SHARED_PKG) (>= 2.24.0)'
+
+DEB_CONFIGURE_EXTRA_FLAGS += --libexecdir=/usr/lib/$(SHARED_PKG)
+
+DEB_FIXPERMS_EXCLUDE += libgtop_server2
+
+ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
+install/$(SHARED_PKG)::
+	# The server is only necessary on kFreeBSD
+	dh_install --autodest -p$(SHARED_PKG) \
+		--ignore=debian/$(SHARED_PKG).install \
+		debian/tmp/usr/lib/*/libgtop_server2
+endif

debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

debian/watch

@@ -1,3 +1,3 @@
-version=2
-http://ftp.gnome.org/pub/GNOME/sources/libgtop/([\d\.]+)[02468]/ \
-	libgtop-(.*)\.tar\.gz
+version=3
+http://ftp.gnome.org/pub/GNOME/sources/libgtop/([\d\.]+[02468])/ \
+	libgtop-(.*)\.tar\.xz