Author: branden
Date: 2003-12-31 19:12:05 -0500 (Wed, 31 Dec 2003)
New Revision: 879
Modified:
branches/4.3.0/sid/debian/README
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/rules
Log:
Add new (phony) target to rules file, "patch-audit", upon which build
targets depend. This target ensures that the patches to the upstream
source applied cleanly (no offsets, no fuzz).
(debian/README): document new patch-audit target
(debian/rules): implement new patch-audit target
Modified: branches/4.3.0/sid/debian/README
===================================================================
--- branches/4.3.0/sid/debian/README 2003-12-31 19:34:49 UTC (rev 878)
+++ branches/4.3.0/sid/debian/README 2004-01-01 00:12:05 UTC (rev 879)
@@ -20,6 +20,13 @@
Interesting targets supported by the debian/rules file include:
debian/rules unpacked Unpacks the source.
debian/rules setup Unpacks and patches the source.
+ debian/rules patch-audit Unpacks and patches the source, and
+ verifies that there are no offsets or
+ fuzz in the patches. If you are
+ contributing a patch, please verify that
+ this target works before submitting it;
+ it can save the package maintainers a
+ considerable amount of time.
debian/rules make_patch Creates a patch call new.diff in the
package root that is the difference
betwwen a source tree patched with
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2003-12-31 19:34:49 UTC (rev 878)
+++ branches/4.3.0/sid/debian/changelog 2004-01-01 00:12:05 UTC (rev 879)
@@ -14,8 +14,14 @@
(Closes: #225408)
- debian/rules
- -- Branden Robinson <[EMAIL PROTECTED]> Wed, 31 Dec 2003 14:32:57 -0500
+ * Add new (phony) target to rules file, "patch-audit", upon which build
+ targets depend. This target ensures that the patches to the upstream
+ source applied cleanly (no offsets, no fuzz).
+ - debian/README: document new patch-audit target
+ - debian/rules: implement new patch-audit target
+ -- Branden Robinson <[EMAIL PROTECTED]> Wed, 31 Dec 2003 19:09:40 -0500
+
xfree86 (4.3.0-0pre1v5) experimental; urgency=low
* Grab fixes to upstream CVS xf-4_3-branch since last pull.
Modified: branches/4.3.0/sid/debian/rules
===================================================================
--- branches/4.3.0/sid/debian/rules 2003-12-31 19:34:49 UTC (rev 878)
+++ branches/4.3.0/sid/debian/rules 2004-01-01 00:12:05 UTC (rev 879)
@@ -191,16 +191,18 @@
$(STAMP_DIR)/stamp-configure: $(patched)
dh_testdir
+# I am more anal than the dbs package maintainer about diffs, it seems.
+patch-audit: $(patched)
+ @if egrep -il '(fuzz|offset)' stampdir/log/patches/*; then \
+ echo "The above patches had fuzz or offsets. Please fix." >&2; \
+ exit 1; \
+ fi
+
# DO NOT CHANGE THIS RULE WITHOUT CHECKING FOR SYNCHRONICITY WITH THE
build-server RULE BELOW
build: $(STAMP_DIR)/stamp-build
-$(STAMP_DIR)/stamp-build: $(patched) $(STAMP_DIR)/genscripts
+$(STAMP_DIR)/stamp-build: patch-audit $(STAMP_DIR)/genscripts
dh_testdir
- # I am more anal than the dbs package maintainer about diffs, it seems.
- if egrep -il '(fuzz|offset)' stampdir/log/patches/*; then \
- echo "The above patches had fuzz or offsets. Please fix." >&2; \
- exit 1; \
- fi
# copy Xft stuff into exports/{lib,include} so we don't have to pull
# in -L/usr/include and other, similarly ugly, stuff (including, but
# not limited to, -I/usr/include).
@@ -488,7 +490,7 @@
# DO NOT CHANGE THIS RULE WITHOUT CHECKING FOR SYNCHRONICITY WITH THE build
RULE ABOVE
build-server: $(STAMP_DIR)/build-server
-$(STAMP_DIR)/build-server: $(patched) $(STAMP_DIR)/genscripts
+$(STAMP_DIR)/build-server: patch-audit $(STAMP_DIR)/genscripts
dh_testdir
# create source tree for static, debuggable XFree86 server
mkdir $(SOURCE_TREE)-xserver-xfree86-dbg
@@ -574,6 +576,6 @@
.PHONY: build build-arch build-install install clean binary-arch binary-indep
binary
.PHONY: default environment
.PHONY: build-server install-server binary-server
-.PHONY: cleanscripts
+.PHONY: cleanscripts patch-audit
# vim:set noet ai sts=8 sw=8 tw=0:
