[SCM] Debian packaging for openturns www.openturns.org branch, debian, updated. debian/1.1-8

Denis Barbier bouzim at gmail.com
Mon Jul 15 18:40:08 UTC 2013


The following commit has been merged in the debian branch:
commit e48bca3b2af79b1c67d179b7f941890a0e55ad51
Author: Denis Barbier <bouzim at gmail.com>
Date:   Fri Jul 5 18:08:10 2013 +0200

    Fix building source package on *-i386
    
    There was trouble with debian/patches/modify-tests-O0-i386.patch,
    it must be unapplied only if had previously been applied.

diff --git a/debian/rules b/debian/rules
index f82a68c..1b4b61f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,10 +53,12 @@ debian/tmp/usr/lib/R/site-library/rot:
 ifneq (,$(findstring $(shell dpkg-architecture -qDEB_HOST_ARCH), i386 kfreebsd-i386 hurd-i386))
 override_dh_quilt_patch:
 	dh_quilt_patch
-	patch -p1 < debian/patches/modify-tests-O0-i386.patch
+	test -e debian/patches/modify-tests-O0-i386.applied || patch -p1 < debian/patches/modify-tests-O0-i386.patch
+	touch debian/patches/modify-tests-O0-i386.applied
 
 override_dh_quilt_unpatch:
-	patch -R -p1 < debian/patches/modify-tests-O0-i386.patch
+	test ! -e debian/patches/modify-tests-O0-i386.applied || patch -R -p1 < debian/patches/modify-tests-O0-i386.patch
+	-rm -f debian/patches/modify-tests-O0-i386.applied
 	dh_quilt_unpatch
 endif
 

-- 
Debian packaging for openturns www.openturns.org



More information about the debian-science-commits mailing list