[debian-edu-commits] debian-edu/pkg-team/ 21/159: make libtoolise maybe work

[Dominik George]

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

natureshadow-guest pushed a commit to branch master
in repository xrdp.

commit fb784ad997f7683a05f60915fdfb49b12b57da49
Author: mirabilos <tg at mirbsd.org>
Date:   Wed Aug 5 19:25:46 2015 +0200

    make libtoolise maybe work
---
 patches/libtoolise.diff | 25 +++++++++++++++++++++++++
 patches/series          |  1 +
 2 files changed, 26 insertions(+)

diff --git a/patches/libtoolise.diff b/patches/libtoolise.diff
new file mode 100644
index 0000000..a7d16e4
--- /dev/null
+++ b/patches/libtoolise.diff
@@ -0,0 +1,25 @@
+# DP: taken from upstream
+# DP: should no longer be needed with next git snapshot
+
+--- a/bootstrap
++++ b/bootstrap
+@@ -14,7 +14,7 @@ then
+   exit 1
+ fi
+ 
+-which libtool
++which libtool || which libtoolize
+ if ! test $? -eq 0
+ then
+   echo "error, install libtool"
+--- a/xorgxrdp/bootstrap
++++ b/xorgxrdp/bootstrap
+@@ -14,7 +14,7 @@ then
+   exit 1
+ fi
+ 
+-which libtool
++which libtool || which libtoolize
+ if ! test $? -eq 0
+ then
+   echo "error, install libtool"
diff --git a/patches/series b/patches/series
index 55b7b64..f0a1ab7 100644
--- a/patches/series
+++ b/patches/series
@@ -1 +1,2 @@
 debian-manpage.diff
+libtoolise.diff

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