[java-common] 03/09: Install java_defaults.mk with dh_install

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Thu Oct 8 08:15:52 UTC 2015


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

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

commit c4bde2a9729d0b97851bd18c54d5f550b4a73e22
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Oct 7 22:31:37 2015 +0200

    Install java_defaults.mk with dh_install
---
 debian/java-common.install | 1 +
 debian/rules               | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian/java-common.install b/debian/java-common.install
index de8c434..ec02ee0 100644
--- a/debian/java-common.install
+++ b/debian/java-common.install
@@ -1 +1,2 @@
 scripts/completion/update-java-alternatives usr/share/bash-completion/completions
+debian/java_defaults.mk usr/share/java/
diff --git a/debian/rules b/debian/rules
index 96b434c..42bdfa2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -154,8 +154,6 @@ binary-indep: build-indep install-indep
 	dh_testdir -i
 	dh_testroot -i
 	dh_install -i
-	mkdir -p debian/java-common/usr/share/java
-	cp debian/java_defaults.mk debian/java-common/usr/share/java/.
 	mkdir -p debian/default-jdk-doc/usr/share/doc/default-jre-headless
 	ln -sf ../$(p_doc)/api debian/default-jdk-doc/usr/share/doc/default-jre-headless/api
 	ln -sf ../$(p_doc)/api debian/default-jdk-doc/usr/share/doc/default-jdk-doc/api

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



More information about the pkg-java-commits mailing list