[SCM] UNNAMED PROJECT branch, master, updated. debian/2.0.5.0-1+090318-4-7-ga127cff

[Steffen Moeller]

The following commit has been merged in the master branch:
commit a127cffa6a8f8c5bfa80eee7fe4f73b0cbed24ad
Author: Steffen Moeller <moeller at debian.org>
Date:   Mon Jul 19 01:50:11 2010 +0200

    build_qcad.sh was helped.

diff --git a/debian/patches/build_qcad.sh.patch b/debian/patches/build_qcad.sh.patch
new file mode 100644
index 0000000..67381ec
--- /dev/null
+++ b/debian/patches/build_qcad.sh.patch
@@ -0,0 +1,130 @@
+Index: qcad/scripts/build_qcad.sh
+===================================================================
+--- qcad.orig/scripts/build_qcad.sh	2010-07-19 01:39:17.000000000 +0200
++++ qcad/scripts/build_qcad.sh	2010-07-19 01:48:42.000000000 +0200
+@@ -1,6 +1,9 @@
+ #!/bin/bash
+ # $Id: build_qcad.sh 2488 2005-07-20 08:33:25Z andrew $
+ 
++# The build process shall start from this directory
++root=$(dirname $0)/..
++
+ echo "build_qcad.sh"
+ echo "Usage: ./build_qcad.sh [options]"
+ echo "options:"
+@@ -150,7 +153,8 @@
+ 
+ echo "QMAKE_OPT: $QMAKE_OPT"
+ 
+-cd ..
++cd "$root"
++root=$(pwd)
+ 
+ echo "-------- Building fparser --------"
+ cd fparser
+@@ -159,7 +163,8 @@
+     ./configure
+ fi
+ eval $MAKE
+-cd ..
++
++cd "$root"
+ 
+ if [ ! -f fparser/lib/libfparser.a ]
+ then
+@@ -174,8 +179,8 @@
+     ./configure
+ fi
+ eval $MAKE
+-cd ..
+ 
++cd "$root"
+ if [ ! -f dxflib/lib/libdxf.a ]
+ then
+     echo "Building libdxf.a failed"
+@@ -205,8 +210,7 @@
+     if [ -d $p ]
+     then
+         echo "-------- Building $p --------"
+-        cd $p
+-        cd src
++        cd "$root"/$p/src
+         qmake $p.pro $QMAKE_OPT
+         if [ "x$platform" == "xwin32" ]
+         then
+@@ -214,10 +218,11 @@
+             sed "s/ \// \\\\/g" tmp2 > tmp3
+             mv tmp3 Makefile
+         fi
+-        cd ..
++
++        cd "$root"/$p
+         eval $MAKE
+-        cd ..
+ 
++        cd "$root"
+         if [ ! -f $p/lib/*.a ]
+         then
+             echo "Building $p failed"
+@@ -227,8 +232,7 @@
+ done
+ 
+ echo "-------- Building QCad --------"
+-cd qcad
+-cd src
++cd "$root"/qcad/src
+ qmake qcad.pro $QMAKE_OPT
+ if [ "x$platform" == "xwin32" ]
+ then
+@@ -238,28 +242,27 @@
+     sed "s/\/\"\"/\\\\\"\"/g" tmp2 > tmp3
+     mv tmp3 Makefile
+ fi
+-cd ..
+-
+ 
++cd "$root"/qcad
+ eval $MAKE
+-cd ..
+ 
++cd "$root"
+ if [ -z $notrans ]
+ then
+     echo "-------- Building Translations --------"
+-    cd scripts
++    cd "$root"/scripts
+     bash ./release_translations.sh
+ fi
+ 
+ if [ "x$platform" == "xosx" ]
+ then
+-    if [ ! -d ../qcad/$target.app ]
++    if [ ! -d "$root"/qcad/$target.app ]
+     then
+         echo "Building qcad binary failed"
+         exit;
+     fi
+ else
+-    if [ ! -f ../qcad/$target ]
++    if [ ! -f "$root"/qcad/$target ]
+     then
+         echo "Building qcad binary failed"
+         exit;
+@@ -267,9 +270,9 @@
+ fi
+ 
+ # create mac .app folder:
+-cd ./qcad
+ if [ "x$platform" == "xosx" ]
+ then
++    cd "$root"/qcad
+     if [ -d $target.app ]
+     then
+         echo Preparing Application Folder for $target
+@@ -305,6 +308,4 @@
+     fi
+ fi
+ 
+-#cd scripts
+-#bash ./release_translations.sh
+ 

-- 
UNNAMED PROJECT