[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0-1-14-gc99ff34
The following commit has been merged in the debian-experimental-3.5 branch:
commit c99ff348f1aa6edfac4d7fdd592898bf93922e22
Author: Rene Engelhard <rene@debian.org>
Date: Mon Feb 20 10:13:17 2012 +0100
fix install for new binfilter.desktop
diff --git a/rules b/rules
index 5883781..e0e86e4 100755
--- a/rules
+++ b/rules
@@ -1722,7 +1722,7 @@ endif
# move desktop files to their correct packages
for i in base calc draw impress math writer binfilter; do \
- if [ "$$i" = "binfilter" ]; then j=filter-binfilter; else j=$$i; done; \
+ if [ "$$i" = "binfilter" ]; then j=filter-binfilter; else j=$$i; fi; \
mkdir -p $(PKGDIR)-$$j/$(OODIR)/share/xdg; \
mv $(PKGDIR)-common/$(OODIR)/share/xdg/$$i.desktop \
$(PKGDIR)-$$j/$(OODIR)/share/xdg; \
diff --git a/scripts/gid2pkgdirs.sh b/scripts/gid2pkgdirs.sh
index 7251532..9e809ee 100755
--- a/scripts/gid2pkgdirs.sh
+++ b/scripts/gid2pkgdirs.sh
@@ -65,7 +65,8 @@ mv ./usr/share/mimelnk/application/* \
# pkg/libreoffice-$p/usr/share/man/man1
#done
for i in ./usr/share/applications/*.desktop; do \
- if [ "`basename $i`" = "libreoffice-startcenter.desktop" ]; then p=libreoffice-common; else \
+ if [ "`basename $i`" = "libreoffice-startcenter.desktop" ]; then p=libreoffice-common; \
+ elif [ "`basename $i`" = "libreoffice-binfilter.desktop" ]; then p=libreoffice-filter-binfilter; else \
p=`basename $i .desktop`; fi
mkdir -p pkg/$p/usr/share/applications
mv $i \
--
LibreOffice packaging repository
Reply to: