./packages/openofficeorg/3.2/experimental r1763: merge; update ooo-build
------------------------------------------------------------
revno: 1763 [merge]
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Tue 2010-01-12 23:36:42 +0100
message:
merge; update ooo-build
modified:
changelog
shell-lib-components.sh
shell-lib-extensions.sh
=== modified file 'changelog'
--- a/changelog 2010-01-12 00:14:41 +0000
+++ b/changelog 2010-01-12 22:36:42 +0000
@@ -5,7 +5,7 @@
* ooo-build:
- switch to ooo-build-3-2 branch
- - update (eaf48d9a7c7ba149d287cba4978a44a174ff8db3)
+ - update (fd8a89475d134bb24f8082e94f3bf0fefbea3bd5)
* debian/control.in:
- actually fix Vcs-Bzr:
@@ -19,7 +19,7 @@
* merge 1:3.1.1-12 and -13
- -- Rene Engelhard <rene@debian.org> Tue, 12 Jan 2010 01:09:20 +0100
+ -- Rene Engelhard <rene@debian.org> Tue, 12 Jan 2010 20:24:11 +0100
openoffice.org (1:3.1.1-13) UNRELEASED; urgency=medium
@@ -34,8 +34,11 @@
(gcc-defaults is blocked)
- per request from the security team: use internal mysqlcppconn for
all archs (consistency), instead of only for i386
+ * debian/shell-lib-{extensions,components}.sh: add missing .lock to actually
+ check for the extistence of the lockfile and not for the profile dir, thanks
+ Chris Cheney
- -- Rene Engelhard <rene@debian.org> Thu, 07 Jan 2010 20:45:52 +0100
+ -- Rene Engelhard <rene@debian.org> Tue, 12 Jan 2010 23:25:59 +0100
openoffice.org (1:3.1.1-12) unstable; urgency=medium
=== modified file 'shell-lib-components.sh'
--- a/shell-lib-components.sh 2009-10-17 11:14:59 +0000
+++ b/shell-lib-components.sh 2010-01-12 22:31:01 +0000
@@ -1,6 +1,6 @@
check_for_running_ooo() {
if [ -e /usr/lib/openoffice/program/bootstraprc ]; then
- LOCKFILE=`grep UserInstallation /usr/lib/openoffice/program/bootstraprc | cut -d= -f2 | sed -e 's,SYSUSERCONFIG,HOME,'`
+ LOCKFILE="`grep UserInstallation /usr/lib/openoffice/program/bootstraprc | cut -d= -f2 | sed -e 's,SYSUSERCONFIG,HOME,'`/.lock"
PID=`pgrep soffice.bin | head -n 1`
if [ -n "$PID" ] || [ -e "$LOCKFILE" ]; then
db_input high openoffice.org/running
=== modified file 'shell-lib-extensions.sh'
--- a/shell-lib-extensions.sh 2009-10-17 11:14:59 +0000
+++ b/shell-lib-extensions.sh 2010-01-12 22:31:01 +0000
@@ -1,6 +1,6 @@
check_for_running_ooo() {
if [ -e /usr/lib/openoffice/program/bootstraprc ]; then
- LOCKFILE=`grep UserInstallation /usr/lib/openoffice/program/bootstraprc | cut -d= -f2 | sed -e 's,SYSUSERCONFIG,HOME,'`
+ LOCKFILE="`grep UserInstallation /usr/lib/openoffice/program/bootstraprc | cut -d= -f2 | sed -e 's,SYSUSERCONFIG,HOME,'`/.lock"
PID=`pgrep soffice.bin | head -n 1`
if [ -n "$PID" ] || [ -e "$LOCKFILE" ]; then
db_input high openoffice.org/running
Reply to: