[Libreoffice-commits] .: bin/piece patches/dev300 patches/evo2 src/evolocal.odb src/Makefile.am
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Oct 13 04:01:45 PDT 2010
bin/piece/unpack-extras | 3 -
dev/null |binary
patches/dev300/apply | 7 ---
patches/dev300/default-evolution-database.diff | 42 -----------------------
patches/evo2/default-evo-column-mapping.diff | 44 -------------------------
patches/evo2/default-evo2-ab.diff | 28 ---------------
src/Makefile.am | 3 -
7 files changed, 1 insertion(+), 126 deletions(-)
New commits:
commit d7beb6873f438130d3eb6d5294ccce9023703e88
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 13 10:45:30 2010 +0100
merge in evolution patches
diff --git a/bin/piece/unpack-extras b/bin/piece/unpack-extras
index 9a37f47..4accc63 100755
--- a/bin/piece/unpack-extras
+++ b/bin/piece/unpack-extras
@@ -3,9 +3,6 @@
TOOLSDIR=$1
OOBUILDDIR=$2
-echo "Copying default evolution database into tree"
-cp -f $TOOLSDIR/src/evolocal.odb $OOBUILDDIR/extras/source/database || exit 1;
-
echo "Copying custom user-dicts into tree"
[ -d $OOBUILDDIR/extras/source/wordbook ] || mkdir -p $OOBUILDDIR/extras/source/wordbook
cp -f $TOOLSDIR/src/*.dic $OOBUILDDIR/extras/source/wordbook || exit 1;
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 31f26e8..087aba7 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -866,18 +866,11 @@ about-build-ver-readability.diff, i#68590, tml
[ AddressBooks ]
-# Evolution should also be default database(n#66217).
-default-evolution-database.diff, michael
-# Mailmerge column mapping by default (n#73627)
-default-evo-column-mapping.diff, michael
# build either the driver for Evolution 1.x or 2.x
# they produce the same binary and configuration, so they can't be built at once
# I think that the Evolution 1.x address book is obsolete anyway
buildfix-evo1-vs-evo2.diff, bnc#496902, i#101439, pmladek
-# NB. when this cws goes up-stream we need to enable this
-default-evo2-ab.diff, michael
-
[ DebianBaseOnly ]
# add JDK paths for MySQL, PostgreSQL, JTDS
diff --git a/patches/dev300/default-evolution-database.diff b/patches/dev300/default-evolution-database.diff
deleted file mode 100644
index 5507786..0000000
--- a/patches/dev300/default-evolution-database.diff
+++ /dev/null
@@ -1,42 +0,0 @@
----
- extras/source/database/makefile.mk | 4 ++--
- .../data/org/openoffice/Office/DataAccess.xcu | 8 ++++++++
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git extras/source/database/makefile.mk extras/source/database/makefile.mk
-index 66e0d1e..9395961 100644
---- extras/source/database/makefile.mk
-+++ extras/source/database/makefile.mk
-@@ -37,8 +37,8 @@ TARGET=databasegeneral
-
- ZIP1TARGET = $(DATABASE_USER_TARGET)
-
--ZIP1LIST = biblio.odb
--
-+ZIP1LIST = biblio.odb \
-+ evolocal.odb
- ZIP2TARGET = $(DATABASE_USER_BIBLIO_TARGET)
-
- ZIP2LIST = biblio.dbf biblio.dbt
-diff --git officecfg/registry/data/org/openoffice/Office/DataAccess.xcu officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
-index 613b995..4e70af0 100644
---- officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
-+++ officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
-@@ -153,6 +153,14 @@
- </node>
- </node>
- <node oor:name="RegisteredNames">
-+ <node oor:name="EvolutionLocal" oor:op="replace">
-+ <prop oor:name="Location" oor:type="xs:string">
-+ <value>$(userurl)/database/evolocal.odb</value>
-+ </prop>
-+ <prop oor:name="Name" oor:type="xs:string">
-+ <value>EvolutionLocal</value>
-+ </prop>
-+ </node>
- <node oor:name="org.openoffice.Bibliography" oor:op="replace">
- <prop oor:name="Location" oor:type="xs:string">
- <value>$(userurl)/database/biblio.odb</value>
---
-1.7.0.1
-
diff --git a/patches/evo2/default-evo-column-mapping.diff b/patches/evo2/default-evo-column-mapping.diff
deleted file mode 100644
index 9d169e7..0000000
--- a/patches/evo2/default-evo-column-mapping.diff
+++ /dev/null
@@ -1,44 +0,0 @@
----
- .../registry/data/org/openoffice/Office/Writer.xcu | 26 ++++++++++++++++++++
- 1 files changed, 26 insertions(+), 0 deletions(-)
-
-diff --git officecfg/registry/data/org/openoffice/Office/Writer.xcu officecfg/registry/data/org/openoffice/Office/Writer.xcu
-index 8add2a0..bae36af 100644
---- officecfg/registry/data/org/openoffice/Office/Writer.xcu
-+++ officecfg/registry/data/org/openoffice/Office/Writer.xcu
-@@ -40,6 +40,32 @@
- <prop oor:name="IsHideEmptyParagraphs" >
- <value>true</value>
- </prop>
-+ <node oor:name="DataSource">
-+ <prop oor:name="DataSourceName" oor:type="xs:string">
-+ <value>EvolutionLocal</value>
-+ </prop>
-+ <prop oor:name="DataTableName" oor:type="xs:string">
-+ <value>Personal</value>
-+ </prop>
-+ </node>
-+ <node oor:name="AddressDataAssignments">
-+ <node oor:name="_0" oor:op="replace">
-+ <prop oor:name="DBColumnAssignments" oor:type="oor:string-list">
-+ <value oor:separator=",">title,full_name,family_name,org,addr_line1,addr_line2,city,state,zip,country,home_phone,business_phone,email_1,</value>
-+ </prop>
-+ <node oor:name="DataSource">
-+ <prop oor:name="DataCommandType" oor:type="xs:short">
-+ <value>0</value>
-+ </prop>
-+ <prop oor:name="DataSourceName" oor:type="xs:string">
-+ <value>EvolutionLocal</value>
-+ </prop>
-+ <prop oor:name="DataTableName" oor:type="xs:string">
-+ <value>Personal</value>
-+ </prop>
-+ </node>
-+ </node>
-+ </node>
- <prop oor:name="EMailSupported">
- <value>true</value>
- </prop>
---
-1.7.0.1
-
diff --git a/patches/evo2/default-evo2-ab.diff b/patches/evo2/default-evo2-ab.diff
deleted file mode 100644
index 3eec862..0000000
--- a/patches/evo2/default-evo2-ab.diff
+++ /dev/null
@@ -1,28 +0,0 @@
----
- extensions/source/abpilot/abspilot.cxx | 7 +++----
- 1 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git extensions/source/abpilot/abspilot.cxx extensions/source/abpilot/abspilot.cxx
-index 01fb844..508f79f 100644
---- extensions/source/abpilot/abspilot.cxx
-+++ extensions/source/abpilot/abspilot.cxx
-@@ -115,13 +115,12 @@ namespace abp
- m_pCancel->SetClickHdl( LINK( this, OAddessBookSourcePilot, OnCancelClicked) );
-
- // some initial settings
-+#ifdef UNX
- #ifdef MACOSX
- m_aSettings.eType = AST_MACAB;
--#elif WITH_MOZILLA
--#ifdef UNX
-- m_aSettings.eType = AST_MORK;
- #else
-- m_aSettings.eType = AST_OE;
-+// FIXME: if KDE use KAB instead
-+ m_aSettings.eType = AST_EVOLUTION;
- #endif
- #else
- m_aSettings.eType = AST_OTHER;
---
-1.7.0.1
-
diff --git a/src/Makefile.am b/src/Makefile.am
index 0d537ed..276e358 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -35,5 +35,4 @@ EXTRA_DIST=\
tango_mainapp_16.png \
glib-1.2.10-ooo.patch \
libIDL-0.6.8-ooo.patch \
- go-oo-team.png \
- evolocal.odb
+ go-oo-team.png
diff --git a/src/evolocal.odb b/src/evolocal.odb
deleted file mode 100644
index 82f486a..0000000
Binary files a/src/evolocal.odb and /dev/null differ
More information about the Libreoffice-commits
mailing list