[SCM] LibreOffice packaging repository branch, debian-experimental-3.7, updated. libreoffice_3.6.3_rc2-1-109-g0560699
The following commit has been merged in the debian-experimental-3.7 branch:
commit 6a7973571f79134e92016b3a2880de5f79ba1c1e
Author: Rene Engelhard <rene@debian.org>
Date: Fri Nov 9 01:24:09 2012 +0100
binfilter is gone
diff --git a/changelog b/changelog
index 9e29284..ef5f84a 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:3.7.0~alpha0~git20121108-1) UNRELEASED; urgency=low
+libreoffice (1:3.7.0~alpha0~git20121109-1) UNRELEASED; urgency=low
* new upstream snapshot
- contains new driver for mozab (mork). Automatically enabled thus
@@ -19,6 +19,8 @@ libreoffice (1:3.7.0~alpha0~git20121108-1) UNRELEASED; urgency=low
- temporarily disable python3-uno as the new python-based wizards
(in comon!) don't work with it...
* debian/uno-libs3.symbols: update
+ * debian/control*.in, debian/rules, debian/scripts/gid2pkgdirs.sh: binfilter
+ is gone. yay.
-- Rene Engelhard <rene@debian.org> Tue, 06 Nov 2012 20:43:46 +0100
diff --git a/control b/control
index 3ffc920..722abea 100644
--- a/control
+++ b/control
@@ -18,7 +18,7 @@ Architecture: amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe pp
Section: metapackages
Depends: libreoffice-core (= ${binary:Version}), libreoffice-writer, libreoffice-calc, libreoffice-impress, libreoffice-draw, libreoffice-math, libreoffice-base, libreoffice-report-builder-bin [!hppa !kfreebsd-amd64 !kfreebsd-i386], ttf-dejavu, ttf-sil-gentium-basic, libreoffice-filter-mobiledev, python-uno, ${java-common-depends}, ${misc:Depends}
Recommends: fonts-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}, ${ooo-binfilter-dep}, ${ooo-officebean-dep}
+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}, ${ooo-officebean-dep}
Description: office productivity suite (metapackage)
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -61,7 +61,6 @@ Description: office productivity suite (metapackage)
media backend
* libpaper-utils: papersize detection support via paperconf
* bluez: Bluetooth support for Impress (slideshow remote control
- * libreoffice-filter-binfilter: legacy filters (e.g. StarOffice 5.2)
Package: libreoffice-l10n-za
Section: metapackages
@@ -91,7 +90,7 @@ Architecture: amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe pp
Depends: libreoffice-common (>> ${base-version}), fonts-opensymbol, ${shlibs:Depends}, fontconfig, ${misc:Depends}
Pre-Depends: ure (>= 1.5.1+OOo3.1.1-15)
Conflicts: libreoffice-calc (<< ${binary:Version}), libreoffice-writer (<< ${binary:Version}), libreoffice-impress (<< ${binary:Version}), libreoffice-draw (<< ${binary:Version}), libreoffice-base (<< ${binary:Version}), libreoffice-gtk (<< ${binary:Version}), libreoffice-gnome (<< ${binary:Version}), libreoffice-kde (<< ${binary:Version}), libreoffice-evolution (<< ${binary:Version}), libreoffice-filter-so52 (<< ${binary:Version}), libreoffice-officebean (<< ${binary:Version}), libreoffice-dev (<< ${binary:Version}), libreoffice-style-crystal (<< 1:3.3.0-1), libreoffice-style-oxygen (<< 1:3.3.0-1), libreoffice-style-tango (<< 1:3.3.0-1), libreoffice-style-hicontrast (<< 1:3.3.0-1), libreoffice-style-galaxy (<< 1:3.3.0-1), libreoffice-style-andromeda (<< 1:3.3.0-1), libcairo2 (= 1.4.8-1), libicu38 (= 3.8~d01-1), cli-uno-bridge (<< 1:3.0.0~dev300m22), cacao-oj6-jre, mozilla-plugin-vlc (<< 1.0)
-Breaks: myspell-ru (<< 0.99g5-8.1), myspell-lv (<< 0.7.3-3.1), myspell-et (<< 1:20030606-12.1), myspell-fi (<< 0.7-17.2), myspell-cs-cz (<< 20040229-4.1), myspell-el-gr (<< 0.3-1.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<< 2.0.10-3.1), hunspell-ar (<< 0.0.0+20080110-1.1), myspell-hu (<< 0.99.4-1.2), hunspell-gl-es (<< 2.2a-6), myspell-gv (<< 0.50-8), myspell-en-au (<< 2.1-5), myspell-fa (<< 0.20070816-2), hunspell-uz (<< 0.6-3.1), hunspell-ko (<< 0.3.3-1), hunspell-se (<< 1.0~beta6.20081222-1.1), hunspell-de-med (<< 20090825-1), hunspell-en-us (<< 20070829-3), myspell-sv-se (<< 1.3.8-6-2.2), myspell-sk (<< 0.5.5a-2.1), myspell-fo (<< 0.2.36-3), myspell-nl (<< 1:1.10-3), myspell-pt-br (<< 2009.03.30-1.1), myspell-pl (<< 20090830-1), myspell-pt-pt (<< 20090309-1.1), myspell-ga (<< 2.0-19), myspell-gd (<< 0.50-7), myspell-ku (<< 0.20.0-1.1), myspell-hr (<< 20060617-2), myspell-fr-gut (<< 1:1.0-26.1), myspell-eo (<< 2.1.2000.02.25-41), myspell-de-de-oldspell (<< 1:2-25.1), my
spell-da (<< 1.6.18-1.1), myspell-es (<< 1.10-7), myspell-de-at (<< 20071211-2), myspell-de-ch (<< 20071211-2), myspell-de-de (<< 20071211-2), hunspell-de-at (<< 20071211-2), hunspell-de-ch (<< 20071211-2), hunspell-de-de (<< 20071211-2), myspell-ca (<< 0.6-8), myspell-tl (<< 0.4-0-5), myspell-ne (<< 1.0-4.1), myspell-fr (<< 1.4-25), myspell-hy (<< 0.10.1-1.1), myspell-en-us (<< 1:3.1.0-3), myspell-en-gb (<< 1:3.1.0-3), myspell-en-za (<< 1:3.1.0-3), myspell-af (<< 1:3.1.0-3), myspell-it (<< 1:3.1.0-3), myspell-sw (<< 1:3.1.0-3), myspell-th (<< 1:3.1.0-3), hunspell-en-ca (<< 1:3.1.0-3), hunspell-ne (<< 1:3.1.0-3), hunspell-da (<< 1:3.1.0-3), hunspell-fr (<< 1:3.1.0-3), hunspell-vi (<< 1:3.1.0-3), hunspell-hu (<< 1:3.1.0-3), hunspell-sr (<< 1:3.1.0-3), hunspell-sh (<< 1:3.1.0-3), myspell-lv (<< 0.7.3-3.1), myspell-et (<< 1:20030606-12.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<< 2.0.10-3.1), libreoffice-filter-binfilter (<< 1:3.4.1~), libreoffice-evolution (<< 1:3.4.1~), lib
reoffice-kab (<< 1:3.4.1~), libreoffice-sdbc-postgresql (<< 0.8.1~), mozilla-libreoffice (<< 1:3.5.0~beta~),
+Breaks: myspell-ru (<< 0.99g5-8.1), myspell-lv (<< 0.7.3-3.1), myspell-et (<< 1:20030606-12.1), myspell-fi (<< 0.7-17.2), myspell-cs-cz (<< 20040229-4.1), myspell-el-gr (<< 0.3-1.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<< 2.0.10-3.1), hunspell-ar (<< 0.0.0+20080110-1.1), myspell-hu (<< 0.99.4-1.2), hunspell-gl-es (<< 2.2a-6), myspell-gv (<< 0.50-8), myspell-en-au (<< 2.1-5), myspell-fa (<< 0.20070816-2), hunspell-uz (<< 0.6-3.1), hunspell-ko (<< 0.3.3-1), hunspell-se (<< 1.0~beta6.20081222-1.1), hunspell-de-med (<< 20090825-1), hunspell-en-us (<< 20070829-3), myspell-sv-se (<< 1.3.8-6-2.2), myspell-sk (<< 0.5.5a-2.1), myspell-fo (<< 0.2.36-3), myspell-nl (<< 1:1.10-3), myspell-pt-br (<< 2009.03.30-1.1), myspell-pl (<< 20090830-1), myspell-pt-pt (<< 20090309-1.1), myspell-ga (<< 2.0-19), myspell-gd (<< 0.50-7), myspell-ku (<< 0.20.0-1.1), myspell-hr (<< 20060617-2), myspell-fr-gut (<< 1:1.0-26.1), myspell-eo (<< 2.1.2000.02.25-41), myspell-de-de-oldspell (<< 1:2-25.1), my
spell-da (<< 1.6.18-1.1), myspell-es (<< 1.10-7), myspell-de-at (<< 20071211-2), myspell-de-ch (<< 20071211-2), myspell-de-de (<< 20071211-2), hunspell-de-at (<< 20071211-2), hunspell-de-ch (<< 20071211-2), hunspell-de-de (<< 20071211-2), myspell-ca (<< 0.6-8), myspell-tl (<< 0.4-0-5), myspell-ne (<< 1.0-4.1), myspell-fr (<< 1.4-25), myspell-hy (<< 0.10.1-1.1), myspell-en-us (<< 1:3.1.0-3), myspell-en-gb (<< 1:3.1.0-3), myspell-en-za (<< 1:3.1.0-3), myspell-af (<< 1:3.1.0-3), myspell-it (<< 1:3.1.0-3), myspell-sw (<< 1:3.1.0-3), myspell-th (<< 1:3.1.0-3), hunspell-en-ca (<< 1:3.1.0-3), hunspell-ne (<< 1:3.1.0-3), hunspell-da (<< 1:3.1.0-3), hunspell-fr (<< 1:3.1.0-3), hunspell-vi (<< 1:3.1.0-3), hunspell-hu (<< 1:3.1.0-3), hunspell-sr (<< 1:3.1.0-3), hunspell-sh (<< 1:3.1.0-3), myspell-lv (<< 0.7.3-3.1), myspell-et (<< 1:20030606-12.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<< 2.0.10-3.1), libreoffice-filter-binfilter, libreoffice-evolution (<< 1:3.4.1~), libreoffice-kab (
<< 1:3.4.1~), libreoffice-sdbc-postgresql (<< 0.8.1~), mozilla-libreoffice (<< 1:3.5.0~beta~),
libreoffice-common (<< 1:3.6.1~rc1)
Provides: libreoffice-bundled
Replaces: libreoffice-calc (<< 1:3.3.2-5), ure (<< 1:3.6.1-2), uno-libs3 (<< 1:3.6.1-2)
@@ -145,7 +144,7 @@ Description: office productivity suite -- arch-independent Java support files
Package: libreoffice-writer
Architecture: amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Depends: libreoffice-core (= ${binary:Version}), libreoffice-base-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends}, ${java-common-depends}, libreoffice-emailmerge, libreoffice-math
+Recommends: ${java-runtime-depends}, ${java-common-depends}, libreoffice-emailmerge, libreoffice-math
Replaces: libreoffice-core (<< 1:3.3.2-5)
Suggests: libreoffice-gcj, libreoffice-base
Description: office productivity suite -- word processor
@@ -702,7 +701,7 @@ Package: libreoffice-dbg
Section: debug
Architecture: amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Priority: extra
-Depends: libreoffice-core (= ${binary:Version}) | libreoffice-gcj (= ${binary:Version}) | libreoffice-dev (= ${binary:Version}) | libreoffice-gnome (= ${binary:Version}) | libreoffice-kde (= ${binary:Version}) | libreoffice-calc (= ${binary:Version}) | libreoffice-base-core (= ${binary:Version}) | libreoffice-base (= ${binary:Version}) | libreoffice-impress (= ${binary:Version}) | libreoffice-filter-binfilter (= ${binary:Version}) | libreoffice-draw (= ${binary:Version}) | libreoffice-writer (= ${binary:Version}) | python-uno (= ${binary:Version}) | cli-uno-bridge (= ${binary:Version}) | mozilla-libreoffice (= ${binary:Version}) | libreoffice-ogltrans (= ${binary:Version}), ${misc:Depends}
+Depends: libreoffice-core (= ${binary:Version}) | libreoffice-gcj (= ${binary:Version}) | libreoffice-dev (= ${binary:Version}) | libreoffice-gnome (= ${binary:Version}) | libreoffice-kde (= ${binary:Version}) | libreoffice-calc (= ${binary:Version}) | libreoffice-base-core (= ${binary:Version}) | libreoffice-base (= ${binary:Version}) | libreoffice-impress (= ${binary:Version}) | libreoffice-draw (= ${binary:Version}) | libreoffice-writer (= ${binary:Version}) | python-uno (= ${binary:Version}) | cli-uno-bridge (= ${binary:Version}) | mozilla-libreoffice (= ${binary:Version}) | libreoffice-ogltrans (= ${binary:Version}), ${misc:Depends}
Recommends: ure-dbg
Suggests: ${dbg-dbg-suggests}
Pre-Depends: dpkg (>= 1.15.6)
diff --git a/control.binfilter.in b/control.binfilter.in
deleted file mode 100644
index 6151afe..0000000
--- a/control.binfilter.in
+++ /dev/null
@@ -1,20 +0,0 @@
-Package: libreofficeVER-filter-binfilter
-Section: misc
-Architecture: %OOO_BINFILTER_ARCHS%
-Depends: libreofficeVER-core (= ${binary:Version}),
- libreofficeVER-common (>= 1:3.4.0~),
- ${shlibs:Depends},
- ${misc:Depends}
-Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
-Description: office productivity suite -- legacy filters (e.g. StarOffice 5.2)
- LibreOffice is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains the "binfilters", legacy filters for
- - the old StarOffice 5.2 formats
- - StarWriter 1.0/2.0
- - StarWriter/DOS
- - *Writer* filters for
- + Excel
- + Lotus
-
diff --git a/control.debug.in b/control.debug.in
index bdc5d8e..0fcdd84 100644
--- a/control.debug.in
+++ b/control.debug.in
@@ -2,7 +2,7 @@ Package: libreofficeVER-dbg
Section: debug
Architecture: %OOO_ARCHS%
Priority: extra
-Depends: libreofficeVER-core (= ${binary:Version}) | libreofficeVER-gcj (= ${binary:Version}) | libreofficeVER-dev (= ${binary:Version}) | libreofficeVER-gnome (= ${binary:Version}) | libreofficeVER-kde (= ${binary:Version}) | libreofficeVER-calc (= ${binary:Version}) | libreofficeVER-base-core (= ${binary:Version}) | libreofficeVER-base (= ${binary:Version}) | libreofficeVER-impress (= ${binary:Version}) | libreofficeVER-filter-binfilter (= ${binary:Version}) | libreofficeVER-draw (= ${binary:Version}) | libreofficeVER-writer (= ${binary:Version}) | python-uno (= ${binary:Version}) | cli-uno-bridge (= ${binary:Version}) | mozilla-libreofficeVER (= ${binary:Version}) | libreofficeVER-ogltrans (= ${binary:Version}), ${misc:Depends}
+Depends: libreofficeVER-core (= ${binary:Version}) | libreofficeVER-gcj (= ${binary:Version}) | libreofficeVER-dev (= ${binary:Version}) | libreofficeVER-gnome (= ${binary:Version}) | libreofficeVER-kde (= ${binary:Version}) | libreofficeVER-calc (= ${binary:Version}) | libreofficeVER-base-core (= ${binary:Version}) | libreofficeVER-base (= ${binary:Version}) | libreofficeVER-impress (= ${binary:Version}) | libreofficeVER-draw (= ${binary:Version}) | libreofficeVER-writer (= ${binary:Version}) | python-uno (= ${binary:Version}) | cli-uno-bridge (= ${binary:Version}) | mozilla-libreofficeVER (= ${binary:Version}) | libreofficeVER-ogltrans (= ${binary:Version}), ${misc:Depends}
Recommends: ure-dbg
Suggests: ${dbg-dbg-suggests}
Pre-Depends: dpkg (>= 1.15.6)
diff --git a/control.in b/control.in
index f66dd08..47a119c 100644
--- a/control.in
+++ b/control.in
@@ -81,7 +81,6 @@ Suggests: hunspell-dictionary,
pstoedit,
imagemagick | graphicsmagick-imagemagick-compat,
${gstreamer-plugins-suggests},
- ${ooo-binfilter-dep},
${ooo-officebean-dep}
Description: office productivity suite (metapackage)
LibreOffice is a full-featured office productivity suite that provides
@@ -123,7 +122,6 @@ Description: office productivity suite (metapackage)
* gstreamer0.10-plugins-*: GStreamer plugins for use with LibreOffices
media backend
* libpaper-utils: papersize detection support via paperconf
- * libreofficeVER-filter-binfilter: legacy filters (e.g. StarOffice 5.2)
Package: libreofficeVER-l10n-za
Section: metapackages
@@ -182,7 +180,7 @@ Conflicts: libreofficeVER-unbundled,
cli-uno-bridge (<< 1:3.0.0~dev300m22),
cacao-oj6-jre,
mozilla-plugin-vlc (<< 1.0)
-Breaks: myspell-ru (<< 0.99g5-8.1), myspell-lv (<< 0.7.3-3.1), myspell-et (<< 1:20030606-12.1), myspell-fi (<< 0.7-17.2), myspell-cs-cz (<< 20040229-4.1), myspell-el-gr (<< 0.3-1.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<< 2.0.10-3.1), hunspell-ar (<< 0.0.0+20080110-1.1), myspell-hu (<< 0.99.4-1.2), hunspell-gl-es (<< 2.2a-6), myspell-gv (<< 0.50-8), myspell-en-au (<< 2.1-5), myspell-fa (<< 0.20070816-2), hunspell-uz (<< 0.6-3.1), hunspell-ko (<< 0.3.3-1), hunspell-se (<< 1.0~beta6.20081222-1.1), hunspell-de-med (<< 20090825-1), hunspell-en-us (<< 20070829-3), myspell-sv-se (<< 1.3.8-6-2.2), myspell-sk (<< 0.5.5a-2.1), myspell-fo (<< 0.2.36-3), myspell-nl (<< 1:1.10-3), myspell-pt-br (<< 2009.03.30-1.1), myspell-pl (<< 20090830-1), myspell-pt-pt (<< 20090309-1.1), myspell-ga (<< 2.0-19), myspell-gd (<< 0.50-7), myspell-ku (<< 0.20.0-1.1), myspell-hr (<< 20060617-2), myspell-fr-gut (<< 1:1.0-26.1), myspell-eo (<< 2.1.2000.02.25-41), myspell-de-de-oldspell (<< 1:2-25.1), my
spell-da (<< 1.6.18-1.1), myspell-es (<< 1.10-7), myspell-de-at (<< 20071211-2), myspell-de-ch (<< 20071211-2), myspell-de-de (<< 20071211-2), hunspell-de-at (<< 20071211-2), hunspell-de-ch (<< 20071211-2), hunspell-de-de (<< 20071211-2), myspell-ca (<< 0.6-8), myspell-tl (<< 0.4-0-5), myspell-ne (<< 1.0-4.1), myspell-fr (<< 1.4-25), myspell-hy (<< 0.10.1-1.1), myspell-en-us (<< 1:3.1.0-3), myspell-en-gb (<< 1:3.1.0-3), myspell-en-za (<< 1:3.1.0-3), myspell-af (<< 1:3.1.0-3), myspell-it (<< 1:3.1.0-3), myspell-sw (<< 1:3.1.0-3), myspell-th (<< 1:3.1.0-3), hunspell-en-ca (<< 1:3.1.0-3), hunspell-ne (<< 1:3.1.0-3), hunspell-da (<< 1:3.1.0-3), hunspell-fr (<< 1:3.1.0-3), hunspell-vi (<< 1:3.1.0-3), hunspell-hu (<< 1:3.1.0-3), hunspell-sr (<< 1:3.1.0-3), hunspell-sh (<< 1:3.1.0-3), myspell-lv (<< 0.7.3-3.1), myspell-et (<< 1:20030606-12.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<< 2.0.10-3.1), libreoffice-filter-binfilter (<< 1:3.4.1~), libreoffice-evolution (<< 1:3.4.1~), lib
reoffice-kab (<< 1:3.4.1~), libreoffice-sdbc-postgresql (<< 0.8.1~), mozilla-libreoffice (<< 1:3.5.0~beta~),
+Breaks: myspell-ru (<< 0.99g5-8.1), myspell-lv (<< 0.7.3-3.1), myspell-et (<< 1:20030606-12.1), myspell-fi (<< 0.7-17.2), myspell-cs-cz (<< 20040229-4.1), myspell-el-gr (<< 0.3-1.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<< 2.0.10-3.1), hunspell-ar (<< 0.0.0+20080110-1.1), myspell-hu (<< 0.99.4-1.2), hunspell-gl-es (<< 2.2a-6), myspell-gv (<< 0.50-8), myspell-en-au (<< 2.1-5), myspell-fa (<< 0.20070816-2), hunspell-uz (<< 0.6-3.1), hunspell-ko (<< 0.3.3-1), hunspell-se (<< 1.0~beta6.20081222-1.1), hunspell-de-med (<< 20090825-1), hunspell-en-us (<< 20070829-3), myspell-sv-se (<< 1.3.8-6-2.2), myspell-sk (<< 0.5.5a-2.1), myspell-fo (<< 0.2.36-3), myspell-nl (<< 1:1.10-3), myspell-pt-br (<< 2009.03.30-1.1), myspell-pl (<< 20090830-1), myspell-pt-pt (<< 20090309-1.1), myspell-ga (<< 2.0-19), myspell-gd (<< 0.50-7), myspell-ku (<< 0.20.0-1.1), myspell-hr (<< 20060617-2), myspell-fr-gut (<< 1:1.0-26.1), myspell-eo (<< 2.1.2000.02.25-41), myspell-de-de-oldspell (<< 1:2-25.1), my
spell-da (<< 1.6.18-1.1), myspell-es (<< 1.10-7), myspell-de-at (<< 20071211-2), myspell-de-ch (<< 20071211-2), myspell-de-de (<< 20071211-2), hunspell-de-at (<< 20071211-2), hunspell-de-ch (<< 20071211-2), hunspell-de-de (<< 20071211-2), myspell-ca (<< 0.6-8), myspell-tl (<< 0.4-0-5), myspell-ne (<< 1.0-4.1), myspell-fr (<< 1.4-25), myspell-hy (<< 0.10.1-1.1), myspell-en-us (<< 1:3.1.0-3), myspell-en-gb (<< 1:3.1.0-3), myspell-en-za (<< 1:3.1.0-3), myspell-af (<< 1:3.1.0-3), myspell-it (<< 1:3.1.0-3), myspell-sw (<< 1:3.1.0-3), myspell-th (<< 1:3.1.0-3), hunspell-en-ca (<< 1:3.1.0-3), hunspell-ne (<< 1:3.1.0-3), hunspell-da (<< 1:3.1.0-3), hunspell-fr (<< 1:3.1.0-3), hunspell-vi (<< 1:3.1.0-3), hunspell-hu (<< 1:3.1.0-3), hunspell-sr (<< 1:3.1.0-3), hunspell-sh (<< 1:3.1.0-3), myspell-lv (<< 0.7.3-3.1), myspell-et (<< 1:20030606-12.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<< 2.0.10-3.1), libreoffice-filter-binfilter, libreoffice-evolution (<< 1:3.4.1~), libreoffice-kab (
<< 1:3.4.1~), libreoffice-sdbc-postgresql (<< 0.8.1~), mozilla-libreoffice (<< 1:3.5.0~beta~),
libreoffice-common (<< 1:3.6.1~rc1)
Provides: libreofficeVER-bundled
Replaces: libreofficeVER-calc (<< 1:3.3.2-5), ure (<< 1:3.6.1-2), uno-libs3 (<< 1:3.6.1-2)
@@ -250,7 +248,7 @@ Depends: libreofficeVER-core (= ${binary:Version}),
libreofficeVER-base-core (= ${binary:Version})%OOO_NO_BASE_ARCHS%,
${shlibs:Depends},
${misc:Depends}
-Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends}, ${java-common-depends}, libreofficeVER-emailmerge, libreofficeVER-math
+Recommends: ${java-runtime-depends}, ${java-common-depends}, libreofficeVER-emailmerge, libreofficeVER-math
Replaces: libreofficeVER-core (<< 1:3.3.2-5)
Suggests: libreofficeVER-gcj,
libreofficeVER-base
diff --git a/libreoffice-core.bug-control b/libreoffice-core.bug-control
deleted file mode 100644
index cfaa7b1..0000000
--- a/libreoffice-core.bug-control
+++ /dev/null
@@ -1,2 +0,0 @@
-report-with: libreoffice-common libreoffice-java-common ttf-opensymbol
-package-status: libxrender1 libxinerama1 libsane iceweasel firefox icedove iceape-browser libreoffice-filter-binfilter pstoedit imagemagick fglrx-driver nvidia-glx nvidia-glx-legacy
diff --git a/libreoffice-filter-binfilter.bug-control b/libreoffice-filter-binfilter.bug-control
deleted file mode 100644
index 1ac405f..0000000
--- a/libreoffice-filter-binfilter.bug-control
+++ /dev/null
@@ -1 +0,0 @@
-report-with: libreoffice-core
diff --git a/libreoffice-filter-binfilter.lintian-overrides b/libreoffice-filter-binfilter.lintian-overrides
deleted file mode 100644
index 8b4fb10..0000000
--- a/libreoffice-filter-binfilter.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-libreoffice-filter-binfilter: binary-or-shlib-defines-rpath
-libreoffice-filter-binfilter: postinst-uses-db-input
diff --git a/libreoffice-filter-binfilter.mime b/libreoffice-filter-binfilter.mime
deleted file mode 100644
index ebdfbb0..0000000
--- a/libreoffice-filter-binfilter.mime
+++ /dev/null
@@ -1,14 +0,0 @@
-###
-# shared-mime-info
-
-# StarDivision StarOffice 5.0
-application/vnd.stardivision.calc; soffice -no-oosplash --calc '%s'; edit=soffice -no-oosplash --calc '%s'; test=test -n "$DISPLAY"; description="StarCalc 5.0"; nametemplate=%s.sdc; priority=8
-application/vnd.stardivision.chart; soffice -no-oosplash --calc '%s'; edit=soffice -no-oosplash --calc '%s'; test=test -n "$DISPLAY"; description="StarChart 5.0"; nametemplate=%s.sds; priority=8
-application/vnd.stardivision.draw; soffice -no-oosplash --draw '%s'; edit=soffice -no-oosplash --draw '%s'; test=test -n "$DISPLAY"; description="StarDraw 5.0"; nametemplate=%s.sda; priority=8
-application/vnd.stardivision.impress; soffice -no-oosplash --impress '%s'; edit=soffice -no-oosplash --impress '%s'; test=test -n "$DISPLAY"; description="StarImpress 5.0"; nametemplate=%s.sdd; priority=8
-application/vnd.stardivision.math; soffice -no-oosplash --math '%s'; edit=soffice -no-oosplash --math '%s'; test=test -n "$DISPLAY"; description="StarMath 5.0"; nametemplate=%s.sdf; priority=8
-application/vnd.stardivision.writer-global; soffice -no-oosplash --writer '%s'; edit=soffice -no-oosplash --writer '%s'; test=test -n "$DISPLAY"; description="StarWriter 5.0 Master Document"; nametemplate=%s.sgl; priority=8
-application/vnd.stardivision.writer; soffice -no-oosplash --writer '%s'; edit=soffice -no-oosplash --writer '%s'; test=test -n "$DISPLAY"; description="StarWriter 5.0"; nametemplate=%s.sdw; priority=8
-
-#
-###
diff --git a/patches/install-fixes.diff b/patches/install-fixes.diff
index 26fb2b3..140c222 100644
--- a/patches/install-fixes.diff
+++ b/patches/install-fixes.diff
@@ -11,7 +11,7 @@ index eaabf9c..c1b1ec6 100755
BUILDDIR=`pwd`
FILELISTSDIR="$BUILDDIR/file-lists"
-@@ -380,163 +380,6 @@
+@@ -370,154 +370,6 @@
# the British fixes can be removed after the issue #54113 is fixed
remove_duplicity_from_flists common_list.txt lang_en-GB_list.txt $INSTALLDIR/presets/config/standard.sog
@@ -44,9 +44,6 @@ index eaabf9c..c1b1ec6 100755
- create_package_directory gid_Module_Oo_Linguistic pkg/libreoffice-common
- create_package_directory gid_Module_Optional_Xsltfiltersamples pkg/libreoffice-common
- create_package_directory gid_Module_Optional_Javafilter pkg/libreoffice-common
-- if [ -f gid_Module_Optional_Binfilter ]; then
-- create_package_directory gid_Module_Optional_Binfilter pkg/libreoffice-filter-binfilter
-- fi
- create_package_directory gid_Module_Optional_Grfflt pkg/libreoffice-draw
- create_package_directory gid_Module_Prg_Calc_Bin pkg/libreoffice-calc
- create_package_directory gid_Module_Prg_Math_Bin pkg/libreoffice-math
@@ -90,13 +87,7 @@ index eaabf9c..c1b1ec6 100755
- create_package_directory gid_Module_Langpack_Brand_`echo $l | sed -e s/-/_/g` pkg/libreoffice-l10n-$l
- create_package_directory gid_Module_Langpack_Resource_`echo $l | sed -e s/-/_/g` pkg/libreoffice-l10n-$l
- create_package_directory gid_Module_Helppack_Help_`echo $l | sed -e s/-/_/g` pkg/libreoffice-help-$l
-- if [ -f gid_Module_Optional_Binfilter ]; then
-- if [ "$l" = "en-US" ]; then
-- create_package_directory gid_Module_Langpack_Binfilter_en_US pkg/libreoffice-filter-binfilter
-- else
-- create_package_directory gid_Module_Langpack_Binfilter_`echo $l | sed -e s/-/_/g` pkg/libreoffice-l10n-$l
-- fi
-- fi
+-
- # some help files are in _Langpack_{Writer,Impress,...}_<lang>
- # move them from -l10n to -help
- if [ "$l" = "en-US" ]; then d=en; else d=$l; fi
@@ -175,18 +166,3 @@ index eaabf9c..c1b1ec6 100755
fi
# mark the config files
---- a/Makefile.top-old 2012-04-07 02:25:12.933759413 +0200
-+++ b/Makefile.top 2012-04-07 02:46:00.766017382 +0200
-@@ -429,10 +429,10 @@
- mv "$(DEVINSTALLDIR)"/LibO*_install-arc_en-US/* "$(DEVINSTALLDIR)"/opt
- else
- ifeq ($(DISABLE_LINKOO),TRUE)
-- @ooinstall $(DEVINSTALLDIR)/opt
-+ @export WITH_LANG="en-US"; ooinstall $(DEVINSTALLDIR)/opt
- @install-gdb-printers -L
- else
-- @ooinstall -l $(DEVINSTALLDIR)/opt
-+ @export WITH_LANG="en-US"; ooinstall -l $(DEVINSTALLDIR)/opt
- endif
- endif
- @rm -f $(SRCDIR)/install && ln -s $(DEVINSTALLDIR)/opt/ $(SRCDIR)/install
diff --git a/patches/series b/patches/series
index bd65f1b..c4b1318 100644
--- a/patches/series
+++ b/patches/series
@@ -2,7 +2,7 @@ no-minimaltoc.diff
debian-opt.diff
gcj-safe-jni-h-include.diff
jurt-soffice-location.diff
-split-binfilters-and-evo.diff
+split-evoab.diff
#rhino-build-optional.diff
disable-dynamic-list-cpp.diff
fix-system-lpsolve-build.diff
diff --git a/patches/split-binfilters-and-evo.diff b/patches/split-binfilters-and-evo.diff
deleted file mode 100644
index 195cb2a..0000000
--- a/patches/split-binfilters-and-evo.diff
+++ /dev/null
@@ -1,171 +0,0 @@
---- libreoffice-3.5.0/postprocess/packcomponents/makefile.mk-old 2011-06-13 23:35:26.000000000 +0000
-+++ libreoffice-3.5.0/postprocess/packcomponents/makefile.mk 2011-06-13 23:35:58.000000000 +0000
-@@ -303,12 +303,6 @@ my_components += \
- component/wizards/com/sun/star/wizards/web/web
- .END
-
--.IF "$(WITH_BINFILTER)" != "NO"
--my_components += \
-- bf_migratefilter \
-- bindet
--.END
--
- .IF "$(WITH_MOZILLA)" != "NO"
- my_components += component/extensions/source/plugin/pl
- .END
-@@ -388,10 +382,6 @@ my_components += component/connectivity/source/drivers/mozab/bootstrap/mozbootst
- my_components += component/shell/source/cmdmail/cmdmail
- .END
-
--.IF "$(OS)" != "WNT" && "$(ENABLE_EVOAB2)" != ""
--my_components += component/connectivity/source/drivers/evoab2/evoab
--.END
--
- .IF "$(OS)" != "WNT" && "$(ENABLE_GSTREAMER)" != ""
- my_components += component/avmedia/source/gstreamer/avmediagstreamer
- .END
-@@ -414,3 +404,51 @@ $(MISC)/services.input : makefile.mk
- '<list>$(my_components:^"<filename>":+".component</filename>")</list>' \
- > $@
-
-+
-+.IF "$(WITH_BINFILTER)" == "YES"
-+ALLTAR: $(MISC)/bf_migratefilter.rdb $(MISC)/bindet.rdb
-+
-+$(MISC)/bf_migratefilter.rdb .ERRREMOVE : \
-+ $(SOLARENV)/bin/packcomponents.xslt \
-+ $(MISC)/bf_migratefilter.input \
-+ $(SOLARXMLDIR)/bf_migratefilter.component
-+ $(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \
-+ $(SOLARENV)/bin/packcomponents.xslt \
-+ $(MISC)/bf_migratefilter.input
-+
-+$(MISC)/bindet.rdb .ERRREMOVE : \
-+ $(SOLARENV)/bin/packcomponents.xslt \
-+ $(MISC)/bindet.input \
-+ $(SOLARXMLDIR)/bindet.component
-+ $(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \
-+ $(SOLARENV)/bin/packcomponents.xslt \
-+ $(MISC)/bindet.input
-+
-+$(MISC)/bf_migratefilter.input : makefile.mk
-+ echo \
-+ '<list><filename>bf_migratefilter.component</filename></list>' \
-+ > $@
-+
-+$(MISC)/bindet.input : makefile.mk
-+ echo \
-+ '<list><filename>bindet.component</filename></list>' \
-+ > $@
-+.END
-+
-+.IF "$(ENABLE_EVOAB2)" == "YES"
-+ALLTAR : $(MISC)/evoab.rdb
-+
-+$(MISC)/evoab.rdb .ERRREMOVE : \
-+ $(SOLARENV)/bin/packcomponents.xslt \
-+ $(MISC)/evoab.input \
-+ $(SOLARXMLDIR)/connectivity/source/drivers/evoab2/evoab.component
-+ $(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \
-+ $(SOLARENV)/bin/packcomponents.xslt \
-+ $(MISC)/evoab.input
-+
-+$(MISC)/evoab.input : makefile.mk
-+ echo \
-+ '<list><filename>component/connectivity/source/drivers/evoab2/evoab/evoab.component</filename></list>' \
-+ > $@
-+.END
-+
---- libreoffice-3.5.0/postprocess/packregistry/makefile.mk-old 2011-12-20 04:49:53.000000000 +0100
-+++ libreoffice-3.5.0/postprocess/packregistry/makefile.mk 2011-12-20 04:52:13.000000000 +0100
-@@ -41,6 +41,7 @@ MY_XCDS = \
- $(MISC)/ctl.xcd \
- $(MISC)/ctlseqcheck.xcd \
- $(MISC)/draw.xcd \
-+ $(MISC)/evoab.xcd \
- $(MISC)/graphicfilter.xcd \
- $(MISC)/impress.xcd \
- $(MISC)/korea.xcd \
-@@ -334,8 +335,8 @@ ERROR : unknown-GUIBASE
- MY_FILES_main += $(MY_MOD)/org/openoffice/ucb/Configuration-neon.xcu
- .END
- .IF "$(ENABLE_EVOAB2)" == "TRUE"
--MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu
--MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu
-+MY_FILES_evoab += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu
-+MY_FILES_evoab += $(MY_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu
- MY_DRIVERS += evoab
- .END
- .IF "$(SOLAR_JAVA)" == "TRUE"
---- libreoffice-3.5.0/postprocess/prj/d.lst-old 2011-12-20 11:39:36.000000000 +0000
-+++ libreoffice-3.5.0/postprocess/prj/d.lst 2011-12-20 11:40:07.000000000 +0000
-@@ -4,4 +4,7 @@
- ..\%__SRC%\misc\lang\*.xcd %_DEST%\xml\
- ..\%__SRC%\misc\scriptproviderforbeanshell.rdb %_DEST%\xml\scriptproviderforbeanshell.rdb
- ..\%__SRC%\misc\scriptproviderforjavascript.rdb %_DEST%\xml\scriptproviderforjavascript.rdb
-+..\%__SRC%\misc\bf_migratefilter.rdb %_DEST%\xml\bf_migratefilter.rdb
-+..\%__SRC%\misc\bindet.rdb %_DEST%\xml\bindet.rdb
-+..\%__SRC%\misc\evoab.rdb %_DEST%\xml\evoab.rdb
- ..\%__SRC%\misc\services.rdb %_DEST%\xml\services.rdb
---- libreoffice-3.5.0/scp2/source/ooo/file_library_ooo.scp-old 2011-12-20 05:11:44.000000000 +0100
-+++ libreoffice-3.5.0/scp2/source/ooo/file_library_ooo.scp 2011-12-20 05:12:07.000000000 +0100
-@@ -446,6 +446,13 @@
-
- STD_LIB_FILE( gid_File_Lib_Evoab , evoab)
-
-+File gid_File_Share_Registry_Evoab_Xcd
-+ TXT_FILE_BODY;
-+ Styles = (PACKED);
-+ Dir = gid_Brand_Dir_Share_Registry;
-+ Name = "evoab.xcd";
-+End
-+
- #endif // #ifdef ENABLE_EVOAB2
-
- #endif // #ifdef UNX
---- libreoffice-3.5.0/scp2/source/gnome/module_gnome.scp-old 2011-12-20 05:15:16.000000000 +0100
-+++ libreoffice-3.5.0/scp2/source/gnome/module_gnome.scp 2011-12-20 05:15:30.000000000 +0100
-@@ -43,6 +43,7 @@ Module gid_Module_Optional_Gnome
- Files = (
- #ifdef ENABLE_EVOAB2
- gid_File_Lib_Evoab,
-+ gid_File_Share_Registry_Evoab_Xcd,
- #endif
- #ifdef ENABLE_GTK
- gid_File_Lib_Fps_Gnome,
-diff -u binfilter-old/file_binfilter.scp binfilter/file_binfilter.scp
---- libreoffice-3.5.0/scp2/source/binfilter/file_binfilter.scp 2011-12-06 14:02:07.000000000 +0000
-+++ libreoffice-3.5.0/scp2/source/binfilter/file_binfilter.scp 2011-12-20 10:16:46.000000000 +0000
-@@ -42,7 +42,19 @@
- Styles = (PACKED);
- End
-
-+File gid_File_Rdb_Bf_Migratefilter
-+ TXT_FILE_BODY;
-+ Name = "bf_migratefilter.rdb";
-+ Dir = gid_Brand_Dir_Program_Services;
-+ Styles = (PACKED);
-+End
-
-+File gid_File_Rdb_Bindet
-+ TXT_FILE_BODY;
-+ Name = "bindet.rdb";
-+ Dir = gid_Brand_Dir_Program_Services;
-+ Styles = (PACKED);
-+End
-
- STD_LIB_FILE( gid_File_Lib_Bf_Go, bf_go)
- STD_LIB_FILE( gid_File_Lib_Bf_Sch, bf_sch)
-diff -u binfilter-old/module_binfilter.scp binfilter/module_binfilter.scp
---- libreoffice-3.5.0/scp2/source/binfilter/module_binfilter.scp 2011-12-06 14:02:07.000000000 +0000
-+++ libreoffice-3.5.0/scp2/source/binfilter/module_binfilter.scp 2011-12-20 10:17:56.000000000 +0000
-@@ -53,7 +53,9 @@
- gid_File_Lib_Bf_Wrapper,
- gid_File_Lib_Legacy_Binfilters,
- gid_File_Lib_Bf_Migratefilter,
-+ gid_File_Rdb_Bf_Migratefilter,
- gid_File_Lib_Bindet,
-+ gid_File_Rdb_Bindet,
- gid_File_Res_Bf_Sch,
- gid_File_Res_Bf_Svx,
- gid_File_Res_Bf_Svt,
diff --git a/patches/split-evoab.diff b/patches/split-evoab.diff
new file mode 100644
index 0000000..7908414
--- /dev/null
+++ b/patches/split-evoab.diff
@@ -0,0 +1,68 @@
+--- libreoffice-3.5.0/postprocess/packcomponents/makefile.mk-old 2011-06-13 23:35:26.000000000 +0000
++++ libreoffice-3.5.0/postprocess/packcomponents/makefile.mk 2011-06-13 23:35:58.000000000 +0000
+@@ -388,10 +382,6 @@ my_components += component/connectivity/source/drivers/mozab/bootstrap/mozbootst
+ my_components += component/shell/source/cmdmail/cmdmail
+ .END
+
+-.IF "$(OS)" != "WNT" && "$(ENABLE_EVOAB2)" != ""
+-my_components += component/connectivity/source/drivers/evoab2/evoab
+-.END
+-
+ .IF "$(OS)" != "WNT" && "$(ENABLE_GSTREAMER)" != ""
+ my_components += component/avmedia/source/gstreamer/avmediagstreamer
+ .END
+--- libreoffice-3.5.0/postprocess/packregistry/makefile.mk-old 2011-12-20 04:49:53.000000000 +0100
++++ libreoffice-3.5.0/postprocess/packregistry/makefile.mk 2011-12-20 04:52:13.000000000 +0100
+@@ -41,6 +41,7 @@ MY_XCDS = \
+ $(MISC)/ctl.xcd \
+ $(MISC)/ctlseqcheck.xcd \
+ $(MISC)/draw.xcd \
++ $(MISC)/evoab.xcd \
+ $(MISC)/graphicfilter.xcd \
+ $(MISC)/impress.xcd \
+ $(MISC)/korea.xcd \
+@@ -334,8 +335,8 @@ ERROR : unknown-GUIBASE
+ MY_FILES_main += $(MY_MOD)/org/openoffice/ucb/Configuration-neon.xcu
+ .END
+ .IF "$(ENABLE_EVOAB2)" == "TRUE"
+-MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu
+-MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu
++MY_FILES_evoab += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu
++MY_FILES_evoab += $(MY_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu
+ MY_DRIVERS += evoab
+ .END
+ .IF "$(SOLAR_JAVA)" == "TRUE"
+--- libreoffice-3.5.0/postprocess/prj/d.lst-old 2011-12-20 11:39:36.000000000 +0000
++++ libreoffice-3.5.0/postprocess/prj/d.lst 2011-12-20 11:40:07.000000000 +0000
+@@ -4,4 +4,5 @@
+ ..\%__SRC%\misc\lang\*.xcd %_DEST%\xml\
+ ..\%__SRC%\misc\scriptproviderforbeanshell.rdb %_DEST%\xml\scriptproviderforbeanshell.rdb
+ ..\%__SRC%\misc\scriptproviderforjavascript.rdb %_DEST%\xml\scriptproviderforjavascript.rdb
++..\%__SRC%\misc\evoab.rdb %_DEST%\xml\evoab.rdb
+ ..\%__SRC%\misc\services.rdb %_DEST%\xml\services.rdb
+--- libreoffice-3.5.0/scp2/source/ooo/file_library_ooo.scp-old 2011-12-20 05:11:44.000000000 +0100
++++ libreoffice-3.5.0/scp2/source/ooo/file_library_ooo.scp 2011-12-20 05:12:07.000000000 +0100
+@@ -446,6 +446,13 @@
+
+ STD_LIB_FILE( gid_File_Lib_Evoab , evoab)
+
++File gid_File_Share_Registry_Evoab_Xcd
++ TXT_FILE_BODY;
++ Styles = (PACKED);
++ Dir = gid_Brand_Dir_Share_Registry;
++ Name = "evoab.xcd";
++End
++
+ #endif // #ifdef ENABLE_EVOAB2
+
+ #endif // #ifdef UNX
+--- libreoffice-3.5.0/scp2/source/gnome/module_gnome.scp-old 2011-12-20 05:15:16.000000000 +0100
++++ libreoffice-3.5.0/scp2/source/gnome/module_gnome.scp 2011-12-20 05:15:30.000000000 +0100
+@@ -43,6 +43,7 @@ Module gid_Module_Optional_Gnome
+ Files = (
+ #ifdef ENABLE_EVOAB2
+ gid_File_Lib_Evoab,
++ gid_File_Share_Registry_Evoab_Xcd,
+ #endif
+ #ifdef ENABLE_GTK
+ gid_File_Lib_Fps_Gnome,
diff --git a/rules b/rules
index 9a5b9bd..0a29186 100755
--- a/rules
+++ b/rules
@@ -123,7 +123,6 @@ ifeq "$(ENABLE_PYTHON3)" "y"
endif
endif
PACKAGE_TTF_OPENSYMBOL=y
-BUILD_BINFILTERS=n
BUILD_ONLY_EN_US=y
ENABLE_HELP=y
ENABLE_JAVA=y
@@ -483,12 +482,6 @@ OOO_NSPLUGIN_ARCHS=
endif
$(eval $(call gen_no_archs,OOO_NSPLUGIN_ARCHS))
-# builds long and is for legacy filters. probably not needed on {arm,mips}{,el}
-ifneq (,$(filter arm% mips% m68k, $(DEB_HOST_ARCH)))
- BUILD_BINFILTERS=n
-endif
-OOO_BINFILTER_ARCHS:=$(filter-out arm% mips% m68k, $(OOO_ARCHS))
-
#############
# Distro-specific overrides
@@ -1070,11 +1063,6 @@ else
CONFIGURE_FLAGS += --disable-randr
endif
-ifeq "$(BUILD_BINFILTERS)" "y"
- CONFIGURE_FLAGS+= --enable-binfilter
- OOO_BINFILTER_DEP = libreoffice$(VER)-filter-binfilter
-endif
-
ifneq "$(BUILD_PYUNO)" "y"
DEBHELPER_OPTIONS+= -Npython-uno -Npython3-uno -Nlibreoffice-script-provider-python
CONFIGURE_FLAGS += --disable-python
@@ -1463,10 +1451,6 @@ ifeq "$(ENABLE_EVO2)" "y"
sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
>> debian/control < debian/control.evolution.in
endif
-ifeq "$(BUILD_BINFILTERS)" "y"
- sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
- >> debian/control < debian/control.binfilter.in
-endif
ifeq "$(ENABLE_KDEAB)" "y"
sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
>> debian/control < debian/control.kab.in
@@ -1483,7 +1467,6 @@ endif
perl -pi -e "s,%OOO_GCJ_ARCHS%,$(OOO_GCJ_ARCHS),g" debian/control
perl -pi -e "s,%OOO_NSPLUGIN_ARCHS%,$(OOO_NSPLUGIN_ARCHS),g" debian/control
perl -pi -e "s,%OOO_OGLTRANS_ARCHS%,$(OOO_OGLTRANS_ARCHS),g" debian/control
- perl -pi -e "s,%OOO_BINFILTER_ARCHS%,$(OOO_BINFILTER_ARCHS),g" debian/control
perl -pi -e "s,%OOO_STLPORT_ARCHS%,$(OOO_STLPORT_ARCHS),g" debian/control
perl -pi -e "s,%OOO_GCJ_JDK_ARCHS%,$(OOO_GCJ_JDK_ARCHS),g" debian/control
perl -pi -e "s,%OOO_ARCH_DEP_EXTENSIONS_ARCHS%,$(OOO_ARCH_DEP_EXTENSIONS_ARCHS),g" debian/control
@@ -1785,20 +1768,13 @@ ifneq "$(ENABLE_HELP)" "n"
done
endif
-ifneq "$(BUILD_BINFILTERS)" "y"
- # somewhow there's a libreoffice-filter-binfilter here even when binfilter disabled.
- # go sure.
- rm -rf debian/tmp/pkg/libreoffice-filter-binfilter/usr/share/applications
-endif
-
dh_installdirs -A
dh_install -A --sourcedir=debian/tmp/pkg --fail-missing
rm -rf debian/tmp/pkg
# move desktop files to their correct packages
- for i in base calc draw impress math writer binfilter; do \
- if [ "$$i" = "binfilter" ]; then j=filter-binfilter; else j=$$i; fi; \
+ for i in base calc draw impress math writer; do \
mkdir -p $(PKGDIR)-$$j/$(OODIR)/share/xdg; \
mv $(PKGDIR)-common/$(OODIR)/share/xdg/$$i.desktop \
$(PKGDIR)-$$j/$(OODIR)/share/xdg; \
@@ -2929,7 +2905,6 @@ endif
-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
-V'java-gcj-depends=$(JAVA_GCJ_DEPENDS)' \
-V'Binary-Version=$(BINARY_VERSION)' \
- -V'ooo-binfilter-dep=$(OOO_BINFILTER_DEP)' \
-V'ooo-officebean-dep=$(OOO_OFFICEBEAN_DEP)' \
-V'kde-iconset-dep=$(KDE_ICONSET_DEP)' \
-V'lpsolve-dep=$(LPSOLVE_DEP)' \
@@ -3070,7 +3045,6 @@ endif
-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
-V'textcat-data-recommends=$(TEXTCAT_DATA_RECOMMENDS)' \
-V'Binary-Version=$(BINARY_VERSION)' \
- -V'ooo-binfilter-dep=$(OOO_BINFILTER_DEP)' \
-V'dbg-dbg-suggests=$(DBG_DBG_SUGGESTS)' \
-v$(BINARY_VERSION)
ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
@@ -3144,7 +3118,7 @@ $(call get_orig_tarball,-%):
$(call pack_gittarball,$*,$@,libreoffice-$(DEB_VERSION_UPSTREAM)/$*)
# Get upstream external sources
-$(call get_orig_tarball,-src): binfilter/no_localization dictionaries/en/README.txt helpcontent2/makefile.pmk translations/makefile.mk .gitignore
+$(call get_orig_tarball,-src): dictionaries/en/README.txt helpcontent2/makefile.pmk translations/makefile.mk .gitignore
dh_testdir
rm -rf $(TARFIILE_LOCATION)
mkdir -p $(TARFILE_LOCATION)
@@ -3156,9 +3130,6 @@ $(call get_orig_tarball,-src): binfilter/no_localization dictionaries/en/README.
.gitignore: $(call get_orig_tarball)
$(call unpack_gittarball,,$<,--strip-components=1)
-binfilter/no_localization: $(call get_orig_tarball,-binfilter)
- $(call unpack_gittarball,binfilter,$<,)
-
dictionaries/en/README.txt: $(call get_orig_tarball,-dictionaries)
$(call unpack_gittarball,dictionaries,$<,)
diff --git a/scripts/gid2pkgdirs.sh b/scripts/gid2pkgdirs.sh
index ef8c991..336f765 100755
--- a/scripts/gid2pkgdirs.sh
+++ b/scripts/gid2pkgdirs.sh
@@ -67,7 +67,6 @@ mv ./usr/share/mimelnk/application/* \
for i in ./usr/share/applications/*.desktop; do \
if [ "`basename $i`" = "libreoffice-startcenter.desktop" ]; then p=libreoffice-common; \
elif [ "`basename $i`" = "libreoffice-xsltfilter.desktop" ]; then p=libreoffice-common; \
- elif [ "`basename $i`" = "libreoffice-binfilter.desktop" ]; then p=libreoffice-filter-binfilter; else \
p=`basename $i .desktop`; fi
mkdir -p pkg/$p/usr/share/applications
mv $i \
@@ -85,7 +84,6 @@ create_package_directory gid_Module_Root_Files_Images pkg/libreoffice-
create_package_directory gid_Module_Oo_Linguistic pkg/libreoffice-common
create_package_directory gid_Module_Optional_Xsltfiltersamples pkg/libreoffice-common
create_package_directory gid_Module_Optional_Javafilter pkg/libreoffice-common
-create_package_directory gid_Module_Optional_Binfilter pkg/libreoffice-filter-binfilter
create_package_directory gid_Module_Optional_Grfflt pkg/libreoffice-draw
create_package_directory gid_Module_Prg_Calc_Bin pkg/libreoffice-calc
create_package_directory gid_Module_Prg_Math_Bin pkg/libreoffice-math
@@ -139,13 +137,6 @@ for l in `echo $OOO_LANGS_LIST`; do
if [ -f gid_Module_Helppack_Help_`echo $l | sed -e s/-/_/g` ]; then
create_package_directory gid_Module_Helppack_Help_`echo $l | sed -e s/-/_/g` pkg/libreoffice-help-$l
fi
- if [ -f gid_Module_Optional_Binfilter ]; then
- if [ "$l" = "en-US" ]; then
- create_package_directory gid_Module_Langpack_Binfilter_en_US pkg/libreoffice-filter-binfilter
- else
- create_package_directory gid_Module_Langpack_Binfilter_`echo $l | sed -e s/-/_/g` pkg/libreoffice-l10n-$l
- fi
- fi
# some help files are in _Langpack_{Writer,Impress,...}_<lang>
# move them from -l10n to -help
if [ "$l" = "en-US" ]; then d=en; else d=$l; fi
--
LibreOffice packaging repository
Reply to: