Sidebar patch replaced with the one written by Stuart Henderson (Closes: 619822)

[software/mutt-debian.git] / debian / update-autotools.sh

diff --git a/debian/update-autotools.sh b/debian/update-autotools.sh
old mode 100644 (file)
new mode 100755 (executable)
index 2c0d16d..f161b02
--- a/debian/update-autotools.sh
+++ b/debian/update-autotools.sh
@@ -2,18 +2,18 @@
 
 set -e
 
 
 set -e
 

-D="$1" # mutt-1.5.X
+dh_testdir
+
+D=$(basename "$PWD")

 PATCH_NAME=misc/autotools-update.diff 
 
 PATCH_NAME=misc/autotools-update.diff 
 

-cd $D
-dh_testdir

 debclean
 quilt delete $PATCH_NAME || test $? -eq 1
 quilt push -aq
 ln -sf /usr/share/misc/config.sub .
 ln -sf /usr/share/misc/config.guess .
 debclean
 quilt delete $PATCH_NAME || test $? -eq 1
 quilt push -aq
 ln -sf /usr/share/misc/config.sub .
 ln -sf /usr/share/misc/config.guess .

-cd -

 
 

+cd ..

 cp -al $D $D.orig
 
 cd $D 
 cp -al $D $D.orig
 
 cd $D 


@@ -29,9 +29,10 @@ diff -ru $D.orig $D >$T || test $? -eq 1
 patch -p1 -R -d $D <$T
 
 cd $D
 patch -p1 -R -d $D <$T
 
 cd $D

-quilt import -f -n $PATCH_NAME `basename $T`
+quilt import -f -P $PATCH_NAME `basename $T`

 quilt push
 quilt push

-cd -
+quilt refresh -p0
+cd ..

 
 rm -f $T
 rm -rf $D.orig
 
 rm -f $T
 rm -rf $D.orig