[SCM] marble packaging branch, master, updated. ca3b67f257d4ac46fc11476b80f953f2f1977f7a

[Pino Toscano]

The following commit has been merged in the master branch:
commit ca3b67f257d4ac46fc11476b80f953f2f1977f7a
Author: Pino Toscano <pino at debian.org>
Date:   Wed Nov 16 10:13:17 2011 +0100

    rules: disable opengl on armel only for ubuntu
---
 debian/rules |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index a4e898e..9062715 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,8 +7,12 @@ include /usr/share/pkg-kde-tools/qt-kde-team/2/library-packages.mk
 marble_soversion := $(shell dh_listpackages | sed -n '/^libmarblewidget/{s/^libmarblewidget//p}')
 marble_plugin_path = /usr/lib/kde4/plugins/marble/$(marble_soversion)
 
-ifeq ($(DEB_HOST_ARCH),armel)
-conf_args += -DWITH_OpenGL=OFF
+vendor := $(shell dpkg-vendor --query Vendor)
+
+ifeq ($(vendor),Ubuntu)
+  ifeq ($(DEB_HOST_ARCH),armel)
+    conf_args += -DWITH_OpenGL=OFF
+  endif
 endif
 
 override_dh_auto_configure:

-- 
marble packaging