------------------------------------------------------------
revno: 1744
committer: Rene Engelhard <[email protected]>
branch nick: debian
timestamp: Fri 2009-12-18 02:04:30 +0100
message:
add Recovery.xcu
added:
Recovery.xcu
modified:
changelog
rules
=== added file 'Recovery.xcu'
--- a/Recovery.xcu 1970-01-01 00:00:00 +0000
+++ b/Recovery.xcu 2009-12-18 01:04:30 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<oor:component-data xmlns:oor="http://openoffice.org/2001/registry";
xmlns:xs="http://www.w3.org/2001/XMLSchema"; oor:name="Recovery"
oor:package="org.openoffice.Office">
+ <node oor:name="SessionShutdown">
+ <prop oor:name="DocumentStoreUIEnabled" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ </node>
+ <node oor:name="RecoveryList">
+ <node oor:name="recovery_item_1" oor:op="remove"/>
+ <node oor:name="recovery_item_3" oor:op="remove"/>
+ </node>
+ <node oor:name="RecoveryInfo">
+ <prop oor:name="SessionData" oor:type="xs:boolean">
+ <value>false</value>
+ </prop>
+ </node>
+</oor:component-data>
\ No newline at end of file
=== modified file 'changelog'
--- a/changelog 2009-12-18 01:01:48 +0000
+++ b/changelog 2009-12-18 01:04:30 +0000
@@ -11,10 +11,14 @@
- re-enable eo; enable ast (asturian)
- enable hppa, use gcj-jdk
- --enable-layout
+ - install Recovery.xcu (see below)
+
+ * debian/Recovery.xcu: add Recovery.xcu to make OOo handle
+ GNOME session close (see issue 105172)
* merge 1:3.1.1-9 to 1:3.1.1-11
- -- Rene Engelhard <[email protected]> Fri, 18 Dec 2009 02:01:18 +0100
+ -- Rene Engelhard <[email protected]> Fri, 18 Dec 2009 02:02:06 +0100
openoffice.org (1:3.1.1-11) UNRELEASED; urgency=low
=== modified file 'rules'
--- a/rules 2009-12-18 01:01:48 +0000
+++ b/rules 2009-12-18 01:04:30 +0000
@@ -2299,6 +2299,12 @@
endif
endif
+# we dirst need to find out whether it works on lenny, see issue 105172
+ifneq "$(LENNY_BACKPORT)" "y"
+ install -D -m644 debian/Recovery.xcu \
+
$(PKGDIR)-gnome/$(OODIR)/share/registry/data/org/openoffice/Office/Recovery.xcu
+endif
+
ifeq "$(ENABLE_EVO2)" "y"
mkdir -p -m755 $(PKGDIR)-evolution/$(OODIR)/program
mv $(PKGDIR)-core/$(OODIR)/program/libevoab*.so
$(PKGDIR)-evolution/$(OODIR)/program
