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

[Steffen Moeller]

The following commit has been merged in the master branch:
commit c86d64970137ef65089697c6393dfc6ace26225f
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Jul 18 18:45:09 2010 +0200

    patches to address problems of upstream scripts

diff --git a/debian/patches/help_security_of_build_scripts.patch b/debian/patches/help_security_of_build_scripts.patch
new file mode 100644
index 0000000..fe6313c
--- /dev/null
+++ b/debian/patches/help_security_of_build_scripts.patch
@@ -0,0 +1,37 @@
+Index: qcad/qcad/build.sh
+===================================================================
+--- qcad.orig/qcad/build.sh	2010-07-18 18:12:42.000000000 +0200
++++ qcad/qcad/build.sh	2010-07-18 18:16:52.000000000 +0200
+@@ -1,7 +1,6 @@
+ #! /bin/sh
+ 
+-rm debug_*.log
+-rm debug_*.html
++find . -name 'debug_*.log' -o -name 'debug_*.html' | xargs -r rm
+ 
+ #export QTDIR=/usr/lib/qt3
+ #export QTDIR=/opt/qt
+@@ -16,17 +15,17 @@
+ start=`date`
+ 
+ echo "--------------------------------------------------------------- dxflib"
+-cd $base/dxflib
+-make
++make -C $base/dxflib
+ #make install
+ 
+ for pro in qcadlib qcadcmd qcadcam qcadactions qcadguiqt qcadscripting
+ do
+ 	echo "--------------------------------------------------------------- $pro"
+-	cd $base/$pro/src
+-	$QTDIR/bin/qmake ./$pro.pro -o ./Makefile
+-	make staticlib
+-	cd ..
++	(
++		cd $base/$pro/src ;
++		$QTDIR/bin/qmake ./$pro.pro -o ./Makefile ;
++		make staticlib
++	)
+ 	#make install
+ done
+ 
diff --git a/debian/patches/release_translations_qm_dir.patch b/debian/patches/release_translations_qm_dir.patch
new file mode 100644
index 0000000..b5892d1
--- /dev/null
+++ b/debian/patches/release_translations_qm_dir.patch
@@ -0,0 +1,45 @@
+Index: qcad/scripts/release_translations.sh
+===================================================================
+--- qcad.orig/scripts/release_translations.sh	2010-07-18 18:25:58.000000000 +0200
++++ qcad/scripts/release_translations.sh	2010-07-18 18:38:17.000000000 +0200
+@@ -2,22 +2,28 @@
+ cd ..
+ cwd=`pwd`
+ 
++if [ ! -d "$cwd"/qcad/qm ]; then
++	echo "Creating target directory for .qm files."
++	mkdir -p "$cwd"/qcad/qm
++fi
++
+ for dir in qcad qcadactions qcadguiqt qcadcmd qcadlib         
+ do
+-	pushd $dir/src
++	if [ ! -d "$dir"/src ]; then continue; fi
++	pushd "$dir"/src
+ 	echo "running lrelease in $dir/src..."
+-	find -type f -name '*.ts' -exec $QTDIR/bin/lrelease '{}' \;
+-	find -type f -name '*.pro' -exec $QTDIR/bin/lrelease '{}' \;
++	find -type f -name '*.ts' -exec "$QTDIR"/bin/lrelease '{}' \;
++	find -type f -name '*.pro' -exec "$QTDIR"/bin/lrelease '{}' \;
+ 	popd
+ 	
+-	pushd $dir/src/ts
+-		echo "copying from $dir/src/ts..."
+-		for tf in *.qm
+-		do
+-			if [ ! -e $cwd/qcad/qm/$tf ]
+-			then
+-				cp $cwd/$dir/src/ts/$tf $cwd/qcad/qm/$tf
+-			fi
+-		done
++	pushd "$dir"/src/ts
++	echo "copying from $dir/src/ts..."
++	for tf in *.qm
++	do
++		if [ ! -e "$cwd"/qcad/qm/"$tf" ]
++		then
++			cp "$cwd"/"$dir"/src/ts/"$tf" "$cwd"/qcad/qm/"$tf"
++		fi
++	done
+ 	popd
+ done
diff --git a/debian/patches/series b/debian/patches/series
index 58f9df7..7b08d21 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,5 @@ bug#370464.patch
 define-debian-paths.patch
 add-hint-about-qcad-doc.patch
 create-about_txt.patch
+help_security_of_build_scripts.patch
+scripts/release_translations_qm_dir.patch

-- 
UNNAMED PROJECT