[ooo-build-commit] bin/unpack patches/dev300

[René Engelhard]

 bin/unpack           |    7 +++++--
 patches/dev300/apply |    2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 5739313064526a269475e095cb2b07fd4c3539c3
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Aug 17 23:27:12 2009 +0200

    the graphite stuff is supposed to me in m56

diff --git a/bin/unpack b/bin/unpack
index d51a799..a7cbcc5 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -347,8 +347,11 @@ fi
 fi
 
 if test "$ENABLE_GRAPHITE" = "TRUE"; then
-    mkdir -p $OOBUILDDIR/graphite/download
-    $GNUCP -af $SRCDIR/$GRAPHITE_SRC $OOBUILDDIR/graphite/download
+  if echo $CVSTAG | grep -q -i dev300 && \
+    test `echo $CVSTAG | cut -d"-" -f2 | sed -e "s/m//"` -lt "56"; then
+      mkdir -p $OOBUILDDIR/graphite/download
+      $GNUCP -af $SRCDIR/$GRAPHITE_SRC $OOBUILDDIR/graphite/download
+  fi
 fi
 
 # Win32 prerequisites ...
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 5113437..4a215d6 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -160,7 +160,7 @@ CrossWin32 : CrossWin32Patches
 ooo-build-resources-sc-sc-hrc.diff, kohei
 ooo-build-resources-svx-dialogs-hrc.diff, kohei
 
-[ GraphiteSupport ]
+[ GraphiteSupport < dev300-m56 ]
 cws-graphite01-20090630.diff, i#69129
 
 [ HelpContent ]