[SCM] LibreOffice packaging repository branch, ubuntu-quantal-3.6, updated. libreoffice_3.5.4-5-143-g4d4f4d6

["Bjoern Michaelsen" <bjoern.michaelsen@canonical.com>]

The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 550a0a74024c23aede98f37d37fe0665260f24f4
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Tue Jun 12 00:31:50 2012 +0200

    update changelog

diff --git a/changelog b/changelog
index eeb5045..4b1b933 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.michaelsen@canonical.com>  Fri, 08 Jun 2012 10:35:34 +0200
+ -- Bjoern Michaelsen <bjoern.michaelsen@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 ae5483d..3e7af59 100755
--- a/rules
+++ b/rules
@@ -515,6 +515,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