Attached is the diff for the NMU which I have uploaded to the 3-day delay queue on gluck. This upload can be overridden by a maintainer upload between now and then.
Don Armstrong -- Every gun that is made, every warship launched, every rocket fired signifies in the final sense, a theft from those who hunger and are not fed, those who are cold and are not clothed. This world in arms is not spending money alone. It is spending the sweat of its laborers, the genius of its scientists, the hopes of its children. This is not a way of life at all in any true sense. Under the clouds of war, it is humanity hanging on a cross of iron. -- Dwight Eisenhower, April 16, 1953 http://www.donarmstrong.com http://rzlab.ucr.edu
diff -u procps-3.2.6/debian/changelog procps-3.2.6/debian/changelog --- procps-3.2.6/debian/changelog +++ procps-3.2.6/debian/changelog @@ -1,3 +1,12 @@ +procps (1:3.2.6-2.1) unstable; urgency=low + + * NMU + * Use a temporary file for the output of the check_gcc test to avoid + removing /dev/null on failure. Thanks to Niv Altivanik for the patch. + (Closes: #336710) + + -- Don Armstrong <[EMAIL PROTECTED]> Sun, 19 Feb 2006 15:48:35 -0800 + procps (1:3.2.6-2) unstable; urgency=low * properly patched for kfreebsd Closes: #290719 diff -u procps-3.2.6/debian/patches/00list procps-3.2.6/debian/patches/00list --- procps-3.2.6/debian/patches/00list +++ procps-3.2.6/debian/patches/00list @@ -11,0 +12 @@ +50_dev_null_makefile_fix.dpatch only in patch2: unchanged: --- procps-3.2.6.orig/debian/patches/50_dev_null_makefile_fix.dpatch +++ procps-3.2.6/debian/patches/50_dev_null_makefile_fix.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## dev_null_makefile_fix.dpatch by <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + [EMAIL PROTECTED]@ +diff -urNad procps-3.2.6~/Makefile procps-3.2.6/Makefile +--- procps-3.2.6~/Makefile 2005-10-30 07:27:04.000000000 +0100 ++++ procps-3.2.6/Makefile 2005-12-20 02:57:41.000000000 +0100 +@@ -119,7 +119,7 @@ + # Unlike the kernel one, this check_gcc goes all the way to + # producing an executable. There might be a -m64 that works + # until you go looking for a 64-bit curses library. +-check_gcc = $(shell if $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) dummy.c $(ALL_LDFLAGS) $(1) -o /dev/null $(CURSES) > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;) ++check_gcc = $(shell if $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) dummy.c $(ALL_LDFLAGS) $(1) -o will_this_file_really_exist.tmp $(CURSES) > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ; rm -f will_this_file_really_exist.tmp) + + # Be 64-bit if at all possible. In a cross-compiling situation, one may + # do "make m64=-m32 lib64=lib" to produce 32-bit executables. DO NOT
signature.asc
Description: Digital signature
