[jenkins-memory-monitor] 07/07: New upstream release (1.8) Removed procps-3.3.patch (fixed upstream) Build depend on junit4 instead of junit
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Sep 4 21:32:34 UTC 2014
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository jenkins-memory-monitor.
commit 35fa47cdce5e367d46028c370e1f1c9d59e9db8e
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Sep 4 23:26:01 2014 +0200
New upstream release (1.8)
Removed procps-3.3.patch (fixed upstream)
Build depend on junit4 instead of junit
---
debian/changelog | 7 ++-
debian/control | 2 +-
debian/jenkins-memory-monitor.poms | 12 ++++--
debian/maven.rules | 2 +-
debian/patches/procps-3.3.patch | 88 --------------------------------------
debian/patches/series | 1 -
6 files changed, 16 insertions(+), 96 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6e8bf42..75779d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,16 @@
-jenkins-memory-monitor (1.7-3) UNRELEASED; urgency=medium
+jenkins-memory-monitor (1.8-1) unstable; urgency=medium
* Team upload.
+ * New upstream release
+ - Removed procps-3.3.patch (fixed upstream)
+ - Build depend on junit4 instead of junit
* debian/control:
- Removed the deprecated DM-Upload-Allowed field
- Standards-Version updated to 3.9.5 (no changes)
- Use canonical URLs for the Vcs-* fields
* Switch to debhelper level 9
- -- Emmanuel Bourg <ebourg at apache.org> Thu, 04 Sep 2014 22:25:56 +0200
+ -- Emmanuel Bourg <ebourg at apache.org> Thu, 04 Sep 2014 23:25:50 +0200
jenkins-memory-monitor (1.7-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 8e1afef..e441364 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: James Page <james.page at ubuntu.com>
Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper, procps
Build-Depends-Indep:
default-jdk-doc,
- junit,
+ junit4,
libjna-java,
libjna-java-doc,
libmaven-compiler-plugin-java,
diff --git a/debian/jenkins-memory-monitor.poms b/debian/jenkins-memory-monitor.poms
index 7e2db20..8545d14 100644
--- a/debian/jenkins-memory-monitor.poms
+++ b/debian/jenkins-memory-monitor.poms
@@ -2,7 +2,9 @@
# Format of this file is:
# <path to pom file> [option]*
# where option can be:
-# --ignore: ignore this POM or
+# --ignore: ignore this POM and its artifact if any
+# --ignore-pom: don't install the POM. To use on POM files that are created
+# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
# --no-parent: remove the <parent> tag from the POM
# --package=<package>: an alternative package to use when installing this POM
# and its artifact
@@ -11,12 +13,16 @@
# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
# during a clean operation with mh_cleanpom or mh_installpom
# --artifact=<path>: path to the build artifact associated with this POM,
-# it will be installed when using the command mh_install
+# it will be installed when using the command mh_install. [mh_install]
# --java-lib: install the jar into /usr/share/java to comply with Debian
# packaging guidelines
# --usj-name=<name>: name to use when installing the library in /usr/share/java
# --usj-version=<version>: version to use when installing the library in /usr/share/java
# --no-usj-versionless: don't install the versionless link in /usr/share/java
-# --dest-jar=<path>: the destination for the real jar
+# --dest-jar=<path>: the destination for the real jar.
+# It will be installed with mh_install. [mh_install]
+# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+# Empty by default. [mh_install]
#
pom.xml --no-parent
diff --git a/debian/maven.rules b/debian/maven.rules
index be4177c..39496fb 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -16,4 +16,4 @@
# and version starting with 3., replacing the version with 3.x
# junit junit jar s/3\\..*/3.x/
-junit junit jar s/3\..*/3.x/ * *
+junit junit jar s/4\..*/4.x/ * *
diff --git a/debian/patches/procps-3.3.patch b/debian/patches/procps-3.3.patch
deleted file mode 100644
index a71fa08..0000000
--- a/debian/patches/procps-3.3.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-Author: James Page <james.page at ubuntu.com>
-Description: [PATCH] Updates to deal with procps >= 3.3 as present in Debian
- unstable
-Origin: https://github.com/javacruft/extras-memory-monitor/commit/7ba8e783a9936a3b59abd840f516c741ee9ea3b9
-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: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);
- if(m.find()) {
-- values[i] = parse(m.group(1));
-+ if (m.groupCount() == 2) {
-+ // Deal with later versions of procps
-+ // which split KMG from values
-+ values[i] = parse(m.group(2) + m.group(1));
-+ } else {
-+ values[i] = parse(m.group(1));
-+ }
- continue OUTER;
- }
- } catch (NumberFormatException e) {
-@@ -161,6 +167,31 @@
- 6907 kohsuke 20 0 134m 14m 9184 S 2 0.4 0:51.56 metacity
-
-
-+On Debian Sid 29/05/2012
-+====================================
-+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: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
-+ 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)
-+or gigabytes (Gb) depending on the amount of currently
-+installed physical memory.
-+
-+Line 1 reflects physical memory, classified as:
-+ total, used, free, buffers
-+
-+Line 2 reflects virtual memory, classified as:
-+ total, used, free, cached
-
- From http://www.unixtop.org/about.shtml
- =======================================
-@@ -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])(?: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])(?:i)?b mem(?:ory)?:.* ([0-9.]+) free"), // Linux procps (>= 3.3)
- Pattern.compile("^physmem:.* ([0-9.]+[kmgb]) free") // Mac OS X
- },
-
- // total swap memory
- new Pattern[] {
- 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])(?: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])(?: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
- },
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index c7c23e6..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-procps-3.3.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jenkins-memory-monitor.git
More information about the pkg-java-commits
mailing list