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

[libreoffice] 02/03: fix symlink permissions (lp: #1200277), thanks Ritesh



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 e94c822e59d934a4795a1d89245369851d14724a
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Tue Feb 25 21:15:16 2014 +0100

    fix symlink permissions (lp: #1200277), thanks Ritesh
---
 changelog | 11 +++++++----
 rules     |  3 +++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/changelog b/changelog
index bfb03b0..b1a9ac3 100644
--- a/changelog
+++ b/changelog
@@ -1,9 +1,12 @@
-libreoffice (1:3.5.7-0ubuntu6~precise1~ppa1) precise; urgency=low
+libreoffice (1:3.5.7-0ubuntu6~precise1~ppa2) precise; urgency=low
 
-   [Nobuto MURATA]
-   * fix xls file size ballooning (LP: #1194740)
+  [ Nobuto MURATA ]
+  * fix xls file size ballooning (LP: #1194740)
 
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com>  Thu, 03 Oct 2013 22:49:22 +0200
+  [ Ritesh Khadgaray ]
+  * fix symlink permissions (lp: #1200277)
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com>  Tue, 25 Feb 2014 21:08:08 +0100
 
 libreoffice (1:3.5.7-0ubuntu5) precise; urgency=low
 
diff --git a/rules b/rules
index 806cf9a..024b66c 100755
--- a/rules
+++ b/rules
@@ -1768,6 +1768,9 @@ endif
 		mkdir -p $(PKGDIR)-$$j/$(OODIR)/share/xdg; \
 		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; \
 	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: