From ab5c85290c9315f1491690821817646bb00ed047 Mon Sep 17 00:00:00 2001 From: Gustavo Noronha Date: Sat, 7 Jan 2006 22:02:23 +0000 Subject: [PATCH 01/20] merging changes done for experimental --- debian/changelog | 20 ++++++++++++++++++++ debian/control | 4 ++-- debian/control.in | 2 +- debian/copyright | 28 +++++++++++++++++++++++----- debian/patches/02_fix_link.patch | 18 ------------------ debian/rules | 3 ++- debian/watch | 2 +- 7 files changed, 49 insertions(+), 28 deletions(-) delete mode 100644 debian/patches/02_fix_link.patch diff --git a/debian/changelog b/debian/changelog index 0e528a49..bf8e57c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,23 @@ +libgtop2 (2.12.0-2) experimental; urgency=high + + * Bump shlibs to >= 2.12.0 since the #define'd functions of the API are now + real symbols. (Closes: #336736) [debian/rules] + * Add CDBS' utils. [debian/rules] + * Fix license. [debian/copyright] + * Bump up Standards-Version to 3.6.2. [debian/control, debian/control.in] + + -- Loic Minier Tue, 1 Nov 2005 12:44:28 +0100 + +libgtop2 (2.12.0-1) experimental; urgency=low + + * New upstream version. + * debian/patches/02_fix_link.patch: + - fixed with the new version. + * debian/watch: + - updated + + -- Sebastien Bacher Tue, 18 Oct 2005 12:08:17 +0200 + libgtop2 (2.10.2-1) unstable; urgency=low * New upstream version: diff --git a/debian/control b/debian/control index 5b877730..f7e300ce 100644 --- a/debian/control +++ b/debian/control @@ -2,9 +2,9 @@ Source: libgtop2 Section: libs Priority: optional Maintainer: Sebastien Bacher -Uploaders: Debian GNOME Maintainers , Akira TAGOH , Andreas Rottmann , Andrew Lau , Carlos Perelló Marín , Ed Boraas , Edd Dumbill , Emil Soleyman-Zomalan , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Joe Drew , Johannes Rohr , Jordi Mallach , Jose Carlos Garcia Sogo , Josselin Mouette , Loic Minier , Marc 'HE' Brockschmidt , Ondřej Surý , Rob Bradford , Robert McQueen , Ross Burton , Sjoerd Simons , Takuo KITAME +Uploaders: Debian GNOME Maintainers , Akira TAGOH , Andreas Rottmann , Andrew Lau , Carlos Perelló Marín , Clément Stenac , Ed Boraas , Edd Dumbill , Emil Soleyman-Zomalan , Guilherme de S. Pastore , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Joe Drew , Johannes Rohr , Jordi Mallach , Jose Carlos Garcia Sogo , Josselin Mouette , Loic Minier , Marc 'HE' Brockschmidt , Ondřej Surý , Rob Bradford , Robert McQueen , Ross Burton , Sjoerd Simons , Takuo KITAME Build-Depends: debhelper (>= 4.0), gettext, pkg-config, libpopt-dev, xlibs-dev, libglib2.0-dev, gnome-pkg-tools, cdbs, texinfo -Standards-Version: 3.6.1.0 +Standards-Version: 3.6.2 Package: libgtop2-5 Architecture: any diff --git a/debian/control.in b/debian/control.in index 507c9ece..5e4c81ae 100644 --- a/debian/control.in +++ b/debian/control.in @@ -4,7 +4,7 @@ Priority: optional Maintainer: Sebastien Bacher Uploaders: @GNOME_TEAM@ Build-Depends: debhelper (>= 4.0), gettext, pkg-config, libpopt-dev, xlibs-dev, libglib2.0-dev, gnome-pkg-tools, cdbs, texinfo -Standards-Version: 3.6.1.0 +Standards-Version: 3.6.2 Package: libgtop2-5 Architecture: any diff --git a/debian/copyright b/debian/copyright index d70c347c..4de83df7 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,10 +5,28 @@ then Noel Koethe in December 2001 It was downloaded from ftp://ftp.gnome.org/pub/GNOME/stable/sources/gtop/ -Upstream Authors: Radek Doul\xedk , - Martin Baulig +Upstream Authors and Copyright Holders: + Martin Baulig (martin@home-of-linux.org) + Drazen Kacar (dave@srce.hr) + Benoît Dejean (tazforever@dlfp.org) +(The full list is in /usr/share/doc/libgtop2*/AUTHORS.) -Copyright: +License: + + This package 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. + + This package 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 this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. -Released under the terms of the GPL; see -/usr/share/common-licenses/GPL. diff --git a/debian/patches/02_fix_link.patch b/debian/patches/02_fix_link.patch deleted file mode 100644 index 73f89918..00000000 --- a/debian/patches/02_fix_link.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -u libgtop2-2.5.2/sysdeps/common/Makefile.in.orig libgtop2-2.5.2/sysdeps/common/Makefile.in ---- libgtop2-2.5.2/sysdeps/common/Makefile.in.orig 2004-03-27 02:53:38.000000000 +0100 -+++ libgtop2-2.5.2/sysdeps/common/Makefile.in 2004-03-27 02:54:59.000000000 +0100 -@@ -160,12 +160,12 @@ - $(inodedb_SRCLIST) - - --libgtop_common_2_0_la_LDFLAGS = $(LT_VERSION_INFO) -+libgtop_common_2_0_la_LDFLAGS = $(LT_VERSION_INFO) -L`pwd`/../../lib/.libs - libgtop_common_2_0_la_LIBADD = $(LIBGTOP_EXTRA_LIBS) - - libgtop_suid_common_2_0_la_SOURCES = error.c sysdeps_suid.c - --libgtop_suid_common_2_0_la_LDFLAGS = $(LT_VERSION_INFO) -+libgtop_suid_common_2_0_la_LDFLAGS = $(LT_VERSION_INFO) -L`pwd`/../../lib/.libs - - EXTRA_DIST = inodedb.c - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/debian/rules b/debian/rules index ee9fe85a..49034435 100755 --- a/debian/rules +++ b/debian/rules @@ -2,9 +2,10 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.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 DEB_CONFIGURE_EXTRA_FLAGS := --without-xauth --with-x -DEB_DH_MAKESHLIBS_ARGS_ALL = -V 'libgtop2-5 (>= 2.9.4)' +DEB_DH_MAKESHLIBS_ARGS_ALL = -V 'libgtop2-5 (>= 2.12.0)' diff --git a/debian/watch b/debian/watch index d1df7bd6..8f7f8fa7 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,4 @@ version=2 -ftp://ftp.gnome.org/pub/GNOME/sources/libgtop/2.10/ \ +ftp://ftp.gnome.org/pub/GNOME/sources/libgtop/2.12/ \ libgtop-(.*)\.tar\.gz \ debian uupdate From 1aa277d42ddc607f0f187269fc22869455942de3 Mon Sep 17 00:00:00 2001 From: Gustavo Noronha Date: Sat, 7 Jan 2006 22:07:49 +0000 Subject: [PATCH 02/20] preparing upload to unstable with a new upstream release --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index bf8e57c4..59d53048 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libgtop2 (2.12.2-3) UNRELEASED; urgency=low + + * New upstream release + * Upload to unstable + + -- Gustavo Noronha Silva Sat, 7 Jan 2006 20:02:39 -0200 + libgtop2 (2.12.0-2) experimental; urgency=high * Bump shlibs to >= 2.12.0 since the #define'd functions of the API are now From e2cced6038481ad2e46fc5956287b7ab12e698bd Mon Sep 17 00:00:00 2001 From: Gustavo Noronha Date: Sat, 7 Jan 2006 22:08:34 +0000 Subject: [PATCH 03/20] fixed upstream address --- debian/changelog | 4 +++- debian/copyright | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 59d53048..fcf5bd49 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,10 @@ libgtop2 (2.12.2-3) UNRELEASED; urgency=low * New upstream release * Upload to unstable + * debian/copyright: + - change 'downloaded from' address to the correct location - -- Gustavo Noronha Silva Sat, 7 Jan 2006 20:02:39 -0200 + -- Gustavo Noronha Silva Sat, 7 Jan 2006 20:08:13 -0200 libgtop2 (2.12.0-2) experimental; urgency=high diff --git a/debian/copyright b/debian/copyright index 4de83df7..e3728964 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,7 +3,7 @@ then Martin Schulze in October 1998 then Ian Lynagh in November 1998 then Noel Koethe in December 2001 -It was downloaded from ftp://ftp.gnome.org/pub/GNOME/stable/sources/gtop/ +It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/libgtop/ Upstream Authors and Copyright Holders: Martin Baulig (martin@home-of-linux.org) From c9d8086f210da60f619f27a3006b5b61525460d4 Mon Sep 17 00:00:00 2001 From: Gustavo Noronha Date: Sat, 7 Jan 2006 22:32:19 +0000 Subject: [PATCH 04/20] xlibs-dev transition --- debian/changelog | 4 +++- debian/control.in | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index fcf5bd49..4218b4e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,10 @@ libgtop2 (2.12.2-3) UNRELEASED; urgency=low * Upload to unstable * debian/copyright: - change 'downloaded from' address to the correct location + * debian/control.in: + - build-depends updated to not b-d on xlibs-dev, libxau-dev added - -- Gustavo Noronha Silva Sat, 7 Jan 2006 20:08:13 -0200 + -- Gustavo Noronha Silva Sat, 7 Jan 2006 20:31:56 -0200 libgtop2 (2.12.0-2) experimental; urgency=high diff --git a/debian/control.in b/debian/control.in index 5e4c81ae..fa769f5f 100644 --- a/debian/control.in +++ b/debian/control.in @@ -3,7 +3,7 @@ Section: libs Priority: optional Maintainer: Sebastien Bacher Uploaders: @GNOME_TEAM@ -Build-Depends: debhelper (>= 4.0), gettext, pkg-config, libpopt-dev, xlibs-dev, libglib2.0-dev, gnome-pkg-tools, cdbs, texinfo +Build-Depends: debhelper (>= 4.0), gettext, pkg-config, libpopt-dev, libxau-dev, libglib2.0-dev, gnome-pkg-tools, cdbs, texinfo Standards-Version: 3.6.2 Package: libgtop2-5 From 58be85cb0c2d710bb66571d05046b0d414101bbd Mon Sep 17 00:00:00 2001 From: Gustavo Noronha Date: Sat, 7 Jan 2006 22:32:52 +0000 Subject: [PATCH 05/20] auto-generated --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index f7e300ce..2976be2a 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: libs Priority: optional Maintainer: Sebastien Bacher Uploaders: Debian GNOME Maintainers , Akira TAGOH , Andreas Rottmann , Andrew Lau , Carlos Perelló Marín , Clément Stenac , Ed Boraas , Edd Dumbill , Emil Soleyman-Zomalan , Guilherme de S. Pastore , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Joe Drew , Johannes Rohr , Jordi Mallach , Jose Carlos Garcia Sogo , Josselin Mouette , Loic Minier , Marc 'HE' Brockschmidt , Ondřej Surý , Rob Bradford , Robert McQueen , Ross Burton , Sjoerd Simons , Takuo KITAME -Build-Depends: debhelper (>= 4.0), gettext, pkg-config, libpopt-dev, xlibs-dev, libglib2.0-dev, gnome-pkg-tools, cdbs, texinfo +Build-Depends: debhelper (>= 4.0), gettext, pkg-config, libpopt-dev, libxau-dev, libglib2.0-dev, gnome-pkg-tools, cdbs, texinfo Standards-Version: 3.6.2 Package: libgtop2-5 From 54ba34e017e2510019ef0e2ee70c5f8a99b14f25 Mon Sep 17 00:00:00 2001 From: Gustavo Noronha Date: Sat, 7 Jan 2006 22:34:06 +0000 Subject: [PATCH 06/20] releasing to unstable --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4218b4e4..731de805 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libgtop2 (2.12.2-3) UNRELEASED; urgency=low +libgtop2 (2.12.2-3) unstable; urgency=low * New upstream release * Upload to unstable From 0576e5bd2c5265980b9760bf72742cb54f82df96 Mon Sep 17 00:00:00 2001 From: Gustavo Noronha Date: Sat, 7 Jan 2006 23:34:01 +0000 Subject: [PATCH 07/20] argh; misrevision --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 731de805..a0946a2c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libgtop2 (2.12.2-3) unstable; urgency=low +libgtop2 (2.12.2-1) unstable; urgency=low * New upstream release * Upload to unstable From b68eaa9f71e9fece3a17bbf5bbce1baa7142bb6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Minier?= Date: Sun, 7 May 2006 08:42:01 +0000 Subject: [PATCH 08/20] * Stop shipping *.la files in libgtop2-dev. --- debian/changelog | 7 +++++++ debian/libgtop2-dev.install | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a0946a2c..db68fa60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libgtop2 (2.12.2-2) UNRELEASED; urgency=low + + * Stop shipping *.la files in libgtop2-dev. + [debian/libgtop2-dev.install] + + -- Loic Minier Sun, 7 May 2006 10:41:43 +0200 + libgtop2 (2.12.2-1) unstable; urgency=low * New upstream release diff --git a/debian/libgtop2-dev.install b/debian/libgtop2-dev.install index 7c04464b..acea1177 100644 --- a/debian/libgtop2-dev.install +++ b/debian/libgtop2-dev.install @@ -1,6 +1,5 @@ debian/tmp/usr/include/libgtop-2.0/* debian/tmp/usr/lib/libgtop-2.0.a -debian/tmp/usr/lib/libgtop-2.0.la debian/tmp/usr/lib/libgtop-2.0.so debian/tmp/usr/include/gnome/* debian/tmp/usr/lib/pkgconfig/* From 86241cc7d2ecab8d151478effbe4fc2b868d1c2e Mon Sep 17 00:00:00 2001 From: Josselin Mouette Date: Sat, 20 May 2006 18:16:06 +0000 Subject: [PATCH 09/20] [ Josselin Mouette ] * New upstream release. + Fix for proc_state.h reference in documentation (closes: #353596). * Bump glib build-dependency. * Standards version is 3.7.2. * New library package name. * Split the translations in a separate package. * Use dpkg-dev 1.13.19 for NMU-safety. * Rework package descriptions. * libgtop2-5.docs: removed, added automatically by cdbs. * libgtop2-5.post*: removed, duplicates dh_makeshlibs. * rules: enable xauth. * libgtop-config.1: removed, unused. -- Josselin Mouette Sat, 20 May 2006 20:12:59 +0200 --- debian/changelog | 19 ++++++++++++++-- debian/control | 46 ++++++++++++++++++++------------------ debian/control.in | 44 +++++++++++++++++++----------------- debian/libgtop-config.1 | 34 ---------------------------- debian/libgtop2-5.docs | 3 --- debian/libgtop2-5.install | 2 -- debian/libgtop2-5.postinst | 8 ------- debian/libgtop2-5.postrm | 8 ------- debian/libgtop2-7.install | 1 + debian/rules | 4 +--- debian/watch | 2 +- 11 files changed, 67 insertions(+), 104 deletions(-) delete mode 100644 debian/libgtop-config.1 delete mode 100644 debian/libgtop2-5.docs delete mode 100644 debian/libgtop2-5.install delete mode 100644 debian/libgtop2-5.postinst delete mode 100644 debian/libgtop2-5.postrm create mode 100644 debian/libgtop2-7.install diff --git a/debian/changelog b/debian/changelog index db68fa60..ff23b646 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,24 @@ -libgtop2 (2.12.2-2) UNRELEASED; urgency=low +libgtop2 (2.14.1-1) unstable; urgency=low + [ Loic Minier ] * Stop shipping *.la files in libgtop2-dev. [debian/libgtop2-dev.install] - -- Loic Minier Sun, 7 May 2006 10:41:43 +0200 + [ Josselin Mouette ] + * New upstream release. + + Fix for proc_state.h reference in documentation (closes: #353596). + * Bump glib build-dependency. + * Standards version is 3.7.2. + * New library package name. + * Split the translations in a separate package. + * Use dpkg-dev 1.13.19 for NMU-safety. + * Rework package descriptions. + * libgtop2-5.docs: removed, added automatically by cdbs. + * libgtop2-5.post*: removed, duplicates dh_makeshlibs. + * rules: enable xauth. + * libgtop-config.1: removed, unused. + + -- Josselin Mouette Sat, 20 May 2006 20:12:59 +0200 libgtop2 (2.12.2-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 2976be2a..81833675 100644 --- a/debian/control +++ b/debian/control @@ -2,35 +2,37 @@ Source: libgtop2 Section: libs Priority: optional Maintainer: Sebastien Bacher -Uploaders: Debian GNOME Maintainers , Akira TAGOH , Andreas Rottmann , Andrew Lau , Carlos Perelló Marín , Clément Stenac , Ed Boraas , Edd Dumbill , Emil Soleyman-Zomalan , Guilherme de S. Pastore , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Joe Drew , Johannes Rohr , Jordi Mallach , Jose Carlos Garcia Sogo , Josselin Mouette , Loic Minier , Marc 'HE' Brockschmidt , Ondřej Surý , Rob Bradford , Robert McQueen , Ross Burton , Sjoerd Simons , Takuo KITAME -Build-Depends: debhelper (>= 4.0), gettext, pkg-config, libpopt-dev, libxau-dev, libglib2.0-dev, gnome-pkg-tools, cdbs, texinfo -Standards-Version: 3.6.2 +Uploaders: Debian GNOME Maintainers , Akira TAGOH , Andreas Rottmann , Andrew Lau , Clément Stenac , Dafydd Harries , Guilherme de S. Pastore , Gustavo Franco , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Jordi Mallach , Jose Carlos Garcia Sogo , Josselin Mouette , Loic Minier , Marc 'HE' Brockschmidt , Marco Cabizza , Ondřej Surý , Ross Burton , Sjoerd Simons , Takuo KITAME +Build-Depends: debhelper (>= 4.0), gettext, pkg-config, libpopt-dev, libxau-dev, libglib2.0-dev (>= 2.6.0), gnome-pkg-tools, cdbs, texinfo, dpkg-dev (>= 1.13.19) +Standards-Version: 3.7.2 -Package: libgtop2-5 +Package: libgtop2-7 Architecture: any Section: libs -Depends: ${shlibs:Depends} -Conflicts: libgtop2, libgtop2-2, libgtop2-4 -Replaces: libgtop2, libgtop2-2, libgtop2-4 -Description: Libraries for gtop system monitoring library (part of Gnome 2) - Gnome is the "GNU Network Object Model Environment" +Depends: ${shlibs:Depends}, libgtop2-common (>= ${source:Version}) +Description: gtop system monitoring library + The gtop library reads information about processes and the state of the + system. It is used by the GNOME desktop environment. . - It is a project to build a complete, user-friendly desktop based - entirely on free software. - . - This package contains the gtop libraries which read information about - processes and the running systems. + This package contains the shared library. Package: libgtop2-dev Architecture: any Section: libdevel -Depends: libgtop2-5 (= ${Source-Version}), libglib2.0-dev -Description: Dev libraries for gtop system monitoring library (part of Gnome 2) - Gnome is the "GNU Network Object Model Environment" +Depends: libgtop2-7 (= ${binary:Version}), libglib2.0-dev +Description: gtop system monitoring library + The gtop library reads information about processes and the state of the + system. It is used by the GNOME desktop environment. . - It is a project to build a complete, user-friendly desktop based - entirely on free software. + This package contains the static library, development headers, and + documentation. + +Package: libgtop2-common +Architecture: any +Section: libs +Replaces: libgtop2-5, libgtop2-4, libgtop2-2 +Description: common files for the gtop system monitoring library + 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 include files and static library for the - gtop libraries which read information about processes and the running - systems. + This package contains the translations. diff --git a/debian/control.in b/debian/control.in index fa769f5f..9acdab87 100644 --- a/debian/control.in +++ b/debian/control.in @@ -3,34 +3,36 @@ Section: libs Priority: optional Maintainer: Sebastien Bacher Uploaders: @GNOME_TEAM@ -Build-Depends: debhelper (>= 4.0), gettext, pkg-config, libpopt-dev, libxau-dev, libglib2.0-dev, gnome-pkg-tools, cdbs, texinfo -Standards-Version: 3.6.2 +Build-Depends: debhelper (>= 4.0), gettext, pkg-config, libpopt-dev, libxau-dev, libglib2.0-dev (>= 2.6.0), gnome-pkg-tools, cdbs, texinfo, dpkg-dev (>= 1.13.19) +Standards-Version: 3.7.2 -Package: libgtop2-5 +Package: libgtop2-7 Architecture: any Section: libs -Depends: ${shlibs:Depends} -Conflicts: libgtop2, libgtop2-2, libgtop2-4 -Replaces: libgtop2, libgtop2-2, libgtop2-4 -Description: Libraries for gtop system monitoring library (part of Gnome 2) - Gnome is the "GNU Network Object Model Environment" +Depends: ${shlibs:Depends}, libgtop2-common (>= ${source:Version}) +Description: gtop system monitoring library + The gtop library reads information about processes and the state of the + system. It is used by the GNOME desktop environment. . - It is a project to build a complete, user-friendly desktop based - entirely on free software. - . - This package contains the gtop libraries which read information about - processes and the running systems. + This package contains the shared library. Package: libgtop2-dev Architecture: any Section: libdevel -Depends: libgtop2-5 (= ${Source-Version}), libglib2.0-dev -Description: Dev libraries for gtop system monitoring library (part of Gnome 2) - Gnome is the "GNU Network Object Model Environment" +Depends: libgtop2-7 (= ${binary:Version}), libglib2.0-dev +Description: gtop system monitoring library + The gtop library reads information about processes and the state of the + system. It is used by the GNOME desktop environment. . - It is a project to build a complete, user-friendly desktop based - entirely on free software. + This package contains the static library, development headers, and + documentation. + +Package: libgtop2-common +Architecture: any +Section: libs +Replaces: libgtop2-5, libgtop2-4, libgtop2-2 +Description: common files for the gtop system monitoring library + 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 include files and static library for the - gtop libraries which read information about processes and the running - systems. + This package contains the translations. diff --git a/debian/libgtop-config.1 b/debian/libgtop-config.1 deleted file mode 100644 index b58d9689..00000000 --- a/debian/libgtop-config.1 +++ /dev/null @@ -1,34 +0,0 @@ -.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) diff --git a/debian/libgtop2-5.docs b/debian/libgtop2-5.docs deleted file mode 100644 index 86dfdb8c..00000000 --- a/debian/libgtop2-5.docs +++ /dev/null @@ -1,3 +0,0 @@ -README -NEWS -AUTHORS diff --git a/debian/libgtop2-5.install b/debian/libgtop2-5.install deleted file mode 100644 index 428c0e99..00000000 --- a/debian/libgtop2-5.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/usr/share/locale/* -debian/tmp/usr/lib/*.so.* diff --git a/debian/libgtop2-5.postinst b/debian/libgtop2-5.postinst deleted file mode 100644 index b8309774..00000000 --- a/debian/libgtop2-5.postinst +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -if [ "$1" = "configure" ]; then - ldconfig -fi - -#DEBHELPER# - diff --git a/debian/libgtop2-5.postrm b/debian/libgtop2-5.postrm deleted file mode 100644 index ec68a8af..00000000 --- a/debian/libgtop2-5.postrm +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -if [ "$1" = "remove" ]; then - ldconfig -fi - -#DEBHELPER# - diff --git a/debian/libgtop2-7.install b/debian/libgtop2-7.install new file mode 100644 index 00000000..79bbe2f0 --- /dev/null +++ b/debian/libgtop2-7.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/*.so.* diff --git a/debian/rules b/debian/rules index 49034435..3dca6fd6 100755 --- a/debian/rules +++ b/debian/rules @@ -6,6 +6,4 @@ 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 -DEB_CONFIGURE_EXTRA_FLAGS := --without-xauth --with-x - -DEB_DH_MAKESHLIBS_ARGS_ALL = -V 'libgtop2-5 (>= 2.12.0)' +DEB_DH_MAKESHLIBS_ARGS_ALL = -V 'libgtop2-7 (>= 2.14.0)' diff --git a/debian/watch b/debian/watch index 8f7f8fa7..5ff75a7e 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,4 @@ version=2 -ftp://ftp.gnome.org/pub/GNOME/sources/libgtop/2.12/ \ +ftp://ftp.gnome.org/pub/GNOME/sources/libgtop/2.14/ \ libgtop-(.*)\.tar\.gz \ debian uupdate From bfa7616e3e11953555032158c842b958f48de646 Mon Sep 17 00:00:00 2001 From: Josselin Mouette Date: Sat, 20 May 2006 18:16:44 +0000 Subject: [PATCH 10/20] Forgot to add libgtop2-common.install. --- debian/libgtop2-common.install | 1 + 1 file changed, 1 insertion(+) create mode 100644 debian/libgtop2-common.install diff --git a/debian/libgtop2-common.install b/debian/libgtop2-common.install new file mode 100644 index 00000000..a8a4508d --- /dev/null +++ b/debian/libgtop2-common.install @@ -0,0 +1 @@ +debian/tmp/usr/share/locale From 75906acd6419e8174df685f7da50dd279585bbde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Minier?= Date: Wed, 28 Jun 2006 20:38:22 +0000 Subject: [PATCH 11/20] * Update upload date. --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ff23b646..0f081990 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,7 +18,7 @@ libgtop2 (2.14.1-1) unstable; urgency=low * rules: enable xauth. * libgtop-config.1: removed, unused. - -- Josselin Mouette Sat, 20 May 2006 20:12:59 +0200 + -- Loic Minier Wed, 28 Jun 2006 22:38:06 +0200 libgtop2 (2.12.2-1) unstable; urgency=low From 749e74db2319186eef9b84dffcf9f736ace3a994 Mon Sep 17 00:00:00 2001 From: Dafydd Harries Date: Tue, 4 Jul 2006 17:08:05 +0000 Subject: [PATCH 12/20] make libgtop2-common arch: all instead of arch: any --- debian/changelog | 6 ++++++ debian/control.in | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0f081990..1d84e11e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libgtop2 (2.14.1-2) unstable; urgency=low + + * Make libgtop2-common arch: all instead of arch: any. + + -- Dafydd Harries Tue, 4 Jul 2006 18:04:14 +0100 + libgtop2 (2.14.1-1) unstable; urgency=low [ Loic Minier ] diff --git a/debian/control.in b/debian/control.in index 9acdab87..622cc779 100644 --- a/debian/control.in +++ b/debian/control.in @@ -28,7 +28,7 @@ Description: gtop system monitoring library documentation. Package: libgtop2-common -Architecture: any +Architecture: all Section: libs Replaces: libgtop2-5, libgtop2-4, libgtop2-2 Description: common files for the gtop system monitoring library From da3afa24634ea48a300fea01eab6c95b50e541c6 Mon Sep 17 00:00:00 2001 From: Dafydd Harries Date: Tue, 4 Jul 2006 17:14:59 +0000 Subject: [PATCH 13/20] update libgtop2 control from control.in --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 81833675..1baf1fe8 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: libgtop2 Section: libs Priority: optional Maintainer: Sebastien Bacher -Uploaders: Debian GNOME Maintainers , Akira TAGOH , Andreas Rottmann , Andrew Lau , Clément Stenac , Dafydd Harries , Guilherme de S. Pastore , Gustavo Franco , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Jordi Mallach , Jose Carlos Garcia Sogo , Josselin Mouette , Loic Minier , Marc 'HE' Brockschmidt , Marco Cabizza , Ondřej Surý , Ross Burton , Sjoerd Simons , Takuo KITAME +Uploaders: Debian GNOME Maintainers , Andrew Lau , Clément Stenac , Dafydd Harries , Guilherme de S. Pastore , Gustavo Franco , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Jordi Mallach , Jose Carlos Garcia Sogo , Josselin Mouette , Loic Minier , Marc 'HE' Brockschmidt , Marco Cabizza , Oystein Gisnas , Ondřej Surý , Ross Burton , Sjoerd Simons Build-Depends: debhelper (>= 4.0), gettext, pkg-config, libpopt-dev, libxau-dev, libglib2.0-dev (>= 2.6.0), gnome-pkg-tools, cdbs, texinfo, dpkg-dev (>= 1.13.19) Standards-Version: 3.7.2 @@ -28,7 +28,7 @@ Description: gtop system monitoring library documentation. Package: libgtop2-common -Architecture: any +Architecture: all Section: libs Replaces: libgtop2-5, libgtop2-4, libgtop2-2 Description: common files for the gtop system monitoring library From 40ba4286badf43c28da9383f6184568266334867 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Minier?= Date: Sat, 29 Jul 2006 16:58:07 +0000 Subject: [PATCH 14/20] * Let libgtop2-common also replace the venerable libgtop2. (Closes: #380350) --- debian/changelog | 6 ++++++ debian/control | 2 +- debian/control.in | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1d84e11e..6757cc8d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libgtop2 (2.14.1-3) unstable; urgency=low + + * Let libgtop2-common also replace the venerable libgtop2. (Closes: #380350) + + -- Loic Minier Sat, 29 Jul 2006 18:57:02 +0200 + libgtop2 (2.14.1-2) unstable; urgency=low * Make libgtop2-common arch: all instead of arch: any. diff --git a/debian/control b/debian/control index 1baf1fe8..121587a7 100644 --- a/debian/control +++ b/debian/control @@ -30,7 +30,7 @@ Description: gtop system monitoring library Package: libgtop2-common Architecture: all Section: libs -Replaces: libgtop2-5, libgtop2-4, libgtop2-2 +Replaces: libgtop2-5, libgtop2-4, libgtop2-2, libgtop2 Description: common files for the gtop system monitoring library The gtop library reads information about processes and the state of the system. It is used by the GNOME desktop environment. diff --git a/debian/control.in b/debian/control.in index 622cc779..40d27f12 100644 --- a/debian/control.in +++ b/debian/control.in @@ -30,7 +30,7 @@ Description: gtop system monitoring library Package: libgtop2-common Architecture: all Section: libs -Replaces: libgtop2-5, libgtop2-4, libgtop2-2 +Replaces: libgtop2-5, libgtop2-4, libgtop2-2, libgtop2 Description: common files for the gtop system monitoring library The gtop library reads information about processes and the state of the system. It is used by the GNOME desktop environment. From ac0de1b4b6ab8cfc5e3363617ec1725d01550d37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Minier?= Date: Sat, 29 Jul 2006 20:16:01 +0000 Subject: [PATCH 15/20] * New upstream release, with API additions. --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 6757cc8d..c58a5af8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libgtop2 (2.14.2-1) unstable; urgency=low + + * New upstream release, with API additions. + + -- Loic Minier Sat, 29 Jul 2006 22:10:12 +0200 + libgtop2 (2.14.1-3) unstable; urgency=low * Let libgtop2-common also replace the venerable libgtop2. (Closes: #380350) From 890d95524796917b8b0b845145936197f1c124c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Minier?= Date: Sat, 29 Jul 2006 20:16:29 +0000 Subject: [PATCH 16/20] - Bump shlibs to >= 2.14.2. --- debian/changelog | 3 ++- debian/rules | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c58a5af8..a5452597 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ libgtop2 (2.14.2-1) unstable; urgency=low * New upstream release, with API additions. + - Bump shlibs to >= 2.14.2. - -- Loic Minier Sat, 29 Jul 2006 22:10:12 +0200 + -- Loic Minier Sat, 29 Jul 2006 22:16:12 +0200 libgtop2 (2.14.1-3) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 3dca6fd6..ac4513ff 100755 --- a/debian/rules +++ b/debian/rules @@ -6,4 +6,4 @@ 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 -DEB_DH_MAKESHLIBS_ARGS_ALL = -V 'libgtop2-7 (>= 2.14.0)' +DEB_DH_MAKESHLIBS_ARGS_ALL = -V 'libgtop2-7 (>= 2.14.2)' From ed59462fe9f3cf55aea1dbcc83b55e5475a7c6a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Minier?= Date: Wed, 9 Aug 2006 09:32:28 +0000 Subject: [PATCH 17/20] * Build-depend on libxml-parser-perl. --- debian/changelog | 6 ++++++ debian/control | 2 +- debian/control.in | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a5452597..11dc3013 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libgtop2 (2.14.2-2) unstable; urgency=low + + * Build-depend on libxml-parser-perl. + + -- Loic Minier Wed, 9 Aug 2006 11:30:23 +0200 + libgtop2 (2.14.2-1) unstable; urgency=low * New upstream release, with API additions. diff --git a/debian/control b/debian/control index 121587a7..95a564da 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: libs Priority: optional Maintainer: Sebastien Bacher Uploaders: Debian GNOME Maintainers , Andrew Lau , Clément Stenac , Dafydd Harries , Guilherme de S. Pastore , Gustavo Franco , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Jordi Mallach , Jose Carlos Garcia Sogo , Josselin Mouette , Loic Minier , Marc 'HE' Brockschmidt , Marco Cabizza , Oystein Gisnas , Ondřej Surý , Ross Burton , Sjoerd Simons -Build-Depends: debhelper (>= 4.0), gettext, pkg-config, libpopt-dev, libxau-dev, libglib2.0-dev (>= 2.6.0), gnome-pkg-tools, cdbs, texinfo, dpkg-dev (>= 1.13.19) +Build-Depends: debhelper (>= 4.0), gettext, pkg-config, libpopt-dev, libxau-dev, libglib2.0-dev (>= 2.6.0), gnome-pkg-tools, cdbs, texinfo, dpkg-dev (>= 1.13.19), libxml-parser-perl Standards-Version: 3.7.2 Package: libgtop2-7 diff --git a/debian/control.in b/debian/control.in index 40d27f12..a6d5393c 100644 --- a/debian/control.in +++ b/debian/control.in @@ -3,7 +3,7 @@ Section: libs Priority: optional Maintainer: Sebastien Bacher Uploaders: @GNOME_TEAM@ -Build-Depends: debhelper (>= 4.0), gettext, pkg-config, libpopt-dev, libxau-dev, libglib2.0-dev (>= 2.6.0), gnome-pkg-tools, cdbs, texinfo, dpkg-dev (>= 1.13.19) +Build-Depends: debhelper (>= 4.0), gettext, pkg-config, libpopt-dev, libxau-dev, libglib2.0-dev (>= 2.6.0), gnome-pkg-tools, cdbs, texinfo, dpkg-dev (>= 1.13.19), libxml-parser-perl Standards-Version: 3.7.2 Package: libgtop2-7 From 7cf5c515ff680d3230ebb2f1d01a693818f2209b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Minier?= Date: Wed, 6 Sep 2006 17:48:20 +0000 Subject: [PATCH 18/20] * New upstream release; no API changes. --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 11dc3013..dbd8000f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libgtop2 (2.14.3-1) unstable; urgency=low + + * New upstream release; no API changes. + + -- Loic Minier Wed, 6 Sep 2006 15:55:02 +0200 + libgtop2 (2.14.2-2) unstable; urgency=low * Build-depend on libxml-parser-perl. From cac1c8d790f6ca434d7e88dbf1f43f64e67f2b2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Minier?= Date: Sun, 17 Sep 2006 09:36:28 +0000 Subject: [PATCH 19/20] * New upstream release; no API change. --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index dbd8000f..9f50c597 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libgtop2 (2.14.4-1) unstable; urgency=low + + * New upstream release; no API change. + + -- Loic Minier Sun, 17 Sep 2006 11:23:28 +0200 + libgtop2 (2.14.3-1) unstable; urgency=low * New upstream release; no API changes. From a5fee43fadf39024c6ae796fbfdbe0a4efad0974 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Minier?= Date: Sun, 19 Nov 2006 10:19:56 +0000 Subject: [PATCH 20/20] * New patch, 10_kfreebsd, to build-depend and depend on libkvm-dev on kfreebsd, to update the m4 macros to detect __FreeBSD_kernel__, and to update configure; thanks Petr Salinger; closes: #399270. --- debian/changelog | 8 + debian/control | 4 +- debian/control.in | 4 +- debian/patches/10_kfreebsd.patch | 643 +++++++++++++++++++++++++++++++ debian/rules | 5 + 5 files changed, 660 insertions(+), 4 deletions(-) create mode 100644 debian/patches/10_kfreebsd.patch diff --git a/debian/changelog b/debian/changelog index 9f50c597..62eb15ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +libgtop2 (2.14.4-2) unstable; urgency=low + + * New patch, 10_kfreebsd, to build-depend and depend on libkvm-dev on + kfreebsd, to update the m4 macros to detect __FreeBSD_kernel__, and to + update configure; thanks Petr Salinger; closes: #399270. + + -- Loic Minier Sun, 19 Nov 2006 10:59:47 +0100 + libgtop2 (2.14.4-1) unstable; urgency=low * New upstream release; no API change. diff --git a/debian/control b/debian/control index 95a564da..0462417e 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: libs Priority: optional Maintainer: Sebastien Bacher Uploaders: Debian GNOME Maintainers , Andrew Lau , Clément Stenac , Dafydd Harries , Guilherme de S. Pastore , Gustavo Franco , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Jordi Mallach , Jose Carlos Garcia Sogo , Josselin Mouette , Loic Minier , Marc 'HE' Brockschmidt , Marco Cabizza , Oystein Gisnas , Ondřej Surý , Ross Burton , Sjoerd Simons -Build-Depends: debhelper (>= 4.0), gettext, pkg-config, libpopt-dev, libxau-dev, libglib2.0-dev (>= 2.6.0), gnome-pkg-tools, cdbs, texinfo, dpkg-dev (>= 1.13.19), libxml-parser-perl +Build-Depends: debhelper (>= 4.0), gettext, pkg-config, libpopt-dev, libxau-dev, libglib2.0-dev (>= 2.6.0), gnome-pkg-tools, cdbs, texinfo, dpkg-dev (>= 1.13.19), libxml-parser-perl, libkvm-dev [kfreebsd-i386 kfreebsd-amd64] Standards-Version: 3.7.2 Package: libgtop2-7 @@ -19,7 +19,7 @@ Description: gtop system monitoring library Package: libgtop2-dev Architecture: any Section: libdevel -Depends: libgtop2-7 (= ${binary:Version}), libglib2.0-dev +Depends: libgtop2-7 (= ${binary:Version}), libglib2.0-dev, ${libkvm-dev} Description: gtop system monitoring library The gtop library reads information about processes and the state of the system. It is used by the GNOME desktop environment. diff --git a/debian/control.in b/debian/control.in index a6d5393c..f42557d8 100644 --- a/debian/control.in +++ b/debian/control.in @@ -3,7 +3,7 @@ Section: libs Priority: optional Maintainer: Sebastien Bacher Uploaders: @GNOME_TEAM@ -Build-Depends: debhelper (>= 4.0), gettext, pkg-config, libpopt-dev, libxau-dev, libglib2.0-dev (>= 2.6.0), gnome-pkg-tools, cdbs, texinfo, dpkg-dev (>= 1.13.19), libxml-parser-perl +Build-Depends: debhelper (>= 4.0), gettext, pkg-config, libpopt-dev, libxau-dev, libglib2.0-dev (>= 2.6.0), gnome-pkg-tools, cdbs, texinfo, dpkg-dev (>= 1.13.19), libxml-parser-perl, libkvm-dev [kfreebsd-i386 kfreebsd-amd64] Standards-Version: 3.7.2 Package: libgtop2-7 @@ -19,7 +19,7 @@ Description: gtop system monitoring library Package: libgtop2-dev Architecture: any Section: libdevel -Depends: libgtop2-7 (= ${binary:Version}), libglib2.0-dev +Depends: libgtop2-7 (= ${binary:Version}), libglib2.0-dev, ${libkvm-dev} Description: gtop system monitoring library The gtop library reads information about processes and the state of the system. It is used by the GNOME desktop environment. diff --git a/debian/patches/10_kfreebsd.patch b/debian/patches/10_kfreebsd.patch new file mode 100644 index 00000000..07bb7730 --- /dev/null +++ b/debian/patches/10_kfreebsd.patch @@ -0,0 +1,643 @@ +--- 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 + #ifdef __bsdi__ + #include + #else +-#if __FreeBSD_version < 400005 ++#if (__FreeBSD_version < 400005) && !defined(__FreeBSD_kernel__) + #include + #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 + #include +-#if (__FreeBSD_version >= 400011) ++#if (__FreeBSD_version >= 400011) || defined(__FreeBSD_kernel__) + #include + #else + #include + #endif + #endif + +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + #define _KVM_VNODE + #endif + #include +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + #undef _KVM_VNODE + #endif + #include +@@ -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 + #endif + #if !defined(__bsdi__) && !(defined(__FreeBSD__) && defined(__alpha__)) && \ +- !defined(__NetBSD__) ++ !defined(__NetBSD__) + #include + #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 + #include + +-#if defined(__FreeBSD__) || defined(__NetBSD__) ++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__FreeBSD_kernel__) + #include + #else + #include +@@ -167,7 +173,7 @@ + #include + #include + +-#if defined(__FreeBSD__) || defined(__NetBSD__) ++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__FreeBSD_kernel__) + #include + #else + #include +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 + #include + +-#if defined(__FreeBSD__) || defined(__NetBSD__) ++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__FreeBSD_kernel__) + #include + #else + #include +@@ -21928,7 +22016,7 @@ + #include + #include + +-#if defined(__FreeBSD__) || defined(__NetBSD__) ++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__FreeBSD_kernel__) + #include + #else + #include diff --git a/debian/rules b/debian/rules index ac4513ff..dad7756f 100755 --- a/debian/rules +++ b/debian/rules @@ -7,3 +7,8 @@ include /usr/share/cdbs/1/class/gnome.mk include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk DEB_DH_MAKESHLIBS_ARGS_ALL = -V 'libgtop2-7 (>= 2.14.2)' + +ifeq (kfreebsd,$(DEB_HOST_ARCH_OS)) +DEB_DH_GENCONTROL_ARGS = -- -Vlibkvm-dev=libkvm-dev +endif +