[mutt] 01/07: Fix the version string (regression)

[Faidon Liambotis]

This is an automated email from the git hooks/post-receive script.

paravoid pushed a commit to branch experimental
in repository mutt.

commit 9bbfa8964bdc02724090da75e25a87008efdec59
Author: Faidon Liambotis <paravoid at debian.org>
Date:   Fri Jul 8 13:23:45 2016 +0300

    Fix the version string (regression)
    
    neomutt's version.sh + separate builddir directories (as introduced with
    a315e23) don't play nice. Fix version.sh to account for that by
    reverting a small portion of it from the original mutt.
---
 debian/patches/series                        |  1 +
 debian/patches/upstream/fix-version-sh.patch | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
index f5f9b9f..f7b089a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 neomutt-20160611.patch
 neomutt-devel/sensible-browser.patch
+upstream/fix-version-sh.patch
 features/809802_timeout_hook.patch
 features/multiple-fcc.patch
 debian-specific/Muttrc.patch
diff --git a/debian/patches/upstream/fix-version-sh.patch b/debian/patches/upstream/fix-version-sh.patch
new file mode 100644
index 0000000..a411a91
--- /dev/null
+++ b/debian/patches/upstream/fix-version-sh.patch
@@ -0,0 +1,12 @@
+--- a/version.sh
++++ b/version.sh
+@@ -1,4 +1,9 @@
+ #!/bin/sh
+ 
++# Switch to directory where this script lives so that further commands are run
++# from the root directory of the source.  The script path and srcdir are double
++# quoted to allow the space character to appear in the path.
++srcdir=`dirname "$0"` && cd "$srcdir" || exit 1
++
+ cat VERSION* | tr -d \\n
+ 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mutt/mutt.git