[SCM] jenkins-memory-monitor packaging branch, master, updated. debian/1.7-1-2-g20a643e
James Page
james.page at ubuntu.com
Tue May 29 10:44:40 UTC 2012
The following commit has been merged in the master branch:
commit 20a643e3a1de6404f2e837a69c75e62e48c292c7
Author: James Page <james.page at ubuntu.com>
Date: Tue May 29 11:39:08 2012 +0100
Fix FTBFS with procps 3.3.3 (Closes: #674389):
* Fix FTBFS with procps 3.3.3 (Closes: #674389):
- d/patches/propc-3.3.patch: Refreshed to accommodate new output format
of top command.
diff --git a/debian/changelog b/debian/changelog
index dd547b5..fd998b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,17 @@
-jenkins-memory-monitor (1.7-2) UNRELEASED; urgency=low
+jenkins-memory-monitor (1.7-2) unstable; urgency=low
- * Team upload.
+ [ tony mancill ]
* Address typos in package description in d/control (Closes: #661980).
- Thanks to Paul Menzel.
* Bump Standards-Version to 3.9.3 (no changes).
* Update Format: specifier in d/copyright.
- -- tony mancill <tmancill at debian.org> Wed, 07 Mar 2012 20:36:06 -0800
+ [ James Page ]
+ * Fix FTBFS with procps 3.3.3 (Closes: #674389):
+ - d/patches/propc-3.3.patch: Refreshed to accommodate new output format
+ of top command.
+
+ -- James Page <james.page at ubuntu.com> Tue, 29 May 2012 11:38:14 +0100
jenkins-memory-monitor (1.7-1) unstable; urgency=low
diff --git a/debian/patches/procps-3.3.patch b/debian/patches/procps-3.3.patch
index 2762d68..a71fa08 100644
--- a/debian/patches/procps-3.3.patch
+++ b/debian/patches/procps-3.3.patch
@@ -6,8 +6,8 @@ Forwarded: yes
Index: jenkins-memory-monitor/src/main/java/org/jvnet/hudson/Top.java
===================================================================
---- jenkins-memory-monitor.orig/src/main/java/org/jvnet/hudson/Top.java 2012-02-21 11:49:45.947333469 +0000
-+++ jenkins-memory-monitor/src/main/java/org/jvnet/hudson/Top.java 2012-02-21 11:50:33.571332276 +0000
+--- jenkins-memory-monitor.orig/src/main/java/org/jvnet/hudson/Top.java 2012-02-21 11:51:10.427331352 +0000
++++ jenkins-memory-monitor/src/main/java/org/jvnet/hudson/Top.java 2012-05-29 11:28:29.586027313 +0100
@@ -109,7 +109,13 @@
try {
Matcher m = p.matcher(line);
@@ -23,25 +23,24 @@ Index: jenkins-memory-monitor/src/main/java/org/jvnet/hudson/Top.java
continue OUTER;
}
} catch (NumberFormatException e) {
-@@ -161,6 +167,32 @@
+@@ -161,6 +167,31 @@
6907 kohsuke 20 0 134m 14m 9184 S 2 0.4 0:51.56 metacity
-+On Debian Sid 21/02/2012
++On Debian Sid 29/05/2012
+====================================
-+uname -a && which top && top -b | head
-+Linux hendrix 3.2.0-17-generic #26-Ubuntu SMP Fri Feb 17 21:35:49 UTC 2012 x86_64 GNU/Linux
++Linux hendrix 3.2.0-24-generic #39-Ubuntu SMP Mon May 21 16:52:17 UTC 2012 x86_64 GNU/Linux
+/usr/bin/top
-+top - 11:09:11 up 20:10, 0 users, load average: 0.21, 0.32, 0.28
-+Tasks: 248 total, 1 running, 244 sleeping, 0 stopped, 3 zombie
-+%Cpu(s): 4.0 us, 0.5 sy, 0.0 ni, 95.4 id, 0.1 wa, 0.0 hi, 0.0 si, 0.0 st
-+Kb Mem: 3980580 total, 3266708 used, 713872 free, 66592 buffers
-+Kb Swap: 4124668 total, 121968 used, 4002700 free, 390988 cached
++top - 11:24:47 up 2:43, 0 users, load average: 0.13, 0.52, 0.77
++Tasks: 224 total, 2 running, 221 sleeping, 0 stopped, 1 zombie
++%Cpu(s): 1.5 us, 9.4 sy, 0.0 ni, 89.0 id, 0.1 wa, 0.0 hi, 0.0 si, 0.0 st
++KiB Mem: 3980564 total, 2757216 used, 1223348 free, 193496 buffers
++KiB Swap: 4124668 total, 256 used, 4124412 free, 1004884 cached
+
+ PID USER PR NI VIRT RES SHR S %CPU %MEM TIME+ COMMAND
-+ 1501 root 20 0 595m 186m 129m S 12.4 4.8 44:02.25 Xorg
-+ 2498 jamespag 20 0 1891m 658m 20m S 6.2 16.9 25:06.72 compiz
-+21823 jamespag 20 0 23760 1508 1072 R 6.2 0.0 0:00.01 top
++ 1607 root 20 0 494m 140m 115m S 18.3 3.6 3:54.94 Xorg
++ 3452 jamespag 20 0 1431m 563m 42m S 12.2 14.5 1:11.48 thunderbird-bin
++26657 jamespag 20 0 23616 1540 1096 R 12.2 0.0 0:00.02 top
+
+MEMORY Usage
+This portion consists of two lines which may express values in kilobytes (Kb), megabytes (Mb)
@@ -56,18 +55,18 @@ Index: jenkins-memory-monitor/src/main/java/org/jvnet/hudson/Top.java
From http://www.unixtop.org/about.shtml
=======================================
-@@ -260,25 +292,29 @@
+@@ -260,25 +291,29 @@
new Pattern[] {
Pattern.compile("^mem(?:ory)?:.* ([0-9.]+[kmgb]) phys mem"), // Sol10+blastwave
Pattern.compile("^mem(?:ory)?:.* ([0-9.]+[kmgb]) total"), // Linux
-+ Pattern.compile("^([kmg])b mem(?:ory)?:.* ([0-9.]+) total"), // Linux procps (>= 3.3)
++ Pattern.compile("^([kmg])(?:i)?b mem(?:ory)?:.* ([0-9.]+) total"), // Linux procps (>= 3.3)
Pattern.compile("^mem(?:ory)?:.* ([0-9.]+[kmgb]) real") // unixtop.org
},
// available phys. memory
new Pattern[] {
Pattern.compile("^mem(?:ory)?:.* ([0-9.]+[kmgb]) free"),
-+ Pattern.compile("^([kmg])b mem(?:ory)?:.* ([0-9.]+) free"), // Linux procps (>= 3.3)
++ Pattern.compile("^([kmg])(?:i)?b mem(?:ory)?:.* ([0-9.]+) free"), // Linux procps (>= 3.3)
Pattern.compile("^physmem:.* ([0-9.]+[kmgb]) free") // Mac OS X
},
@@ -76,14 +75,14 @@ Index: jenkins-memory-monitor/src/main/java/org/jvnet/hudson/Top.java
Pattern.compile("^mem(?:ory)?:.* ([0-9.]+[kmgb]) swap,"), // Sol10+blastwave
- Pattern.compile("^swap:.* ([0-9.]+[kmgb]) total") // Linux
+ Pattern.compile("^swap:.* ([0-9.]+[kmgb]) total"), // Linux
-+ Pattern.compile("^([kmg])b swap:.* ([0-9.]+) total") // Linux procps (>= 3.3)
++ Pattern.compile("^([kmg])(?:i)?b swap:.* ([0-9.]+) total") // Linux procps (>= 3.3)
},
// available swap memory
new Pattern[] {
Pattern.compile("^mem(?:ory)?:.* ([0-9.]+[kmgb]) free swap"), // Sol10+blastwave
Pattern.compile("^swap:.* ([0-9.]+[kmb]) free"), // Linux
-+ Pattern.compile("^([kmg])b swap:.* ([0-9.]+) free"), // Linux procps (>= 3.3)
++ Pattern.compile("^([kmg])(?:i)?b swap:.* ([0-9.]+) free"), // Linux procps (>= 3.3)
Pattern.compile("^swap:\\w* (?:[0-9.]+[kmb])\\w* \\+ \\w*([0-9.]+[kmb]) free"), // Mac OS
Pattern.compile("^mem(?:ory)?:.* ([0-9.]+[kmgb]) swap free") // unixtop
},
--
jenkins-memory-monitor packaging
More information about the pkg-java-commits
mailing list