The following commit has been merged in the debian-experimental-4.0 branch:
commit 7e1986f394b3dd5eb041122ea77545eac2e3024a
Author: Bjoern Michaelsen <[email protected]>
Date: Fri Mar 15 07:14:37 2013 +0100
make -gnome -> -gnome | -kde replacements robust
- e.g. wrap-and-sort or manual changes might move -gnome to the end of a
list
- it has no trailing comma there
- thus guards against a hard to spot possible regression
diff --git a/control.in b/control.in
index 059998c..ba24c2e 100644
--- a/control.in
+++ b/control.in
@@ -89,7 +89,6 @@ Suggests: cups-bsd,
imagemagick | graphicsmagick-imagemagick-compat,
libgl1,
libreoffice-grammarcheck,
- libreoffice-gnome,
libreoffice-help-${help-l10n-virtual-version},
libreoffice-l10n-${help-l10n-virtual-version},
libsane,
@@ -101,7 +100,8 @@ Suggests: cups-bsd,
unixodbc,
${gstreamer-plugins-suggests},
${java-runtime-depends},
- ${ooo-officebean-dep}
+ ${ooo-officebean-dep},
+ %LO-DESKTOP-INTEGRATION%
Description: office productivity suite (metapackage)
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 cc673fd..e53972d 100755
--- a/rules
+++ b/rules
@@ -1478,7 +1478,9 @@ endif
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 "$(BUILD_KDE)" "y"
- perl -pi -e 's/ libreoffice-gnome,/ libreoffice-gnome |
libreoffice-kde,/' debian/control
+ perl -pi -e 's/%LO-DESKTOP-INTEGRATION%/libreoffice$(VER)-gnome |
libreoffice$(VER)-kde/' debian/control
+else
+ perl -pi -e 's/%LO-DESKTOP-INTEGRATION%/libreoffice$(VER)-gnome/'
debian/control
endif
ifeq (sk,$(findstring sk,$(HELPISOS)))
--
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]
