Release version 2.28.5-2 to unstable

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

debian/changelog

@@ -1,3 +1,35 @@
+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.

debian/control

@@ -7,7 +7,7 @@ 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>, Michael Biebl <biebl@debian.org>, Sebastian Dröge <slomo@debian.org>
+Uploaders: Andreas Henriksson <andreas@fatal.se>, Emilio Pozuelo Monfort <pochu@debian.org>, Josselin Mouette <joss@debian.org>, Martin Pitt <mpitt@debian.org>, Michael Biebl <biebl@debian.org>, Sebastian Dröge <slomo@debian.org>
 Build-Depends: debhelper (>= 8),
                gettext,
                pkg-config,
@@ -22,13 +22,13 @@ Build-Depends: debhelper (>= 8),
                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.4
+Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/libgtop2
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/libgtop2
 
 Package: libgtop2-7
 Architecture: any

debian/control.in

@@ -17,13 +17,13 @@ Build-Depends: debhelper (>= 8),
                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.4
+Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/libgtop2
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/libgtop2
 
 Package: libgtop2-7
 Architecture: any

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_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
+06_kfreebsd_sys_pipe.patch

debian/rules

@@ -12,6 +12,13 @@ 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_CONFIGURE_EXTRA_FLAGS += --libexecdir=/usr/lib/$(SHARED_PKG)