[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_4.0.1_rc1-2-189-gf46c184
The following commit has been merged in the ubuntu-raring-4.0 branch:
commit bf432fd0c3f3f28f63fa2e37d53e326cb56021a7
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Wed Mar 6 18:58:20 2013 +0100
fixing sed logic for missing trailing comma, wrap-and-sort again
diff --git a/control.in b/control.in
index 310bfaf..1ea5023 100644
--- a/control.in
+++ b/control.in
@@ -4,8 +4,7 @@ Priority: optional
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
XSBC-Original-Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <rene@debian.org>
-Build-Depends: %BUILD_DEPS%,
- autoconf,
+Build-Depends: autoconf,
automake,
bc,
bison,
@@ -34,8 +33,9 @@ Build-Depends: %BUILD_DEPS%,
x11proto-render-dev,
xsltproc,
zip,
- zlib1g-dev
-Build-Depends-Indep: %BUILD_DEPS_INDEP%, fdupes, imagemagick, xml-core
+ zlib1g-dev,
+ %BUILD_DEPS%
+Build-Depends-Indep: fdupes, imagemagick, xml-core, %BUILD_DEPS_INDEP%
Build-Conflicts: ant (= 1.8.0-1) [%OOO_GCJ_JDK_ARCHS%],
ant (= 1.8.0-2) [%OOO_GCJ_JDK_ARCHS%],
ant (= 1.8.0-3) [%OOO_GCJ_JDK_ARCHS%],
@@ -80,7 +80,7 @@ Depends: libreofficeVER-base%OOO_NO_BASE_ARCHS%,
${pyuno-depends}
Recommends: fonts-liberation | ttf-mscorefonts-installer,
libpaper-utils,
- libreoffice-gnome
+ %LO-DESKTOP-INTEGRATION%
Suggests: cups-bsd,
fonts-sil-gentium-basic,
hunspell-dictionary,
@@ -90,7 +90,6 @@ Suggests: cups-bsd,
libgl1,
libreoffice-grammarcheck,
libreofficeVER-filter-mobiledev,
- libreofficeVER-gnome,
libreofficeVER-help-${help-l10n-virtual-version},
libreofficeVER-l10n-${help-l10n-virtual-version},
libsane,
@@ -786,3 +785,4 @@ Description: PDF Import component for LibreOffice
.
This package contains a component enabling LibreOffice to import PDF
Documents.
+
diff --git a/control.subsequentcheckbase.in b/control.subsequentcheckbase.in
index 1fa6c08..d875cf7 100644
--- a/control.subsequentcheckbase.in
+++ b/control.subsequentcheckbase.in
@@ -2,7 +2,7 @@ Package: libreofficeVER-subsequentcheckbase
Section: libs
Priority: extra
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, libreofficeVER
+Depends: libreofficeVER, ${misc:Depends}, ${shlibs:Depends}
Description: LibreOffice java test libraries
LibreOffice subsequentchecks integration test suite
diff --git a/rules b/rules
index 49d9c25..ee1eb23 100755
--- a/rules
+++ b/rules
@@ -1495,7 +1495,9 @@ 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
+ 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 "$(ENABLE_SDBC_POSTGRESQL)" "y"
sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
--
LibreOffice packaging repository
Reply to: