[SCM] LibreOffice packaging repository branch, ubuntu-quantal-3.6, updated. libreoffice_3.5.4-5-163-ged06f67
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 99c0770a6c5033f39649716f353cdefdf55b9379
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Jul 19 08:57:11 2012 +0200
remove build-conflict against gcc 4.7, temp. disable subsequentcheck
diff --git a/changelog b/changelog
index 9897005..d1c2c7b 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:3.6.0~rc2-0ubuntu2) quantal; urgency=low
+
+ * remove build-conflict against gcc-4.7
+ * disable subsequentcheck for this (first) upload
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 19 Jul 2012 09:05:15 +0200
+
libreoffice (1:3.6.0~rc2-0ubuntu1) quantal; urgency=low
* new upstream rc
diff --git a/control.in b/control.in
index 93b571d..ca53bd3 100644
--- a/control.in
+++ b/control.in
@@ -40,7 +40,7 @@ Build-Depends: dpkg-dev (>= 1.16.1),
wget | curl
%BUILD_DEPS%
Build-Depends-Indep: fdupes, xml-core, imagemagick %BUILD_DEPS_INDEP%
-Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386 amd64], libc6-dev (= 2.6.1-4) [i386 amd64], libc0.1-dev (= 2.13-26) [kfreebsd-i386 kfreebsd-amd64], nvidia-glx-dev, nvidia-glx-legacy-dev, gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<< 1.3.9~), qt3-dev-tools, 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%], g++-4.6 (= 4.6.1-10), g++-4.6 (= 4.6.1-11), gcc (>= 4:4.7~) [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64], g++ (>= 4:4.7~) [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64]
+Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386 amd64], libc6-dev (= 2.6.1-4) [i386 amd64], libc0.1-dev (= 2.13-26) [kfreebsd-i386 kfreebsd-amd64], nvidia-glx-dev, nvidia-glx-legacy-dev, gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<< 1.3.9~), qt3-dev-tools, 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%], g++-4.6 (= 4.6.1-10), g++-4.6 (= 4.6.1-11)
Standards-Version: 3.9.1
XS-Python-Version: @PYTHON_VERSION@
Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git
diff --git a/rules b/rules
index 5ff49c8..6cc5675 100755
--- a/rules
+++ b/rules
@@ -1660,7 +1660,7 @@ endif
export HOME=$$t; \
export SAL_USE_VCLPLUGIN="svp"; \
if [ -x /usr/bin/gdb ]; then ulimit -c unlimited; fi && \
- $(MAKE) -k check gb_Deliver_HARDLINK=T && \
+ $(MAKE) -k unitcheck slowcheck gb_Deliver_HARDLINK=T && \
rm -rf $$t
ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
patch -p1 -R < $(CURDIR)/debian/patches/disable-db-tests.diff
--
LibreOffice packaging repository
Reply to: