./packages/openofficeorg/3.1.1/unstable r1781: only build-depend on (gcc-)mingw32 when we actually enable the SDK

[Rene Engelhard <rene@debian.org>]

------------------------------------------------------------
revno: 1781
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Sat 2009-12-12 11:58:06 +0100
message:
  only build-depend on (gcc-)mingw32 when we actually enable the SDK
modified:
  changelog
  rules

=== modified file 'changelog'
--- a/changelog	2009-12-09 10:56:45 +0000
+++ b/changelog	2009-12-12 10:58:06 +0000
@@ -1,3 +1,10 @@
+openoffice.org (1:3.1.1-10) UNRELEASED; urgency=low
+
+  * debian/rules:
+    - only build-depend on (gcc-)mingw32 when we actually enable the SDK
+
+ -- Rene Engelhard <rene@debian.org>  Sat, 12 Dec 2009 11:56:16 +0100
+
 openoffice.org (1:3.1.1-9) unstable; urgency=low
 
   * ooo-build

=== modified file 'rules'
--- a/rules	2009-12-08 23:28:36 +0000
+++ b/rules	2009-12-12 10:58:06 +0000
@@ -718,17 +718,19 @@
 	BUILD_DEPS += , libsaxonb-java [$(OOO_JAVA_ARCHS)]
 	JAVA_COMMON_JAVA_DEPENDS+= , libsaxonb-java
   endif
-  ifeq "$(DIST)" "Debian"
-    ifeq "$(shell gcc --version | head -n 1 | awk '{print $$4}' | cut -d. -f1,2)" "4.4"
+  ifeq "$(PACKAGE_SDK)" "y"
+    ifeq "$(DIST)" "Debian"
+      ifeq "$(shell gcc --version | head -n 1 | awk '{print $$4}' | cut -d. -f1,2)" "4.4"
 	BUILD_DEPS += , gcc-mingw32 [$(OOO_JAVA_ARCHS)]
-    else
-      ifeq "$(GCC_VERSION)" "4.4"
-        BUILD_DEPS += , gcc-mingw32 [$(OOO_JAVA_ARCHS)]
       else
-	BUILD_DEPS += , mingw32 [$(OOO_JAVA_ARCHS)]
+        ifeq "$(GCC_VERSION)" "4.4"
+          BUILD_DEPS += , gcc-mingw32 [$(OOO_JAVA_ARCHS)]
+        else
+	  BUILD_DEPS += , mingw32 [$(OOO_JAVA_ARCHS)]
+        endif
       endif
+	  CONFIGURE_FLAGS += --with-mingwin=i586-mingw32msvc-g++
     endif
-	CONFIGURE_FLAGS += --with-mingwin=i586-mingw32msvc-g++
   endif
   ifeq "$(ENABLE_MEDIAWIKI)" "y"
 	CONFIGURE_FLAGS += --enable-wiki-publisher