[libreoffice] 03/03: guard symlink change for special cased platforms
This is an automated email from the git hooks/post-receive script.
sweetshark-guest pushed a commit to branch ubuntu-precise-3.5
in repository libreoffice.
commit d4ff373e5afaf35f53466da376a353fdcd654703
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Fri May 9 00:01:51 2014 +0200
guard symlink change for special cased platforms
---
changelog | 6 ++++++
rules | 6 ++++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/changelog b/changelog
index 70aeb2d..eb81107 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:3.5.7-0ubuntu6.1) precise; urgency=medium
+
+ * guard symlink change for special cased platforms
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 08 May 2014 23:48:13 +0200
+
libreoffice (1:3.5.7-0ubuntu6) precise; urgency=low
[ Ritesh Khadgaray ]
diff --git a/rules b/rules
index 024b66c..ad1ade2 100755
--- a/rules
+++ b/rules
@@ -1769,8 +1769,10 @@ endif
mv $(PKGDIR)-common/$(OODIR)/share/xdg/$$i.desktop \
$(PKGDIR)-$$j/$(OODIR)/share/xdg; \
rm -f $(PKGDIR)-$$j/usr/share/applications/libreoffice-$$i.desktop; \
- cp $(PKGDIR)-$$j/$(OODIR)/share/xdg/$$i.desktop \
- $(PKGDIR)-$$j/usr/share/applications/libreoffice-$$i.desktop; \
+ (test -e $(PKGDIR)-$$j/$(OODIR)/share/xdg/$$i.desktop && \
+ test -d $(PKGDIR)-$$j/usr/share/applications/ && \
+ cp $(PKGDIR)-$$j/$(OODIR)/share/xdg/$$i.desktop \
+ $(PKGDIR)-$$j/usr/share/applications/libreoffice-$$i.desktop) || true; \
done
# move help to /usr/share
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: