Release version 2.32.0-1 to unstable

thanks Steven Chamberlain for the patch. Closes: #788709

debian/changelog

@@ -1,3 +1,41 @@
+libgtop2 (2.32.0-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Update symbols file and bump shlibs version to 2.32.0.
+  * Update patches, drop 02_hurd_stub_backend.patch, fixed upstream.
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 08 Oct 2015 00:12:49 +0200
+
+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.

debian/compat

@@ -1 +1 @@
-8
+9

debian/control

@@ -2,20 +2,19 @@
 # 
 # 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: 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),
+Uploaders: 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,
                intltool (>= 0.35.0),
                libxt-dev,
@@ -26,12 +25,14 @@ Build-Depends: debhelper (>= 8),
                gtk-doc-tools (>= 1.4),
                gobject-introspection (>= 0.6.7),
                libgirepository1.0-dev (>= 0.10.7-1~)
-Standards-Version: 3.9.4
+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
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libgtop2-common (>= ${source:Version})
@@ -43,9 +44,10 @@ 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)
@@ -56,6 +58,7 @@ Description: gtop system monitoring library (devel)
 
 Package: libgtop2-common
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends},
 Description: gtop system monitoring library (common)
  The gtop library reads information about processes and the state of the
@@ -65,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.
@@ -76,6 +79,7 @@ Description: gtop system monitoring library (documentation)
 
 Package: gir1.2-gtop-2.0
 Architecture: any
+Multi-Arch: same
 Section: introspection
 Depends: ${misc:Depends},
          ${gir:Depends}

debian/control.in

@@ -3,14 +3,14 @@ Section: libs
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 8),
+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,
                intltool (>= 0.35.0),
                libxt-dev,
@@ -21,12 +21,14 @@ Build-Depends: debhelper (>= 8),
                gtk-doc-tools (>= 1.4),
                gobject-introspection (>= 0.6.7),
                libgirepository1.0-dev (>= 0.10.7-1~)
-Standards-Version: 3.9.4
+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
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libgtop2-common (>= ${source:Version})
@@ -38,9 +40,10 @@ 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)
@@ -51,6 +54,7 @@ Description: gtop system monitoring library (devel)
 
 Package: libgtop2-common
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends},
 Description: gtop system monitoring library (common)
  The gtop library reads information about processes and the state of the
@@ -60,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.
@@ -71,6 +75,7 @@ Description: gtop system monitoring library (documentation)
 
 Package: gir1.2-gtop-2.0
 Architecture: any
+Multi-Arch: same
 Section: introspection
 Depends: ${misc:Depends},
          ${gir:Depends}

debian/gir1.2-gtop-2.0.install

@@ -1 +1 @@
-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,78 @@
+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_type@Base 2.32.0
+ 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_map_entry_get_type@Base 2.32.0
+ glibtop_mountentry_get_type@Base 2.32.0
+ glibtop_mountlist_get_type@Base 2.32.0
+ glibtop_open_files_entry_get_type@Base 2.32.0
+ glibtop_open_l@Base 2.22.3
+ glibtop_proc_map_get_type@Base 2.32.0
+ glibtop_proc_open_files_get_type@Base 2.32.0
+ glibtop_server_features@Base 2.22.3
+ glibtop_set_parameter_l@Base 2.22.3
+ glibtop_sys_siglist@Base 2.22.3

debian/libgtop2-dev.install

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

debian/patches/02_hurd_stub_backend.patch

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

debian/patches/03_kfreebsd_installdirs.patch

@@ -7,20 +7,27 @@ 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.32.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.32.0.orig/libgtop-sysdeps.m4	2015-10-07 23:46:35.738589058 +0200
++++ libgtop-2.32.0/libgtop-sysdeps.m4	2015-10-07 23:51:51.006990769 +0200
+@@ -40,38 +40,38 @@
+ 	netbsd*|bsdi*)
  	  libgtop_sysdeps_dir=bsd
- 	  libgtop_use_machine_h=yes
  	  libgtop_need_server=yes
 -	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server2'
 +	  libgtop_postinstall='chgrp kmem $(DESTDIR)$(libexecdir)/libgtop_server2 && chmod 2755 $(DESTDIR)$(libexecdir)/libgtop_server2'
  	  ;;
  	openbsd*)
  	  libgtop_sysdeps_dir=openbsd
-@@ -87,27 +87,27 @@
+ 	  libgtop_need_server=yes
+ 	  libgtop_sysdeps_private_mountlist=yes
+ 	  libgtop_sysdeps_private_fsusage=yes
+-	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2555 $(bindir)/libgtop_server2'
++	  libgtop_postinstall='chgrp kmem $(DESTDIR)$(libexecdir)/libgtop_server2 && chmod 2755 $(DESTDIR)$(libexecdir)/libgtop_server2'
+ 	  ;;
+ 	freebsd*|kfreebsd*)
+ 	  libgtop_sysdeps_dir=freebsd
  	  libgtop_need_server=yes
  	  libgtop_sysdeps_private_mountlist=yes
  	  libgtop_sysdeps_private_fsusage=yes
@@ -29,14 +36,12 @@ Index: libgtop2/libgtop-sysdeps.m4
  	  ;;
  	solaris*)
  	  libgtop_sysdeps_dir=solaris
- 	  libgtop_use_machine_h=yes
  	  libgtop_need_server=yes
 -	  libgtop_postinstall='chgrp sys $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server'
 +	  libgtop_postinstall='chgrp sys $(DESTDIR)$(libexecdir)/libgtop_server && chmod 2755 $(DESTDIR)$(libexecdir)/libgtop_server'
  	  ;;
  	aix*)
  	  libgtop_sysdeps_dir=aix
- 	  libgtop_use_machine_h=yes
  	  libgtop_need_server=yes
  	  libgtop_have_sysinfo=yes
 -	  libgtop_postinstall='chgrp system $(bindir)/libgtop_server && chmod g+s $(bindir)/libgtop_server2'
@@ -44,7 +49,6 @@ Index: libgtop2/libgtop-sysdeps.m4
  	  ;;
  	darwin*)
  	  libgtop_sysdeps_dir=darwin
- 	  libgtop_use_machine_h=yes
  	  libgtop_need_server=yes
  	  libgtop_have_sysinfo=yes
 -	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod g+s $(bindir)/libgtop_server2'
@@ -52,11 +56,11 @@ Index: libgtop2/libgtop-sysdeps.m4
  	  ;;
  	cygwin*)
  	  libgtop_sysdeps_dir=cygwin
-Index: libgtop2/src/daemon/Makefile.am
+Index: libgtop-2.32.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.32.0.orig/src/daemon/Makefile.am	2015-10-07 23:46:35.738589058 +0200
++++ libgtop-2.32.0/src/daemon/Makefile.am	2015-10-07 23:46:35.734589003 +0200
+@@ -26,7 +26,7 @@
  suid_common			=
  endif
  
@@ -65,11 +69,11 @@ Index: libgtop2/src/daemon/Makefile.am
  
  EXTRA_PROGRAMS			= libgtop_server2
  
-Index: libgtop2/configure.in
+Index: libgtop-2.32.0/configure.ac
 ===================================================================
---- 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.32.0.orig/configure.ac	2015-10-07 23:46:35.738589058 +0200
++++ libgtop-2.32.0/configure.ac	2015-10-07 23:46:35.734589003 +0200
+@@ -285,8 +285,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/series

@@ -1,3 +1,2 @@
-02_hurd_stub_backend.patch
 03_kfreebsd_installdirs.patch
-06_kfreebsd_sys_pipe.patch
+04_kfreebsd_version.patch

debian/rules

@@ -9,7 +9,7 @@ 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
 
@@ -19,9 +19,10 @@ 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.32.0)'
 
-DEB_CONFIGURE_EXTRA_FLAGS += --libexecdir=/usr/lib/$(SHARED_PKG)
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
+                             --libexecdir=\$${libdir}/$(SHARED_PKG)
 
 DEB_FIXPERMS_EXCLUDE += libgtop_server2
 
@@ -30,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