------------------------------------------------------------
revno: 1558
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Wed 2009-05-20 10:06:56 +0200
message:
update ooo-build, check for existence of rdb bevore regview
modified:
changelog
shell-lib.sh
=== modified file 'changelog'
--- a/changelog 2009-05-20 00:13:41 +0000
+++ b/changelog 2009-05-20 08:06:56 +0000
@@ -1,12 +1,19 @@
openoffice.org (1:3.1.0-3) UNRELEASED; urgency=low
+ * ooo-build:
+ - update (c1a864706b14df89477cbafffdaba519fbc6c4e9 - 3.1.0.2)
+
* debian/openoffice.org-common.preinst.in: use mkdir -p, not mkdir
(closes: #529518)
* debian/rules:
- add explicit build-dep on gcj when building native jars, now needed
due to java-gcj-compat changes....
+ * debian/shell-lib.sh:
+ - check whether $rdb exists in revoke_from_services_rdb() before running
+ regview on it as it doesn't when the new -evolution is first unpacked in
+ a upgrade run before the new -core.
- -- Rene Engelhard <r...@debian.org> Wed, 20 May 2009 01:43:56 +0200
+ -- Rene Engelhard <r...@debian.org> Wed, 20 May 2009 09:43:43 +0200
openoffice.org (1:3.1.0-2) unstable; urgency=low
=== modified file 'shell-lib.sh'
--- a/shell-lib.sh 2009-05-17 11:31:27 +0000
+++ b/shell-lib.sh 2009-05-20 08:06:56 +0000
@@ -86,7 +86,7 @@
revoke_from_services_rdb() {
rdb="`echo /@OOBASISDIR@/program | sed -e s/usr/var/`/services.rdb"
lib="`basename $1`"
- if /usr/lib/ure/bin/regview $rdb | grep -q $lib; then
+ if [ -e "$rdb" ] && /usr/lib/ure/bin/regview $rdb | grep -q $lib; then
/usr/lib/ure/bin/regcomp -revoke -r $rdb -br $rdb -c file://$1
fi
}
