[SCM] Qt 4 packaging branch, master, updated. debian/4.7.2-2-3-g3ab2fa7

Pino Toscano pino-guest at alioth.debian.org
Tue Mar 22 09:33:11 UTC 2011


The following commit has been merged in the master branch:
commit e44300a99636dec09cd956137a5082fa4d2d62dc
Author: Pino Toscano <pino at kde.org>
Date:   Tue Mar 22 10:24:49 2011 +0100

    hppa: change the test directory for readdir from doc/html to doc/src/images
    
    the former is removed in the clean target, so it won't exist when configuring
---
 debian/changelog |    3 +++
 debian/rules     |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c79c03a..0582386 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qt4-x11 (4:4.7.2-3) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Change the directory used for the hppa readdir test from doc/html (which
+    gets removed in clean) to doc/src/images.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 22 Mar 2011 10:21:55 +0100
 
diff --git a/debian/rules b/debian/rules
index fb64e0b..52bf5f6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -62,8 +62,8 @@ ifeq ($(DEB_HOST_ARCH),hppa)
 	mkdir -p debian/hppa-tmp
 	echo "Testing whether getdents kernel bug is present on this buildd - see #433768"
 	gcc -o debian/hppa-tmp/hppa-test-program debian/readdir-hppa-test.c
-	cd $(CURDIR)/doc/html && $(CURDIR)/debian/hppa-tmp/hppa-test-program | sort > $(CURDIR)/debian/hppa-tmp/readdir_r-out
-	cd $(CURDIR)/doc/html && ls -a | sort > $(CURDIR)/debian/hppa-tmp/ls-a-out
+	cd $(CURDIR)/doc/src/images && $(CURDIR)/debian/hppa-tmp/hppa-test-program | sort > $(CURDIR)/debian/hppa-tmp/readdir_r-out
+	cd $(CURDIR)/doc/src/images && ls -a | sort > $(CURDIR)/debian/hppa-tmp/ls-a-out
 	@if ! diff -q $(CURDIR)/debian/hppa-tmp/readdir_r-out $(CURDIR)/debian/hppa-tmp/ls-a-out ; \
 		then \
 		echo "Kernel bug present. This will misbuild qt4 if proceeding. Failing" ; \

-- 
Qt 4 packaging



More information about the pkg-kde-commits mailing list