--- a/.bashrc	Mon Nov 19 21:45:28 2012 +0200
+++ b/.bashrc	Tue Nov 20 23:41:41 2012 +0200
@@ -118,6 +118,8 @@
 # alias vim='vim -X' #don't try to contact xserver (which can hang on network issues)
 # alias gdb='gdb -tui' #enable the text window interface if possible
 
+alias dquilt="quilt --quiltrc=${HOME}/.quiltrc-dpkg"
+
 # what most people want from od (hexdump)
 # alias hd='od -Ax -tx1z -v'
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.quiltrc-dpkg	Tue Nov 20 23:41:41 2012 +0200
@@ -0,0 +1,17 @@
+# -*- mode: sh -*-
+
+d=.
+until [ -d $d/debian ]; do
+  d=`readlink -e $d/..`
+  [ $d = / ] && break || :
+done
+
+if [ -d $d/debian ] && [ -z $QUILT_PATCHES ]; then
+  # if in Debian packaging tree with unset $QUILT_PATCHES
+  QUILT_PATCHES="debian/patches"
+  QUILT_PATCH_OPTS="--reject-format=unified"
+  QUILT_DIFF_ARGS="-p ab --no-timestamps --no-index --color=auto"
+  QUILT_REFRESH_ARGS="-p ab --no-timestamps --no-index"
+  QUILT_COLORS="diff_hdr=1;32:diff_add=1;34:diff_rem=1;31:diff_hunk=1;33:diff_ctx=35:diff_cctx=33"
+  mkdir -p $d/debian/patches
+fi

--- a/Makefile	Mon Nov 19 21:45:28 2012 +0200
+++ b/Makefile	Tue Nov 20 23:41:41 2012 +0200
@@ -1,4 +1,4 @@
-SHELL = /bin/sh
+SHELL = /bin/sh -eu
 export PATH := /bin:/usr/bin:${PATH}
 
 # Disable built in pattern rules.
@@ -41,7 +41,7 @@
     .guile \
     .signature .muttrc .tidy \
     .dictrc \
-    .hgrc .hgignore .hgstyle .bazaar .gitconfig .gitignore .cvsrc .quiltrc \
+    .hgrc .hgignore .hgstyle .bazaar .gitconfig .gitignore .cvsrc .quiltrc .quiltrc-dpkg \
     .gnupg \
     .glhackrc
 MANUALINSTALL_ITEMS = .mc