[libreoffice-online] 04/04: clean up install; install into debian/tmp and use dh_install

[Rene Engelhard]

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

rene pushed a commit to branch master
in repository libreoffice-online.

commit cf3b63837150f406d80f684c0260373094a44af4
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Tue Nov 28 23:07:51 2017 +0000

    clean up install; install into debian/tmp and use dh_install
---
 debian/loleaflet.install |  1 +
 debian/loolwsd.install   |  7 +++++++
 debian/loolwsd.links     |  2 ++
 debian/rules             | 10 ++++++----
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/debian/loleaflet.install b/debian/loleaflet.install
new file mode 100644
index 0000000..e0818c7
--- /dev/null
+++ b/debian/loleaflet.install
@@ -0,0 +1 @@
+usr/share/libreoffice-online/loleaflet
diff --git a/debian/loolwsd.install b/debian/loolwsd.install
new file mode 100644
index 0000000..0517be9
--- /dev/null
+++ b/debian/loolwsd.install
@@ -0,0 +1,7 @@
+etc
+usr/bin
+usr/share/doc/loolwsd
+usr/share/libreoffice-online/discovery.xml
+usr/share/libreoffice-online/favicon.ico
+usr/share/libreoffice-online/robots.txt
+
diff --git a/debian/loolwsd.links b/debian/loolwsd.links
new file mode 100644
index 0000000..ce93ca7
--- /dev/null
+++ b/debian/loolwsd.links
@@ -0,0 +1,2 @@
+usr/share/libreoffice-online usr/share/loolwsd
+
diff --git a/debian/rules b/debian/rules
index f8e1399..ae85da1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,10 +27,12 @@ override_dh_auto_test:
 	# do not test
 
 override_dh_auto_install:
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/loolwsd/
-
-	mkdir -p $(CURDIR)/debian/loleaflet/usr/share/loolwsd
-	cp -ar $(CURDIR)/loleaflet $(CURDIR)/debian/loleaflet/usr/share/loolwsd
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	mv $(CURDIR)/debian/tmp/usr/share/doc/libreoffice-online \
+		$(CURDIR)/debian/tmp/usr/share/doc/loolwsd
+#	cp -ar $(CURDIR)/loleaflet $(CURDIR)/debian/tmp/usr/share/libreoffice-online
+	dh_install --sourcedir=debian/tmp
+	dh_missing --sourcedir=debian/tmp --fail-missing
 
 	cd $(CURDIR)/debian/loolwsd/usr/bin && find . -type f ! -name "loolwsd-systemplate-setup" -exec chrpath -d {} \;
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice-online.git