The following commit has been merged in the debian-experimental-4.0 branch:
commit 2f0a77543e8ec7e0995530f2fd388eba4373d2b3
Author: Bjoern Michaelsen <[email protected]>
Date: Wed Mar 6 18:29:26 2013 +0100
better sed in -kde after all parts of control.in are assembled
diff --git a/rules b/rules
index 8d0c7ab..703a1ec 100755
--- a/rules
+++ b/rules
@@ -1466,7 +1466,6 @@ endif
ifeq "$(BUILD_KDE)" "y"
sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
>> debian/control < debian/control.kde.in
- perl -pi -e 's/ libreoffice$(VER)-gnome,/ libreoffice-gnome |
libreoffice$(VER)-kde,/' debian/control
endif
ifeq "$(ENABLE_SDBC_POSTGRESQL)" "y"
sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
@@ -1500,6 +1499,9 @@ endif
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 "$(BUILD_KDE)" "y"
+ perl -pi -e 's/ libreoffice$(VER)-gnome,/ libreoffice$(VER)-gnome |
libreoffice$(VER)-kde,/' debian/control
+endif
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]
