Refresh debian/control

thanks Steven Chamberlain for the patch. Closes: #788709

debian/changelog

@@ -1,4 +1,106 @@
-libgtop2 (2.28.3-1) UNRELEASED; urgency=low
+libgtop2 (2.30.0-2) experimental; urgency=medium
+
+  * Fix build failure on kFreeBSD due to undeclared '__FreeBSD_version',
+    thanks Steven Chamberlain for the patch. Closes: #788709
+
+ -- Michael Biebl <biebl@debian.org>  Mon, 15 Jun 2015 21:16:09 +0200
+
+libgtop2 (2.30.0-1) experimental; urgency=medium
+
+  [ Jackson Doak ]
+  * New upstream release.
+    - Increases maximum CPU limit, which breaks ABI.
+  * Change library name to libgtop2-10 for new SONAME
+  * Drop 06_kfreebsd_sys_pipe.patch. Fixed upstream.
+
+  [ Michael Biebl ]
+  * Drop obsolete Replaces from pre-wheezy.
+  * Convert to multiarch.
+  * Bump Standards-Version to 3.9.6.
+  * Bump debhelper compatibility level to 9.
+  * Rename library package to libgtop-2.0-10 to match the SONAME.
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 14 Jun 2015 13:04:40 +0200
+
+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)

debian/compat

@@ -1 +1 @@
-5
+9

debian/control

@@ -2,36 +2,39 @@
 # 
 # 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: Andreas Henriksson <andreas@fatal.se>, 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>, Martin Pitt <mpitt@debian.org>, Michael Biebl <biebl@debian.org>, Sebastian Dröge <slomo@debian.org>
+Build-Depends: debhelper (>= 9),
                gettext,
                pkg-config,
                libxau-dev,
                libglib2.0-dev (>= 2.6.0),
                gnome-pkg-tools (>= 0.10),
                dh-autoreconf,
-               cdbs,
-               quilt,
+               cdbs (>= 0.4.93),
                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
-Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/libgtop2
-Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/libgtop2
+               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.6
+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
+Package: libgtop-2.0-10
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-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
@@ -41,9 +44,11 @@ Description: gtop system monitoring library (shared)
 
 Package: libgtop2-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends},
-         libgtop2-7 (= ${binary:Version}),
+         libgtop-2.0-10 (= ${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
@@ -53,11 +58,8 @@ Description: gtop system monitoring library (devel)
 
 Package: libgtop2-common
 Architecture: all
+Multi-Arch: foreign
 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.
@@ -66,11 +68,25 @@ Description: gtop system monitoring library (common)
 
 Package: libgtop2-doc
 Architecture: all
+Multi-Arch: foreign
 Section: doc
 Depends: ${misc:Depends},
-Replaces: libgtop2-dev (<< 2.28.0-1)
 Description: gtop system monitoring library (documentation)
  The gtop library reads information about processes and the state of the
  system. It is used by the GNOME desktop environment.
  .
  This package contains the documentation.
+
+Package: gir1.2-gtop-2.0
+Architecture: any
+Multi-Arch: same
+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,32 +1,36 @@
 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 (>= 9),
                gettext,
                pkg-config,
                libxau-dev,
                libglib2.0-dev (>= 2.6.0),
                gnome-pkg-tools (>= 0.10),
                dh-autoreconf,
-               cdbs,
-               quilt,
+               cdbs (>= 0.4.93),
                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
-Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/libgtop2
-Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/libgtop2
+               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.6
+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
+Package: libgtop-2.0-10
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-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
@@ -36,9 +40,11 @@ Description: gtop system monitoring library (shared)
 
 Package: libgtop2-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends},
-         libgtop2-7 (= ${binary:Version}),
+         libgtop-2.0-10 (= ${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
@@ -48,11 +54,8 @@ Description: gtop system monitoring library (devel)
 
 Package: libgtop2-common
 Architecture: all
+Multi-Arch: foreign
 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.
@@ -61,11 +64,25 @@ Description: gtop system monitoring library (common)
 
 Package: libgtop2-doc
 Architecture: all
+Multi-Arch: foreign
 Section: doc
 Depends: ${misc:Depends},
-Replaces: libgtop2-dev (<< 2.28.0-1)
 Description: gtop system monitoring library (documentation)
  The gtop library reads information about processes and the state of the
  system. It is used by the GNOME desktop environment.
  .
  This package contains the documentation.
+
+Package: gir1.2-gtop-2.0
+Architecture: any
+Multi-Arch: same
+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/libgtop-2.0-10.install

@@ -0,0 +1 @@
+usr/lib/*/*.so.*

debian/libgtop-2.0-10.symbols

@@ -0,0 +1,71 @@
+libgtop-2.0.so.10 libgtop-2.0-10 #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/libgtop-config.1

@@ -0,0 +1,34 @@
+.TH GTOP l "15 September 1999"
+.SH NAME
+\fBlibgtop-config\fP \- libgtop libraries and component information retrieval.
+.SH SYNTAX
+.B libgtop-config
+.RI [ --version ]
+.RI [ --config ]
+.RI [ --features-def-file ]
+.SH DESCRIPTION
+.B libgtop-config
+is used to retrieve information from installed libraries in the system.
+
+This manual page was written for the Debian GNU/Linux distribution because the original program does not have a manual page.
+.LP
+.SH OPTIONS
+.TP
+.B \-\-version
+.PD
+Prints the version of libgtop that you're using.
+.TP
+.B \-\-config
+.PD
+Prints the location of libgtopConf.sh.
+.TP
+.B \-\-version
+.PD
+Prints the location of libgtop-features.def.
+.SH BUGS
+None known
+
+.SH AUTHORS
+Martin Baulig (martin@home-of-linux.org)
+.TP
+Josh Sled (jsled@scam.XCF.Berkeley.EDU)

debian/libgtop-dev.postinst

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+#DEBHELPER#
+

debian/libgtop2-5.docs

@@ -0,0 +1,3 @@
+README
+NEWS
+AUTHORS

debian/libgtop2-5.install

@@ -0,0 +1,2 @@
+debian/tmp/usr/share/locale/*
+debian/tmp/usr/lib/*.so.*

debian/libgtop2-5.postinst

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if [ "$1" = "configure" ]; then
+    ldconfig
+fi
+
+#DEBHELPER#
+

debian/libgtop2-5.postrm

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if [ "$1" = "remove" ]; then
+    ldconfig
+fi
+
+#DEBHELPER#
+

debian/libgtop2-common.install

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

debian/libgtop2-dev.info

@@ -0,0 +1 @@
+doc/libgtop2.info

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/01_kfreebsd_kvm_libs.patch

@@ -1,23 +0,0 @@
-Description: FTBFS on GNU/kFreeBSD
-Bug-Debian: http://bugs.debian.org/555316
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=601319
-Author: Petr Salinger <Petr.Salinger@seznam.cz>
-
-diff -Nur -x '*.orig' -x '*~' libgtop2-2.28.0/libgtop-sysdeps.m4 libgtop2-2.28.0.new/libgtop-sysdeps.m4
---- libgtop2-2.28.0/libgtop-sysdeps.m4	2009-07-10 14:14:18.000000000 +0200
-+++ libgtop2-2.28.0.new/libgtop-sysdeps.m4	2009-11-09 22:20:31.000000000 +0100
-@@ -148,13 +148,7 @@
- 
- 	case "$host_os" in
- 	*bsd*)
--		case "$host_os" in
--		*kfreebsd*)
--		AC_CHECK_LIB(kvm, kvm_open, KVM_LIBS="-lkvm -lfreebsd -lbsd", KVM_LIBS=, -lfreebsd -lbsd);;
--		*) 
--	  	AC_CHECK_LIB(kvm, kvm_open, KVM_LIBS=-lkvm, KVM_LIBS=);;
--	  	esac
--	  
-+	  AC_CHECK_LIB(kvm, kvm_open, KVM_LIBS=-lkvm, KVM_LIBS=)
- 	  AC_SUBST(KVM_LIBS)
- 
- 	  case "$host_os" in

debian/patches/03_kfreebsd_installdirs.patch

@@ -7,20 +7,20 @@ 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
+Index: libgtop2/libgtop-sysdeps.m4
 ===================================================================
---- libgtop-2.28.0.orig/libgtop-sysdeps.m4	2009-11-22 17:31:01.861694527 +0100
-+++ libgtop-2.28.0/libgtop-sysdeps.m4	2009-11-22 17:33:11.877189288 +0100
-@@ -73,7 +73,7 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
+--- 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'
  	  ;;
- 	freebsd*|kfreebsd*)
- 	  libgtop_sysdeps_dir=freebsd
-@@ -81,27 +81,27 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
+ 	openbsd*)
+ 	  libgtop_sysdeps_dir=openbsd
+@@ -87,27 +87,27 @@
  	  libgtop_need_server=yes
  	  libgtop_sysdeps_private_mountlist=yes
  	  libgtop_sysdeps_private_fsusage=yes
@@ -52,11 +52,11 @@ Index: libgtop-2.28.0/libgtop-sysdeps.m4
  	  ;;
  	cygwin*)
  	  libgtop_sysdeps_dir=cygwin
-Index: libgtop-2.28.0/src/daemon/Makefile.am
+Index: libgtop2/src/daemon/Makefile.am
 ===================================================================
---- libgtop-2.28.0.orig/src/daemon/Makefile.am	2009-11-22 17:29:07.097688961 +0100
-+++ libgtop-2.28.0/src/daemon/Makefile.am	2009-11-22 17:29:46.589689603 +0100
-@@ -28,7 +28,7 @@ suid_sysdeps			=
+--- 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
  
@@ -65,11 +65,11 @@ Index: libgtop-2.28.0/src/daemon/Makefile.am
  
  EXTRA_PROGRAMS			= libgtop_server2
  
-Index: libgtop-2.28.0/configure.in
+Index: libgtop2/configure.in
 ===================================================================
---- libgtop-2.28.0.orig/configure.in	2009-11-22 17:36:21.481188616 +0100
-+++ libgtop-2.28.0/configure.in	2009-11-22 17:36:35.733188858 +0100
-@@ -287,8 +287,8 @@ libgtop_save_prefix="$prefix"
+--- 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

debian/patches/04_kfreebsd_version.patch

@@ -0,0 +1,21 @@
+From: Steven Chamberlain <steven@pyro.eu.org>
+Date: Mon, 15 Jun 2015 17:09:49 +0100
+
+Support GNU/kFreeBSD by using __FreeBSD_kernel_version here,
+rather than simply __FreeBSD_version (which is only defined in
+FreeBSD itself).
+
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=788709
+--- a/sysdeps/freebsd/open.c
++++ b/sysdeps/freebsd/open.c
+@@ -43,6 +43,10 @@
+ 	server->real_ncpu = ncpus - 1;
+ 	server->ncpu = MIN(GLIBTOP_NCPU - 1, server->real_ncpu);
+ 
++#if defined(__FreeBSD__)
+ 	server->os_version_code = __FreeBSD_version;
++#else
++	server->os_version_code = __FreeBSD_kernel_version;
++#endif
+ 
+ }

debian/patches/04_kfreebsd_version_check.patch

@@ -1,28 +0,0 @@
-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
-+++ libgtop-2.28.0/src/daemon/server.c	2009-11-22 21:15:02.673188074 +0100
-@@ -86,16 +86,6 @@ main(int argc, char *argv[])
- 			 LIBGTOP_COMPILE_RELEASE);
- 		_exit (1);
- 	}
--#else
--	if (strcmp (uts.sysname, LIBGTOP_COMPILE_SYSTEM) ||
--	    strcmp (uts.release, LIBGTOP_COMPILE_RELEASE) ||
--	    strcmp (uts.machine, LIBGTOP_COMPILE_MACHINE)) {
--		fprintf (stderr, "Can only run on %s %s %s\n",
--			 LIBGTOP_COMPILE_SYSTEM,
--			 LIBGTOP_COMPILE_RELEASE,
--			 LIBGTOP_COMPILE_MACHINE);
--		_exit (1);
--	}
- #endif
- 
- 	glibtop_init_p (glibtop_global_server, 0, 0);

debian/patches/05_kfreebsd_8.0.patch

@@ -1,28 +0,0 @@
-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/10_kfreebsd.patch

@@ -1,643 +0,0 @@
---- libgtop2-2.14.4.orig/sysdeps/freebsd/procsignal.c
-+++ libgtop2-2.14.4/sysdeps/freebsd/procsignal.c
-@@ -70,7 +70,7 @@
- 		return;
- 	}
- 
--#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
-+#if (defined(__FreeBSD__) && (__FreeBSD_version >= 500013)) || defined(__FreeBSD_kernel__)
- 
- #define	PROC_SIGLIST	ki_siglist
- #define	PROC_SIGMASK	ki_sigmask
-@@ -92,7 +92,7 @@
- #if defined(__NetBSD__) && (__NetBSD_Version__ >= 105150000)
- 	buf->signal [0] = pinfo [0].kp_proc.p_sigctx.ps_siglist.__bits[0];
- #elif (defined(__NetBSD__) && (NSIG > 32)) || \
--      (defined(__FreeBSD__) && (__FreeBSD_version >= 400011))
-+      (defined(__FreeBSD__) && (__FreeBSD_version >= 400011) || defined(__FreeBSD_kernel__))
- 	buf->signal [0] = pinfo [0].PROC_SIGLIST.__bits[0];
- #else
- 	buf->signal [0] = pinfo [0].kp_proc.p_siglist;
-@@ -104,7 +104,7 @@
- #if defined(__NetBSD__) && (__NetBSD_Version__ >= 105150000)
- 	buf->blocked [0] = pinfo [0].kp_proc.p_sigctx.ps_sigmask.__bits[0];
- #elif (defined(__NetBSD__) && (NSIG > 32)) || \
--      (defined(__FreeBSD__) && (__FreeBSD_version >= 400011))
-+      (defined(__FreeBSD__) && (__FreeBSD_version >= 400011) || defined(__FreeBSD_kernel__))
- 	buf->blocked [0] = pinfo [0].PROC_SIGMASK.__bits[0];
- #else
- 	buf->blocked [0] = pinfo [0].kp_proc.p_sigmask;
-@@ -116,7 +116,7 @@
- #if defined(__NetBSD__) && (__NetBSD_Version__ >= 105150000)
- 	buf->sigignore [0] = pinfo [0].kp_proc.p_sigctx.ps_sigignore.__bits[0];
- #elif (defined(__NetBSD__) && (NSIG > 32)) || \
--      (defined(__FreeBSD__) && (__FreeBSD_version >= 400011))
-+      (defined(__FreeBSD__) && (__FreeBSD_version >= 400011) || defined(__FreeBSD_kernel__))
- 	buf->sigignore [0] = pinfo [0].PROC_SIGIGNORE.__bits[0];
- #else
- 	buf->sigignore [0] = pinfo [0].kp_proc.p_sigignore;
-@@ -128,7 +128,7 @@
- #if defined(__NetBSD__) && (__NetBSD_Version__ >= 105150000)
- 	buf->sigcatch [0] = pinfo [0].kp_proc.p_sigctx.ps_sigcatch.__bits[0];
- #elif (defined(__NetBSD__) && (NSIG > 32)) || \
--      (defined(__FreeBSD__) && (__FreeBSD_version >= 400011))
-+      (defined(__FreeBSD__) && (__FreeBSD_version >= 400011) || defined(__FreeBSD_kernel__))
- 	buf->sigcatch [0] = pinfo [0].PROC_SIGCATCH.__bits[0];
- #else
- 	buf->sigcatch [0] = pinfo [0].kp_proc.p_sigcatch;
-only in patch2:
-unchanged:
---- libgtop2-2.14.4.orig/sysdeps/freebsd/mem.c
-+++ libgtop2-2.14.4/sysdeps/freebsd/mem.c
-@@ -43,7 +43,7 @@
- (1L << GLIBTOP_MEM_FREE) +
- (1L << GLIBTOP_MEM_SHARED) +
- (1L << GLIBTOP_MEM_BUFFER) +
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- (1L << GLIBTOP_MEM_CACHED) +
- #endif
- (1L << GLIBTOP_MEM_USER) + (1L << GLIBTOP_MEM_LOCKED);
-@@ -66,7 +66,7 @@
- #else
- #if defined(__bsdi__)
- 	{ "_bufcachemem" },
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- 	{ "_bufspace" },
- #else
- 	{ "_bufpages" },
-@@ -171,7 +171,7 @@
- 
- 	/* convert memory stats to Kbytes */
- 
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- 	v_total_count = vmm.v_page_count;
- #else
- #if defined(__NetBSD__)  && (__NetBSD_Version__ >= 104000000) || defined(__OpenBSD__)
-@@ -198,7 +198,7 @@
- 	buf->used  = (guint64) pagetok (v_used_count) << LOG1024;
- 	buf->free  = (guint64) pagetok (v_free_count) << LOG1024;
- 
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- 	buf->cached = (guint64) pagetok (vmm.v_cache_count) << LOG1024;
- #endif
- 
-@@ -210,7 +210,7 @@
- 
- 	buf->shared = (guint64) pagetok (vmt.t_rmshr) << LOG1024;
- 
--#if __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- 	buf->buffer = (guint64) bufspace;
- #else
- 	buf->buffer = (guint64) pagetok (bufspace) << LOG1024;
-only in patch2:
-unchanged:
---- libgtop2-2.14.4.orig/sysdeps/freebsd/procstate.c
-+++ libgtop2-2.14.4/sysdeps/freebsd/procstate.c
-@@ -73,7 +73,7 @@
- 		return;
- 	}
- 
--#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
-+#if (defined(__FreeBSD__) && (__FreeBSD_version >= 500013)) || defined(__FreeBSD_kernel__)
- #define	PROC_COMM	ki_comm
- #define	PROC_SVUID	ki_svuid
- #define	PROC_SVGID	ki_svgid
-only in patch2:
-unchanged:
---- libgtop2-2.14.4.orig/sysdeps/freebsd/fsusage.c
-+++ libgtop2-2.14.4/sysdeps/freebsd/fsusage.c
-@@ -46,9 +46,9 @@
- 	if (result == -1) {
- 		return;
- 	}
--
-+#if !defined(__FreeBSD_kernel__)
- 	buf->read = sfs.f_syncreads + sfs.f_asyncreads;
- 	buf->write = sfs.f_syncwrites + sfs.f_asyncwrites;
--
-+#endif
- 	buf->flags |= (1 << GLIBTOP_FSUSAGE_READ) | (1 << GLIBTOP_FSUSAGE_WRITE);
- }
-only in patch2:
-unchanged:
---- libgtop2-2.14.4.orig/sysdeps/freebsd/swap.c
-+++ libgtop2-2.14.4/sysdeps/freebsd/swap.c
-@@ -33,13 +33,13 @@
- (1L << GLIBTOP_SWAP_FREE) + (1L << GLIBTOP_SWAP_PAGEIN) +
- (1L << GLIBTOP_SWAP_PAGEOUT);
- 
--#if defined(__FreeBSD__) || defined(__bsdi__)
-+#if defined(__FreeBSD__) || defined(__bsdi__) || defined(__FreeBSD_kernel__)
- 
- #include <sys/conf.h>
- #ifdef __bsdi__
- #include <vm/swap_pager.h>
- #else
--#if __FreeBSD_version < 400005
-+#if (__FreeBSD_version < 400005) && !defined(__FreeBSD_kernel__)
- #include <sys/rlist.h>
- #endif
- #endif
-@@ -94,7 +94,7 @@
- void
- glibtop_init_swap_p (glibtop *server)
- {
--#if defined(__FreeBSD__) || defined(__bsdi__)
-+#if defined(__FreeBSD__) || defined(__bsdi__) || defined(__FreeBSD_kernel__)
- #if __FreeBSD__ < 4 || defined(__bsdi__)
- 	if (kvm_nlist (server->machine.kd, nlst) < 0) {
- 		glibtop_warn_io_r (server, "kvm_nlist (swap)");
-@@ -130,9 +130,9 @@
- void
- glibtop_get_swap_p (glibtop *server, glibtop_swap *buf)
- {
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- 
--# if __FreeBSD__ < 4
-+# if (__FreeBSD__ < 4) && !defined(__FreeBSD_kernel__)
- 	char *header;
- 	int hlen, nswdev, dmmax;
- 	int div, nfree, npfree;
-@@ -194,7 +194,7 @@
- 		buf->pagein = 0;
- 		buf->pageout = 0;
- 	} else {
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- 		buf->pagein = vmm.v_swappgsin - swappgsin;
- 		buf->pageout = vmm.v_swappgsout - swappgsout;
- #else
-@@ -208,7 +208,7 @@
- #endif
- 	}
- 
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-         swappgsin = vmm.v_swappgsin;
- 	swappgsout = vmm.v_swappgsout;
- #else
-@@ -221,9 +221,9 @@
- #endif
- #endif
- 
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- 
--#if __FreeBSD__ < 4
-+#if (__FreeBSD__ < 4) && !defined(__FreeBSD_kernel__)
- 
- 	/* Size of largest swap device. */
- 
-only in patch2:
-unchanged:
---- libgtop2-2.14.4.orig/sysdeps/freebsd/procmap.c
-+++ libgtop2-2.14.4/sysdeps/freebsd/procmap.c
-@@ -41,18 +41,18 @@
- #else
- #include <vm/vm_object.h>
- #include <vm/vm_map.h>
--#if (__FreeBSD_version >= 400011)
-+#if (__FreeBSD_version >= 400011) || defined(__FreeBSD_kernel__)
- #include <vm/vm.h>
- #else
- #include <vm/vm_prot.h>
- #endif
- #endif
- 
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- #define _KVM_VNODE
- #endif
- #include <sys/vnode.h>
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- #undef _KVM_VNODE
- #endif
- #include <sys/mount.h>
-@@ -109,9 +109,9 @@
- 	struct vm_object object;
- #endif
- 	glibtop_map_entry *maps;
--#if defined __FreeBSD__
-+#if (defined __FreeBSD__) || defined(__FreeBSD_kernel__)
- 	struct vnode vnode;
--#if __FreeBSD_version < 500039
-+#if (__FreeBSD_version < 500039) && !defined(__FreeBSD_kernel__)
- 	struct inode inode;
- #endif
- #endif
-@@ -137,7 +137,7 @@
- 	/* Now we get the memory maps. */
- 
- 	if (kvm_read (server->machine.kd,
--#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
-+#if (defined(__FreeBSD__) && (__FreeBSD_version >= 500013)) || defined(__FreeBSD_kernel__)
- 		      (unsigned long) pinfo [0].ki_vmspace,
- #else
- 		      (unsigned long) pinfo [0].kp_proc.p_vmspace,
-@@ -179,8 +179,8 @@
- 			update = 1;
- 		}
- 
--#ifdef __FreeBSD__
--#if __FreeBSD__ >= 4
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#if (__FreeBSD__ >= 4) || defined(__FreeBSD_kernel__)
- 		if (entry.eflags & (MAP_ENTRY_IS_SUB_MAP))
- 			continue;
- #else
-@@ -256,7 +256,7 @@
- #endif
- 
- 
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- 		/* If the object is of type vnode, add its size */
- 
- 		if (object.type != OBJT_VNODE)
-@@ -270,10 +270,10 @@
- 			      &vnode, sizeof (vnode)) != sizeof (vnode))
- 			glibtop_error_io_r (server, "kvm_read (vnode)");
- 
--#if defined(__FreeBSD__) && (__FreeBSD_version >= 500039)
-+#if (defined(__FreeBSD__) && (__FreeBSD_version >= 500039)) || defined(__FreeBSD_kernel__)
-                switch (vnode.v_type) {
-                    case VREG:
--#if __FreeBSD_version < 600006
-+#if (__FreeBSD_version < 600006) && !defined(__FreeBSD_kernel__)
-                        maps [i-1].inode = vnode.v_cachedid;
-                        maps [i-1].device = vnode.v_cachedfs;
- #endif
-only in patch2:
-unchanged:
---- libgtop2-2.14.4.orig/sysdeps/freebsd/procmem.c
-+++ libgtop2-2.14.4/sysdeps/freebsd/procmem.c
-@@ -73,7 +73,7 @@
- static const unsigned long _glibtop_sysdeps_proc_mem_share =
- #if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
- (1L << GLIBTOP_PROC_MEM_SHARE);
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- (1L << GLIBTOP_PROC_MEM_SHARE);
- #else
- 0;
-@@ -126,7 +126,7 @@
- #else
- 	struct vm_object object;
- #endif
--#if !defined(__FreeBSD__) || (__FreeBSD_version < 500013)
-+#if (!defined(__FreeBSD__) || (__FreeBSD_version < 500013)) && !defined(__FreeBSD_kernel__)
- 	struct plimit plimit;
- #endif
- 	int count;
-@@ -147,7 +147,7 @@
- 		glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid);
- 		return;
- 	}
--#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
-+#if (defined(__FreeBSD__) && (__FreeBSD_version >= 500013)) || defined(__FreeBSD_kernel__)
- 
- #define        PROC_VMSPACE   ki_vmspace
- 
-@@ -214,8 +214,8 @@
- 			return;
- 		}
- 
--#ifdef __FreeBSD__
--#if __FreeBSD__ >= 4
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#if (__FreeBSD__ >= 4) || defined(__FreeBSD_kernel__)
- 		if (entry.eflags & (MAP_ENTRY_IS_SUB_MAP))
- 			continue;
- #else
-@@ -282,7 +282,7 @@
- #endif /* __NetBSD_Version__ >= 105250000 */
- #endif
- 
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- 		if (object.type != OBJT_VNODE)
- 			continue;
- 
-only in patch2:
-unchanged:
---- libgtop2-2.14.4.orig/sysdeps/freebsd/prockernel.c
-+++ libgtop2-2.14.4/sysdeps/freebsd/prockernel.c
-@@ -36,7 +36,7 @@
- #include <sys/user.h>
- #endif
- #if !defined(__bsdi__) && !(defined(__FreeBSD__) && defined(__alpha__)) && \
--    !defined(__NetBSD__)
-+    !defined(__NetBSD__) 
- #include <machine/pcb.h>
- #endif
- 
-@@ -94,7 +94,7 @@
- 			   pid_t pid)
- {
- 	struct kinfo_proc *pinfo;
--#ifndef __FreeBSD__
-+#if !(defined(__FreeBSD__) || defined(__FreeBSD_kernel__))
- 	struct user *u_addr = (struct user *)USRSTACK;
- 	struct pstats pstats;
- 	struct pcb pcb;
-@@ -119,7 +119,7 @@
- 	if ((pinfo == NULL) || (count != 1))
- 		glibtop_error_io_r (server, "kvm_getprocs (%d)", pid);
- 
--#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
-+#if (defined(__FreeBSD__) && (__FreeBSD_version >= 500013)) || defined(__FreeBSD_kernel__)
- 
- #define	PROC_WCHAN	ki_wchan
- #define	PROC_WMESG	ki_wmesg
-@@ -147,7 +147,7 @@
- 	}
- #endif
- 
--#ifndef __FreeBSD__
-+#if !(defined(__FreeBSD__) || defined(__FreeBSD_kernel__))
- 
- 	/* Taken from `saveuser ()' in `/usr/src/bin/ps/ps.c'. */
- 
-@@ -203,9 +203,9 @@
- 		       (unsigned long) &u_addr->u_pcb,
- 		       (char *) &pcb, sizeof (pcb)) == sizeof (pcb))
- 		{
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- #ifndef __alpha__
--#if (__FreeBSD_version >= 300003)
-+#if (__FreeBSD_version >= 300003) || defined(__FreeBSD_kernel__)
- 			buf->kstk_esp = (guint64) pcb.pcb_esp;
- 			buf->kstk_eip = (guint64) pcb.pcb_eip;
- #else
-only in patch2:
-unchanged:
---- libgtop2-2.14.4.orig/sysdeps/freebsd/procuid.c
-+++ libgtop2-2.14.4/sysdeps/freebsd/procuid.c
-@@ -77,7 +77,7 @@
- 		return;
- 	}
- 
--#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
-+#if (defined(__FreeBSD__) && (__FreeBSD_version >= 500013)) || defined(__FreeBSD_kernel__)
- 
- #define	PROC_RUID	ki_ruid
- #define	PROC_SVUID	ki_svuid
-@@ -87,12 +87,8 @@
- #define	PROC_PGID	ki_pgid
- #define	PROC_TPGID	ki_tpgid
- #define	PROC_NICE	ki_nice
--#if __FreeBSD_version >= 500013
- #define	PROC_PRIORITY	ki_pri.pri_user
- #else
--#define	PROC_PRIORITY	ki_priority
--#endif
--#else
- 
- #define	PROC_RUID	kp_eproc.e_pcred.p_ruid
- #define	PROC_SVUID	kp_eproc.e_pcred.p_svuid
-only in patch2:
-unchanged:
---- libgtop2-2.14.4.orig/sysdeps/freebsd/proclist.c
-+++ libgtop2-2.14.4/sysdeps/freebsd/proclist.c
-@@ -86,7 +86,7 @@
- 	pids = g_realloc (pids, count * sizeof (unsigned));
- 	/* Copy the pids over to this chain */
- 	for (i=j=0; i < count; i++) {
--#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
-+#if (defined(__FreeBSD__) && (__FreeBSD_version >= 500013)) || defined(__FreeBSD_kernel__)
- #define PROC_STAT	ki_stat
- #define PROC_RUID	ki_ruid
- #define PROC_PID	ki_pid
-only in patch2:
-unchanged:
---- libgtop2-2.14.4.orig/sysdeps/freebsd/proctime.c
-+++ libgtop2-2.14.4/sysdeps/freebsd/proctime.c
-@@ -58,9 +58,8 @@
-  * system, and interrupt time usage.
-  */
- 
--#ifndef __FreeBSD__
-+#if !(defined(__FreeBSD__) || defined(__FreeBSD_kernel__))
- 
--#ifndef __FreeBSD__
- static void
- calcru(p, up, sp, ip)
-      struct proc *p;
-@@ -109,8 +108,6 @@
- 		ip->tv_usec = it % 1000000;
- 	}
- }
--#endif
--
- #endif /* !__FreeBSD__ */
- 
- /* Provides detailed information about a process. */
-@@ -145,7 +142,7 @@
- 	if ((pinfo == NULL) || (count != 1))
- 		glibtop_error_io_r (server, "kvm_getprocs (%d)", pid);
- 
--#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
-+#if (defined(__FreeBSD__) && (__FreeBSD_version >= 500013)) || defined(__FreeBSD_kernel__)
- 	buf->rtime = pinfo [0].ki_runtime;
- #elif (defined __FreeBSD__) && (__FreeBSD_version <= 500013)
- 	buf->rtime = pinfo [0].kp_proc.p_runtime;
-@@ -182,8 +179,8 @@
- 
- 	buf->flags |= _glibtop_sysdeps_proc_time_user;
- #else
--#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
--#if __FreeBSD_version >= 500016
-+#if (defined(__FreeBSD__) && (__FreeBSD_version >= 500013)) || defined(__FreeBSD_kernel__)
-+#if (__FreeBSD_version >= 500016) || defined(__FreeBSD_kernel__)
-        if ((pinfo [0].ki_flag & PS_INMEM)) {
- #else
-        if ((pinfo [0].ki_flag & P_INMEM)) {
-only in patch2:
-unchanged:
---- libgtop2-2.14.4.orig/libgtop-sysdeps.m4
-+++ libgtop2-2.14.4/libgtop-sysdeps.m4
-@@ -64,7 +64,7 @@
- 	  libgtop_have_sysinfo=yes
- 	  libgtop_need_server=no
- 	  ;;
--	freebsd*|netbsd*|openbsd*|bsdi*)
-+	freebsd*|netbsd*|openbsd*|bsdi*|kfreebsd*)
- 	  libgtop_sysdeps_dir=freebsd
- 	  libgtop_use_machine_h=yes
- 	  libgtop_need_server=yes
-@@ -122,7 +122,13 @@
- 
- 	case "$host_os" in
- 	*bsd*)
--	  AC_CHECK_LIB(kvm, kvm_open, KVM_LIBS=-lkvm, KVM_LIBS=)
-+		case "$host_os" in
-+		*kfreebsd*)
-+		AC_CHECK_LIB(kvm, kvm_open, KVM_LIBS="-lkvm -lfreebsd -lbsd", KVM_LIBS=, -lfreebsd -lbsd);;
-+		*) 
-+	  	AC_CHECK_LIB(kvm, kvm_open, KVM_LIBS=-lkvm, KVM_LIBS=);;
-+	  	esac
-+	  
- 	  AC_SUBST(KVM_LIBS)
- 
- 	  AC_CHECK_HEADERS(net/if_var.h)
-@@ -141,7 +147,7 @@
- #include <net/netisr.h>
- #include <net/route.h>
- 
--#if defined(__FreeBSD__) || defined(__NetBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__FreeBSD_kernel__)
- #include <net/if_sppp.h>
- #else
- #include <i4b/sppp/if_sppp.h>
-@@ -167,7 +173,7 @@
- #include <net/netisr.h>
- #include <net/route.h>
- 
--#if defined(__FreeBSD__) || defined(__NetBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__FreeBSD_kernel__)
- #include <net/if_sppp.h>
- #else
- #include <i4b/sppp/if_sppp.h>
-only in patch2:
-unchanged:
---- libgtop2-2.14.4.orig/configure
-+++ libgtop2-2.14.4/configure
-@@ -21504,7 +21504,7 @@
- 	  libgtop_have_sysinfo=yes
- 	  libgtop_need_server=no
- 	  ;;
--	freebsd*|netbsd*|openbsd*|bsdi*)
-+	freebsd*|netbsd*|openbsd*|bsdi*|kfreebsd*)
- 	  libgtop_sysdeps_dir=freebsd
- 	  libgtop_use_machine_h=yes
- 	  libgtop_need_server=yes
-@@ -21563,7 +21563,93 @@
- 
- 	case "$host_os" in
- 	*bsd*)
--	  { echo "$as_me:$LINENO: checking for kvm_open in -lkvm" >&5
-+		case "$host_os" in
-+		*kfreebsd*)
-+		{ echo "$as_me:$LINENO: checking for kvm_open in -lkvm" >&5
-+echo $ECHO_N "checking for kvm_open in -lkvm... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_kvm_kvm_open+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lkvm -lfreebsd -lbsd $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char kvm_open ();
-+int
-+main ()
-+{
-+return kvm_open ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_lib_kvm_kvm_open=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_kvm_kvm_open=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_kvm_kvm_open" >&5
-+echo "${ECHO_T}$ac_cv_lib_kvm_kvm_open" >&6; }
-+if test $ac_cv_lib_kvm_kvm_open = yes; then
-+  KVM_LIBS="-lkvm -lfreebsd -lbsd"
-+else
-+  KVM_LIBS=
-+fi
-+;;
-+		*)
-+	  	{ echo "$as_me:$LINENO: checking for kvm_open in -lkvm" >&5
- echo $ECHO_N "checking for kvm_open in -lkvm... $ECHO_C" >&6; }
- if test "${ac_cv_lib_kvm_kvm_open+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -21645,6 +21731,8 @@
- else
-   KVM_LIBS=
- fi
-+;;
-+	  	esac
- 
- 
- 
-@@ -21839,7 +21927,7 @@
- #include <net/netisr.h>
- #include <net/route.h>
- 
--#if defined(__FreeBSD__) || defined(__NetBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__FreeBSD_kernel__)
- #include <net/if_sppp.h>
- #else
- #include <i4b/sppp/if_sppp.h>
-@@ -21928,7 +22016,7 @@
- #include <net/netisr.h>
- #include <net/route.h>
- 
--#if defined(__FreeBSD__) || defined(__NetBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__FreeBSD_kernel__)
- #include <net/if_sppp.h>
- #else
- #include <i4b/sppp/if_sppp.h>

debian/patches/20_glibtop_get_proc_map-stack-overflow.patch

@@ -1,108 +0,0 @@
-Index: sysdeps/linux/procmap.c
-===================================================================
---- sysdeps/linux/procmap.c	(révision 2545)
-+++ sysdeps/linux/procmap.c	(révision 2546)
-@@ -38,7 +38,7 @@
- #define SMAPS_FILE "/proc/%u/smaps"
- 
- 
--#define PROC_MAPS_FORMAT "%16llx-%16llx %4c %16llx %02hx:%02hx %llu%*[ ]%[^\n]\n"
-+#define PROC_MAPS_FORMAT "%16llx-%16llx %4c %16llx %02hx:%02hx %llu%*[ ]%n"
- 
- 
- static const unsigned long _glibtop_sysdeps_proc_map =
-@@ -132,6 +132,8 @@
- 	FILE *maps;
- 	const char *filename;
- 	gboolean has_smaps;
-+	char *line = NULL;
-+	size_t line_size = 0;
- 
- 	glibtop_init_s (&server, GLIBTOP_SYSDEPS_PROC_MAP, 0);
- 
-@@ -152,33 +154,29 @@
- 
- 	while(TRUE)
- 	{
--		char line[1024];
--
- 		unsigned long perm = 0;
--		int rv;
- 		guint len;
-+		int line_end;
- 
- 		unsigned short dev_major, dev_minor;
- 		guint64 start, end, offset, inode;
- 		char flags[4];
--		char filename [GLIBTOP_MAP_FILENAME_LEN+1];
-+		char *filename;
- 
- 		glibtop_map_entry *entry;
- 
--		if (!fgets(line, sizeof line, maps))
-+		if (getline(&line, &line_size, maps) == -1)
- 			break;
- 
- 		/* 8 arguments */
--		rv = sscanf(line, PROC_MAPS_FORMAT,
--			    &start, &end, flags, &offset,
--			    &dev_major, &dev_minor, &inode, filename);
-+		if (sscanf(line, PROC_MAPS_FORMAT,
-+			   &start, &end, flags, &offset,
-+			   &dev_major, &dev_minor, &inode, &line_end) != 7)
-+			break;
- 
--		if(rv == EOF || rv < 7)
--		  break;
-+		filename = line + line_end;
-+		g_strstrip(filename);
- 
--		if(rv == 7) /* no filename */
--		  filename[0] = '\0';
--
- 		/* Compute access permissions. */
- 
- 		if (flags [0] == 'r')
-@@ -217,6 +215,7 @@
- 
- 	}
- 
-+	free(line);
- 	fclose (maps);
- 
- 	buf->flags = _glibtop_sysdeps_proc_map;
-Index: sysdeps/linux/procopenfiles.c
-===================================================================
---- sysdeps/linux/procopenfiles.c	(révision 2545)
-+++ sysdeps/linux/procopenfiles.c	(révision 2546)
-@@ -58,7 +58,8 @@
- parse_file(const char *filename, LineParser parser, GHashTable *dict)
- {
- 	FILE *f;
--	char line[1024];
-+	char *line = NULL;
-+	size_t size = 0;
- 
- 	f = fopen(filename, "r");
- 
-@@ -67,15 +68,16 @@
- 		return;
- 	}
- 
-+
- 	/* skip the first line */
--	if(!fgets(line, sizeof line, f)) goto eof;
-+	if (getline(&line, &size, f) == -1)
-+		goto eof;
- 
--	while(fgets(line, sizeof line, f))
--	{
-+	while (getline(&line, &size, f) != -1)
- 		parser(dict, line);
--	}
- 
-  eof:
-+	free(line);
- 	fclose(f);
- }
- 

debian/patches/99_ltmain_as-needed.patch

@@ -1,9 +1,7 @@
-Index: libgtop-2.28.0/ltmain.sh
-===================================================================
---- libgtop-2.28.0.orig/ltmain.sh	2009-09-21 09:54:29.000000000 +0200
-+++ libgtop-2.28.0/ltmain.sh	2009-11-22 17:17:07.677688108 +0100
-@@ -4716,6 +4716,11 @@ func_mode_link ()
- 	arg=$func_stripname_result
+--- 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)
@@ -12,9 +10,9 @@ Index: libgtop-2.28.0/ltmain.sh
 +	;;
 +
        -Wl,*)
- 	func_stripname '-Wl,' '' "$arg"
- 	args=$func_stripname_result
-@@ -5070,6 +5075,15 @@ func_mode_link ()
+ 	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
+ 	arg=
+@@ -2137,6 +2142,15 @@
  	lib=
  	found=no
  	case $deplib in

debian/patches/series

@@ -1,6 +1,3 @@
-01_kfreebsd_kvm_libs.patch
 02_hurd_stub_backend.patch
 03_kfreebsd_installdirs.patch
-04_kfreebsd_version_check.patch
-05_kfreebsd_8.0.patch
-99_ltmain_as-needed.patch
+04_kfreebsd_version.patch

debian/rules

@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.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
@@ -10,12 +9,20 @@ include /usr/share/cdbs/1/rules/autoreconf.mk
 
 GNOME_MODULE := libgtop
 
-SHARED_PKG := libgtop2-7
+SHARED_PKG := libgtop-2.0-10
 
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-DEB_DH_MAKESHLIBS_ARGS_ALL += -V '$(SHARED_PKG) (>= 2.23.2)'
 
-DEB_CONFIGURE_EXTRA_FLAGS += --libexecdir=/usr/lib/$(SHARED_PKG)
+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 += --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
+                             --libexecdir=\$${libdir}/$(SHARED_PKG)
 
 DEB_FIXPERMS_EXCLUDE += libgtop_server2
 
@@ -24,5 +31,5 @@ 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
+		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/$(SHARED_PKG)/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