[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. libreoffice_3.4.1-1-4-gf1a0e02
The following commit has been merged in the debian-experimental-3.4.0 branch:
commit 3719071ece1927f7fa2188cf580db8c6a0734d70
Author: Rene Engelhard <rene@debian.org>
Date: Sun Jul 10 21:16:00 2011 +0200
check for /@OOBASISDIR@/program/.services.rdb
diff --git a/changelog b/changelog
index 214ca9b..de4309d 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:3.4.1-2) UNRELEASED; urgency=low
+
+ * debian/shell-lib-components.sh:
+ - check for /@OOBASISDIR@/program/.services.rdb (closes: #633396)
+
+ -- Rene Engelhard <rene@debian.org> Sun, 10 Jul 2011 00:18:19 +0200
+
libreoffice (1:3.4.1-1) experimental; urgency=low
* new upstream release
diff --git a/shell-lib-components.sh b/shell-lib-components.sh
index 06f4816..c08751c 100644
--- a/shell-lib-components.sh
+++ b/shell-lib-components.sh
@@ -42,21 +42,23 @@ register_to_services_rdb() {
}
update_services_rdb() {
- echo "Updating services.rdb..."
- rdb="`echo /@OOBASISDIR@/program | sed -e s/usr/var/`/services.rdb"
- if [ -d /@OOBASISDIR@/registered-components ]; then
- cat /@OOBASISDIR@/program/.services.rdb \
- | sed -e "s#</components>##" \
- > $rdb
- for c in /@OOBASISDIR@/registered-components/*.component; do \
- tail -n 1 $c \
- | sed -e 's#<component xmlns="http://openoffice.org/2010/uno-components"#<component#'\
- >> $rdb; \
- done
- perl -pi -e "s/\n//" $rdb
- sed -i 's#$#</components>#' $rdb
- else
- cp /@OOBASISDIR@/program/.services.rdb $rdb
+ if [ -f /@OOBASISDIR@/program/.services.rdb ]; then
+ echo "Updating services.rdb..."
+ rdb="`echo /@OOBASISDIR@/program | sed -e s/usr/var/`/services.rdb"
+ if [ -d /@OOBASISDIR@/registered-components ]; then
+ cat /@OOBASISDIR@/program/.services.rdb \
+ | sed -e "s#</components>##" \
+ > $rdb
+ for c in /@OOBASISDIR@/registered-components/*.component; do \
+ tail -n 1 $c \
+ | sed -e 's#<component xmlns="http://openoffice.org/2010/uno-components"#<component#'\
+ >> $rdb; \
+ done
+ perl -pi -e "s/\n//" $rdb
+ sed -i 's#$#</components>#' $rdb
+ else
+ cp /@OOBASISDIR@/program/.services.rdb $rdb
+ fi
+ echo "done."
fi
- echo "done."
}
--
LibreOffice packaging repository
Reply to: