[SCM] LibreOffice packaging repository branch, ubuntu-saucy-4.1, updated. libreoffice_4.1.0_beta1-2-287-g58523f8
The following commit has been merged in the ubuntu-saucy-4.1 branch:
commit 9e1bc664e8917468cf59852ad4d4f0353197d457
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Sat Jun 8 14:12:10 2013 +0200
remove X-KDE-Protocols patching
* upstreamed as https://gerrit.libreoffice.org/#/c/4198/
* broken anyway:
find: warning: Unix filenames usually don't contain slashes (though pathnames do). That means that '-name `xdg/*.desktop'' will probably evaluate to false all the time on this system. You might find the '-wholename' test more useful, or perhaps '-samefile'. Alternatively, if you are using GNU grep, you could use 'find ... -print0 | grep -FzZ `xdg/*.desktop''.
diff --git a/rules b/rules
index 596b2cc..d79e2b8 100755
--- a/rules
+++ b/rules
@@ -2347,11 +2347,6 @@ endif
mkdir -p -m755 $(PKGDIR)-base/usr/share/applications \
$(PKGDIR)-core/usr/share/applications
- for f in `find debian -name 'xdg/*.desktop' ! -name "*soffice.od*"`; do \
- if ! grep -q X-KDE-Protocols $$f; then \
- echo 'X-KDE-Protocols=file,http,smb,ftp,webdav' >> $$f; \
- fi; \
- done
sed -i -e 's/Office;/Office;Graphics;/' $(PKGDIR)-draw/$(OODIR)/share/xdg/draw.desktop
# invalid, according to lintian. make it shut up.
for i in writer calc impress draw math base; do \
--
LibreOffice packaging repository
Reply to: