On Sun, Jun 04, 2006 at 11:55:26PM +0300, Jari Aalto wrote:
[...]
> Symlinking the .pc makes no difference (see the build log below). The
> build fails there is file:
>
> ~/.quiltrc
> QUILT_PATCHES="some/dir"
I agree with bug submitter. David, ok to commit this patch into xsfbs?
Xterm repository has to be patched too since it does not use xsfbs.
Denis
Index: xsfbs.mk
===================================================================
--- xsfbs.mk (révision 2778)
+++ xsfbs.mk (copie de travail)
@@ -81,6 +81,9 @@
# their files.
DEBTREEDIR:=$(CURDIR)/debian/tmp
+# Make sure that everyone uses the same quilt configuration file
+QUILT:=quilt --quiltrc=debian/xsfbs/quiltrc
+
# All "important" targets have four lines:
# 1) A target name that is invoked by a package-building tool or the user.
# This consists of a dependency on a "$(STAMP_DIR)/"-prefixed counterpart.
@@ -127,9 +130,6 @@
if [ ! -e $(STAMP_DIR)/log ]; then \
mkdir $(STAMP_DIR)/log; \
fi; \
- if [ ! -e patches ]; then \
- ln -s debian/patches patches; \
- fi; \
>$@
# Apply all patches to the upstream source.
@@ -141,9 +141,9 @@
echo "Couldn't find quilt. Please install it or add it to the
build-depends for this package."; \
exit 1; \
fi; \
- if quilt next; then \
+ if $(QUILT) next; then \
echo -n "Applying patches..."; \
- if quilt push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \
+ if $(QUILT) push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \
echo "successful."; \
else \
echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \
@@ -160,7 +160,7 @@
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \
- if quilt pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \
+ if $(QUILT) pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \
echo "successful."; \
else \
echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \
@@ -184,6 +184,8 @@
.PHONY: xsfclean
xsfclean: cleanscripts unpatch
dh_testdir
+ # The patches symlink was added in previous versions of this file
+ # and is not created since 2006-08-14, it will be removed later.
rm -f .pc patches
rm -rf $(STAMP_DIR) $(SOURCE_DIR)
rm -rf imports
@@ -296,17 +298,17 @@
@echo -n "Auditing patches..."; \
>$(STAMP_DIR)/log/patch; \
FUZZY=; \
- while [ -n "$$(quilt next)" ]; do \
- RESULT=$$(quilt push -v | tee -a $(STAMP_DIR)/log/patch | grep ^Hunk
| sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/');\
+ while [ -n "$$($(QUILT) next)" ]; do \
+ RESULT=$$($(QUILT) push -v | tee -a $(STAMP_DIR)/log/patch | grep
^Hunk | sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/');\
case "$$RESULT" in \
succeeded) \
- echo "fuzzy patch: $$(quilt top)" \
- | tee -a $(STAMP_DIR)/log/$$(quilt top); \
+ echo "fuzzy patch: $$($(QUILT) top)" \
+ | tee -a $(STAMP_DIR)/log/$$($(QUILT) top); \
FUZZY=yes; \
;; \
FAILED) \
- echo "broken patch: $$(quilt next)" \
- | tee -a $(STAMP_DIR)/log/$$(quilt next); \
+ echo "broken patch: $$($(QUILT) next)" \
+ | tee -a $(STAMP_DIR)/log/$$($(QUILT) next); \
exit 1; \
;; \
esac; \
--- /dev/null
+++ quiltrc
@@ -0,0 +1,2 @@
+QUILT_PATCHES="debian/patches"
+QUILT_NO_DIFF_TIMESTAMPS=1
