← Back to branch summary

~ubuntu-dev/ubuntu/lucid/quilt/lucid-201002101907

« back to all changes in this revision

Viewing changes to quilt/import.in

  • Committer: Bazaar Package Importer
  • Author(s): Raphaël Hertzog, Martin Quinson, Raphaël Hertzog, Ryan Niebur
  • Date: 2009-09-02 22:05:25 UTC
  • mfrom: (1.2.6 upstream)
  • mto: This revision was merged to the branch mainline in revision 9.
  • Revision ID: james.westby@ubuntu.com-20090902220525-zhckxgbs9wqhyw83
https://launchpad.net/bugs/402237
http://bugs.debian.org/544668
[ Martin Quinson ]
* New upstream release.
* debian/patches/generic-awk: removed since merged upstream.
* debian/patches/*: updated so that they apply again on this release.

[ Raphaël Hertzog ]
* Remove Simon Hormans from Uploaders with his permission.
* debian/patches/fix-manpage-generation: fix Makefile so that
  the manual page is correctly generated with dash too (LP: #402237)
* Improve dh_quilt_patch/unpatch by respecting the QUILT_PATCH_DIR
  environment variable like /usr/share/quilt/quilt.make does.
  Closes: #544668

[ Ryan Niebur ]
* Add myself to Uploaders
* fixes to the arch_all patch to pass test suite
  - port upstream changes to the c version to the bash rewrite
    of backup-files
  - fix backup-files to process all files passed in on the
    command line instead of just the last (a clear bug)
* refresh all patches with -p ab
* add procmail to build deps, needed by tests
* Debian Policy 3.8.3

Show diffs side-by-side

added added

removed removed

Lines of Context:
quilt/import.in
19
19
 
20
20
usage()
21
21
{
22
 
        printf $"Usage: quilt import [-p num] [-P patch] [-f] [-d {o|a|n}] patchfile ...\n"
 
22
        printf $"Usage: quilt import [-p num] [-R] [-P patch] [-f] [-d {o|a|n}] patchfile ...\n"
23
23
        if [ x$1 = x-h ]
24
24
        then
25
25
                printf $"
29
29
-p num
30
30
        Number of directory levels to strip when applying (default=1)
31
31
 
 
32
-R
 
33
        Apply patch in reverse.
 
34
 
32
35
-P patch
33
36
        Patch filename to use inside quilt. This option can only be
34
37
        used when importing a single patch.
93
96
        exit $status
94
97
}
95
98
 
96
 
options=`getopt -o P:d:fp:h -- "$@"`
 
99
options=`getopt -o P:d:fp:Rh -- "$@"`
97
100
 
98
101
if [ $? -ne 0 ]
99
102
then
111
114
        -p)
112
115
                opt_strip=$2
113
116
                shift 2 ;;
 
117
        -R)
 
118
                opt_reverse=1
 
119
                shift ;;
114
120
        -d)
115
121
                case "$2" in
116
122
                        o|n|a) opt_desc=$2 ;;
135
141
fi
136
142
 
137
143
[ -n "$opt_strip" ] && patch_args="-p$opt_strip"
 
144
if [ -n "$opt_reverse" ]
 
145
then
 
146
        if [ -n "$patch_args" ]
 
147
        then
 
148
                patch_args="$patch_args -R"
 
149
        else
 
150
                patch_args="-R"
 
151
        fi
 
152
fi
138
153
 
 
154
before=$(patch_after "$(top_patch)")
139
155
for patch_file in "$@"
140
156
do
141
157
        if [ -n "$opt_patch" ]
202
218
        [ "$merged_patch_file" != "$patch_file" ] && rm -f "$merged_patch_file"
203
219
 
204
220
        if ! patch_in_series $patch &&
205
 
           ! insert_in_series $patch "$patch_args"
 
221
           ! insert_in_series $patch "$patch_args" "$before"
206
222
        then
207
223
                printf $"Failed to insert patch %s into file series\n" \
208
224
                       "$(print_patch $patch)" >&2