./packages/openofficeorg/3.3.0/experimental r2051: remove Recovery.xcu, we now need to to this in main.xcd
------------------------------------------------------------
revno: 2051
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2010-07-06 20:34:07 +0200
message:
remove Recovery.xcu, we now need to to this in main.xcd
removed:
Recovery.xcu
modified:
changelog
rules
=== removed file 'Recovery.xcu'
--- a/Recovery.xcu 2009-12-18 01:04:30 +0000
+++ b/Recovery.xcu 1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-<?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 2010-07-06 13:43:55 +0000
+++ b/changelog 2010-07-06 18:34:07 +0000
@@ -20,6 +20,7 @@
remove anymore
* debian/uno-libs3.symbols: update
* debian/broffice.org*: update diversions
+ * debian/Recovery.xcu: remove, we now need to to this in main.xcd
-- Rene Engelhard <rene@debian.org> Tue, 29 Jun 2010 07:48:18 +0200
=== modified file 'rules'
--- a/rules 2010-07-06 13:08:01 +0000
+++ b/rules 2010-07-06 18:34:07 +0000
@@ -2602,12 +2602,6 @@
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
@@ -3516,6 +3510,12 @@
done
endif
+# we first need to find out whether it works on lenny, see issue 105172
+ifneq "$(LENNY_BACKPORT)" "y"
+ # enable session handling and recovery
+ perl -pi -e 's,<prop oor:name="DocumentStoreUIEnabled" oor:type="xs:boolean"><value>false</value></prop>,<prop oor:name="DocumentStoreUIEnabled" oor:type="xs:boolean"><value>true</value></prop>,' $(PKGDIR)-common/$(OODIR)/share/registry/main.xcd
+endif
+
touch $@
binary-arch: $(STAMP_DIR)/binary-arch
Reply to: