[libreoffice] 11/11: copying the files after they are in place should help
This is an automated email from the git hooks/post-receive script.
sweetshark-guest pushed a commit to branch ubuntu-trusty-4.2
in repository libreoffice.
commit 0912387217f05236760518de5636c390f2ecbaca
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Wed Feb 26 15:46:12 2014 +0100
copying the files after they are in place should help
---
changelog | 2 +-
rules | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/changelog b/changelog
index 67652b4..d18a7b9 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.2.1-0ubuntu2~ppa1) trusty; urgency=low
+libreoffice (1:4.2.1-0ubuntu2~ppa2) trusty; urgency=low
[ Ritesh Khadgaray ]
* fix symlink permissions (lp: #1200277)
diff --git a/rules b/rules
index 7bedf12..d9ef324 100755
--- a/rules
+++ b/rules
@@ -1949,11 +1949,11 @@ endif
# move desktop files to their correct packages
for i in base calc draw impress math writer; do \
mkdir -p $(PKGDIR)-$$i/$(OODIR)/share/xdg; \
+ mv $(PKGDIR)-common/$(OODIR)/share/xdg/$$i.desktop \
+ $(PKGDIR)-$$i/$(OODIR)/share/xdg; \
rm -f $(PKGDIR)-$$i/usr/share/applications/libreoffice-$$i.desktop; \
cp $(PKGDIR)-$$i/$(OODIR)/share/xdg/$$i.desktop \
$(PKGDIR)-$$i/usr/share/applications/libreoffice-$$i.desktop; \
- mv $(PKGDIR)-common/$(OODIR)/share/xdg/$$i.desktop \
- $(PKGDIR)-$$i/$(OODIR)/share/xdg; \
done
ifeq "$(ENABLE_JAVA)" "y"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: