From b1f188e1b929d16dc6671c0020610eea29b1dbf9 Mon Sep 17 00:00:00 2001 From: Mark Hindess Date: Wed, 12 Aug 2009 22:48:02 +0000 Subject: [PATCH] [r803734] Minor improvements to Debian packaging. --- debian/docs | 2 -- debian/rules | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/docs b/debian/docs index dfeb48637..9ef2c9b4d 100644 --- a/debian/docs +++ b/debian/docs @@ -1,4 +1,2 @@ -COPYRIGHT LICENSE NOTICE -THIRD_PARTY_NOTICES.txt diff --git a/debian/rules b/debian/rules index 128b1b483..b26aa8be0 100755 --- a/debian/rules +++ b/debian/rules @@ -90,6 +90,7 @@ install-arch: dh_installdirs -s mkdir -p $(VMDIR)/usr/lib/harmony-5.0/jdk/jre/bin + -rm -rf $(VMDIR)/usr/lib/harmony-5.0/jdk/jre/bin/drlvm mv $(CURDIR)/target/hdk/jdk/jre/bin/default \ $(VMDIR)/usr/lib/harmony-5.0/jdk/jre/bin/drlvm mv $(CURDIR)/target/hdk/jdk/jre/bin/libhythr.so \ @@ -99,6 +100,7 @@ install-arch: $(VMDIR)/usr/share/lintian/overrides/harmony-5.0-drlvm mkdir -p $(CLDIR)/usr/lib/harmony-5.0/jdk + -rm -rf $(CLDIR)/usr/lib/harmony-5.0/jdk/jre mv $(CURDIR)/target/hdk/jdk/jre $(CLDIR)/usr/lib/harmony-5.0/jdk mkdir -p $(JREDIR)/usr/lib/harmony-5.0/jdk/jre/bin @@ -106,9 +108,11 @@ install-arch: $(JREDIR)/usr/lib/harmony-5.0/jdk/jre/bin mkdir -p $(JDKDIR)/usr/lib/harmony-5.0 + -rm -rf $(JDKDIR)/usr/lib/harmony-5.0/jdk mv $(CURDIR)/target/hdk/jdk $(JDKDIR)/usr/lib/harmony-5.0 mkdir -p $(HDKDIR)/usr/lib + -rm -rf $(HDKDIR)/usr/lib/harmony-5.0 mv $(CURDIR)/target/hdk $(HDKDIR)/usr/lib/harmony-5.0 dh_install -s -- 2.11.4.GIT