summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuel Bourg <ebourg@apache.org>2015-10-07 22:31:37 +0200
committerEmmanuel Bourg <ebourg@apache.org>2015-10-08 00:22:27 +0200
commitc4bde2a9729d0b97851bd18c54d5f550b4a73e22 (patch)
tree5ae2ac9a08cf665e893b8c9cf9bdab2f04352570
parent165c6bacfbfac11135e9a742eccb80e032376227 (diff)
downloadjava-common-c4bde2a9729d0b97851bd18c54d5f550b4a73e22.tar.gz
Install java_defaults.mk with dh_install
-rw-r--r--debian/java-common.install1
-rwxr-xr-xdebian/rules2
2 files changed, 1 insertions, 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