[visualvm] 02/02: New upstream release (1.3.8) Removed 02-java8-compatibility.patch (fixed upstream)
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Jul 2 15:33:09 UTC 2014
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository visualvm.
commit a2736e793e4fad678175c8212b6516e015f53d94
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Jul 2 17:32:28 2014 +0200
New upstream release (1.3.8)
Removed 02-java8-compatibility.patch (fixed upstream)
---
debian/changelog | 4 +-
debian/patches/02-java8-compatibility.patch | 145 ----------------------------
debian/patches/series | 1 -
3 files changed, 3 insertions(+), 147 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8ce3482..31c51d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
-visualvm (1.3.7-3) UNRELEASED; urgency=medium
+visualvm (1.3.8-1) UNRELEASED; urgency=medium
+ * New upstream release
+ - Removed 02-java8-compatibility.patch (fixed upstream)
* Improved the mangling of the upstream version in debian/watch
-- Emmanuel Bourg <ebourg at apache.org> Tue, 01 Jul 2014 22:27:57 +0200
diff --git a/debian/patches/02-java8-compatibility.patch b/debian/patches/02-java8-compatibility.patch
deleted file mode 100644
index 4eb0d93..0000000
--- a/debian/patches/02-java8-compatibility.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-Description: Fixes compilation errors with Java 8
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: no
---- a/netbeans/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/FlatProfileContainer.java
-+++ b/netbeans/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/FlatProfileContainer.java
-@@ -359,18 +359,18 @@
- super.swap(a, b);
- FlatProfileContainer.this.swap(a, b);
-
-- swap(timeInMcs0,a,b);
-- swap(totalTimeInMcs0,a,b);
-+ FlatProfileContainer.swap(timeInMcs0,a,b);
-+ FlatProfileContainer.swap(totalTimeInMcs0,a,b);
-
- if (collectingTwoTimeStamps) {
-- swap(timeInMcs1,a,b);
-- swap(totalTimeInMcs1,a,b);
-+ FlatProfileContainer.swap(timeInMcs1,a,b);
-+ FlatProfileContainer.swap(totalTimeInMcs1,a,b);
- }
-
-- swap(methodIds,a,b);
-+ FlatProfileContainer.swap(methodIds,a,b);
-
- if (percent != null) {
-- swap(percent,a,b);
-+ FlatProfileContainer.swap(percent,a,b);
- }
- }
- }).sort(sortOrder);
-@@ -392,19 +392,19 @@
- super.swap(a, b);
- FlatProfileContainer.this.swap(a, b);
-
-- swap(timeInMcs0,a,b);
-- swap(totalTimeInMcs0,a,b);
-+ FlatProfileContainer.swap(timeInMcs0,a,b);
-+ FlatProfileContainer.swap(totalTimeInMcs0,a,b);
-
- if (collectingTwoTimeStamps) {
-- swap(timeInMcs1,a,b);
-- swap(totalTimeInMcs1,a,b);
-+ FlatProfileContainer.swap(timeInMcs1,a,b);
-+ FlatProfileContainer.swap(totalTimeInMcs1,a,b);
- }
-
-- swap(methodIds,a,b);
-- swap(nInvocations,a,b);
-+ FlatProfileContainer.swap(methodIds,a,b);
-+ FlatProfileContainer.swap(nInvocations,a,b);
-
- if (percent != null) {
-- swap(percent,a,b);
-+ FlatProfileContainer.swap(percent,a,b);
- }
- }
- }).sort(sortOrder);
-@@ -438,18 +438,18 @@
- super.swap(a, b);
- FlatProfileContainer.this.swap(a, b);
-
-- swap(totalTimeInMcs0,a,b);
-+ FlatProfileContainer.swap(totalTimeInMcs0,a,b);
-
- if (collectingTwoTimeStamps) {
-- swap(tpmBF,a,b);
-- swap(totalTimeInMcs1,a,b);
-+ FlatProfileContainer.swap(tpmBF,a,b);
-+ FlatProfileContainer.swap(totalTimeInMcs1,a,b);
- }
-
-- swap(methodIds,a,b);
-- swap(nInvocations,a,b);
-+ FlatProfileContainer.swap(methodIds,a,b);
-+ FlatProfileContainer.swap(nInvocations,a,b);
-
- if (percent != null) {
-- swap(percent,a,b);
-+ FlatProfileContainer.swap(percent,a,b);
- }
- }
- }).sort(sortOrder);
-@@ -467,14 +467,14 @@
- super.swap(a, b);
- FlatProfileContainer.this.swap(a, b);
-
-- swap(totalTimeInMcs0,a,b);
-+ FlatProfileContainer.swap(totalTimeInMcs0,a,b);
-
- if (collectingTwoTimeStamps) {
-- swap(tpmBF,a,b);
-- swap(totalTimeInMcs1,a,b);
-+ FlatProfileContainer.swap(tpmBF,a,b);
-+ FlatProfileContainer.swap(totalTimeInMcs1,a,b);
- }
-
-- swap(methodIds,a,b);
-+ FlatProfileContainer.swap(methodIds,a,b);
- }
- }).sort(sortOrder);
- }
-@@ -508,18 +508,18 @@
- super.swap(a, b);
- FlatProfileContainer.this.swap(a, b);
-
-- swap(timeInMcs0,a,b);
-+ FlatProfileContainer.swap(timeInMcs0,a,b);
-
- if (collectingTwoTimeStamps) {
-- swap(tpmBF,a,b);
-- swap(timeInMcs1,a,b);
-+ FlatProfileContainer.swap(tpmBF,a,b);
-+ FlatProfileContainer.swap(timeInMcs1,a,b);
- }
-
-- swap(methodIds,a,b);
-- swap(nInvocations,a,b);
-+ FlatProfileContainer.swap(methodIds,a,b);
-+ FlatProfileContainer.swap(nInvocations,a,b);
-
- if (percent != null) {
-- swap(percent,a,b);
-+ FlatProfileContainer.swap(percent,a,b);
- }
- }
- }).sort(sortOrder);
-@@ -537,14 +537,14 @@
- super.swap(a, b);
- FlatProfileContainer.this.swap(a, b);
-
-- swap(timeInMcs0,a,b);
-+ FlatProfileContainer.swap(timeInMcs0,a,b);
-
- if (collectingTwoTimeStamps) {
-- swap(tpmBF,a,b);
-- swap(timeInMcs1,a,b);
-+ FlatProfileContainer.swap(tpmBF,a,b);
-+ FlatProfileContainer.swap(timeInMcs1,a,b);
- }
-
-- swap(methodIds,a,b);
-+ FlatProfileContainer.swap(methodIds,a,b);
- }
- }).sort(sortOrder);
- }
diff --git a/debian/patches/series b/debian/patches/series
index dd72e98..a0d3d79 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
01-gcc-settings.patch
-02-java8-compatibility.patch
03-launcher.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/visualvm.git
More information about the pkg-java-commits
mailing list