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

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 14459b22aa77582734402ffa0ae24b0221fab8bc
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Jul 18 17:35:13 2010 +0200

    cleaning files: only clean what is existing
    
    The packaging was working around an upstream bug.

diff --git a/debian/patches/qcadlib_makefile.patch b/debian/patches/qcadlib_makefile.patch
new file mode 100644
index 0000000..52213ad
--- /dev/null
+++ b/debian/patches/qcadlib_makefile.patch
@@ -0,0 +1,59 @@
+Index: qcad/qcadlib/Makefile
+===================================================================
+--- qcad.orig/qcadlib/Makefile	2010-07-18 17:16:30.000000000 +0200
++++ qcad/qcadlib/Makefile	2010-07-18 17:23:52.000000000 +0200
+@@ -22,7 +22,7 @@
+ 
+ prepare:
+ 	test -d ./include || mkdir -p ./include
+-	-( cd ./include; rm -f *.h; \
++	-( cd ./include && find . -name "*.h" | xargs -r rm  && \
+ 	for hf in `find ../src -name '*.h'`; do \
+ 		if [ "x$$OS" = "xWindows_NT" ]; then \
+ 			cp "$$hf" .; \
+@@ -57,16 +57,16 @@
+ 	-(doxygen ./doxygen.cfg)
+ 
+ statistics:
+-	@echo "Lines in source files:"
++	@echo -n "Lines in source files:"
+ 	-find -name *.cpp | xargs cat | wc
+-	@echo "Lines in header files:"
++	@echo -n "Lines in header files:"
+ 	-find -name *.h | xargs cat | wc
+ 
+ indent:
+-	-find . -name "*.cpp" | xargs astyle --style=kr
+-	-find . -name "*.h" | xargs astyle --style=kr
+-	-find . -name "*.h.orig" | xargs rm
+-	-find . -name "*.cpp.orig" | xargs rm
++	-find . -name "*.cpp" | xargs -r astyle --style=kr
++	-find . -name "*.h" | xargs -r astyle --style=kr
++	-find . -name "*.h.orig" | xargs -r rm
++	-find . -name "*.cpp.orig" | xargs -r rm
+ 
+ dist:	clean
+ 	-rm -d ../doc/classref/html/en/*
+Index: qcad/make_dist.sh
+===================================================================
+--- qcad.orig/make_dist.sh	2010-07-18 17:24:14.000000000 +0200
++++ qcad/make_dist.sh	2010-07-18 17:27:33.000000000 +0200
+@@ -4,11 +4,12 @@
+ 
+ for i in $dirs
+ do
+-	cd $i
+-	make clean
+-	cd ..
++	make -C $i clean
+ done
+ 
+-for i in $(find -name '*.qm') ; do rm -rf $i ; done
+-for i in $(find -name '*.a') ; do rm -rf $i ; done
+-rm */include/*
++find -name '*.qm' | xargs -r rm -rf 
++find -name '*.a' | xargs -r rm -rf
++for i in */include
++do
++	rm -f $i/*
++done
diff --git a/debian/patches/series b/debian/patches/series
index bca776c..58f9df7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+qcadlib_makefile.patch
 invoke-release-translations-with-bash.patch
 # define-qmakespecs-on-makefiles.patch
 bug#234340.patch
diff --git a/debian/rules b/debian/rules
index 2413b22..523303b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,9 +13,6 @@ override_dh_auto_configure:
 override_dh_auto_clean:
 	dh_auto_clean
 
-	touch ./dxflib/include/DELETE.ME
-	# touching because make_dist.sh will fail if there is nothing to delete in */include/*
-	# upstream should use:  find . \( -name '*.a' -o -name '*.qm' -o -type l \) -exec rm -f {} \;
 	sh make_dist.sh
 
 	# patch-system-but-direct-changes-in-diff

-- 
UNNAMED PROJECT