← Back to branch summary

~ubuntu-branches/ubuntu/natty/python3.1/natty-security

« back to all changes in this revision

Viewing changes to debian/patches/makesetup-bashism.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2010-07-06 16:52:42 UTC
  • mfrom: (1.2.1 upstream) (2.1.11 sid)
  • Revision ID: james.westby@ubuntu.com-20100706165242-2xv4i019r3et6c0j
Tags: 3.1.2+20100706-1ubuntu1
* Merge with Debian; remaining changes:
  - Regenerate the control file.
  - Add debian/patches/overwrite-semaphore-check for Lucid buildds.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/makesetup-bashism.dpatch
1
 
#! /bin/sh -e
2
 
 
3
 
# DP: Fix bashism in makesetup shell script
4
 
 
5
 
dir=
6
 
if [ $# -eq 3 -a "$2" = '-d' ]; then
7
 
    pdir="-d $3"
8
 
    dir="$3/"
9
 
elif [ $# -ne 1 ]; then
10
 
    echo >&2 "usage: `basename $0`: -patch|-unpatch [-d <srcdir>]"
11
 
    exit 1
12
 
fi
13
 
case "$1" in
14
 
    -patch)
15
 
        patch $pdir -f --no-backup-if-mismatch -p0 < $0
16
 
        ;;
17
 
    -unpatch)
18
 
        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
19
 
        ;;
20
 
    *)
21
 
        echo >&2 "usage: `basename $0`: -patch|-unpatch [-d <srcdir>]"
22
 
        exit 1
23
 
esac
24
 
exit 0
25
 
 
26
 
--- Modules/makesetup~  2009-11-19 15:14:31.758960233 +0000
27
 
+++ Modules/makesetup   2009-11-19 15:14:47.218976182 +0000
28
 
@@ -281,7 +281,7 @@
29
 
        -)      ;;
30
 
        *)      sedf="@sed.in.$$"
31
 
                trap 'rm -f $sedf' 0 1 2 3
32
 
-               echo "1i\\" >$sedf
33
 
+               printf "1i\\" >$sedf
34
 
                str="# Generated automatically from $makepre by makesetup."
35
 
                echo "$str" >>$sedf
36
 
                echo "s%_MODOBJS_%$OBJS%" >>$sedf