[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[libreoffice] 10/11: no symlinks for .desktop file (lp#1200277) -- thanks Ritesh



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 d3026a173d34e1c41179401a098c45205f60b419
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Tue Feb 25 17:59:04 2014 +0100

    no symlinks for .desktop file (lp#1200277) -- thanks Ritesh
---
 changelog | 7 +++++++
 rules     | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/changelog b/changelog
index d6563d8..67652b4 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:4.2.1-0ubuntu2~ppa1) trusty; urgency=low
+
+  [ Ritesh Khadgaray ]
+  * fix symlink permissions (lp: #1200277)
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com>  Wed, 19 Feb 2014 23:05:41 +0100
+
 libreoffice (1:4.2.1-0ubuntu1) trusty; urgency=low
 
   * bump to new upstream release
diff --git a/rules b/rules
index c4b5865..7bedf12 100755
--- a/rules
+++ b/rules
@@ -1949,6 +1949,9 @@ 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; \
+		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

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


Reply to: