# # # patch "debian/patches/00list" # from [6fea2d23ad28ae3bc4dd04e4d08e94d628bc1f9f] # to [3f7be8dd862344cbe55ae52eb8b1a370d8c2bfe5] # # patch "debian/patches/01_disable_SIGPIPE_test.dpatch" # from [4314675b4361d7afd02936c22563eee61cc35be8] # to [4e23960959d5aba07c6696ddc8497b731fdd0a46] # # patch "debian/rules" # from [cf52cb2c0fe1bbf5def6c6750fd09e498279a7c1] # to [b79626772e209172eda8e4844a5fcb68e119388c] # ============================================================ --- debian/patches/00list 6fea2d23ad28ae3bc4dd04e4d08e94d628bc1f9f +++ debian/patches/00list 3f7be8dd862344cbe55ae52eb8b1a370d8c2bfe5 @@ -1 +1 @@ -01_disable_SIGPIPE_test +01_disable_SIGPIPE_test.dpatch ============================================================ --- debian/patches/01_disable_SIGPIPE_test.dpatch 4314675b4361d7afd02936c22563eee61cc35be8 +++ debian/patches/01_disable_SIGPIPE_test.dpatch 4e23960959d5aba07c6696ddc8497b731fdd0a46 @@ -1,17 +1,14 @@ #! /bin/sh /usr/share/dpatch/dpatch-run -## 01_disable_SIGPIPE_test.dpatch by +## 01_disable_SIGPIPE_test.dpatch by ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: A patch to disable the log_quits_on_SIGPIPE test temporarly @DPATCH@ ---- tests/log_quits_on_SIGPIPE/__driver__.lua 516da7ffcbf62fcbe923784a6a1d11bedbb553e2 -+++ tests/log_quits_on_SIGPIPE/__driver__.lua 7bed3257834b7cb2be5450f617f20e2a4dbb8f86 -@@ -1,9 +1,11 @@ skip_if(ostype=="Windows") - -- user interaction commands that produce a lot of output, like 'mtn - -- log', should die immediately on SIGPIPE (which they'll get if, for - -- instance, the user pipes the command to a pager, reads the first +--- monotone-0.38-1/tests/log_quits_on_SIGPIPE/__driver__.lua~ 2007-12-11 13:46:36.000000000 +0100 ++++ monotone-0.38-1/tests/log_quits_on_SIGPIPE/__driver__.lua 2007-12-11 13:48:20.000000000 +0100 +@@ -4,6 +4,8 @@ -- few dozen lines, and then quits the pager). skip_if(ostype=="Windows") ============================================================ --- debian/rules cf52cb2c0fe1bbf5def6c6750fd09e498279a7c1 +++ debian/rules b79626772e209172eda8e4844a5fcb68e119388c @@ -51,6 +51,8 @@ CFLAGS ?= $(DEFAULT_CFLAGS) CFLAGS ?= $(DEFAULT_CFLAGS) +include /usr/share/dpatch/dpatch.make + # put this up top so it's the default rule. # # Policy (section 4.9) says that build should depend on build-indep. @@ -69,7 +71,7 @@ CFLAGS ?= $(DEFAULT_CFLAGS) # binary-indep phase rather than the build phase, which works fine (as # long as you are being sensible and using fakeroot, anyway; I haven't # tried it with actual root privileges and don't propose to). -build: build-arch +build: patch-stamp build-arch config.status: configure dh_testdir @@ -105,7 +107,8 @@ build-indep-stamp: config.status make -j$(CPUS) info html monotone.pdf touch $@ -clean: +clean: clean1 unpatch +clean1: dh_testdir dh_testroot [ ! -f Makefile ] || $(MAKE) distclean