r1638 - in glibc-package: branches/glibc-2.4/debian branches/glibc-2.4/debian/debhelper.in branches/glibc-2.4/debian/rules.d trunk/debian trunk/debian/rules.d
Author: aurel32
Date: 2006-06-08 09:39:13 +0000 (Thu, 08 Jun 2006)
New Revision: 1638
Removed:
glibc-package/branches/glibc-2.4/debian/debhelper.in/glibc-doc.info
glibc-package/branches/glibc-2.4/debian/debhelper.in/glibc-doc.install
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/rules.d/build.mk
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/rules.d/build.mk
Log:
glibc (2.3.6-15) unstable; urgency=low
* debian/rules.d/build.mk: generate a test log file even if the testsuite
is disabled, too make debhelper 5 happy.
-- Aurelien Jarno <aurel32@debian.org> Thu, 8 Jun 2006 08:02:47 +0200
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-06-07 23:13:30 UTC (rev 1637)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-06-08 09:39:13 UTC (rev 1638)
@@ -135,7 +135,7 @@
-- Aurelien Jarno <aurel32@debian.org> Sun, 28 May 2006 03:28:14 +0200
-glibc (2.3.6-15) UNRELEASED; urgency=low
+glibc (2.3.6-16) UNRELEASED; urgency=low
* Add arm/cvs-gcc4.1-raise.diff (fix build failure with gcc-4.1) from
upstream.
@@ -143,8 +143,15 @@
upstream.
* Build with gcc 4.1 on all architectures but hurd-i386.
- -- Aurelien Jarno <aurel32@debian.org> Thu, 8 Jun 2006 00:51:49 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Thu, 8 Jun 2006 08:03:49 +0200
+glibc (2.3.6-15) unstable; urgency=low
+
+ * debian/rules.d/build.mk: generate a test log file even if the testsuite
+ is disabled, too make debhelper 5 happy.
+
+ -- Aurelien Jarno <aurel32@debian.org> Thu, 8 Jun 2006 08:02:47 +0200
+
glibc (2.3.6-14) unstable; urgency=low
[ Aurelien Jarno ]
Deleted: glibc-package/branches/glibc-2.4/debian/debhelper.in/glibc-doc.info
===================================================================
--- glibc-package/branches/glibc-2.4/debian/debhelper.in/glibc-doc.info 2006-06-07 23:13:30 UTC (rev 1637)
+++ glibc-package/branches/glibc-2.4/debian/debhelper.in/glibc-doc.info 2006-06-08 09:39:13 UTC (rev 1638)
@@ -1 +0,0 @@
-debian/tmp-libc/usr/share/info/libc.info*
Deleted: glibc-package/branches/glibc-2.4/debian/debhelper.in/glibc-doc.install
===================================================================
--- glibc-package/branches/glibc-2.4/debian/debhelper.in/glibc-doc.install 2006-06-07 23:13:30 UTC (rev 1637)
+++ glibc-package/branches/glibc-2.4/debian/debhelper.in/glibc-doc.install 2006-06-08 09:39:13 UTC (rev 1638)
@@ -1,2 +0,0 @@
-DEB_SRCDIR/manual/libc/*.html usr/share/doc/glibc-doc/html
-
Modified: glibc-package/branches/glibc-2.4/debian/rules.d/build.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/rules.d/build.mk 2006-06-07 23:13:30 UTC (rev 1637)
+++ glibc-package/branches/glibc-2.4/debian/rules.d/build.mk 2006-06-08 09:39:13 UTC (rev 1638)
@@ -82,13 +82,17 @@
$(stamp)check_%: $(stamp)build_%
if [ -n "$(findstring nocheck,$(DEB_BUILD_OPTIONS))" ]; then \
echo "DEB_BUILD_OPTIONS contains nocheck, skipping tests."; \
+ echo "Tests have been disabled via DEB_BUILD_OPTIONS." > $(log_test) ; \
elif [ $(call xx,configure_build) != $(call xx,configure_target) ] && \
! $(DEB_BUILDDIR)/libc.so >/dev/null 2>&1 ; then \
echo "Cross compiling, skipping tests."; \
+ echo "Flavour cross-compiled, tests have been skipped." > $(log_test) ; \
elif ! $(call kernel_check,$(call xx,MIN_KERNEL_SUPPORTED)); then \
echo "Kernel too old, skipping tests."; \
+ echo "Kernel too old, tests have been skipped." > $(log_test) ; \
elif [ $(call xx,RUN_TESTSUITE) != "yes" ]; then \
echo "Testsuite disabled for $(curpass), skipping tests."; \
+ echo "Tests have been disabled." > $(log_test) ; \
else \
echo Testing $(curpass); \
echo -n "Testsuite started: " | tee -a $(log_test); \
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-06-07 23:13:30 UTC (rev 1637)
+++ glibc-package/trunk/debian/changelog 2006-06-08 09:39:13 UTC (rev 1638)
@@ -1,4 +1,4 @@
-glibc (2.3.6-15) UNRELEASED; urgency=low
+glibc (2.3.6-16) UNRELEASED; urgency=low
* Add arm/cvs-gcc4.1-raise.diff (fix build failure with gcc-4.1) from
upstream.
@@ -6,8 +6,15 @@
upstream.
* Build with gcc 4.1 on all architectures but hurd-i386.
- -- Aurelien Jarno <aurel32@debian.org> Thu, 8 Jun 2006 00:51:49 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Thu, 8 Jun 2006 08:03:49 +0200
+glibc (2.3.6-15) unstable; urgency=low
+
+ * debian/rules.d/build.mk: generate a test log file even if the testsuite
+ is disabled, too make debhelper 5 happy.
+
+ -- Aurelien Jarno <aurel32@debian.org> Thu, 8 Jun 2006 08:02:47 +0200
+
glibc (2.3.6-14) unstable; urgency=low
[ Aurelien Jarno ]
Modified: glibc-package/trunk/debian/rules.d/build.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/build.mk 2006-06-07 23:13:30 UTC (rev 1637)
+++ glibc-package/trunk/debian/rules.d/build.mk 2006-06-08 09:39:13 UTC (rev 1638)
@@ -81,13 +81,17 @@
$(stamp)check_%: $(stamp)build_%
if [ -n "$(findstring nocheck,$(DEB_BUILD_OPTIONS))" ]; then \
echo "DEB_BUILD_OPTIONS contains nocheck, skipping tests."; \
+ echo "Tests have been disabled via DEB_BUILD_OPTIONS." > $(log_test) ; \
elif [ $(call xx,configure_build) != $(call xx,configure_target) ] && \
! $(DEB_BUILDDIR)/libc.so >/dev/null 2>&1 ; then \
echo "Cross compiling, skipping tests."; \
+ echo "Flavour cross-compiled, tests have been skipped." > $(log_test) ; \
elif ! $(call kernel_check,$(call xx,MIN_KERNEL_SUPPORTED)); then \
echo "Kernel too old, skipping tests."; \
+ echo "Kernel too old, tests have been skipped." > $(log_test) ; \
elif [ $(call xx,RUN_TESTSUITE) != "yes" ]; then \
echo "Testsuite disabled for $(curpass), skipping tests."; \
+ echo "Tests have been disabled." > $(log_test) ; \
else \
echo Testing $(curpass); \
echo -n "Testsuite started: " | tee -a $(log_test); \
Reply to: