The following commit has been merged in the master branch:
commit 387bca918a29321cdefa9833797e617960aa622a
Author: Rene Engelhard <[email protected]>
Date: Mon Nov 21 22:35:35 2011 +0000
remove depends on -report-builder-bin in libreoffice if not built...
diff --git a/changelog b/changelog
index 4fdca65..00c3043 100644
--- a/changelog
+++ b/changelog
@@ -14,7 +14,7 @@ libreoffice (1:3.4.4-2) UNRELEASED; urgency=medium
* debian/rules, debian/control.fonts.in:
- rename ttf-opensymbol to fonts-opensymbol
- -- Rene Engelhard <[email protected]> Sun, 20 Nov 2011 13:11:02 +0000
+ -- Rene Engelhard <[email protected]> Mon, 21 Nov 2011 22:35:03 +0000
libreoffice (1:3.4.4-1) unstable; urgency=low
diff --git a/control b/control
index 82f048d..4e21716 100644
--- a/control
+++ b/control
@@ -15,7 +15,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
-Depends: libreoffice-core (= ${binary:Version}), libreoffice-writer,
libreoffice-calc, libreoffice-impress, libreoffice-draw, libreoffice-math,
libreoffice-base [!armel], libreoffice-report-builder-bin [!armel], 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], libreoffice-report-builder-bin [!armel !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, 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
diff --git a/control.in b/control.in
index c47c89a..d009162 100644
--- a/control.in
+++ b/control.in
@@ -62,7 +62,7 @@ Depends: libreofficeVER-core (= ${binary:Version}),
libreofficeVER-draw,
libreofficeVER-math,
libreofficeVER-base%OOO_NO_BASE_ARCHS%,
- libreofficeVER-report-builder-bin%OOO_NO_BASE_ARCHS%,
+ libreofficeVER-report-builder-bin%OOO_NO_REPORTDESIGN_ARCHS%,
ttf-dejavu,
ttf-sil-gentium-basic,
libreofficeVER-filter-mobiledev,
diff --git a/rules b/rules
index d518721..bcfe8dd 100755
--- a/rules
+++ b/rules
@@ -1587,6 +1587,7 @@ endif
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
perl -pi -e "s,%OOO_REPORTDESIGN_ARCHS%,$(OOO_REPORTDESIGN_ARCHS),g"
debian/control
+ perl -pi -e
"s,%OOO_NO_REPORTDESIGN_ARCHS%,$(OOO_NO_REPORTDESIGN_ARCHS),g" debian/control
ifeq (sk,$(findstring sk,$(HELPISOS)))
perl -pi -e
's/(Depends:.*)libreoffice-l10n-sk(.*)$$/\1libreoffice-l10n-sk,
libreoffice-help-cs\2/' debian/control
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
