------------------------------------------------------------
revno: 840
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Mon 2007-08-13 22:36:39 +0200
message:
update ooo-build; improve -report-builders maintainer scripts
modified:
changelog
control
control.in
openoffice.org-report-builder.postinst.in
openoffice.org-report-builder.preinst.in
openoffice.org-report-builder.prerm.in
shell-lib.sh
=== modified file 'changelog'
--- a/changelog 2007-08-09 12:10:58 +0000
+++ b/changelog 2007-08-13 20:36:39 +0000
@@ -1,3 +1,16 @@
+openoffice.org (2.3.0~src680m225-1.2pre) experimental; urgency=low
+
+ * ooo-build:
+ - update (r10067)
+ * debian/shell-lib.sh, debian/openoffice.org-report-builder.{pre,post}*.in:
+ impove maintainer scripts (based on cws jl68). Check whether the extension
+ is registered before trying to remove it (it's not in case unopkg fails,
+ and we should be able to recover)
+ * debian/control.in:
+ - make -report-builder depend on a version having jl68 included
+
+ -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 13 Aug 2007 22:35:26 +0200
+
openoffice.org (2.3.0~src680m225-1) experimental; urgency=low
* new upstream snapshot (SRC680_m225)
=== modified file 'control'
--- a/control 2007-08-08 15:35:26 +0000
+++ b/control 2007-08-13 20:36:39 +0000
@@ -472,7 +472,7 @@
Section: misc
Priority: optional
Architecture: i386 powerpc sparc amd64 ppc64
-Depends: ${shlibs:Depends}, openoffice.org-base (>= 2.3.0~src680m225)
+Depends: ${shlibs:Depends}, openoffice.org-base (>= 2.3.0~src680m225),
openoffice.org-core (>> 2.3.0~src680m225)
Conflicts: openoffice.org-reportdesigner
Replaces: openoffice.org-reportdesigner
Provides: openoffice.org-reportdesigner
=== modified file 'control.in'
--- a/control.in 2007-08-08 15:35:26 +0000
+++ b/control.in 2007-08-13 20:36:39 +0000
@@ -716,7 +716,7 @@
Section: misc
Priority: optional
Architecture: %OOO_ARCHS%
-Depends: ${shlibs:Depends}, openoffice.orgVER-base (>= 2.3.0~src680m225)
+Depends: ${shlibs:Depends}, openoffice.orgVER-base (>= 2.3.0~src680m225),
openoffice.orgVER-core (>> 2.3.0~src680m225)
Conflicts: openoffice.org-reportdesigner
Replaces: openoffice.org-reportdesigner
Provides: openoffice.org-reportdesigner
=== modified file 'openoffice.org-report-builder.postinst.in'
--- a/openoffice.org-report-builder.postinst.in 2007-08-08 11:21:18 +0000
+++ b/openoffice.org-report-builder.postinst.in 2007-08-13 20:36:39 +0000
@@ -8,8 +8,7 @@
#INCLUDE_SHELL_LIB#
if [ "$1" = "configure" -o "$1" = "upgrade" ]; then
- /usr/lib/openoffice/program/unopkg add --shared \
-
/usr/lib/openoffice/share/extension/install/sun-report-builder.oxt
+ add_extension
/usr/lib/openoffice/share/extension/install/sun-report-builder.oxt
fi
#DEBHELPER#
=== modified file 'openoffice.org-report-builder.preinst.in'
--- a/openoffice.org-report-builder.preinst.in 2007-08-08 11:21:18 +0000
+++ b/openoffice.org-report-builder.preinst.in 2007-08-13 20:36:39 +0000
@@ -11,8 +11,7 @@
case "$1" in
upgrade)
- /usr/lib/openoffice/program/unopkg remove --shared \
- com.sun.reportdesigner
+ remove_extension com.sun.reportdesigner
;;
esac
=== modified file 'openoffice.org-report-builder.prerm.in'
--- a/openoffice.org-report-builder.prerm.in 2007-08-08 11:21:18 +0000
+++ b/openoffice.org-report-builder.prerm.in 2007-08-13 20:36:39 +0000
@@ -11,8 +11,7 @@
case "$1" in
remove)
- /usr/lib/openoffice/program/unopkg remove --shared \
- com.sun.reportdesigner
+ remove_extension com.sun.reportdesigner
;;
esac
=== modified file 'shell-lib.sh'
--- a/shell-lib.sh 2007-06-19 14:15:11 +0000
+++ b/shell-lib.sh 2007-08-13 20:36:39 +0000
@@ -52,6 +52,24 @@
fi
}
+remove_extension() {
+ if /usr/lib/openoffice/program/unopkg list --shared $1; then
+ INSTDIR=`mktemp -d`
+ /usr/lib/openoffice/program/unopkg remove --shared $1 \
+ "-env:UserInstallation=file:///$INSTDIR" \
+
"-env:UNO_JAVA_JFW_INSTALL_DATA=/usr/lib/openoffice/program/../share/javasettingsunopkginstall.xml"
+ if [ -n $INSTDIR ]; then rm -rf $INSTDIR; fi
+ fi
+}
+
+add_extension() {
+ INSTDIR=`mktemp -d`
+ /usr/lib/openoffice/program/unopkg add --shared $1 \
+ "-env:UserInstallation=file:///$INSTDIR" \
+
"-env:UNO_JAVA_JFW_INSTALL_DATA=/usr/lib/openoffice/program/../share/javasettingsunopkginstall.xml"
+ if [ -n $INSTDIR ]; then rm -rf $INSTDIR; fi
+}
+
trap "message;\
message \"Received signal. Aborting script $0.\";\
message;\
