X Strike Force X.Org X11 SVN commit: r525 - trunk/debian
Author: dnusinow
Date: 2005-08-11 21:05:39 -0500 (Thu, 11 Aug 2005)
New Revision: 525
Modified:
trunk/debian/README
trunk/debian/changelog
trunk/debian/rules
Log:
- Revert change of debian/rules target from prepare to quilt-prepare.
'prepare' is shorter, and for a target is use a lot I'd like to keep it
simple.
Modified: trunk/debian/README
===================================================================
--- trunk/debian/README 2005-08-11 23:23:08 UTC (rev 524)
+++ trunk/debian/README 2005-08-12 02:05:39 UTC (rev 525)
@@ -28,7 +28,7 @@
debian/rules environment Reports information about the build
environment, including variable settings
that control the package build process.
- debian/rules quilt-prepare Sets up the package build directory
+ debian/rules prepare Sets up the package build directory
structure as quilt expects to find it. YOU
MUST RUN THIS TARGET BEFORE ATTEMPTING TO
USE QUILT.
@@ -75,16 +75,16 @@
To start, you should be in the upacked source package directory -- this is the
directory that contains the debian/ and xc/ directories. Run "debian/rules
-quilt-prepare"; this will set up the proper symlinks so that quilt can find
-the patches it needs to apply. Once this is done, you will see a symlink
-named "patches" that will point to debian/patches. This exists because quilt
-expects the patches directory to be located at the top level by default. The
-"quilt-prepare" target sets up a ".pc" symlink as well, which quilt uses
-internally to store information it needs (this is why you'll want to use
-debian/rules clean to clean up, rather than just rm -rf'ing what you see; the
-hidden .pc is easy to forget). Finally, "quilt-prepare" creates a stamp
-directory that so that debian/rules knows what it has done -- this directory
-also houses verbose logs of attempts to apply patches.
+prepare"; this will set up the proper symlinks so that quilt can find the
+patches it needs to apply. Once this is done, you will see a symlink named
+"patches" that will point to debian/patches. This exists because quilt expects
+the patches directory to be located at the top level by default. The "prepare"
+target sets up a ".pc" symlink as well, which quilt uses internally to store
+information it needs (this is why you'll want to use debian/rules clean to
+clean up, rather than just rm -rf'ing what you see; the hidden .pc is easy to
+forget). Finally, "prepare" creates a stamp directory that so that
+debian/rules knows what it has done -- this directory also houses verbose logs
+of attempts to apply patches.
What you do next depends on whether you want to edit an existing patch, or
create a new one.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-08-11 23:23:08 UTC (rev 524)
+++ trunk/debian/changelog 2005-08-12 02:05:39 UTC (rev 525)
@@ -20,7 +20,6 @@
+ Declare phony targets and stampdir_targets adjacent to the target
definitions themselves so they are less likely to get out of sync.
+ Make $(STAMP_DIR) itself a real target.
- + Rename the "prepare" target to "quilt-prepare".
+ Make the "patch", "unpatch", and "patch-audit" rules run more quietly.
+ Wrap some long lines (> 80 columns). Some couldn't be wrapped without
making them even uglier.
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2005-08-11 23:23:08 UTC (rev 524)
+++ trunk/debian/rules 2005-08-12 02:05:39 UTC (rev 525)
@@ -167,10 +167,10 @@
mkdir $@
# Set up the package build directory as quilt expects to find it.
-.PHONY: quilt-prepare
-stampdir_targets+=quilt-prepare
-quilt-prepare: $(STAMP_DIR)/quilt-prepare
-$(STAMP_DIR)/quilt-prepare: $(STAMP_DIR)
+.PHONY: prepare
+stampdir_targets+=prepare
+prepare: $(STAMP_DIR)/prepare
+$(STAMP_DIR)/prepare: $(STAMP_DIR)
mkdir $(STAMP_DIR)/patches $(STAMP_DIR)/log
echo 2 >$(STAMP_DIR)/patches/.version
ln -s debian/patches patches
@@ -181,7 +181,7 @@
.PHONY: patch
stampdir_targets+=patch
patch: $(STAMP_DIR)/patch
-$(STAMP_DIR)/patch: $(STAMP_DIR)/quilt-prepare
+$(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
@echo -n "Applying patches..."; \
if quilt push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \
echo "successful."; \
@@ -838,7 +838,7 @@
# Note: This rule is for Debian package maintainers' convenience, and is not
# needed for conventional build scenarios.
.PHONY: patch-audit
-patch-audit: quilt-prepare unpatch
+patch-audit: prepare unpatch
@echo -n "Auditing patches..."; \
>$(STAMP_DIR)/log/patch; \
FUZZY=; \
Reply to: