X Strike Force X.Org X11 SVN commit: r204 - trunk/debian
Author: branden
Date: 2005-06-14 02:40:16 -0500 (Tue, 14 Jun 2005)
New Revision: 204
Modified:
trunk/debian/rules
Log:
Take the patch-audit target out of the "critical path" of targets used by
dpkg-buildpackage, making it a maintainer-convenience target instead.
+ Remove its $(STAMP_DIR) counterpart and denote it as a phony target.
+ Move it to the end of the rules file with the other convenience targets.
+ Make the $(STAMP_DIR)/build and $(STAMP_DIR)/build-server rules depend
on dbs's "setup" target instead of $(STAMP_DIR)/patch-audit.
+ Update comments.
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2005-06-14 07:30:01 UTC (rev 203)
+++ trunk/debian/rules 2005-06-14 07:40:16 UTC (rev 204)
@@ -128,7 +128,7 @@
# over, you would have to remove the stamp manually. Now, just do
# 'debian/rules <target> <target> ... FORCE=1', and the stamp files
# that match the given targets will be removed automagically.
-stampdir_targets=genscripts patch-audit check-manifest
+stampdir_targets=genscripts check-manifest
stampdir_targets+=build install binary-arch binary-indep
stampdir_targets+=build-server install-server binary-server
ifdef FORCE
@@ -236,16 +236,6 @@
updatepo: debian/po/pothead
debian/scripts/debconf-updatepo --pot-header=pothead --verbose
-# I am more anal than the dbs package maintainer about diffs, it seems.
-patch-audit: $(STAMP_DIR)/patch-audit
-$(STAMP_DIR)/patch-audit: setup
- @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
- touch $@
-
build:
@echo "This target does nothing. Please specify \"build-arch-only\" or \"build-all\""
@echo "instead. Note that it is also acceptable to use the \"binary-arch\" or"
@@ -255,7 +245,7 @@
# DO NOT CHANGE THIS RULE WITHOUT CHECKING FOR SYNCHRONICITY WITH THE build-server RULE BELOW
real-build: $(STAMP_DIR)/build
-$(STAMP_DIR)/build: $(STAMP_DIR)/patch-audit $(STAMP_DIR)/genscripts
+$(STAMP_DIR)/build: setup $(STAMP_DIR)/genscripts
dh_testdir
# Symlink some of the libraries on which we build-depend into
# imports/{lib,include} so we don't have to pull in -L/usr/include and
@@ -587,7 +577,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: $(STAMP_DIR)/patch-audit $(STAMP_DIR)/genscripts
+$(STAMP_DIR)/build-server: setup $(STAMP_DIR)/genscripts
dh_testdir
# Create source tree for static, debuggable Xorg server.
cp -drl $(SOURCE_TREE) $(SOURCE_TREE)-xserver-xorg-dbg
@@ -659,6 +649,7 @@
# This rule removes stuff from the upstream source tree that we don't need, or
# which has licensing problems. It must be run before creating the
# .orig.tar.gz.
+#
# Note: This rule is for Debian package maintainers' convenience, and is not
# needed for conventional build scenarios.
prune-upstream-tree:
@@ -780,6 +771,7 @@
# Change to what should be the correct directory, ensure it is, and if
# so, create the .orig.tar.gz file.
+#
# Note: This rule is for Debian package maintainers' convenience, and is not
# needed for conventional build scenarios.
make-orig-tar-gz: prune-upstream-tree
@@ -787,10 +779,21 @@
&& test -d $(SOURCE_NAME)-$(UPSTREAM_VERSION) \
&& tar --exclude=debian --exclude=debian/* -cf - $(SOURCE_NAME)-$(UPSTREAM_VERSION) | gzip -9 >$(SOURCE_NAME)_$(UPSTREAM_VERSION).orig.tar.gz )
+# Verify that there are no offsets or fuzz in our patches.
+#
+# Note: This rule is for Debian package maintainers' convenience, and is not
+# needed for conventional build scenarios.
+patch-audit: setup
+ @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
+ touch $@
+
.PHONY: default
.PHONY: genscripts cleanscripts
.PHONY: updatepo
-.PHONY: patch-audit
.PHONY: unpatch
.PHONY: clean install
.PHONY: build build-arch-only build-all real-build
@@ -798,6 +801,6 @@
.PHONY: check-manifest check-manifest-arch check-manifest-indep
.PHONY: environment
.PHONY: build-server install-server binary-server
-.PHONY: prune-upstream-tree make-orig-tar-gz
+.PHONY: prune-upstream-tree make-orig-tar-gz patch-audit
# vim:set noet ai sts=8 sw=8 tw=0:
Reply to: