The following commit has been merged in the master branch:
commit 1bc470e085e1c0834d80603c3cc99f64455f7c04
Author: Rene Engelhard <r...@debian.org>
Date: Wed Jun 6 23:14:30 2012 +0200
more -fsigned-char and s390(x) fixes
diff --git a/changelog b/changelog
index 23a0e11..e9a7e5f 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,17 @@
+libreoffice (1:3.5.4-3) unstable; urgency=medium
+
+ * debian/patches/ppc-readd-fsigned-char.diff: sigh. actually breaks.
+ revert.
+ * debian/patches/s390-remove-fsigned-char.diff: remove -fsigned-char
+ to fix smoketest
+
+ * debian/rules:
+ - reenable extensions on s390(x)
+ - actually enable evolution on s390x - and don't ship an empty package
+ if -evolution is disabled
+
+ -- Rene Engelhard <r...@debian.org> Wed, 06 Jun 2012 16:43:09 +0200
+
libreoffice (1:3.5.4-2) unstable; urgency=medium
* debian/patches/ppc-readd-fsigned-char.diff: backport
diff --git a/control b/control
index 4fd2a16..848751a 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 <r...@debian.org>
-Build-Depends: dpkg-dev (>= 1.16.1), lsb-release, bzip2, bison, flex |
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, libcups2-dev, libarchive-zip-perl, fastjar, xsltproc,
libxkbfile-dev, libxinerama-dev, x11proto-render-dev, libxml-parser-perl,
gperf, po-debconf, bc, wget | curl, gcc-4.4 [mips mipsel], g++-4.4 [mips
mipsel], libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips
!mipsel], libpoppler-dev (>= 0.8.0), libpoppler-private-dev,
libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3) [!alpha !armel !sparc],
libexttextcat-dev (>= 3.1.1), libjpeg-dev, libxml2-dev, libxslt1-dev,
libexpat1-dev, unixodbc-dev (>= 2.2.11), libsane-dev, libxrender-dev,
libpng12-dev, libssl-dev, librsvg2-dev, libdb-dev, python (>=
2.6.6-3+squeeze4), python-dev (>= 2.6), python3-
dev, debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), gdb, junit4 (>=
4.8.2-2), openjdk-6-jdk (>= 6b23~pre8-2) [alpha amd64 armel armhf i386 mips
mipsel powerpc powerpcspe ppc64 s390 s390x sparc], openjdk-7-jdk [ia64],
gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64], gcj-native-helper [hppa
kfreebsd-amd64 kfreebsd-i386], libgcj-common (>= 1:4.4.1) [hppa kfreebsd-amd64
kfreebsd-i386], ant (>= 1.7.0), ant-optional (>= 1.7.0), g++-mingw-w64-i686
[i386 amd64], libcommons-codec-java, libcommons-httpclient-java,
libcommons-lang-java, libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java,
libbase-java [!armel !armhf !hppa !s390 !s390x !kfreebsd-amd64 !kfreebsd-i386],
libsac-java [!armel !armhf !hppa !s390 !s390x !kfreebsd-amd64 !kfreebsd-i386],
libxml-java (>= 1.1.6) [!armel !armhf !hppa !s390 !s390x !kfreebsd-amd64
!kfreebsd-i386], libflute-java (>= 1.1.6) [!armel !armhf !hppa !s390 !s390x
!kfreebsd-amd64 !kfreebsd-i386], libpentaho-reporting-flow-engine-java (>=
0.9.4) [!armel !ar
mhf !hppa !s390 !s390x !kfreebsd-amd64 !kfreebsd-i386], liblayout-java (>=
0.2.10) [!armel !armhf !hppa !s390 !s390x !kfreebsd-amd64 !kfreebsd-i386],
libloader-java (>= 1.1.6) [!armel !armhf !hppa !s390 !s390x !kfreebsd-amd64
!kfreebsd-i386], libformula-java (>= 1.1.7) [!armel !armhf !hppa !s390 !s390x
!kfreebsd-amd64 !kfreebsd-i386], librepository-java (>= 1.1.6) [!armel !armhf
!hppa !s390 !s390x !kfreebsd-amd64 !kfreebsd-i386], libfonts-java (>= 1.1.6)
[!armel !armhf !hppa !s390 !s390x !kfreebsd-amd64 !kfreebsd-i386],
libserializer-java (>= 1.1.6) [!armel !armhf !hppa !s390 !s390x !kfreebsd-amd64
!kfreebsd-i386], libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java,
javahelper (>= 0.37~), libnss3-dev (>= 3.12.3), dmake (>= 1:4.11),
libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4), libstlport4.6-dev (>=
4.6.2-3) [i386], libboost-dev (>= 1.38), libmdds-dev (>= 0.5.0),
libvigraimpex-dev, libsampleicc-dev, libicc-utils-dev, libwpd-dev (>= 0.9.0),
libmythes-dev (>= 2:1.
2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libvisio-dev, libcmis-dev,
libicu-dev (>= 4.0), libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>=
4:4.8), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libgtk2.0-dev
(>= 2.10), libgtk-3-dev (>= 3.2~), libebook1.2-dev [!armel !armhf], libpq-dev
(>= 9.0~), 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.70),
libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>=
1.0.8), libglib2.0-dev (>= 2.15.0), libgconf2-dev, liborbit2-dev, gettext, make
(>= 3.81-8.2), libldap2-dev
+Build-Depends: dpkg-dev (>= 1.16.1), lsb-release, bzip2, bison, flex |
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, libcups2-dev, libarchive-zip-perl, fastjar, xsltproc,
libxkbfile-dev, libxinerama-dev, x11proto-render-dev, libxml-parser-perl,
gperf, po-debconf, bc, wget | curl, gcc-4.4 [mips mipsel], g++-4.4 [mips
mipsel], libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips
!mipsel], libpoppler-dev (>= 0.8.0), libpoppler-private-dev,
libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3) [!alpha !armel !sparc],
libexttextcat-dev (>= 3.1.1), libjpeg-dev, libxml2-dev, libxslt1-dev,
libexpat1-dev, unixodbc-dev (>= 2.2.11), libsane-dev, libxrender-dev,
libpng12-dev, libssl-dev, librsvg2-dev, libdb-dev, python (>=
2.6.6-3+squeeze4), python-dev (>= 2.6), python3-
dev, debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), gdb, junit4 (>=
4.8.2-2), openjdk-6-jdk (>= 6b23~pre8-2) [alpha amd64 armel armhf i386 mips
mipsel powerpc powerpcspe ppc64 s390 s390x sparc], openjdk-7-jdk [ia64],
gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64], gcj-native-helper [hppa
kfreebsd-amd64 kfreebsd-i386], libgcj-common (>= 1:4.4.1) [hppa kfreebsd-amd64
kfreebsd-i386], ant (>= 1.7.0), ant-optional (>= 1.7.0), g++-mingw-w64-i686
[i386 amd64], libcommons-codec-java, libcommons-httpclient-java,
libcommons-lang-java, libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java,
libbase-java [!armel !armhf !hppa !kfreebsd-amd64 !kfreebsd-i386], libsac-java
[!armel !armhf !hppa !kfreebsd-amd64 !kfreebsd-i386], libxml-java (>= 1.1.6)
[!armel !armhf !hppa !kfreebsd-amd64 !kfreebsd-i386], libflute-java (>= 1.1.6)
[!armel !armhf !hppa !kfreebsd-amd64 !kfreebsd-i386],
libpentaho-reporting-flow-engine-java (>= 0.9.4) [!armel !armhf !hppa
!kfreebsd-amd64 !kfreebsd-i386], liblayout
-java (>= 0.2.10) [!armel !armhf !hppa !kfreebsd-amd64 !kfreebsd-i386],
libloader-java (>= 1.1.6) [!armel !armhf !hppa !kfreebsd-amd64 !kfreebsd-i386],
libformula-java (>= 1.1.7) [!armel !armhf !hppa !kfreebsd-amd64
!kfreebsd-i386], librepository-java (>= 1.1.6) [!armel !armhf !hppa
!kfreebsd-amd64 !kfreebsd-i386], libfonts-java (>= 1.1.6) [!armel !armhf !hppa
!kfreebsd-amd64 !kfreebsd-i386], libserializer-java (>= 1.1.6) [!armel !armhf
!hppa !kfreebsd-amd64 !kfreebsd-i386], libcommons-logging-java (>= 1.1.1-9),
libservlet2.5-java, javahelper (>= 0.37~), libnss3-dev (>= 3.12.3), dmake (>=
1:4.11), libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4),
libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libmdds-dev (>=
0.5.0), libvigraimpex-dev, libsampleicc-dev, libicc-utils-dev, libwpd-dev (>=
0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0),
libvisio-dev, libcmis-dev, libicu-dev (>= 4.0), libcairo2-dev, kdelibs5-dev (>=
4:4.3.4), lib
qt4-dev (>= 4:4.8), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791),
libgtk2.0-dev (>= 2.10), libgtk-3-dev (>= 3.2~), libebook1.2-dev [!armel
!armhf], libpq-dev (>= 9.0~), 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.70), libgstreamer-plugins-base0.10-dev,
libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libglib2.0-dev (>= 2.15.0),
libgconf2-dev, liborbit2-dev, gettext, make (>= 3.81-8.2), libldap2-dev
Build-Depends-Indep: fdupes, xml-core, imagemagick, 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], libc0.1-dev (= 2.13-26)
[kfreebsd-i386 kfreebsd-amd64], nvidia-glx-dev, nvidia-glx-legacy-dev, 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~), qt3-dev-tools, ant (= 1.8.0-1)
[hppa kfreebsd-i386 kfreebsd-amd64], ant (= 1.8.0-2) [hppa kfreebsd-i386
kfreebsd-amd64], ant (= 1.8.0-3) [hppa kfreebsd-i386 kfreebsd-amd64], g++-4.6
(= 4.6.1-10), g++-4.6 (= 4.6.1-11), gcc (>= 4:4.7~) [!i386 !amd64
!kfreebsd-i386 !kfreebsd-amd64], g++ (>= 4:4.7~) [!i386 !amd64 !kfreebsd-i386
!kfreebsd-amd64], base-files (= 6.0), base-files (= 6.0squeeze1),
libhsqldb-java (>= 1.8.1~)
Standards-Version: 3.9.1
@@ -16,7 +16,7 @@ Homepage: http://www.libreoffice.org
Package: libreoffice
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Section: metapackages
-Depends: libreoffice-core (= ${binary:Version}), libreoffice-writer,
libreoffice-calc, libreoffice-impress, libreoffice-draw, libreoffice-math,
libreoffice-base [!armel !armhf], libreoffice-report-builder-bin [!armel !armhf
!hppa !s390 !s390x !kfreebsd-amd64 !kfreebsd-i386], ttf-dejavu,
ttf-sil-gentium-basic, libreoffice-filter-mobiledev, ${lucene-depends},
${java-common-depends}, ${misc:Depends}
+Depends: libreoffice-core (= ${binary:Version}), libreoffice-writer,
libreoffice-calc, libreoffice-impress, libreoffice-draw, libreoffice-math,
libreoffice-base [!armel !armhf], libreoffice-report-builder-bin [!armel !armhf
!hppa !kfreebsd-amd64 !kfreebsd-i386], ttf-dejavu, ttf-sil-gentium-basic,
libreoffice-filter-mobiledev, ${lucene-depends}, ${java-common-depends},
${misc:Depends}
Recommends: ttf-liberation | ttf-mscorefonts-installer, libpaper-utils
Suggests: hunspell-dictionary, myspell-dictionary,
libreoffice-help-${help-l10n-virtual-version},
libreoffice-l10n-${help-l10n-virtual-version}, unixodbc, cups-bsd, libsane,
hyphen-hyphenation-patterns, mythes-thesaurus, libreoffice-grammarcheck,
libxrender1, libgl1, libreoffice-gnome | libreoffice-kde, iceweasel | firefox |
icedove | thunderbird | iceape-browser | mozilla-browser,
${java-runtime-depends}, openclipart-libreoffice, pstoedit, imagemagick |
graphicsmagick-imagemagick-compat, ${gstreamer-plugins-suggests},
${libldap-suggests}, ${ooo-binfilter-dep}, ${ooo-officebean-dep}
Description: office productivity suite
@@ -3165,7 +3165,7 @@ Homepage:
http://extensions.services.openoffice.org/project/reportdesign
Package: libreoffice-report-builder-bin
Section: misc
-Architecture: alpha amd64 i386 ia64 mips mipsel powerpc powerpcspe ppc64 sparc
+Architecture: alpha amd64 i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390
s390x sparc
Depends: ${shlibs:Depends}, libreoffice-core, libreoffice-base, ${misc:Depends}
Description: LibreOffice extension for building database reports -- libraries
LibreOffice is a full-featured office productivity suite that provides
@@ -3176,7 +3176,7 @@ Description: LibreOffice extension for building database
reports -- libraries
Package: libreoffice-presentation-minimizer
Section: misc
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Depends: ${shlibs:Depends}, libreoffice-core, libreoffice-impress,
${misc:Depends}
Enhances: libreoffice-impress
Conflicts: ure (<< 1.5.1+OOo3.1.1-15), libreoffice-core (<< 1:3.5~),
libreoffice-common (<< 1:3.5~)
@@ -3195,7 +3195,7 @@ Homepage:
http://extensions.services.openoffice.org/project/PresentationMinimize
Package: libreoffice-presenter-console
Section: misc
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Conflicts: ure (<< 1.5.1+OOo3.1.1-15), libreoffice-core (<< 1:3.5~),
libreoffice-common (<< 1:3.5~)
Depends: ${shlibs:Depends}, libreoffice-core, libreoffice-impress,
${misc:Depends}
Enhances: libreoffice-impress
@@ -3220,7 +3220,7 @@ Homepage:
http://extensions.services.openoffice.org/project/presenter-screen
Package: libreoffice-pdfimport
Section: misc
Priority: extra
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Depends: ${shlibs:Depends}, libreoffice-core, ${misc:Depends}
Conflicts: ure (<< 1.5.1+OOo3.1.1-15), libreoffice-core (<< 1:3.5~),
libreoffice-common (<< 1:3.5~)
Description: LibreOffice extension for importing PDF documents
diff --git a/patches/ppc-readd-fsigned-char.diff
b/patches/ppc-readd-fsigned-char.diff
deleted file mode 100644
index dbec561..0000000
--- a/patches/ppc-readd-fsigned-char.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-From 7ef203d2bf72f7d96fd10d1297af06e82550a1c4 Mon Sep 17 00:00:00 2001
-From: Caolán McNamara <caol...@redhat.com>
-Date: Mon, 14 May 2012 12:25:24 +0000
-Subject: Revert "sw34bf03: #i81127#: patch by pmladek: linux/ppc: remove
-fsigned-char"
-
-This reverts commit 875c9a28f49c7a73607fcdfac245b648801dccee.
-because it doesn't make sense to build the dmake modules
-without -fsigned-char and the gbuild modules with -fsigned-char
-
-and we're still got a few bugs where we assume chars are signed
-
-Conflicts:
-
- solenv/inc/unxlngppc.mk
-
-Change-Id: I6ac07fa3ebadd83efd0da1ee69a010b62dfaad59
----
-diff --git a/solenv/inc/unxlngppc.mk b/solenv/inc/unxlngppc.mk
-index 2c690b1..39d3028 100644
---- a/solenv/inc/unxlngppc.mk
-+++ b/solenv/inc/unxlngppc.mk
-@@ -31,3 +31,6 @@ CDEFAULTOPT=-Os
- PICSWITCH:=-fPIC
- .INCLUDE : unxlng.mk
- CDEFS+=-DPOWERPC -DPPC
-+CFLAGS+=-fsigned-char
-+CFLAGSCC+=-fsigned-char
-+CFLAGSCXX+=-fsigned-char
---
-cgit v0.9.0.2-2-gbebe
diff --git a/patches/s390-remove-fsigned-char.diff
b/patches/s390-remove-fsigned-char.diff
new file mode 100644
index 0000000..676aca3
--- /dev/null
+++ b/patches/s390-remove-fsigned-char.diff
@@ -0,0 +1,10 @@
+--- a/solenv/inc/unxlngs390.mk-old 2012-06-06 14:55:10.709066636 +0200
++++ b/solenv/inc/unxlngs390.mk 2012-06-06 14:55:24.585135437 +0200
+@@ -30,6 +30,4 @@
+ PICSWITCH:=-fPIC
+ .INCLUDE : unxlng.mk
+ CDEFS+=-DS390
+-CFLAGS+=-fsigned-char -fno-omit-frame-pointer
+-CFLAGSCC+=-fsigned-char
+-CFLAGSCXX+=-fsigned-char
++CFLAGS+=-fno-omit-frame-pointer
diff --git a/patches/series b/patches/series
index 7f11926..73279e1 100644
--- a/patches/series
+++ b/patches/series
@@ -37,4 +37,4 @@ lp-904212-add-missing-mimetypes-to-impress.desktop.diff
ignore-sc_cellrangesbase-fails.diff
fix-Test-BigPtrArray-on-64bit-bigendian.diff
yyinput-fix-for-unsigned-char.diff
-ppc-readd-fsigned-char.diff
+s390-remove-fsigned-char.diff
diff --git a/rules b/rules
index 6d84d9e..9c66ada 100755
--- a/rules
+++ b/rules
@@ -386,12 +386,12 @@ ifneq ($(DEB_HOST_ARCH),$(findstring
$(DEB_HOST_ARCH),$(OOO_UNOWINREG_DLL_ARCHS)
PACKAGE_UNOWINREG_DLL=n
endif
-OOO_ARCH_DEP_EXTENSIONS_ARCHS := $(filter-out s390 s390x,$(OOO_ARCHS))
+OOO_ARCH_DEP_EXTENSIONS_ARCHS := $(OOO_ARCHS)
OOO_EXTENSIONS_ARCHS := $(OOO_ARCH_DEP_EXTENSIONS_ARCHS)
OOO_BASE_ARCHS := $(filter-out armel armhf,$(OOO_JAVA_ARCHS))
$(eval $(call gen_no_archs,OOO_BASE_ARCHS))
-OOO_REPORTDESIGN_ARCHS := $(filter-out armel armhf $(OOO_GCJ_JDK_ARCHS) s390
s390x,$(OOO_JAVA_ARCHS))
+OOO_REPORTDESIGN_ARCHS := $(filter-out armel armhf
$(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))
$(eval $(call gen_no_archs,OOO_REPORTDESIGN_ARCHS))
ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
@@ -451,13 +451,12 @@ ifeq (ia64,$(findstring ia64,$(OOO_OPENJDK_ARCHS)))
endif
endif
endif
-
ifneq (,$(filter $(DEB_HOST_ARCH),$(OOO_GCJ_ARCHS)))
BUILD_JARS_NATIVE=n
endif
ifeq "$(PACKAGE_NSPLUGIN)" "y"
-OOO_NSPLUGIN_ARCHS = $(filter-out s390x,$(OOO_ARCHS))
+OOO_NSPLUGIN_ARCHS = $(OOO_ARCHS)
else
OOO_NSPLUGIN_ARCHS=
endif
@@ -469,11 +468,6 @@ ifneq (,$(filter arm% mips% m68k, $(DEB_HOST_ARCH)))
endif
OOO_BINFILTER_ARCHS:=$(filter-out arm% mips% m68k, $(OOO_ARCHS))
-ifeq (s390x,$(findstring s390x,$(DEB_HOST_ARCH)))
- ENABLE_EVO2=n
- SYSTEM_STUFF := $(filter-out mozilla-headers, $(SYSTEM_STUFF))
-endif
-
#############
# Distro-specific overrides
@@ -1030,6 +1024,7 @@ endif
ifeq "$(ENABLE_EVO2)" "n"
CONFIGURE_FLAGS += --disable-evolution2
+ DEBHELPER_OPTIONS += -Nlibreoffice-evolution
else
CONFIGURE_FLAGS += --enable-evolution2
BUILD_DEPS += , libebook1.2-dev$(OOO_NO_BASE_ARCHS)
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1scnzh-0000hh...@vasks.debian.org
