commit ec1f5a91015fe9d79ceaee2acdb4625e41a77117 Author: Jose Carlos Garcia Sogo Date: Sat Mar 27 12:24:05 2004 +0000 Added version 2.0.8-7 to repository. diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..4dc4c1e6 --- /dev/null +++ b/.gitignore @@ -0,0 +1,16 @@ +# A simulation of Subversion default ignores, generated by reposurgeon. +*.o +*.lo +*.la +*.al +.libs +*.so +*.so.[0-9]* +*.a +*.pyc +*.pyo +*.rej +*~ +.#* +.*.swp +.DS_store diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 00000000..2dc04a52 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,189 @@ +libgtop2 (2.0.8-7) unstable; urgency=low + + * debian/patches/05_cpu_values.dpatch: + + new version of the patch. + + -- Sebastien Bacher Fri, 13 Feb 2004 19:59:16 +0100 + +libgtop2 (2.0.8-6) unstable; urgency=low + + * debian/patches/05_cpu_values.dpatch: + + new patch to CPU usage with 2.6 kernels (Closes: #231079) + + -- Sebastien Bacher Thu, 12 Feb 2004 23:00:09 +0100 + +libgtop2 (2.0.8-5) unstable; urgency=low + + * debian/patches/04_mem_values2.dpatch: + + should really fix memory values (Closes: #224371). + + -- Sebastien Bacher Wed, 28 Jan 2004 00:39:38 +0100 + +libgtop2 (2.0.8-4) unstable; urgency=low + + * debian/patches/03_mem_values.dpatch: + + patch to fix wrong memory values (Closes: #224371). + * debian/libgtop2.info: + + include libgtop2.info file (Closes: #225546). + + -- Sebastien Bacher Thu, 1 Jan 2004 13:31:21 +0100 + +libgtop2 (2.0.8-3) unstable; urgency=low + + * debian/patches/02_fix_link.dpatch, debian/rules: + + patch from Christian Marillat to fix the link problem (Closes: #194108). + + -- Sebastien Bacher Tue, 30 Dec 2003 21:45:51 +0100 + +libgtop2 (2.0.8-2) unstable; urgency=low + + * Added missing Build-Depends on libpopt-dev and texinfo (Closes: #224928). + * Changed libgtop2-daemon section to utils. + * Updated for the Gnome Team. + + -- Sebastien Bacher Thu, 25 Dec 2003 18:28:31 +0100 + +libgtop2 (2.0.8-1) unstable; urgency=low + + * New upstream release (Closes: #224613). + * debian/patches/01_kernel26-headers.dpatch: + + removed since changes are included in the new version. + * debian/patches/01_libgtop2-kernel2.6.dpatch: + + new patch to build with 2.6 headers (Closes: #223027). + + -- Sebastien Bacher Sat, 20 Dec 2003 18:28:19 +0100 + +libgtop2 (2.0.5-4) unstable; urgency=low + + * Added patch from Steve Fosdick to fix + memory stats on 2.6 kernels (Closes: #137603, #201876, #216385). + * Removed empty libgtop2.info.gz (Closes: #213720). + + -- Sebastien Bacher Mon, 20 Oct 2003 02:11:48 +0200 + +libgtop2 (2.0.5-3) unstable; urgency=low + + * Updated libtool (Closes: #212506). + + -- Sebastien Bacher Wed, 24 Sep 2003 12:22:29 +0200 + +libgtop2 (2.0.5-2) unstable; urgency=low + + * Upload in unstable (Closes: #211969). + + -- Sebastien Bacher Mon, 22 Sep 2003 15:19:57 +0200 + +libgtop2 (2.0.5-1) experimental; urgency=low + + * New maintainer. + * New upstream version + + GNOME 2.4 upload in experimental. + * NMU acknowledge + (Closes: #195454, #195623, #195625, #195665, #195819, #195867, #196044). + * debian/control + + Changed sections. + + Updated Standards-Version to 3.6.1.0. + * debian/rules + + Updated to debhelper 4. + + -- Sebastien Bacher Sat, 13 Sep 2003 16:18:25 +0200 + +libgtop2 (2.0.2.is.2.0.1-1) unstable; urgency=low + + * NMU with maintainer's knowledge, altough Noel will assuredly not like the + way i did the upload, experimenting and Christian Marillat's and Coling + Walters's advice showed me there is no other elegant solution. So i + reverted the package to 2.0.1-4, applied the src/daemon/gnuserv.c buffer + overflow fix from 2.0.2, and made a fake 2.0.2 package. Other alternative + would have been using an epoch, which i consider ugly. The problem with + 2.0.2 is that buggy (even if Christian thinks it is a feature) libtool + apparently did increase the soname, which is not needed here. Also + the libgtop2 build system is broken, probably due to libtool too, because + it will link libraries with already installed libraries and not with the + ones currently building. This is mostly ok, but breaks when the soname + changes. + (Closes: #195454, #195623, #195625, #195665, #195819, #195867, #196044) + + -- Sven Luther Sun, 8 Jun 2003 21:21:07 +0200 + +libgtop2 (2.0.2-1) unstable; urgency=low + + * new upstream from 2003-05-15 + + -- Noel Koethe Thu, 29 May 2003 23:03:00 +0100 + +libgtop2 (2.0.1-4) unstable; urgency=low + + * updated config.guess and config.sub for mips + (closes: Bug#180126) + + -- Noel Koethe Sat, 8 Feb 2003 12:20:00 +0100 + +libgtop2 (2.0.1-3) unstable; urgency=low + + * updated libtool files for mips/mipsel + (closes: Bug#179112) + + -- Noel Koethe Thu, 7 Feb 2003 00:59:00 +0100 + +libgtop2 (2.0.1-2) unstable; urgency=low + + * added missing lib in last upload + (closes: Bug#178989) + + -- Noel Koethe Thu, 30 Jan 2003 10:09:00 +0100 + +libgtop2 (2.0.1-1) unstable; urgency=low + + * new upstream version from 2003-01-13 + (closes: Bug#178932) + * updated Standards-Version + + -- Noel Koethe Wed, 29 Jan 2003 18:16:00 +0100 + +libgtop2 (2.0.0-0) unstable; urgency=low + + * new upstream version from 2002-06-10 + (closes: Bug#150134) + + -- Noel Koethe Sun, 16 Jun 2002 16:20:00 +0200 + +libgtop2 (1.90.2-5) unstable; urgency=low + + * added missing usr/lib/pkgconfig/libgtop-2.0.pc to -dev + package + (closes: Bug#146737) + + -- Noel Koethe Thu, 16 May 2002 20:17:00 +0200 + +libgtop2 (1.90.2-4) unstable; urgency=low + + * corrected libgtop2-dev Depends line to libgtk2.0-dev + (closes: Bug#140589) + + -- Noel Koethe Thu, 11 Apr 2002 17:40:00 +0200 + +libgtop2 (1.90.2-3) unstable; urgency=low + + * recompiled against libgtk2.0 + (closes: Bug#140589) + + -- Noel Koethe Sat, 6 Apr 2002 15:38:00 +0200 + +libgtop2 (1.90.2-2) unstable; urgency=low + + * recompiled against glib/gtk 1.3.15 + (closes: Bug#137074) + + -- Noel Koethe Wed, 6 Mar 2002 15:42:00 +0100 + +libgtop2 (1.90.2-1) unstable; urgency=low + + * Initial Release. + (closes: Bug#133219) + + -- Noel Koethe Sat, 16 Feb 2002 13:16:00 +0100 + +Local variables: +mode: debian-changelog +End: diff --git a/debian/compat b/debian/compat new file mode 100644 index 00000000..b8626c4c --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +4 diff --git a/debian/control b/debian/control new file mode 100644 index 00000000..e10396f7 --- /dev/null +++ b/debian/control @@ -0,0 +1,47 @@ +Source: libgtop2 +Section: libs +Priority: optional +Maintainer: Sebastien Bacher +Uploaders: Debian GNOME Maintainers , Akira TAGOH , Andrew Lau , Edd Dumbill , Emil Soleyman-Zomalan , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Johannes Rohr , Jordi Mallach , Josselin Mouette , Rob Bradford , Robert McQueen , Ross Burton , Takuo KITAME +Build-Depends: debhelper (>= 4.0), dpatch, automake, gettext, autoconf, gawk, pkg-config, libglib2.0-dev, xlibs-dev, libpopt-dev, texinfo, gnome-pkg-tools +Standards-Version: 3.6.1.0 + +Package: libgtop2 +Architecture: any +Section: libs +Depends: ${shlibs:Depends} +Description: Libraries for gtop system monitoring library (part of Gnome 2) + Gnome is the "GNU Network Object Model 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. + +Package: libgtop2-dev +Architecture: any +Section: libdevel +Depends: libgtop2 (= ${Source-Version}), libgtk2.0-dev +Description: Dev libraries for gtop system monitoring library (part of Gnome 2) + Gnome is the "GNU Network Object Model Environment" + . + It is a project to build a complete, user-friendly desktop based + entirely on free software. + . + This package contains the include files and static library for the + gtop libraries which read information about processes and the running + systems. + +Package: libgtop2-daemon +Architecture: any +Section: utils +Depends: ${shlibs:Depends} +Description: gtop daemon for monitoring remote machines (part of Gnome 2) + Gnome is the "GNU Network Object Model Environment" + . + It is a project to build a complete, user-friendly desktop based + entirely on free software. + . + This package contains the libgtop_daemon which can be used to monitor + the processes on remote systems. diff --git a/debian/control.in b/debian/control.in new file mode 100644 index 00000000..73876dcd --- /dev/null +++ b/debian/control.in @@ -0,0 +1,47 @@ +Source: libgtop2 +Section: libs +Priority: optional +Maintainer: Sebastien Bacher +Uploaders: @GNOME_TEAM@ +Build-Depends: debhelper (>= 4.0), dpatch, automake, gettext, autoconf, gawk, pkg-config, libglib2.0-dev, xlibs-dev, libpopt-dev, texinfo, gnome-pkg-tools +Standards-Version: 3.6.1.0 + +Package: libgtop2 +Architecture: any +Section: libs +Depends: ${shlibs:Depends} +Description: Libraries for gtop system monitoring library (part of Gnome 2) + Gnome is the "GNU Network Object Model 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. + +Package: libgtop2-dev +Architecture: any +Section: libdevel +Depends: libgtop2 (= ${Source-Version}), libgtk2.0-dev +Description: Dev libraries for gtop system monitoring library (part of Gnome 2) + Gnome is the "GNU Network Object Model Environment" + . + It is a project to build a complete, user-friendly desktop based + entirely on free software. + . + This package contains the include files and static library for the + gtop libraries which read information about processes and the running + systems. + +Package: libgtop2-daemon +Architecture: any +Section: utils +Depends: ${shlibs:Depends} +Description: gtop daemon for monitoring remote machines (part of Gnome 2) + Gnome is the "GNU Network Object Model Environment" + . + It is a project to build a complete, user-friendly desktop based + entirely on free software. + . + This package contains the libgtop_daemon which can be used to monitor + the processes on remote systems. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 00000000..d70c347c --- /dev/null +++ b/debian/copyright @@ -0,0 +1,14 @@ +This package was debianized by Jim Pick +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/ + +Upstream Authors: Radek Doul\xedk , + Martin Baulig + +Copyright: + +Released under the terms of the GPL; see +/usr/share/common-licenses/GPL. diff --git a/debian/libgtop-config.1 b/debian/libgtop-config.1 new file mode 100644 index 00000000..b58d9689 --- /dev/null +++ b/debian/libgtop-config.1 @@ -0,0 +1,34 @@ +.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/libgtop-daemon.postinst b/debian/libgtop-daemon.postinst new file mode 100644 index 00000000..dadbb97d --- /dev/null +++ b/debian/libgtop-daemon.postinst @@ -0,0 +1,4 @@ +#!/bin/sh + +#DEBHELPER# + diff --git a/debian/libgtop-daemon.substvars b/debian/libgtop-daemon.substvars new file mode 100644 index 00000000..f85b511a --- /dev/null +++ b/debian/libgtop-daemon.substvars @@ -0,0 +1 @@ +shlibs:Depends=libc6 (>= 2.2.4-4), zlib1g (>= 1:1.1.3) diff --git a/debian/libgtop-dev.postinst b/debian/libgtop-dev.postinst new file mode 100644 index 00000000..dadbb97d --- /dev/null +++ b/debian/libgtop-dev.postinst @@ -0,0 +1,4 @@ +#!/bin/sh + +#DEBHELPER# + diff --git a/debian/libgtop1.substvars b/debian/libgtop1.substvars new file mode 100644 index 00000000..b14de184 --- /dev/null +++ b/debian/libgtop1.substvars @@ -0,0 +1 @@ +shlibs:Depends=libc6 (>= 2.2.4-4), libglib1.2 (>= 1.2.0) diff --git a/debian/libgtop2-daemon.files b/debian/libgtop2-daemon.files new file mode 100644 index 00000000..9e5c88fb --- /dev/null +++ b/debian/libgtop2-daemon.files @@ -0,0 +1 @@ +usr/bin/libgtop_daemon2 diff --git a/debian/libgtop2-dev.files b/debian/libgtop2-dev.files new file mode 100644 index 00000000..bdf7d8ff --- /dev/null +++ b/debian/libgtop2-dev.files @@ -0,0 +1,21 @@ +usr/include/libgtop-2.0/* +usr/lib/libgnomesupport-2.0.a +usr/lib/libgnomesupport-2.0.la +usr/lib/libgnomesupport-2.0.so +usr/lib/libgtop-2.0.a +usr/lib/libgtop-2.0.la +usr/lib/libgtop-2.0.so +usr/include/gnome/* +usr/lib/libgtop_common-2.0.a +usr/lib/libgtop_common-2.0.la +usr/lib/libgtop_common-2.0.so +usr/lib/libgtop_names-2.0.a +usr/lib/libgtop_names-2.0.la +usr/lib/libgtop_names-2.0.so +usr/lib/libgtop_suid_common-2.0.a +usr/lib/libgtop_suid_common-2.0.la +usr/lib/libgtop_suid_common-2.0.so +usr/lib/libgtop_sysdeps-2.0.a +usr/lib/libgtop_sysdeps-2.0.la +usr/lib/libgtop_sysdeps-2.0.so +usr/lib/pkgconfig/libgtop-2.0.pc diff --git a/debian/libgtop2.docs b/debian/libgtop2.docs new file mode 100644 index 00000000..33b3cb55 --- /dev/null +++ b/debian/libgtop2.docs @@ -0,0 +1,7 @@ +RELNOTES-0.25 +RELNOTES-1.0 +RELNOTES-1.0.x +LIBGTOP-VERSION +README +NEWS +AUTHORS diff --git a/debian/libgtop2.files b/debian/libgtop2.files new file mode 100644 index 00000000..c09b8c69 --- /dev/null +++ b/debian/libgtop2.files @@ -0,0 +1,4 @@ +usr/share/locale/* +usr/lib/libgnomesupport-2.0.so.0.0.0 +usr/lib/*.so.0.0.8 +usr/lib/*.so.0 diff --git a/debian/libgtop2.info b/debian/libgtop2.info new file mode 100644 index 00000000..9dea40d6 --- /dev/null +++ b/debian/libgtop2.info @@ -0,0 +1 @@ +doc/libgtop2.info diff --git a/debian/libgtop2.postinst b/debian/libgtop2.postinst new file mode 100644 index 00000000..b8309774 --- /dev/null +++ b/debian/libgtop2.postinst @@ -0,0 +1,8 @@ +#!/bin/sh + +if [ "$1" = "configure" ]; then + ldconfig +fi + +#DEBHELPER# + diff --git a/debian/libgtop2.postrm b/debian/libgtop2.postrm new file mode 100644 index 00000000..ec68a8af --- /dev/null +++ b/debian/libgtop2.postrm @@ -0,0 +1,8 @@ +#!/bin/sh + +if [ "$1" = "remove" ]; then + ldconfig +fi + +#DEBHELPER# + diff --git a/debian/patches/00list b/debian/patches/00list new file mode 100644 index 00000000..a80e1188 --- /dev/null +++ b/debian/patches/00list @@ -0,0 +1,6 @@ +01_kernel26-headers.dpatch +02_fix_link.dpatch +03_mem_values.dpatch +04_mem_values2.dpatch +05_cpu_values.dpatch + diff --git a/debian/patches/01_kernel26-headers.dpatch b/debian/patches/01_kernel26-headers.dpatch new file mode 100644 index 00000000..8569bd3b --- /dev/null +++ b/debian/patches/01_kernel26-headers.dpatch @@ -0,0 +1,40 @@ +#!/bin/sh -e +## 01_kernel26-headers.dpatch by Sebastien Bacher +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad /tmp/libgtop2-2.0.8/sysdeps/linux/ppp.c libgtop2-2.0.8/sysdeps/linux/ppp.c +--- /tmp/libgtop2-2.0.8/sysdeps/linux/ppp.c 2003-10-19 18:55:39.000000000 +0200 ++++ libgtop2-2.0.8/sysdeps/linux/ppp.c 2003-12-20 19:54:33.000000000 +0100 +@@ -26,7 +26,10 @@ + #include + #include + +-#include ++/* #include doesn't work for kernel 2.5+ */ ++#include ++#define IIOCGETCPS _IO('I',21) ++#define ISDN_MAX_CHANNELS 64 + #include + #include + #include diff --git a/debian/patches/02_fix_link.dpatch b/debian/patches/02_fix_link.dpatch new file mode 100644 index 00000000..9ae07091 --- /dev/null +++ b/debian/patches/02_fix_link.dpatch @@ -0,0 +1,49 @@ +#!/bin/sh -e +## 02_fix_link.dpatch by Sebastien Bacher +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad /tmp/libgtop2-2.0.8/sysdeps/common/Makefile.in libgtop2-2.0.8/sysdeps/common/Makefile.in +--- /tmp/libgtop2-2.0.8/sysdeps/common/Makefile.in 2003-12-19 17:01:00.000000000 +0100 ++++ libgtop2-2.0.8/sysdeps/common/Makefile.in 2003-12-30 22:04:34.000000000 +0100 +@@ -160,7 +160,7 @@ + $(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 = xmalloc.c error.c sysdeps_suid.c +diff -urNad /tmp/libgtop2-2.0.8/sysdeps/linux/Makefile.in libgtop2-2.0.8/sysdeps/linux/Makefile.in +--- /tmp/libgtop2-2.0.8/sysdeps/linux/Makefile.in 2003-12-19 17:01:01.000000000 +0100 ++++ libgtop2-2.0.8/sysdeps/linux/Makefile.in 2003-12-30 22:04:55.000000000 +0100 +@@ -158,7 +158,7 @@ + + libgtop_sysdeps_2_0_la_LIBADD = @GLIB_LIBS@ + +-libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO) ++libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO) -L`pwd`/../../lib/.libs + + libgtopinclude_HEADERS = glibtop_server.h glibtop_machine.h + libgtopincludedir = $(includedir)/libgtop-2.0 diff --git a/debian/patches/03_mem_values.dpatch b/debian/patches/03_mem_values.dpatch new file mode 100644 index 00000000..3609ce8a --- /dev/null +++ b/debian/patches/03_mem_values.dpatch @@ -0,0 +1,38 @@ +#!/bin/sh -e +## 03_mem_values.dpatch by Sebastien Bacher +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad /tmp/libgtop2-2.0.8/sysdeps/linux/mem.c libgtop2-2.0.8/sysdeps/linux/mem.c +--- /tmp/libgtop2-2.0.8/sysdeps/linux/mem.c 2003-10-20 22:41:06.000000000 +0200 ++++ libgtop2-2.0.8/sysdeps/linux/mem.c 2004-01-01 13:30:47.000000000 +0100 +@@ -66,8 +66,8 @@ + buffer [len] = '\0'; + + buf->total = get_scaled(buffer, "MemTotal:"); +- buf->used = get_scaled(buffer, "Active:"); + buf->free = get_scaled(buffer, "MemFree:"); ++ buf->used = buf->total - buf->free; + buf->shared = get_scaled(buffer, "Mapped:"); + buf->buffer = get_scaled(buffer, "Buffers:"); + buf->cached = get_scaled(buffer, "Cached:"); diff --git a/debian/patches/04_mem_values2.dpatch b/debian/patches/04_mem_values2.dpatch new file mode 100644 index 00000000..8de18152 --- /dev/null +++ b/debian/patches/04_mem_values2.dpatch @@ -0,0 +1,37 @@ +#!/bin/sh -e +## 04_mem_values2.dpatch by Sebastien Bacher +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +if [ $# -lt 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad /tmp/libgtop2-2.0.8/sysdeps/linux/mem.c libgtop2-2.0.8/sysdeps/linux/mem.c +--- /tmp/libgtop2-2.0.8/sysdeps/linux/mem.c 2004-01-28 01:12:42.000000000 +0100 ++++ libgtop2-2.0.8/sysdeps/linux/mem.c 2004-01-28 01:13:14.000000000 +0100 +@@ -68,7 +68,7 @@ + buf->total = get_scaled(buffer, "MemTotal:"); + buf->free = get_scaled(buffer, "MemFree:"); + buf->used = buf->total - buf->free; +- buf->shared = get_scaled(buffer, "Mapped:"); ++ buf->shared = 0; + buf->buffer = get_scaled(buffer, "Buffers:"); + buf->cached = get_scaled(buffer, "Cached:"); + diff --git a/debian/patches/05_cpu_values.dpatch b/debian/patches/05_cpu_values.dpatch new file mode 100644 index 00000000..20a0f78b --- /dev/null +++ b/debian/patches/05_cpu_values.dpatch @@ -0,0 +1,52 @@ +#!/bin/sh -e +## 05_cpu_values.dpatch by Sebastien Bacher +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +if [ $# -lt 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad /tmp/libgtop2-2.0.8/sysdeps/linux/cpu.c libgtop2-2.0.8/sysdeps/linux/cpu.c +--- /tmp/libgtop2-2.0.8/sysdeps/linux/cpu.c 2003-10-19 18:55:39.000000000 +0200 ++++ libgtop2-2.0.8/sysdeps/linux/cpu.c 2004-02-13 19:58:42.000000000 +0100 +@@ -80,6 +80,11 @@ + buf->sys = strtoul (p, &p, 0); + buf->idle = strtoul (p, &p, 0); + ++ /* 2.6 kernel */ ++ buf->idle += strtoull(p, &p, 0); /* "iowait" */ ++ buf->sys += strtoull(p, &p, 0); /* "irq" */ ++ buf->sys += strtoull(p, &p, 0); /* "softirq" */ ++ + total = buf->user; + total += buf->nice; + total += buf->sys; +@@ -99,6 +104,11 @@ + buf->xcpu_sys [i] = strtoul (p, &p, 0); + buf->xcpu_idle [i] = strtoul (p, &p, 0); + ++ /* 2.6 kernel */ ++ buf->xcpu_idle [i] += strtoull(p, &p, 0); /* "iowait" */ ++ buf->xcpu_sys [i] += strtoull(p, &p, 0); /* "irq" */ ++ buf->xcpu_sys [i] += strtoull(p, &p, 0); /* "softirq" */ ++ + total = buf->xcpu_user [i]; + total += buf->xcpu_nice [i]; + total += buf->xcpu_sys [i]; diff --git a/debian/rules b/debian/rules new file mode 100755 index 00000000..eaad7b91 --- /dev/null +++ b/debian/rules @@ -0,0 +1,96 @@ +#!/usr/bin/make -f + +# Include dpatch stuff. +include /usr/share/dpatch/dpatch.make + +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk + +configure: configure-stamp +configure-stamp: + dh_testdir + + # need to run libtoolize before configure because + # config.guess is out of date + #libtoolize --force + + # Add here commands to configure the package. + ./configure --prefix=/usr \ + --infodir=/usr/share/info \ + --mandir=/usr/share/man \ + --without-xauth \ + --with-x + + touch configure-stamp + +build: patch configure-stamp build-stamp +build-stamp: + dh_testdir + + # Add here commands to compile the package. + $(MAKE) + + perl -i -pe 's,-lglib-2.0,-lglib-2.0 $(CURDIR)/lib/libgtop-2.0.la,' sysdeps/common/Makefile + rm sysdeps/common/*.lo + + $(MAKE) -C sysdeps/common + + perl -i -pe 's,-lglib-2.0,-lglib-2.0 $(CURDIR)/lib/libgtop-2.0.la,' sysdeps/linux/Makefile + rm sysdeps/linux/*.lo + + $(MAKE) -C sysdeps/linux + + touch build-stamp + +clean:: unpatch + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + -$(MAKE) distclean + + dh_clean + +install: DH_OPTIONS= +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/tmp. + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/ + + dh_movefiles + +# Build architecture-independent files here. +binary-indep: build install +#nothing + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir -a + dh_testroot -a + dh_installdocs -a + dh_installexamples -a +# dh_installmenu -a +# dh_installinit -a +# dh_installcron -a + dh_installman -a + dh_installinfo -a +# dh_undocumented libgtop_daemon.1 + dh_installchangelogs -a + dh_strip -a + dh_link -a + dh_compress -a + dh_fixperms -a + dh_makeshlibs -a + dh_installdeb -a +# dh_perl -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure