[svn-buildpackage] Tagging libgtop2 2.28.3-1

2011-05-04 16:23:00 +00:00
20 changed files with 176 additions and 264 deletions
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,79 +1,3 @@
-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.
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+5
--- a/debian/control
+++ b/debian/control
@@ -6,9 +6,9 @@
 Source: libgtop2
 Section: libs
 Priority: optional
-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),
+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),
               gettext,
               pkg-config,
               libxau-dev,
@@ -16,24 +16,22 @@ Build-Depends: debhelper (>= 8),
               gnome-pkg-tools (>= 0.10),
               dh-autoreconf,
               cdbs,
+               quilt,
               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.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
+               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

 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
@@ -46,7 +44,6 @@ 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
@@ -57,6 +54,10 @@ 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.
@@ -73,16 +74,3 @@ 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.
-
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,9 +1,9 @@
 Source: libgtop2
 Section: libs
 Priority: optional
-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Maintainer: Sebastien Bacher <seb128@debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 5),
               gettext,
               pkg-config,
               libxau-dev,
@@ -11,24 +11,22 @@ Build-Depends: debhelper (>= 8),
               gnome-pkg-tools (>= 0.10),
               dh-autoreconf,
               cdbs,
+               quilt,
               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.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
+               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

 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
@@ -41,7 +39,6 @@ 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
@@ -52,6 +49,10 @@ 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.
@@ -68,16 +69,3 @@ 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.
-
--- a/debian/gir1.2-gtop-2.0.install
+++ b/debian/gir1.2-gtop-2.0.install
@@ -1 +0,0 @@
-usr/lib/girepository-*
--- a/debian/libgtop2-7.install
+++ b/debian/libgtop2-7.install
@@ -1 +1 @@
-usr/lib/*.so.*
+debian/tmp/usr/lib/*.so.*
--- a/debian/libgtop2-7.symbols
+++ b/debian/libgtop2-7.symbols
@@ -1,71 +0,0 @@
-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
--- a/debian/libgtop2-common.install
+++ b/debian/libgtop2-common.install
@@ -1 +1 @@
-usr/share/locale
+debian/tmp/usr/share/locale
--- a/debian/libgtop2-dev.install
+++ b/debian/libgtop2-dev.install
@@ -1,5 +1,4 @@
-usr/include/libgtop-2.0
-usr/lib/libgtop-2.0.a
-usr/lib/libgtop-2.0.so
-usr/lib/pkgconfig
-usr/share/gir-*
+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
--- a/debian/libgtop2-doc.install
+++ b/debian/libgtop2-doc.install
@@ -1 +1 @@
-usr/share/gtk-doc
+debian/tmp/usr/share/gtk-doc
--- a/debian/patches/01_kfreebsd_kvm_libs.patch
+++ b/debian/patches/01_kfreebsd_kvm_libs.patch
@@ -0,0 +1,23 @@
+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
--- a/debian/patches/03_kfreebsd_installdirs.patch
+++ b/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: libgtop2/libgtop-sysdeps.m4
+Index: libgtop-2.28.0/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-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],[
 	  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 @@
+ 	freebsd*|kfreebsd*)
+ 	  libgtop_sysdeps_dir=freebsd
+@@ -81,27 +81,27 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	  libgtop_need_server=yes
 	  libgtop_sysdeps_private_mountlist=yes
 	  libgtop_sysdeps_private_fsusage=yes
@@ -52,11 +52,11 @@ Index: libgtop2/libgtop-sysdeps.m4
 	  ;;
 	cygwin*)
 	  libgtop_sysdeps_dir=cygwin
-Index: libgtop2/src/daemon/Makefile.am
+Index: libgtop-2.28.0/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 @@
+--- 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			=
 suid_common			=
 endif
 
@@ -65,11 +65,11 @@ Index: libgtop2/src/daemon/Makefile.am
 
 EXTRA_PROGRAMS			= libgtop_server2
 
-Index: libgtop2/configure.in
+Index: libgtop-2.28.0/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-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"
 libgtop_save_exec_prefix="$exec_prefix"
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
 test "x$exec_prefix" = xNONE && exec_prefix=$prefix
--- a/debian/patches/04_kfreebsd_version_check.patch
+++ b/debian/patches/04_kfreebsd_version_check.patch
@@ -0,0 +1,28 @@
+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);
--- a/debian/patches/05_kfreebsd_8.0.patch
+++ b/debian/patches/05_kfreebsd_8.0.patch
@@ -0,0 +1,28 @@
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=608518
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559291
+Author: Petr Salinger <Petr.Salinger@seznam.cz>
+
+Fix a couple of checks for the kFreeBSD kernel.
+
+Index: libgtop-2.28.0/sysdeps/freebsd/procmap.c
+===================================================================
+--- libgtop-2.28.0.orig/sysdeps/freebsd/procmap.c	2009-12-03 13:59:57.866694125 +0100
+++ libgtop-2.28.0/sysdeps/freebsd/procmap.c	2009-12-03 14:03:16.298688337 +0100
+@@ -42,7 +42,7 @@
+ #include <sys/pipe.h>
+ #include <sys/conf.h>
+ #undef _KERNEL
+-#if __FreeBSD_version >= 800038
+#if (__FreeBSD_version >= 800038) || (__FreeBSD_kernel_version >= 800038)
+ #define _WANT_FILE
+ #include <sys/file.h>
+ #undef _WANT_FILE
+@@ -113,7 +113,7 @@ _glibtop_sysdeps_freebsd_dev_inode (glib
+ 
+         if (kvm_read (server->machine.kd, (gulong) inode.i_dev, (char *) &si,
+ 	              sizeof (si)) != sizeof (si) ||
+-#if __FreeBSD_version >= 800039
+#if (__FreeBSD_version >= 800039) || (__FreeBSD_kernel_version >= 800039)
+             kvm_read (server->machine.kd, (gulong)  cdev2priv(&si), (char *) &priv,
+ 		      sizeof (priv))
+ #else
--- a/debian/patches/06_kfreebsd_sys_pipe.patch
+++ b/debian/patches/06_kfreebsd_sys_pipe.patch
@@ -1,22 +0,0 @@
-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>
--- a/debian/patches/99_ltmain_as-needed.patch
+++ b/debian/patches/99_ltmain_as-needed.patch
@@ -0,0 +1,32 @@
+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
+ 	;;
+ 
+      -Wl,--as-needed)
+	deplibs="$deplibs $arg"
+	continue
+	;;
+
+       -Wl,*)
+ 	func_stripname '-Wl,' '' "$arg"
+ 	args=$func_stripname_result
+@@ -5070,6 +5075,15 @@ func_mode_link ()
+ 	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"
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,6 @@
+01_kfreebsd_kvm_libs.patch
 02_hurd_stub_backend.patch
 03_kfreebsd_installdirs.patch
-06_kfreebsd_sys_pipe.patch
+04_kfreebsd_version_check.patch
+05_kfreebsd_8.0.patch
+99_ltmain_as-needed.patch
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
 #!/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
@@ -12,14 +13,7 @@ GNOME_MODULE := libgtop
 SHARED_PKG := libgtop2-7

 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-
-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_DH_MAKESHLIBS_ARGS_ALL += -V '$(SHARED_PKG) (>= 2.23.2)'

 DEB_CONFIGURE_EXTRA_FLAGS += --libexecdir=/usr/lib/$(SHARED_PKG)

--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +0,0 @@
-3.0 (quilt)
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
-version=3
-http://ftp.gnome.org/pub/GNOME/sources/libgtop/([\d\.]+[02468])/ \
-	libgtop-(.*)\.tar\.xz
+version=2
+http://ftp.gnome.org/pub/GNOME/sources/libgtop/([\d\.]+)[02468]/ \
+	libgtop-(.*)\.tar\.gz