[visualvm] 03/09: Added an architecture specific package containing the native libraries Install the application files in /usr/share/visualvm instead of /usr/lib/visualvm

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository visualvm.

commit 55780c289f10deaba5941b846aa0f10900803518
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri May 2 01:04:48 2014 +0200

    Added an architecture specific package containing the native libraries
    Install the application files in /usr/share/visualvm instead of /usr/lib/visualvm
---
 debian/changelog                     |  3 +++
 debian/control                       | 23 +++++++++++++++++++++--
 debian/links                         |  2 --
 debian/rules                         | 14 ++++++++++++--
 debian/{install => visualvm.install} |  0
 debian/visualvm.links                |  2 ++
 6 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 37f0ff1..1ae9264 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ visualvm (1.3.7-1) UNRELEASED; urgency=medium
     - Removed the Ant compatibility patch
     - Depend on libnb-platform18-java instead of libnb-platform13-java
     - Updated the constants in debian/rules
+  * Added an architecture specific package containing the native libraries
+  * Install the application files in /usr/share/visualvm
+    instead of /usr/lib/visualvm
   * Added debian/README.source to document the workflow used with this package
   * debian/rules: Revamped to use the dh command sequencer
   * debian/copyright:
diff --git a/debian/control b/debian/control
index 6211def..d53fcbf 100644
--- a/debian/control
+++ b/debian/control
@@ -17,8 +17,8 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/visualvm.git
 Homepage: https://visualvm.java.net
 
 Package: visualvm
-Architecture: any
-Depends: default-jdk | java7-sdk | java6-sdk, libnb-platform18-java, ${shlibs:Depends}, ${misc:Depends}
+Architecture: all
+Depends: default-jdk | java7-sdk | java6-sdk, libnb-platform18-java, libvisualvm-jni, ${misc:Depends}
 Description: All-in-One Java Troubleshooting Tool
  VisualVM is a visual tool integrating several commandline JDK tools
  and lightweight profiling capabilities. Designed for both production
@@ -32,3 +32,22 @@ Description: All-in-One Java Troubleshooting Tool
     across the entire network.
   - Java Application Users: Create bug reports containing all the
     necessary information.
+
+Package: libvisualvm-jni
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: All-in-One Java Troubleshooting Tool (JNI libraries)
+ VisualVM is a visual tool integrating several commandline JDK tools
+ and lightweight profiling capabilities. Designed for both production
+ and development time use, it further enhances the capability of
+ monitoring and performance analysis for the Java SE platform.
+ .
+ VisualVM is designed for
+  - Application Developers: Monitor, profile, take thread dumps,
+    browse heap dumps.
+  - System Administrators: Monitor and control Java applications
+    across the entire network.
+  - Java Application Users: Create bug reports containing all the
+    necessary information.
+ .
+ This package contains the architecture specific Java native interface part.
diff --git a/debian/links b/debian/links
deleted file mode 100644
index 14be8a2..0000000
--- a/debian/links
+++ /dev/null
@@ -1,2 +0,0 @@
-etc/visualvm/visualvm.conf     usr/lib/visualvm/etc/visualvm.conf
-etc/visualvm/visualvm.clusters usr/lib/visualvm/etc/visualvm.clusters
diff --git a/debian/rules b/debian/rules
index faf887b..9736360 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,15 +11,25 @@ override_dh_auto_configure:
 	dh_autoreconf
 	dh_auto_configure -- --prefix=/usr \
 	        --sysconfdir=/etc/visualvm \
-	        --libdir=/usr/lib/ \
+	        --libdir=/usr/share/ \
 	        --with-jdk-home=$(JAVA_HOME) \
 	        --with-visualvm-version=1.3.7
 
 override_dh_auto_install:
-	dh_auto_install
+	dh_auto_install -- DESTDIR=debian/visualvm
+
+	# Install the icons
 	install -m 644 -D debian/visualvm-32x32.xpm debian/visualvm/usr/share/icons/hicolor/32x32/apps/visualvm.xpm
 	install -m 644 -D debian/visualvm-48x48.xpm debian/visualvm/usr/share/icons/hicolor/48x48/apps/visualvm.xpm
 
+	# Move the native libraries into libvisualvm-jni
+	rm -Rf debian/visualvm/usr/share/visualvm/profiler/lib/deployed/jdk15/linux-amd64
+	rm -Rf debian/visualvm/usr/share/visualvm/profiler/lib/deployed/jdk16/linux-amd64
+	mkdir --parents debian/libvisualvm-jni/usr/lib/jni
+	mv debian/visualvm/usr/share/visualvm/profiler/lib/deployed/jdk15/linux/libprofilerinterface.so debian/libvisualvm-jni/usr/lib/jni/libprofilerinterface-jdk15.so
+	mv debian/visualvm/usr/share/visualvm/profiler/lib/deployed/jdk16/linux/libprofilerinterface.so debian/libvisualvm-jni/usr/lib/jni/libprofilerinterface-jdk16.so
+	rm -Rf debian/visualvm/usr/share/visualvm/profiler/lib/deployed
+
 override_dh_auto_clean:
 	[ ! -f Makefile ] || $(MAKE) clean-local
 	rm -Rf Makefile Makefile.in aclocal.m4 compile config.* configure install-sh missing visualvm.desktop stamps
diff --git a/debian/install b/debian/visualvm.install
similarity index 100%
rename from debian/install
rename to debian/visualvm.install
diff --git a/debian/visualvm.links b/debian/visualvm.links
new file mode 100644
index 0000000..845dec5
--- /dev/null
+++ b/debian/visualvm.links
@@ -0,0 +1,2 @@
+etc/visualvm/visualvm.conf     usr/share/visualvm/etc/visualvm.conf
+etc/visualvm/visualvm.clusters usr/share/visualvm/etc/visualvm.clusters

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/visualvm.git