This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository visualvm.
commit 19c3de614b8af9de84c8badfe1a5af7f61e965a2 Author: Emmanuel Bourg <[email protected]> Date: Thu May 1 01:35:13 2014 +0200 Revamped debian/rules to use the dh command sequencer --- debian/changelog | 2 +- debian/install | 2 + debian/{jvisualvm.sh => jvisualvm} | 0 debian/links | 2 + debian/rules | 104 +++++++------------------------------ 5 files changed, 23 insertions(+), 87 deletions(-) diff --git a/debian/changelog b/debian/changelog index 51bd5de..8f76f6a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,7 @@ visualvm (1.3.7-1) UNRELEASED; urgency=medium - Depend on libnb-platform18-java instead of libnb-platform13-java - Updated the constants in debian/rules * Added debian/README.source to document the workflow used with this package - * debian/rules: Removed unused constants + * debian/rules: Revamped to use the dh command sequencer * debian/copyright: - Refreshed the source URLs - Replaced Sun Microsystems with Oracle diff --git a/debian/install b/debian/install new file mode 100644 index 0000000..593177b --- /dev/null +++ b/debian/install @@ -0,0 +1,2 @@ +debian/jvisualvm usr/bin/ +debian/visualvm.desktop usr/share/applications/ diff --git a/debian/jvisualvm.sh b/debian/jvisualvm similarity index 100% rename from debian/jvisualvm.sh rename to debian/jvisualvm diff --git a/debian/links b/debian/links new file mode 100644 index 0000000..14be8a2 --- /dev/null +++ b/debian/links @@ -0,0 +1,2 @@ +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 7fc1d9c..faf887b 100755 --- a/debian/rules +++ b/debian/rules @@ -1,95 +1,27 @@ #!/usr/bin/make -f -# -*- makefile -*- - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +export JAVA_HOME = $(firstword $(wildcard /usr/lib/jvm/java-7-openjdk-$(DEB_HOST_ARCH) /usr/lib/jvm/default-java)) -d = debian/visualvm - -export JAVA_HOME = $(firstword $(wildcard /usr/lib/jvm/java-7-openjdk-$(DEB_HOST_ARCH) /usr/lib/jvm/java-6-openjdk-$(DEB_HOST_ARCH))) +%: + dh $@ -configure: configure-stamp -configure-stamp: - dh_testdir +override_dh_auto_configure: ./autogen.sh dh_autoreconf - ./configure --prefix=/usr \ - --sysconfdir=/etc/visualvm \ - --with-jdk-home=$(JAVA_HOME) \ - --with-visualvm-version=1.3.7 - touch $@ - -build: build-stamp -build-stamp: configure-stamp - dh_testdir - $(MAKE) - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f *-stamp - if [ -f Makefile ]; then \ - $(MAKE) clean; \ - rm -f Makefile; \ - else \ - rm -f config.log config.status; \ - fi - rm -f config.log config.status visualvm.desktop - rm -rf stamps - rm -Rf Makefile.in aclocal.m4 compile config.guess config.sub configure install-sh missing + dh_auto_configure -- --prefix=/usr \ + --sysconfdir=/etc/visualvm \ + --libdir=/usr/lib/ \ + --with-jdk-home=$(JAVA_HOME) \ + --with-visualvm-version=1.3.7 + +override_dh_auto_install: + dh_auto_install + 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 + +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 dh_autoreconf_clean dh_clean - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs \ - etc/visualvm \ - usr/lib/visualvm/etc \ - - $(MAKE) install DESTDIR=$(CURDIR)/$(d) - - - for i in visualvm.conf visualvm.clusters; do \ - ln -s /etc/visualvm/$$i $(d)/usr/lib/visualvm/etc/$$i; \ - done - - cp debian/jvisualvm.sh $(d)/usr/bin/jvisualvm - - rm -f $(d)/usr/share/visualvm.desktop - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installexamples - install -m 644 -D debian/visualvm-32x32.xpm \ - $(d)/usr/share/icons/hicolor/32x32/apps/visualvm.xpm - install -m 644 -D debian/visualvm-48x48.xpm \ - $(d)/usr/share/icons/hicolor/48x48/apps/visualvm.xpm - install -m 644 -D debian/visualvm.desktop \ - $(d)/usr/share/applications/visualvm.desktop - dh_icons -# dh_installmenu - dh_installman - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/visualvm.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
