The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 63155da3b6b8a15ab96fdb26f52f0ebba39593b8
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Tue Jun 12 00:31:50 2012 +0200
update changelog
diff --git a/changelog b/changelog
index ffb6c79..1bb57a9 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,9 @@
-libreoffice (1:3.6.0~beta1-0ubuntu2) quantal; urgency=low
+libreoffice (1:3.6.0~beta1-0ubuntu5) quantal; urgency=low
* new upstream beta, rebasing on debian
+ * build against gcc 4.6 (related: lp#1007616)
- -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Fri, 08 Jun 2012
10:35:34 +0200
+ -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Tue, 12 Jun 2012
10:30:33 +0200
libreoffice (1:3.6.0~beta1-1) UNRELEASED; urgency=low
diff --git a/rules b/rules
index 58f7d04..5919e9a 100755
--- a/rules
+++ b/rules
@@ -507,6 +507,9 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
GCJ_JDK_VERSION=4.6
ENABLE_EVO2:=n
PACKAGE_NSPLUGIN:=n
+ ifeq "$(DISTREL)" "quantal"
+ GCC_VERSION=4.6
+ endif
endif
CONFIGURE_FLAGS += $(foreach i, $(SYSTEM_STUFF),--with-system-$(i))
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1sinyx-0005st...@vasks.debian.org
