[Git][java-team/visualvm][master] 5 commits: Update debian/copyright
Markus Koschany
gitlab at salsa.debian.org
Tue Oct 6 00:03:02 BST 2020
Markus Koschany pushed to branch master at Debian Java Maintainers / visualvm
Commits:
5e84992f by Markus Koschany at 2020-10-05T18:43:51+02:00
Update debian/copyright
- - - - -
9282031e by Markus Koschany at 2020-10-05T18:44:53+02:00
Clean up debian/rules. Remove obsolete variables.
- - - - -
40bf6375 by Markus Koschany at 2020-10-05T18:46:59+02:00
Update README.source
- - - - -
6de94cf7 by Markus Koschany at 2020-10-05T18:50:59+02:00
Update changelog
- - - - -
de96ce89 by Markus Koschany at 2020-10-05T18:59:47+02:00
Update patch headers
- - - - -
7 changed files:
- debian/README.source
- debian/changelog
- debian/copyright
- debian/patches/01-gcc-settings.patch
- debian/patches/jfr.generic.patch
- debian/patches/sortChildren.patch
- debian/rules
Changes:
=====================================
debian/README.source
=====================================
@@ -1,30 +1,17 @@
Information about visualvm
--------------------------
-visualvm is a composite source package. It consists of two tarballs
-published at https://github.com/visualvm/visualvm.src/releases:
- * visualvm_xyz-src.tar.gz
- * netbeans-profiler-visualvm_releaseXYZ.tar.gz
-
-You also need the nbbuild directory from src:netbeans or libnb-platform18-java.
-
Building a new version
----------------------
Here are the steps to build a new version:
-1) Download the source tarballs.
-
-2) Create a combined orig.tar.xz tarball by extracting visualvm_xyz-src.tar.gz,
- then copy the contents of netbeans-profiler-visualvm_releaseXYZ.tar.gz into the
- netbeans directory and finally copy nbbuild into the netbeans directory too.
- Make sure to remove all prebuilt files like jars, so, sl or dll files.
+1) Download the source tarball with uscan. Currently you have to manually
+ remove the jar files because the "Files-Excluded" mechanism would also remove
+ the .jar directories which is not desired. FIXME.
-3) Import the new version in the Git repository
+2) Import the new version in the Git repository, e.g.
git-import-orig --merge --verbose --pristine-tar ../visualvm_x.y.z.orig.tar.xz
-4) Adjust the version of the NetBeans platform used (at the moment the version
- does not change anymore. So this should not be needed.
- (there are references in debian/control, debian/rules and debian/visualvm.links)
=====================================
debian/changelog
=====================================
@@ -1,8 +1,19 @@
-visualvm (2.0.4-1) UNRELEASED; urgency=medium
+visualvm (2.0.4-1) unstable; urgency=medium
- *
-
- -- Markus Koschany <apo at debian.org> Sun, 04 Oct 2020 20:14:27 +0200
+ * Team upload.
+ * New upstream version 2.0.4.
+ * Switch to debhelper-compat = 13.
+ * Declare compliance with Debian Policy 4.5.0.
+ * d/rules: Set permit.jdk9.builds=true
+ * Drop jhall.patch and ModuleStateSelector.patch.
+ * Refresh the remaining patches and add jfr.generic.patch because Java
+ Mission Control has not been packaged yet.
+ * Tighten dependency on libnb-platform18-java otherwise some features will
+ not work correctly. (plugins, etc.)
+ * Ensure visualvm can be built twice in a row.
+ * Update debian/copyright for new release.
+
+ -- Markus Koschany <apo at debian.org> Mon, 05 Oct 2020 18:47:55 +0200
visualvm (1.4.3-1) unstable; urgency=medium
=====================================
debian/copyright
=====================================
@@ -16,6 +16,13 @@ Files: *
Copyright: 2007-2020, Oracle and/or its affiliates
License: CDDL-1.1 or GPL-2-with-Classpath-exception
+Files: plugins/jsyntaxpane-lib/external/jsyntaxpane/*
+ plugins/oqlsyntax/src/org/graalvm/visualvm/modules/oqlsyntax/*
+Copyright: Ayman Al-Sairafi
+License: Apache-2.0
+ On Debian systems, the complete text of the Apache license 2.0 can be found in
+ /usr/share/common-licenses/Apache-2.0.
+
Files: debian/*
Copyright: 2008-2012, Matthias Klose <doko at ubuntu.com>
2014, Emmanuel Bourg <ebourg at apache.org>
=====================================
debian/patches/01-gcc-settings.patch
=====================================
@@ -2,6 +2,7 @@ From: Markus Koschany <apo at debian.org>
Date: Sun, 4 Oct 2020 20:18:51 +0200
Subject: 01-gcc-settings
+Forwarded: not-needed
---
.../libs.profiler/lib.profiler/native/build/buildnative-linux64.sh | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
=====================================
debian/patches/jfr.generic.patch
=====================================
@@ -2,6 +2,8 @@ From: Markus Koschany <apo at debian.org>
Date: Mon, 5 Oct 2020 01:13:05 +0200
Subject: jfr.generic
+Disable jfr.generic module because it requires Java Mission Control (jmc), more
+precisely flightrecorder.
---
visualvm/nbproject/project.properties | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
=====================================
debian/patches/sortChildren.patch
=====================================
@@ -2,6 +2,7 @@ From: Markus Koschany <apo at debian.org>
Date: Mon, 5 Oct 2020 01:02:21 +0200
Subject: sortChildren
+Still not sure why this one makes the build fail to build from source.
---
visualvm/core/src/org/graalvm/visualvm/core/explorer/ExplorerNode.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
=====================================
debian/rules
=====================================
@@ -14,8 +14,6 @@ endif
NB_PLATFORM_VERSION=18
NB_BUILD_PROPERTIES=-Dpermit.jdk9.builds=true
-ABS_TOP_DIR=`pwd -P`
-NB_DEST_DIR=$(ABS_TOP_DIR)/visualvm
%:
dh $@
View it on GitLab: https://salsa.debian.org/java-team/visualvm/-/compare/b113ffe3501f911a8bb32ebec0025ed5893ccab0...de96ce89d2bb3525b669f2462cb480799696b416
--
View it on GitLab: https://salsa.debian.org/java-team/visualvm/-/compare/b113ffe3501f911a8bb32ebec0025ed5893ccab0...de96ce89d2bb3525b669f2462cb480799696b416
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20201005/45cdf4d5/attachment.html>
More information about the pkg-java-commits
mailing list