← Back to branch summary

~ubuntu-branches/ubuntu/natty/quilt/natty

« back to all changes in this revision

Viewing changes to quilt/fold.in

  • Committer: Bazaar Package Importer
  • Author(s): Martin Quinson
  • Date: 2006-11-23 16:17:11 UTC
  • mfrom: (2.1.6 feisty)
  • Revision ID: james.westby@ubuntu.com-20061123161711-b17ess0ls8t959ca
Tags: 0.45-6
http://bugs.debian.org/397285
http://bugs.debian.org/395482
http://bugs.debian.org/393985
http://bugs.debian.org/386548
http://bugs.debian.org/395447
http://bugs.debian.org/396093
* [debian/patches/override_mail_sender_in_testsuite]
  Fix the patch to catch all occurences of 'quilt mail' since each of them
  will cause a FTBFS on misconfigured hosts (thanks to Goswin Brederlow).
  (Closes: #397285, #395482, #393985) I hope, at least.
  
* [debian/patches/doc_improvement]
  Fix some more typos in the manpages
  (Closes: #386548, #395447)

* [debian/control]
   Add procmail to suggest list to help users locating the 'formail' tool.
   (Closes: #396093)

Show diffs side-by-side

added added

removed removed

Lines of Context:
quilt/fold.in
9
9
# Read in library functions
10
10
if [ "$(type -t patch_file_name)" != function ]
11
11
then
12
 
        if ! [ -r @SCRIPTS@/patchfns ]
 
12
        if ! [ -r $QUILT_DIR/scripts/patchfns ]
13
13
        then
14
 
                echo "Cannot read library @SCRIPTS@/patchfns" >&2
 
14
                echo "Cannot read library $QUILT_DIR/scripts/patchfns" >&2
15
15
                exit 1
16
16
        fi
17
 
        . @SCRIPTS@/patchfns
 
17
        . $QUILT_DIR/scripts/patchfns
18
18
fi
19
19
 
20
20
usage()
73
73
: ${opt_strip_level:=1}
74
74
[ -n "$opt_silent" ] && silent=-s
75
75
 
76
 
top=$(top_patch)
77
 
if [ -z "$top" ]
78
 
then
79
 
        printf $"No patches applied\n" >&2
80
 
        exit 1
81
 
fi
 
76
top=$(find_top_patch) || exit 1
82
77
 
83
78
trap "failed=1" SIGINT
84
79
 
85
80
workdir=$(gen_tempfile -d $PWD)
86
 
@PATCH@ $QUILT_PATCH_OPTS -p$opt_strip_level $silent --backup --prefix="$workdir/" -E \
 
81
patch -d ${SUBDIR:-.} $QUILT_PATCH_OPTS -p$opt_strip_level $silent \
 
82
      --backup --prefix="$workdir/$SUBDIR" -E \
87
83
|| failed=1
88
84
 
89
85
if [ -z "$failed" ]