diff --git a/debian/changelog b/debian/changelog index 51eba358..e45b6292 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,191 @@ +libgtop2 (2.30.0-1) UNRELEASED; urgency=medium + + * New upstream release. + * Change library name to libgtop2-10 for new SONAME + * Drop 06_kfreebsd_sys_pipe.patch. Fixed upstream. + + -- Jackson Doak Wed, 02 Jul 2014 08:45:13 +1000 + +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 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 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 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 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 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 Fri, 27 May 2011 09:56:48 +0200 + +libgtop2 (2.28.3-1) unstable; urgency=low + + * Team upload. + + * New upstream release. + - Fixes linking with strict linkers (Closes: #555183) + * Use dh-autoreconf instead of manually updating 90_autotools.patch + * Add Vcs fields to debian/control* + + -- Andreas Henriksson Mon, 02 May 2011 16:00:40 +0200 + +libgtop2 (2.28.1-1) unstable; urgency=low + + [ Emilio Pozuelo Monfort ] + * debian/patches/02_hurd_stub_backend.patch, + debian/patches/03_kfreebsd_installdirs.patch, + debian/patches/04_kfreebsd_version_check.patch, + debian/patches/05_kfreebsd_8.0.patch: + - Add headers. + + [ Sebastian Dröge ] + * New upstream stable release: + + debian/patches/90_autotools.patch: + - Regenerated for the new version. + + -- Sebastian Dröge Sat, 10 Apr 2010 06:56:34 +0200 + +libgtop2 (2.28.0-4) unstable; urgency=low + + [ Josselin Mouette ] + * 05_kfreebsd_8.0.patch: modified patch from Petr Salinger to make + libgtop2 work correctly with kFreeBSD 8.0. Closes: #559291. + + -- Emilio Pozuelo Monfort Tue, 15 Dec 2009 12:16:51 +0100 + +libgtop2 (2.28.0-3) unstable; urgency=low + + * Switch to quilt for patch management. + * 02_hurd_stub_backend.patch: re-add an implementation of the stub + backend, for the Hurd. Closes: #557446. + * 03_kfreebsd_installdirs.patch: patch to install binaries in + libexecdir so that we can version the installation directory. Also + use DESTDIR in the installation hooks. + * 04_kfreebsd_version_check.patch: drop brain-dead runtime version + check. + * Rename 90_autoconf.patch to 90_autotools.patch, re-run all the + autotools on top of that. + * Pass a versioned libexecdir to the configure arguments. + * Install the server binary on kfreebsd. + * Exclude it from dh_fixperms. + + -- Josselin Mouette Sun, 22 Nov 2009 21:17:18 +0100 + +libgtop2 (2.28.0-2) unstable; urgency=low + + * debian/patches/01_kfreebsd_kvm_libs.patch: + - Patch from Petr Salinger to let libgtop2 build on kFreeBSD again. + Closes: #555316. + * debian/patches/90_autoconf.patch: + - Run autoconf on top of the above patch. + + -- Emilio Pozuelo Monfort Mon, 09 Nov 2009 23:04:50 +0100 + +libgtop2 (2.28.0-1) unstable; urgency=low + + * New upstream release. + * Add a new libgtop2-doc package and ship the html documentation on it. + Also move the info document from the -dev package to the new -doc one. + * debian/watch: Don't uupdate. + * debian/control.in: + - Standards-Version is 3.8.3, no changes needed. + - Let libgtop2-7 and libgtop2-common inherit the section from the source + stanza. + - Unduplicate some short descriptions. + * debian/copyright: Updated. + + -- Emilio Pozuelo Monfort Mon, 21 Sep 2009 23:51:39 +0200 + +libgtop2 (2.26.1-1) unstable; urgency=low + + [ Luca Bruno ] + * New upstream release. + * debian/copyright: + - Specify GPL version 2. + - Don't mention /usr/share/doc/libgtop2*/AUTHORS, all upstream authors + are already listed here. + * debian/control.in: + - Updated Standards-Version to 3.8.1, no additional changes needed. + - Add ${misc:Depends} to all packages. + + [ Josselin Mouette ] + * Fix incorrect Replaces:. + * Remove the FreeBSD-specific libraries from the -dev dependencies, + they are not needed to build libgtop2-based applications. + * Add missing build-dependencies. + + -- Josselin Mouette Thu, 11 Jun 2009 09:15:19 +0200 + +libgtop2 (2.24.3-1) unstable; urgency=low + + * New upstream bugfix release. + + -- Josselin Mouette Wed, 04 Mar 2009 17:47:56 +0100 + libgtop2 (2.24.0-1) experimental; urgency=low * New upstream release. diff --git a/debian/compat b/debian/compat index 7ed6ff82..45a4fb75 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +8 diff --git a/debian/control b/debian/control index 483a7f8d..01323fbd 100644 --- a/debian/control +++ b/debian/control @@ -1,29 +1,40 @@ +# This file is autogenerated. DO NOT EDIT! +# +# Modifications should be made to debian/control.in instead. +# This file is regenerated automatically in the clean target. Source: libgtop2 Section: libs Priority: optional -Maintainer: Sebastien Bacher -Uploaders: Debian GNOME Maintainers , Josselin Mouette , Loic Minier , Sebastian Dröge -Build-Depends: debhelper (>= 5), +Maintainer: Debian GNOME Maintainers +Uploaders: Andreas Henriksson , Emilio Pozuelo Monfort , Martin Pitt , Michael Biebl , Sebastian Dröge +Build-Depends: debhelper (>= 8), gettext, pkg-config, libxau-dev, libglib2.0-dev (>= 2.6.0), gnome-pkg-tools (>= 0.10), + dh-autoreconf, cdbs, texinfo, - dpkg-dev (>= 1.13.19), intltool (>= 0.35.0), - libgeom-dev [kfreebsd-i386 kfreebsd-amd64], - libdevstat-dev [kfreebsd-i386 kfreebsd-amd64], - libkvm-dev [kfreebsd-i386 kfreebsd-amd64] -Standards-Version: 3.8.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 -Package: libgtop2-7 +Package: libgtop2-10 Architecture: any -Section: libs Depends: ${shlibs:Depends}, + ${misc:Depends}, libgtop2-common (>= ${source:Version}) -Description: gtop system monitoring library +Description: gtop system monitoring library (shared) The gtop library reads information about processes and the state of the system. It is used by the GNOME desktop environment. . @@ -32,25 +43,45 @@ Description: gtop system monitoring library Package: libgtop2-dev Architecture: any Section: libdevel -Depends: libgtop2-7 (= ${binary:Version}), - libglib2.0-dev, - ${os-specific-dev} -Description: gtop system monitoring library +Depends: ${misc:Depends}, + libgtop2-10 (= ${binary:Version}), + gir1.2-gtop-2.0 (= ${binary:Version}), + libglib2.0-dev +Description: gtop system monitoring library (devel) The gtop library reads information about processes and the state of the system. It is used by the GNOME desktop environment. . - This package contains the static library, development headers, and - documentation. + This package contains the static library and development headers. Package: libgtop2-common Architecture: all -Section: libs -Replaces: libgtop2-5, - libgtop2-4, - libgtop2-2, - libgtop2 -Description: common files for the gtop system monitoring library +Depends: ${misc:Depends}, +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. . This package contains the translations. + +Package: libgtop2-doc +Architecture: all +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. + . + 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. + diff --git a/debian/control.in b/debian/control.in index 818b1b38..333ed87c 100644 --- a/debian/control.in +++ b/debian/control.in @@ -1,29 +1,36 @@ Source: libgtop2 Section: libs Priority: optional -Maintainer: Sebastien Bacher +Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ -Build-Depends: debhelper (>= 5), +Build-Depends: debhelper (>= 8), gettext, pkg-config, libxau-dev, libglib2.0-dev (>= 2.6.0), gnome-pkg-tools (>= 0.10), + dh-autoreconf, cdbs, texinfo, - dpkg-dev (>= 1.13.19), intltool (>= 0.35.0), - libgeom-dev [kfreebsd-i386 kfreebsd-amd64], - libdevstat-dev [kfreebsd-i386 kfreebsd-amd64], - libkvm-dev [kfreebsd-i386 kfreebsd-amd64] -Standards-Version: 3.8.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 -Package: libgtop2-7 +Package: libgtop2-10 Architecture: any -Section: libs Depends: ${shlibs:Depends}, + ${misc:Depends}, libgtop2-common (>= ${source:Version}) -Description: gtop system monitoring library +Description: gtop system monitoring library (shared) The gtop library reads information about processes and the state of the system. It is used by the GNOME desktop environment. . @@ -32,25 +39,45 @@ Description: gtop system monitoring library Package: libgtop2-dev Architecture: any Section: libdevel -Depends: libgtop2-7 (= ${binary:Version}), - libglib2.0-dev, - ${os-specific-dev} -Description: gtop system monitoring library +Depends: ${misc:Depends}, + libgtop2-10 (= ${binary:Version}), + gir1.2-gtop-2.0 (= ${binary:Version}), + libglib2.0-dev +Description: gtop system monitoring library (devel) The gtop library reads information about processes and the state of the system. It is used by the GNOME desktop environment. . - This package contains the static library, development headers, and - documentation. + This package contains the static library and development headers. Package: libgtop2-common Architecture: all -Section: libs -Replaces: libgtop2-5, - libgtop2-4, - libgtop2-2, - libgtop2 -Description: common files for the gtop system monitoring library +Depends: ${misc:Depends}, +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. . This package contains the translations. + +Package: libgtop2-doc +Architecture: all +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. + . + 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. + diff --git a/debian/copyright b/debian/copyright index e3728964..88d726ec 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,11 +5,20 @@ then Noel Koethe in December 2001 It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/libgtop/ -Upstream Authors and Copyright Holders: +Upstream Authors: 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: +1998-99 Martin Baulig +2004 Nicolás Lichtmaier +2007 Joe Marcus Clarke +1996 Charles Blake +1998 Joshua Sled +1999 Drazen Kacar +1998-2007 Benoît Dejean +2006-2007 Henry Zhang License: @@ -28,5 +37,38 @@ License: 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'. +Public License can be found in `/usr/share/common-licenses/GPL-2'. + +misc/i4b_acct.h is licensed under the following terms: + + Copyright (c) 1997 Joerg Wunsch. All rights reserved. + + Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the author nor the names of any co-contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + 4. Altered versions must be plainly marked as such, and must not be + misrepresented as being the original software and/or documentation. + + THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. diff --git a/debian/gir1.2-gtop-2.0.install b/debian/gir1.2-gtop-2.0.install new file mode 100644 index 00000000..e8a103ca --- /dev/null +++ b/debian/gir1.2-gtop-2.0.install @@ -0,0 +1 @@ +usr/lib/girepository-* diff --git a/debian/libgtop2-10.install b/debian/libgtop2-10.install new file mode 100644 index 00000000..093956b1 --- /dev/null +++ b/debian/libgtop2-10.install @@ -0,0 +1 @@ +usr/lib/*.so.* diff --git a/debian/libgtop2-10.symbols b/debian/libgtop2-10.symbols new file mode 100644 index 00000000..89e4abae --- /dev/null +++ b/debian/libgtop2-10.symbols @@ -0,0 +1,71 @@ +libgtop-2.0.so.10 libgtop2-10 #MINVER# + glibtop_call_l@Base 2.22.3 + glibtop_close@Base 2.22.3 + glibtop_close_r@Base 2.22.3 + glibtop_get_cpu@Base 2.22.3 + glibtop_get_cpu_l@Base 2.22.3 + glibtop_get_fsusage@Base 2.22.3 + glibtop_get_fsusage_l@Base 2.22.3 + glibtop_get_loadavg@Base 2.22.3 + glibtop_get_loadavg_l@Base 2.22.3 + glibtop_get_mem@Base 2.22.3 + glibtop_get_mem_l@Base 2.22.3 + glibtop_get_mountlist@Base 2.22.3 + glibtop_get_mountlist_l@Base 2.22.3 + glibtop_get_msg_limits@Base 2.22.3 + glibtop_get_msg_limits_l@Base 2.22.3 + glibtop_get_netlist@Base 2.22.3 + glibtop_get_netlist_l@Base 2.22.3 + glibtop_get_netload@Base 2.22.3 + glibtop_get_netload_l@Base 2.22.3 + glibtop_get_parameter_l@Base 2.22.3 + glibtop_get_ppp@Base 2.22.3 + glibtop_get_ppp_l@Base 2.22.3 + glibtop_get_proc_affinity@Base 2.24.0 + glibtop_get_proc_affinity_l@Base 2.24.0 + glibtop_get_proc_args@Base 2.22.3 + glibtop_get_proc_args_l@Base 2.22.3 + glibtop_get_proc_argv@Base 2.22.3 + glibtop_get_proc_argv_l@Base 2.22.3 + glibtop_get_proc_kernel@Base 2.22.3 + glibtop_get_proc_kernel_l@Base 2.22.3 + glibtop_get_proc_map@Base 2.22.3 + glibtop_get_proc_map_l@Base 2.22.3 + glibtop_get_proc_mem@Base 2.22.3 + glibtop_get_proc_mem_l@Base 2.22.3 + glibtop_get_proc_open_files@Base 2.22.3 + glibtop_get_proc_open_files_l@Base 2.22.3 + glibtop_get_proc_segment@Base 2.22.3 + glibtop_get_proc_segment_l@Base 2.22.3 + glibtop_get_proc_signal@Base 2.22.3 + glibtop_get_proc_signal_l@Base 2.22.3 + glibtop_get_proc_state@Base 2.22.3 + glibtop_get_proc_state_l@Base 2.22.3 + glibtop_get_proc_time@Base 2.22.3 + glibtop_get_proc_time_l@Base 2.22.3 + glibtop_get_proc_uid@Base 2.22.3 + glibtop_get_proc_uid_l@Base 2.22.3 + glibtop_get_proc_wd@Base 2.22.3 + glibtop_get_proc_wd_l@Base 2.22.3 + glibtop_get_proclist@Base 2.22.3 + glibtop_get_proclist_l@Base 2.22.3 + glibtop_get_sem_limits@Base 2.22.3 + glibtop_get_sem_limits_l@Base 2.22.3 + glibtop_get_shm_limits@Base 2.22.3 + glibtop_get_shm_limits_l@Base 2.22.3 + glibtop_get_swap@Base 2.22.3 + glibtop_get_swap_l@Base 2.22.3 + glibtop_get_sysdeps@Base 2.22.3 + glibtop_get_sysdeps_r@Base 2.22.3 + glibtop_get_sysinfo@Base 2.22.3 + glibtop_get_uptime@Base 2.22.3 + glibtop_get_uptime_l@Base 2.22.3 + glibtop_global_server@Base 2.22.3 + glibtop_init@Base 2.22.3 + glibtop_init_r@Base 2.22.3 + glibtop_internet_addr@Base 2.22.3 + glibtop_make_connection@Base 2.22.3 + glibtop_open_l@Base 2.22.3 + glibtop_server_features@Base 2.22.3 + glibtop_set_parameter_l@Base 2.22.3 + glibtop_sys_siglist@Base 2.22.3 diff --git a/debian/libgtop2-common.install b/debian/libgtop2-common.install index a8a4508d..36354806 100644 --- a/debian/libgtop2-common.install +++ b/debian/libgtop2-common.install @@ -1 +1 @@ -debian/tmp/usr/share/locale +usr/share/locale diff --git a/debian/libgtop2-dev.install b/debian/libgtop2-dev.install index cb9832cb..ad5ec157 100644 --- a/debian/libgtop2-dev.install +++ b/debian/libgtop2-dev.install @@ -1,4 +1,5 @@ -debian/tmp/usr/include/libgtop-2.0 -debian/tmp/usr/lib/libgtop-2.0.a -debian/tmp/usr/lib/libgtop-2.0.so -debian/tmp/usr/lib/pkgconfig +usr/include/libgtop-2.0 +usr/lib/libgtop-2.0.a +usr/lib/libgtop-2.0.so +usr/lib/pkgconfig +usr/share/gir-* diff --git a/debian/libgtop2-doc.doc-base b/debian/libgtop2-doc.doc-base new file mode 100644 index 00000000..7ad56d1d --- /dev/null +++ b/debian/libgtop2-doc.doc-base @@ -0,0 +1,11 @@ +Document: libgtop2 +Title: libsoup Reference Manual +Author: Martin Baulig, Germán Póo-Caamaño +Abstract: This manual documents the interfaces of the libgtop + library and has some short notes to help get you up to speed + with using the library. +Section: Programming + +Format: HTML +Index: /usr/share/gtk-doc/html/libgtop/index.html +Files: /usr/share/gtk-doc/html/libgtop/*html diff --git a/debian/libgtop2-doc.info b/debian/libgtop2-doc.info new file mode 100644 index 00000000..9dea40d6 --- /dev/null +++ b/debian/libgtop2-doc.info @@ -0,0 +1 @@ +doc/libgtop2.info diff --git a/debian/libgtop2-doc.install b/debian/libgtop2-doc.install new file mode 100644 index 00000000..95af827a --- /dev/null +++ b/debian/libgtop2-doc.install @@ -0,0 +1 @@ +usr/share/gtk-doc diff --git a/debian/patches/02_hurd_stub_backend.patch b/debian/patches/02_hurd_stub_backend.patch new file mode 100644 index 00000000..e365e529 --- /dev/null +++ b/debian/patches/02_hurd_stub_backend.patch @@ -0,0 +1,178 @@ +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 + +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 ++#include ++#include ++ ++#include ++ ++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 ++#include ++#include ++ ++#include ++#include ++#include ++ ++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 ++#include ++#include ++ ++static glibtop_sysinfo sysinfo = { }; ++const glibtop_sysinfo * ++glibtop_get_sysinfo_s (glibtop *server) ++{ ++ glibtop_init_s (&server, GLIBTOP_SYSDEPS_CPU, 0); ++ ++ return &sysinfo; ++} diff --git a/debian/patches/03_kfreebsd_installdirs.patch b/debian/patches/03_kfreebsd_installdirs.patch new file mode 100644 index 00000000..c14a7a73 --- /dev/null +++ b/debian/patches/03_kfreebsd_installdirs.patch @@ -0,0 +1,82 @@ +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=602664 +Author: Josselin Mouette + +The libgtop_server2 binary is launched by the library itself, and has no use +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 +=================================================================== +--- 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_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 2755 $(bindir)/libgtop_server2' ++ libgtop_postinstall='chgrp kmem $(DESTDIR)$(libexecdir)/libgtop_server2 && chmod 2755 $(DESTDIR)$(libexecdir)/libgtop_server2' + ;; + 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' ++ libgtop_postinstall='chgrp system $(DESTDIR)$(libexecdir)/libgtop_server && chmod g+s $(DESTDIR)$(libexecdir)/libgtop_server2' + ;; + 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' ++ libgtop_postinstall='chgrp kmem $(DESTDIR)$(libexecdir)/libgtop_server2 && chmod g+s $(DESTDIR)$(libexecdir)/libgtop_server2' + ;; + cygwin*) + libgtop_sysdeps_dir=cygwin +Index: libgtop2/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 @@ + suid_common = + endif + +-bin_PROGRAMS = libgtop_daemon2 @server_programs@ ++libexec_PROGRAMS = libgtop_daemon2 @server_programs@ + + EXTRA_PROGRAMS = libgtop_server2 + +Index: libgtop2/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_save_exec_prefix="$exec_prefix" + test "x$prefix" = xNONE && prefix=$ac_default_prefix + test "x$exec_prefix" = xNONE && exec_prefix=$prefix +-LIBGTOP_BINDIR=`eval echo "${bindir}"` +-LIBGTOP_SERVER=`eval echo "${bindir}/libgtop_server2"` ++LIBGTOP_BINDIR=`eval echo "${libexecdir}"` ++LIBGTOP_SERVER=`eval echo "${libexecdir}/libgtop_server2"` + prefix="$libgtop_save_prefix" + exec_prefix="$libgtop_save_exec_prefix" + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 00000000..6560c681 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +02_hurd_stub_backend.patch +03_kfreebsd_installdirs.patch diff --git a/debian/rules b/debian/rules index 68c286f3..11706577 100755 --- a/debian/rules +++ b/debian/rules @@ -1,18 +1,34 @@ #!/usr/bin/make -f 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 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk +include /usr/share/cdbs/1/rules/autoreconf.mk GNOME_MODULE := libgtop -LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed -DEB_DH_MAKESHLIBS_ARGS_ALL += -V 'libgtop2-7 (>= 2.23.2)' +SHARED_PKG := libgtop2-10 -ifeq (kfreebsd,$(DEB_HOST_ARCH_OS)) -DEB_DH_GENCONTROL_ARGS += -- -Vos-specific-dev="libkvm-dev, libgeom-dev, libdevstat-dev" +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) + +DEB_FIXPERMS_EXCLUDE += libgtop_server2 + +ifeq ($(DEB_HOST_ARCH_OS),kfreebsd) +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 +endif diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch index bc8f5233..987ca2a5 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,3 @@ -version=2 -http://ftp.gnome.org/pub/GNOME/sources/libgtop/([\d\.]+)[02468]/ \ - libgtop-(.*)\.tar\.gz \ - debian uupdate +version=3 +http://ftp.gnome.org/pub/GNOME/sources/libgtop/([\d\.]+[02468])/ \ + libgtop-(.*)\.tar\.xz