[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.2-1-9-g967e161

["Rene Engelhard" <rene@debian.org>]

The following commit has been merged in the master branch:
commit a59140c5a3fe65b8ba262c040d81c7fa93dc3dc5
Author: Rene Engelhard <rene@debian.org>
Date:   Sat Apr 7 00:25:19 2012 +0200

    build-depends on libqt4-dev (>= 4.8) if SYSTEM_GCC_VERSION is 4.7...

diff --git a/changelog b/changelog
index d28891c..d457667 100644
--- a/changelog
+++ b/changelog
@@ -13,6 +13,7 @@ libreoffice (1:3.5.2-2) UNRELEASED; urgency=low
     - strip ure from uno-libs3.substvars again after the .symbols change
       (closes: #667465)
     - remove hack to use same gcc version as gcj version again
+    - build-depends on libqt4-dev (>= 4.8) if SYSTEM_GCC_VERSION is 4.7...
   * debian/libreoffice-core.preinst.in: silence rmdir 
   * debian/rules, debian/control.in, debian/*.triggers.in,
     debian/scripts/gid2pkgdirs.sh: split script-provider-for-python out of
@@ -21,7 +22,7 @@ libreoffice (1:3.5.2-2) UNRELEASED; urgency=low
     - build-conflict against
       gcc (>= 4.7~) [!i386 !amd64], g++ (>= 4.7~) [!i386 !amd64]
 
- -- Rene Engelhard <rene@debian.org>  Fri, 06 Apr 2012 16:02:58 +0200
+ -- Rene Engelhard <rene@debian.org>  Fri, 06 Apr 2012 22:24:47 +0200
 
 libreoffice (1:3.5.2-1) unstable; urgency=low
 
diff --git a/rules b/rules
index 2c317cb..803a9bc 100755
--- a/rules
+++ b/rules
@@ -156,7 +156,11 @@ CAIRO_FONTS_PATCH=y
 BUILD_KDE=y
 # not ported to KDE 4
 ENABLE_KDEAB=n
+ifeq "$(SYSTEM_GCC_VERSION)" "4.7"
+QT_MINVER= (>= 4.8)
+else
 QT_MINVER= (>= 4.5)
+endif
 KDELIBS_MINVER= (>= 4:4.3.4)
 BUILD_DBG_PACKAGE=y
 ifeq "$(BUILD_DBG_PACKAGE)" "y"

-- 
LibreOffice packaging repository