From 747cd525eb803c6a4222b9b15668130607ce990a Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Tue, 18 Oct 2005 10:22:52 +0000 Subject: [PATCH 1/8] 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 --- debian/changelog | 10 ++++++++++ debian/control | 2 +- debian/patches/02_fix_link.patch | 18 ------------------ debian/watch | 2 +- 4 files changed, 12 insertions(+), 20 deletions(-) delete mode 100644 debian/patches/02_fix_link.patch diff --git a/debian/changelog b/debian/changelog index 0e528a49..8a8848f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +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..ca9d4723 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 , 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 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/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 1d61e2617e351443521cf4a66a98e7c2c9531256 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Minier?= Date: Tue, 1 Nov 2005 11:44:49 +0000 Subject: [PATCH 2/8] * 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] --- debian/changelog | 10 ++++++++++ debian/control | 2 +- debian/control.in | 2 +- debian/copyright | 28 +++++++++++++++++++++++----- debian/rules | 3 ++- 5 files changed, 37 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8a8848f3..bf8e57c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +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. diff --git a/debian/control b/debian/control index ca9d4723..f7e300ce 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ 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 -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/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)' From 55561b8ed0ff5d8b8c139f4ddad35ffabd6ac8b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Minier?= Date: Sun, 7 Jan 2007 17:32:47 +0000 Subject: [PATCH 3/8] * New upstream release. - Target at experimental. - Drop patch 10_kfreebsd, merged upstream. --- debian/changelog | 8 + debian/patches/10_kfreebsd.patch | 643 ------------------------------- 2 files changed, 8 insertions(+), 643 deletions(-) delete mode 100644 debian/patches/10_kfreebsd.patch diff --git a/debian/changelog b/debian/changelog index 62eb15ce..7800cd21 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +libgtop2 (2.14.5-1) experimental; urgency=low + + * New upstream release. + - Target at experimental. + - Drop patch 10_kfreebsd, merged upstream. + + -- Loic Minier Sun, 7 Jan 2007 18:27:40 +0100 + libgtop2 (2.14.4-2) unstable; urgency=low * New patch, 10_kfreebsd, to build-depend and depend on libkvm-dev on diff --git a/debian/patches/10_kfreebsd.patch b/debian/patches/10_kfreebsd.patch deleted file mode 100644 index 07bb7730..00000000 --- a/debian/patches/10_kfreebsd.patch +++ /dev/null @@ -1,643 +0,0 @@ ---- 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 From 0385a2fac26125caa0b89fa790fbcbc2e685cbd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Minier?= Date: Tue, 9 Jan 2007 14:22:15 +0000 Subject: [PATCH 4/8] * Add a get-orig-source target to retrieve the upstream tarball. --- debian/changelog | 6 ++++++ debian/rules | 3 +++ 2 files changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7800cd21..470c8aac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libgtop2 (2.14.5-2) UNRELEASED; urgency=low + + * Add a get-orig-source target to retrieve the upstream tarball. + + -- Loic Minier Tue, 9 Jan 2007 15:06:21 +0100 + libgtop2 (2.14.5-1) experimental; urgency=low * New upstream release. diff --git a/debian/rules b/debian/rules index dad7756f..de5b2bf6 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,9 @@ 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 + +GNOME_MODULE := libgtop DEB_DH_MAKESHLIBS_ARGS_ALL = -V 'libgtop2-7 (>= 2.14.2)' From ecd6c3e4a21a73e2192339fa756d349ddf61cb8a Mon Sep 17 00:00:00 2001 From: Kilian Krause Date: Tue, 9 Jan 2007 21:41:21 +0000 Subject: [PATCH 5/8] make sure we don't need the new gnome-pkg-tools (but can use it if it's installed), i.e. make /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk optional --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index de5b2bf6..33355acb 100755 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,7 @@ 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/gnome-pkg-tools/1/rules/gnome-get-source.mk GNOME_MODULE := libgtop From 6b01f300dda716feee77ad1239dfeeed2ed2ffbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Minier?= Date: Sun, 14 Jan 2007 20:28:38 +0000 Subject: [PATCH 6/8] * New upstream release; no API or ABI change. --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 470c8aac..a4a2a569 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -libgtop2 (2.14.5-2) UNRELEASED; urgency=low +libgtop2 (2.14.6-1) experimental; urgency=low * Add a get-orig-source target to retrieve the upstream tarball. + * New upstream release; no API or ABI change. - -- Loic Minier Tue, 9 Jan 2007 15:06:21 +0100 + -- Loic Minier Sun, 14 Jan 2007 20:56:18 +0100 libgtop2 (2.14.5-1) experimental; urgency=low From f733788009d48922ff949c9d182c81d38dd4b081 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Minier?= Date: Mon, 22 Jan 2007 10:45:52 +0000 Subject: [PATCH 7/8] * Include the new check-dist Makefile to prevent accidental uploads to unstable; bump build-dep on gnome-pkg-tools to >= 0.10. --- debian/changelog | 7 +++++++ debian/control | 4 ++-- debian/control.in | 2 +- debian/rules | 1 + 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index a4a2a569..07cee757 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libgtop2 (2.14.6-2) UNRELEASED; urgency=low + + * Include the new check-dist Makefile to prevent accidental uploads to + unstable; bump build-dep on gnome-pkg-tools to >= 0.10. + + -- Loic Minier Mon, 22 Jan 2007 11:36:30 +0100 + libgtop2 (2.14.6-1) experimental; urgency=low * Add a get-orig-source target to retrieve the upstream tarball. diff --git a/debian/control b/debian/control index 0462417e..a6e1db0c 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,8 @@ Source: libgtop2 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, libkvm-dev [kfreebsd-i386 kfreebsd-amd64] +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 , Kilian Krause , 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 (>= 0.10), cdbs, texinfo, dpkg-dev (>= 1.13.19), libxml-parser-perl, libkvm-dev [kfreebsd-i386 kfreebsd-amd64] Standards-Version: 3.7.2 Package: libgtop2-7 diff --git a/debian/control.in b/debian/control.in index f42557d8..775880de 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, libkvm-dev [kfreebsd-i386 kfreebsd-amd64] +Build-Depends: debhelper (>= 4.0), gettext, pkg-config, libpopt-dev, libxau-dev, libglib2.0-dev (>= 2.6.0), gnome-pkg-tools (>= 0.10), cdbs, texinfo, dpkg-dev (>= 1.13.19), libxml-parser-perl, libkvm-dev [kfreebsd-i386 kfreebsd-amd64] Standards-Version: 3.7.2 Package: libgtop2-7 diff --git a/debian/rules b/debian/rules index 33355acb..c30e97be 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,7 @@ 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/check-dist.mk -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk GNOME_MODULE := libgtop From 33f5f205f3d64b468524e7fc81b970da6a8e4dfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Minier?= Date: Sun, 11 Mar 2007 16:08:56 +0000 Subject: [PATCH 8/8] * New upstream stable releases. --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 07cee757..e2a6ac6c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ -libgtop2 (2.14.6-2) UNRELEASED; urgency=low +libgtop2 (2.14.8-1) experimental; urgency=low * Include the new check-dist Makefile to prevent accidental uploads to unstable; bump build-dep on gnome-pkg-tools to >= 0.10. + * New upstream stable releases. - -- Loic Minier Mon, 22 Jan 2007 11:36:30 +0100 + -- Loic Minier Sun, 11 Mar 2007 17:05:45 +0100 libgtop2 (2.14.6-1) experimental; urgency=low