Refresh debian/control

thanks Steven Chamberlain for the patch. Closes: #788709

debian/changelog

@@ -1,3 +1,82 @@
+libgtop2 (2.30.0-3) unstable; urgency=medium
+
+  * Upload to unstable.
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 16 Jun 2015 00:10:47 +0200
+
+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 ]

debian/compat

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

debian/control

@@ -2,38 +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>
+Build-Depends: debhelper (>= 9),
                gettext,
                pkg-config,
                libxau-dev,
                libglib2.0-dev (>= 2.6.0),
                gnome-pkg-tools (>= 0.10),
                dh-autoreconf,
-               cdbs,
+               cdbs (>= 0.4.93),
                texinfo,
-               dpkg-dev (>= 1.13.19),
                intltool (>= 0.35.0),
                libxt-dev,
                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.6.7),
-               gir1.2-glib-2.0
-Standards-Version: 3.9.2
-Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/libgtop2
-Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/libgtop2
+               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
@@ -43,11 +44,12 @@ Description: gtop system monitoring library (shared)
 
 Package: libgtop2-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends},
-         libgtop2-7 (= ${binary:Version}),
-         libglib2.0-dev,
-         gir1.2-gtop-2.0
+         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
  system. It is used by the GNOME desktop environment.
@@ -56,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.
@@ -69,9 +68,9 @@ 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.
@@ -80,6 +79,8 @@ Description: gtop system monitoring library (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)
@@ -87,5 +88,5 @@ Description: gtop system monitoring library (gir bindings)
  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. 
+ generate dynamic bindings.
 

debian/control.in

@@ -1,34 +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,
+               cdbs (>= 0.4.93),
                texinfo,
-               dpkg-dev (>= 1.13.19),
                intltool (>= 0.35.0),
                libxt-dev,
                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.6.7),
-               gir1.2-glib-2.0
-Standards-Version: 3.9.2
-Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/libgtop2
-Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/libgtop2
+               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
@@ -38,11 +40,12 @@ Description: gtop system monitoring library (shared)
 
 Package: libgtop2-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends},
-         libgtop2-7 (= ${binary:Version}),
-         libglib2.0-dev,
-         gir1.2-gtop-2.0
+         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
  system. It is used by the GNOME desktop environment.
@@ -51,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.
@@ -64,9 +64,9 @@ 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.
@@ -75,6 +75,8 @@ Description: gtop system monitoring library (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)
@@ -82,5 +84,5 @@ Description: gtop system monitoring library (gir bindings)
  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. 
+ generate dynamic bindings.
 

debian/gir1.2-gtop-2.0.install

@@ -1 +1 @@
-debian/tmp/usr/lib/girepository-*
+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/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,5 +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
-debian/tmp/usr/share/gir-*
+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/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: libgtop2/sysdeps/freebsd/procmap.c
-===================================================================
---- 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 <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 @@
-                 return;
-         }
- 
--#if __FreeBSD_version >= 800039
-+#if (__FreeBSD_version >= 800039) || (__FreeBSD_kernel_version >= 800039)
-         if (kvm_read (server->machine.kd, (gulong) cdev2priv(inode.i_dev), (char *) &priv,
- 		      sizeof (priv))
- #else

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,32 +0,0 @@
-Index: libgtop2/ltmain.sh
-===================================================================
---- libgtop2.orig/ltmain.sh	2011-08-30 13:25:39.000000000 +0200
-+++ libgtop2/ltmain.sh	2011-09-06 14:12:45.695875002 +0200
-@@ -5787,6 +5787,11 @@
- 	arg=$func_stripname_result
- 	;;
- 
-+      -Wl,--as-needed)
-+	deplibs="$deplibs $arg"
-+	continue
-+	;;
-+
-       -Wl,*)
- 	func_stripname '-Wl,' '' "$arg"
- 	args=$func_stripname_result
-@@ -6150,6 +6155,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

@@ -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

@@ -9,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
 
@@ -23,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/watch

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