[libreoffice] 01/01: some more systray install fixes
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 0ae0c895b9aafd528f579118c10611515495f59b
Author: Rene Engelhard <rene@debian.org>
Date: Tue Aug 9 05:43:52 2016 +0200
some more systray install fixes
---
rules | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/rules b/rules
index c383d9c..cb9e686 100755
--- a/rules
+++ b/rules
@@ -2650,8 +2650,7 @@ endif
ifeq "$(BUILD_GTK)" "y"
mkdir -p -m755 $(PKGDIR)-gtk2/$(OODIR)/share
ifeq "$(ENABLE_SYSTRAY)" "y"
- mv $(PKGDIR)-gnome/$(OODIR)/share/xdg $(PKGDIR)-systray/$(OODIR)/share
- mv $(PKGDIR)-gnome/$(OODIR)/program/*qstart*so $(PKGDIR)-systray/$(OODIR)/share
+ mv $(PKGDIR)-gtk2/$(OODIR)/program/*qstart*so $(PKGDIR)-systray/$(OODIR)/share
endif
ifeq "$(ENABLE_GIO)" "y"
mv $(PKGDIR)-gtk2/$(OODIR)/program/libucpgio1lo.so \
@@ -2707,7 +2706,7 @@ endif
perl -pi -e 's/Application;//; s/X-Red-Hat-Base;//; s/X-SuSE-Core-Office;//; s/X-MandrivaLinux-.*;//;' $(PKGDIR)-$$i/$(OODIR)/share/xdg/$$i.desktop; \
done
ifeq "$(ENABLE_SYSTRAY)" "y"
- perl -pi -e 's/Application;//' $(PKGDIR)-gtk2/$(OODIR)/share/xdg/qstart.desktop
+ perl -pi -e 's/Application;//' $(PKGDIR)-systray/$(OODIR)/share/xdg/qstart.desktop
endif
ifeq "$(ENABLE_PYTHON)" "y"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: