Author: branden Date: 2004-08-10 17:13:46 -0500 (Tue, 10 Aug 2004) New Revision: 1721
Modified: trunk/debian/CHANGESETS trunk/debian/changelog trunk/debian/rules Log: Tighten regex in patch-audit rule so messages like "patching file xc/doc/man/Xt/XtOffset.man" are not false positives. Modified: trunk/debian/CHANGESETS =================================================================== --- trunk/debian/CHANGESETS 2004-08-10 16:51:13 UTC (rev 1720) +++ trunk/debian/CHANGESETS 2004-08-10 22:13:46 UTC (rev 1721) @@ -260,6 +260,10 @@ Add checks to NSERVERS and NDRIVERS to avoid an "unknown" card to be counted as a supported one if the user choose to autodetected. - 1720 + 1720 +Tighten regex in patch-audit rule so messages like "patching file +xc/doc/man/Xt/XtOffset.man" are not false positives. + 1721 + vim:set ai et sts=4 sw=4 tw=80: Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2004-08-10 16:51:13 UTC (rev 1720) +++ trunk/debian/changelog 2004-08-10 22:13:46 UTC (rev 1721) @@ -186,6 +186,9 @@ * Grab fix from XFree86 CVS (2003-05-07) to bounds problems in *scanf(), snprintf() and strncpy() calls in lbxproxy, makepsres, and xedit. + * Tighten regex in patch-audit rule so messages like "patching file + xc/doc/man/Xt/XtOffset.man" are not false positives. + Changes by Fabio M. Di Nitto and Branden Robinson: * Support building only the parts of the source tree needed by @@ -226,7 +229,7 @@ * Add checks to NSERVERS and NDRIVERS to avoid an "unknown" card to be counted as a supported one if the user choose to autodetected. - -- Branden Robinson <[EMAIL PROTECTED]> Mon, 9 Aug 2004 14:22:21 -0500 + -- Branden Robinson <[EMAIL PROTECTED]> Tue, 10 Aug 2004 17:12:02 -0500 xfree86 (4.3.0.dfsg.1-6) unstable; urgency=low Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2004-08-10 16:51:13 UTC (rev 1720) +++ trunk/debian/rules 2004-08-10 22:13:46 UTC (rev 1721) @@ -207,7 +207,8 @@ # I am more anal than the dbs package maintainer about diffs, it seems. patch-audit: $(STAMP_DIR)/patch-audit $(STAMP_DIR)/patch-audit: $(patched) - @if egrep -il '(fuzz|offset)' stampdir/log/patches/*; then \ + @if egrep -il 'Hunk.*succeeded at.*(fuzz|offset)' \ + stampdir/log/patches/*; then \ echo "The above patches had fuzz or offsets. Please fix." >&2; \ exit 1; \ fi