[SCM] LibreOffice packaging repository branch, master, updated. 032e5b95ec803a89b3cd48275f5be11d415c2fe7
The following commit has been merged in the master branch:
commit e49df4bfa04c055248984fcf08d0267252f8d7f6
Author: Rene Engelhard <rene@debian.org>
Date: Thu Feb 17 01:47:44 2011 +0100
disable evolution2 support for now as it doesn't work with evolution 2.32
diff --git a/changelog b/changelog
index d928357..0cf94c0 100644
--- a/changelog
+++ b/changelog
@@ -4,10 +4,15 @@ libreoffice (1:3.3.1~rc2-1) UNRELEASED; urgency=low
* debian/control.in:
- update for new git
+ - remove -evolution
+ * debian/control.evolution.in: new
* debian/rules, debian/soffice.sh, debian/README.DEbian:
- more s/OOo/LibreOffice/ (closes: #613215)
+ * debian/rules:
+ - disable evolution2 support for now as it doesn't work with
+ evolution 2.32
- -- Rene Engelhard <rene@debian.org> Wed, 16 Feb 2011 00:53:26 +0100
+ -- Rene Engelhard <rene@debian.org> Wed, 16 Feb 2011 18:45:55 +0000
libreoffice (1:3.3.1~rc1-2) unstable; urgency=low
diff --git a/control b/control
index 05738ba..f5a6dcc 100644
--- a/control
+++ b/control
@@ -3,7 +3,7 @@ Section: editors
Priority: optional
Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <rene@debian.org>
-Build-Depends: lsb-release, bzip2, bison, flex (>= 2.5.25-7) | flex-old, libxaw7-dev, unzip, zip, autoconf, automake, sharutils, pkg-config, libfontconfig1-dev, libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, po-debconf, bc, wget | curl, g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390], g++-4.4 (>= 4.4.2-5) [armel], dpkg-dev (>= 1.15.1), libgl1-mesa-dev [!armel !armhf !mips !mipsel], libglu1-mesa-dev [!armel !armhf !mips !mipsel], libpoppler-dev (>= 0.8.0), libgraphite-dev, libcurl4-gnutls-dev, libssl-dev, libdb-dev, python-central (>= 0.5), python-dev, debhelper (>= 7.2.3~), epm, libcppunit-dev (>= 1.12), openjdk-6-jdk [
alpha amd64 armel armhf i386 powerpc powerpcspe ppc64 s390 s390x sparc], gcj-native-helper [!powerpc !powerpcspe !ppc64], libgcj-common (>= 1:4.4.1) [!powerpc !powerpcspe !ppc64], ant (>= 1.7.0), ant-optional (>= 1.7.0), gcc-mingw32, mingw32-runtime, libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java, libservlet2.5-java, libbase-java-openoffice.org [!armel], libsac-java [!armel], libxml-java-openoffice.org [!armel], libflute-java-openoffice.org [!armel], libpentaho-reporting-flow-engine-java-openoffice.org [!armel], liblayout-java-openoffice.org [!armel], libloader-java-openoffice.org [!armel], libformula-java-openoffice.org [!armel], librepository-java-openoffice.org [!armel], libfonts-java-openoffice.org [!armel], libserializer-java-openoffice.org [!armel], libcommons-logging-java, libservlet2.5-java, xulrunner-dev, libnss3-dev (>= 3.12.3), dmake (>= 1:4.11), mono-devel (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386
], libmono-dev (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], mono-utils (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], cli-common-dev (>= 0.5.7) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libmdds-dev, libvigraimpex-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libicu-dev (>= 4.0), libxslt1-dev, libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4.5), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libebook1.2-dev [!armel], libxrandr-dev, liblucene2-java (>= 2.3.2), libhsqldb-java (>> 1.8.0.10), bsh (>= 2.0b4), liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1), libsuitesparse-dev (>= 1:3.4.0), libdbus-glib-1-dev (>= 0.60), libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libgtk2.0-dev (>= 2.10), libgnomevfs2-dev,
libgconf2-dev, libldap2-dev
+Build-Depends: lsb-release, bzip2, bison, flex (>= 2.5.25-7) | flex-old, libxaw7-dev, unzip, zip, autoconf, automake, sharutils, pkg-config, libfontconfig1-dev, libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, po-debconf, bc, wget | curl, g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390], g++-4.4 (>= 4.4.2-5) [armel], dpkg-dev (>= 1.15.1), libgl1-mesa-dev [!armel !armhf !mips !mipsel], libglu1-mesa-dev [!armel !armhf !mips !mipsel], libpoppler-dev (>= 0.8.0), libgraphite-dev, libcurl4-gnutls-dev, libssl-dev, libdb-dev, python-central (>= 0.5), python-dev, debhelper (>= 7.2.3~), epm, libcppunit-dev (>= 1.12), openjdk-6-jdk [
alpha amd64 armel armhf i386 powerpc powerpcspe ppc64 s390 s390x sparc], gcj-native-helper [!powerpc !powerpcspe !ppc64], libgcj-common (>= 1:4.4.1) [!powerpc !powerpcspe !ppc64], ant (>= 1.7.0), ant-optional (>= 1.7.0), gcc-mingw32, mingw32-runtime, libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java, libservlet2.5-java, libbase-java-openoffice.org [!armel], libsac-java [!armel], libxml-java-openoffice.org [!armel], libflute-java-openoffice.org [!armel], libpentaho-reporting-flow-engine-java-openoffice.org [!armel], liblayout-java-openoffice.org [!armel], libloader-java-openoffice.org [!armel], libformula-java-openoffice.org [!armel], librepository-java-openoffice.org [!armel], libfonts-java-openoffice.org [!armel], libserializer-java-openoffice.org [!armel], libcommons-logging-java, libservlet2.5-java, xulrunner-dev, libnss3-dev (>= 3.12.3), dmake (>= 1:4.11), mono-devel (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386
], libmono-dev (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], mono-utils (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], cli-common-dev (>= 0.5.7) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libmdds-dev, libvigraimpex-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libicu-dev (>= 4.0), libxslt1-dev, libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4.5), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libxrandr-dev, liblucene2-java (>= 2.3.2), libhsqldb-java (>> 1.8.0.10), bsh (>= 2.0b4), liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1), libsuitesparse-dev (>= 1:3.4.0), libdbus-glib-1-dev (>= 0.60), libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libgtk2.0-dev (>= 2.10), libgnomevfs2-dev, libgconf2-dev, libldap2-de
v
Build-Depends-Indep: fdupes, xml-core, imagemagick, libtextcat-data-utf8, fontforge
Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386 amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev, nvidia-glx-legacy-dev, libmono-dev (= 1.2.6+dfsg-1), libmono-dev (= 1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4), libmono-dev (= 2.4+dfsg-2) [sparc], gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<< 1.3.9~), ant (= 1.8.0-1) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], ant (= 1.8.0-2) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], ant (= 1.8.0-3) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], base-files (= 5), base-files (= 6.0), libhsqldb-java (>= 1.8.1~)
Standards-Version: 3.8.4
@@ -338,19 +338,6 @@ Description: office productivity suite -- GNOME integration
* libreoffice-evolution: Evolution addressbook support
* evolution
-Package: libreoffice-evolution
-Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
-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)
-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.
- .
- This package allows LibreOffice to access Evolution address books.
- You need to install evolution separately.
-
Package: libreoffice-emailmerge
Architecture: all
Depends: ${python:Depends}, python-uno, libreoffice-core, ${misc:Depends}
diff --git a/control.evolution.in b/control.evolution.in
new file mode 100644
index 0000000..5b50dee
--- /dev/null
+++ b/control.evolution.in
@@ -0,0 +1,17 @@
+Package: libreofficeVER-evolution
+Architecture: %OOO_BASE_ARCHS%
+Section: gnome
+Depends: libreofficeVER-core (= ${binary:Version}),
+ libreofficeVER-base,
+ ${shlibs:Depends},
+ ${libebook-dep},
+ ${misc:Depends}
+Recommends: evolution
+Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
+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.
+ .
+ This package allows LibreOffice to access Evolution address books.
+ You need to install evolution separately.
+
diff --git a/control.in b/control.in
index 4baf40b..55a7b61 100644
--- a/control.in
+++ b/control.in
@@ -486,23 +486,6 @@ Description: office productivity suite -- GNOME integration
* libreofficeVER-evolution: Evolution addressbook support
* evolution
-Package: libreofficeVER-evolution
-Architecture: %OOO_BASE_ARCHS%
-Section: gnome
-Depends: libreofficeVER-core (= ${binary:Version}),
- libreofficeVER-base,
- ${shlibs:Depends},
- ${libebook-dep},
- ${misc:Depends}
-Recommends: evolution
-Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
-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.
- .
- This package allows LibreOffice to access Evolution address books.
- You need to install evolution separately.
-
Package: libreofficeVER-emailmerge
Architecture: all
Depends: ${python:Depends}, python-uno, libreofficeVER-core, ${misc:Depends}
diff --git a/rules b/rules
index 13a06a2..8fee6e0 100755
--- a/rules
+++ b/rules
@@ -268,7 +268,7 @@ ENABLE_MINIMIZER=y
ENABLE_PRESENTER_CONSOLE=y
ENABLE_PDFIMPORT=y
BUILD_GTK=y
-ENABLE_EVO2=y
+ENABLE_EVO2=n
ENABLE_GVFS=y
ENABLE_GCONF=y
# broken!
@@ -1025,7 +1025,6 @@ endif
ifeq "$(ENABLE_EVO2)" "n"
CONFIGURE_FLAGS += --disable-evolution2
- DEBHELPER_OPTIONS+= -Nlibreoffice$(VER)-evolution
else
BUILD_DEPS += , libebook1.2-dev$(OOO_NO_BASE_ARCHS)
endif
@@ -1502,6 +1501,10 @@ ifeq "$(ENABLE_MYSQLNATIVE)" "y"
sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
>> debian/control < debian/control.mysql.in
endif
+ifeq "$(ENABLE_EVO2)" "y"
+ sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
+ >> debian/control < debian/control.evolution.in
+endif
perl -pi -e "s,%OOO_ARCHS%,$(OOO_ARCHS),g" debian/control
perl -pi -e "s,%OOO_BASE_ARCHS%,$(OOO_BASE_ARCHS),g" debian/control
--
LibreOffice packaging repository
Reply to: