diff mbox

[Trusty,SRU] UBUNTU: [Debian] Fix linux-doc dangling symlinks

Message ID 1459177015-8937-1-git-send-email-tim.gardner@canonical.com
State New
Headers show

Commit Message

Tim Gardner March 28, 2016, 2:56 p.m. UTC 
From: Tim Gardner <tim.gardner@canonical.com>

BugLink: https://bugs.launchpad.net/bugs/661306

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Chris J Arges <chris.j.arges@canonical.com>
(cherry picked from commit 12d21ea5e531417dee745c36e501a3ec3a74e426)
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---

It seems that this patch was missed for Trusty.

 debian/rules.d/3-binary-indep.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Kamal Mostafa March 28, 2016, 3:11 p.m. UTC | #1 
This has already been ACK'ed, so I'm just applying it to trusty
immediately.

The "cherry picked" line references a vivid SHA (this isn't an upstream
commit) so isn't relevant; dropping it.

 -Kamal
diff mbox

Patch

diff --git a/debian/rules.d/3-binary-indep.mk b/debian/rules.d/3-binary-indep.mk
index 5afbbf4..168a3b5 100644
--- a/debian/rules.d/3-binary-indep.mk
+++ b/debian/rules.d/3-binary-indep.mk
@@ -42,8 +42,9 @@  ifeq ($(do_doc_package_content),true)
 	if [ -z "$(AUTOBUILD)" ]; then \
 		install -d $(docdir)/$(doc_pkg_name)-tmp; \
 		$(kmake) O=$(docdir)/$(doc_pkg_name)-tmp htmldocs; \
-		mv $(docdir)/$(doc_pkg_name)-tmp/Documentation/DocBook \
-			$(docdir)/html; \
+		install -d $(docdir)/html; \
+		rsync -aL $(docdir)/$(doc_pkg_name)-tmp/Documentation/DocBook/ \
+			$(docdir)/html/; \
 		rm -rf $(docdir)/$(doc_pkg_name)-tmp; \
 	fi
 endif