Chillcraft/libgtop
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Version 2.6.0-1

Browse Source 
* Removed unneeded patches.
  * Added 10_relibtoolize patch
  * Added watch file
This commit is contained in:
Jose Carlos Garcia Sogo
2004-04-18 15:19:53 +00:00
parent 0afcfd83fe
commit 0c923e744f
10 changed files with 2609 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
debian/changelog vendored
View File

@@ -1,8 +1,14 @@
libgtop2 (2.6.0-1) UNRELEASED; urgency=low
libgtop2 (2.6.0-1) experimental; urgency=low
* Upgraded to new upstream
* Upgraded to new upstream version.
* debian/watch: added
* debian/patches:
- Removed unneeded patches.
- CDBS don't use dpatch, so remove the part before @DPATCH@ in .dpatches
- 10_relibtoolize.patch: new
* Fixed installation of info file. (Closes: #244010)
-- Rob Taylor <robtaylor@fastmail.fm> Sat, 17 Apr 2004 00:01:01 -0300
-- Jose Carlos Garcia Sogo <jsogo@debian.org> Sun, 18 Apr 2004 16:42:13 +0200
libgtop2 (2.5.2-4) experimental; urgency=low

2
debian/control vendored
View File

@@ -2,7 +2,7 @@ Source: libgtop2
Section: libs
Priority: optional
Maintainer: Sebastien Bacher <seb128@debian.org>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Akira TAGOH <tagoh@debian.org>, Andrew Lau <netsnipe@users.sourceforge.net>, Edd Dumbill <ejad@debian.org>, Emil Soleyman-Zomalan <emil@nishra.com>, Gustavo Noronha Silva <kov@debian.org>, J.H.M. Dassen (Ray) <jdassen@debian.org>, Johannes Rohr <j.rohr@comlink.org>, Jordi Mallach <jordi@debian.org>, Jose Carlos Garcia Sogo <jsogo@debian.org>, Josselin Mouette <joss@debian.org>, Ondřej Surý <ondrej@debian.org>, Rob Bradford <rob@debianplanet.org>, Robert McQueen <robot101@debian.org>, Ross Burton <ross@burtonini.com>, Takuo KITAME <kitame@debian.org>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Akira TAGOH <tagoh@debian.org>, Andreas Rottmann <rotty@debian.org>, Andrew Lau <netsnipe@users.sourceforge.net>, Carlos Perelló Marín <carlos@pemas.net>, Edd Dumbill <ejad@debian.org>, Emil Soleyman-Zomalan <emil@nishra.com>, Gustavo Noronha Silva <kov@debian.org>, J.H.M. Dassen (Ray) <jdassen@debian.org>, Johannes Rohr <j.rohr@comlink.org>, Jordi Mallach <jordi@debian.org>, Jose Carlos Garcia Sogo <jsogo@debian.org>, Josselin Mouette <joss@debian.org>, Ondřej Surý <ondrej@debian.org>, Rob Bradford <rob@debianplanet.org>, Rob Taylor <robtaylor@fastmail.fm>, Robert McQueen <robot101@debian.org>, Ross Burton <ross@debian.org>, Takuo KITAME <kitame@debian.org>
Build-Depends: debhelper (>= 4.0), gettext, pkg-config, libpopt-dev, xlibs-dev, libglib2.0-dev, gnome-pkg-tools, cdbs
Standards-Version: 3.6.1.0

1
debian/patches/00list vendored
View File

@@ -1 +0,0 @@
02_fix_link

40
debian/patches/01_kernel26-headers.dpatch vendored
View File

@@ -1,40 +0,0 @@
#!/bin/sh -e
## 01_kernel26-headers.dpatch by Sebastien Bacher <seb128@debian.org>
##
## 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 <glibtop/xmalloc.h>
#include <glibtop/ppp.h>
-#include <linux/isdn.h>
+/* #include <linux/isdn.h> doesn't work for kernel 2.5+ */
+#include <asm/ioctl.h>
+#define IIOCGETCPS _IO('I',21)
+#define ISDN_MAX_CHANNELS 64
#include <sys/ioctl.h>
#include <sys/stat.h>
#include <fcntl.h>

25
debian/patches/02_fix_link.dpatch → debian/patches/02_fix_link.patch vendored Executable file → Normal file
View File

@@ -1,28 +1,3 @@
#!/bin/sh -e
## 02_fix_link.dpatch by Sebastien Bacher <seb128@debian.org>
##
## 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 -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

38
debian/patches/03_mem_values.dpatch vendored
View File

@@ -1,38 +0,0 @@
#!/bin/sh -e
## 03_mem_values.dpatch by Sebastien Bacher <seb128@debian.org>
##
## 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:");

37
debian/patches/04_mem_values2.dpatch vendored
View File

@@ -1,37 +0,0 @@
#!/bin/sh -e
## 04_mem_values2.dpatch by Sebastien Bacher <seb128@debian.org>
##
## 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:");

52
debian/patches/05_cpu_values.dpatch vendored
View File

@@ -1,52 +0,0 @@
#!/bin/sh -e
## 05_cpu_values.dpatch by Sebastien Bacher <seb128@debian.org>
##
## 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];

2595
debian/patches/10_relibtoolize.patch vendored Normal file
View File

File diff suppressed because it is too large Load Diff

4
debian/watch vendored Normal file
View File

@@ -0,0 +1,4 @@
version=2
ftp://ftp.gnome.org/pub/GNOME/sources/libgtop/2.6/ \
libgtop-(.*)\.tar\.gz \
debian uupdate