[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.3.3-1-3-ge046cea
The following commit has been merged in the master branch:
commit e046cea3d3b3f3255de249e3a4ccfe9837219a3d
Author: Rene Engelhard <rene@debian.org>
Date: Wed Jun 22 22:19:24 2011 +0000
move evolocal.odb into -evolution proper
diff --git a/changelog b/changelog
index 37b335c..662286b 100644
--- a/changelog
+++ b/changelog
@@ -3,10 +3,11 @@ libreoffice (1:3.3.3-2) UNRELEASED; urgency=low
* debian/rules:
- make multiarch changes conditional and skip them for squeeze
(Daniel Baumann)
+ - move evolocal.odb into -evolution proper
* debian/libreoffice-filter-binfilter.links.in: actually create symlink
for libbindet*so in registered-components
- -- Rene Engelhard <rene@debian.org> Wed, 22 Jun 2011 17:47:35 +0200
+ -- Rene Engelhard <rene@debian.org> Thu, 23 Jun 2011 00:16:32 +0200
libreoffice (1:3.3.3-1) unstable; urgency=medium
diff --git a/control b/control
index 9c8c265..0483467 100644
--- a/control
+++ b/control
@@ -3469,6 +3469,7 @@ Section: gnome
Depends: libreoffice-core (= ${binary:Version}), libreoffice-base, ${shlibs:Depends}, ${libebook-dep}, ${misc:Depends}
Recommends: evolution
Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
+Replaces: libreoffice-common (<< 1:3.4.0~)
Description: office productivity suite -- Evolution addressbook support
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
diff --git a/control.evolution.in b/control.evolution.in
index 5b50dee..027f437 100644
--- a/control.evolution.in
+++ b/control.evolution.in
@@ -8,6 +8,7 @@ Depends: libreofficeVER-core (= ${binary:Version}),
${misc:Depends}
Recommends: evolution
Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
+Replaces: libreofficeVER-common (<< 1:3.4.0~)
Description: office productivity suite -- Evolution addressbook support
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
diff --git a/rules b/rules
index bed96c8..31201bb 100755
--- a/rules
+++ b/rules
@@ -1975,6 +1975,12 @@ endif
cd $(PKGDIR)-common/$(OOBASISDIR) && \
rm ure-link && ln -sf /$(OOUREDIR) ure-link
+ifeq "$(ENABLE_EVO2)" "y"
+ mkdir -p $(PKGDIR)-evolution/$(OODIR)/presets/database
+ mv $(PKGDIR)-common/$(OODIR)/presets/database/evolocal.odb \
+ $(PKGDIR)-evolution/$(OODIR)/presets/database
+endif
+
find debian/tmp ! -perm -200 | xargs -r chmod u+w
touch $@
--
LibreOffice packaging repository
Reply to: