[pkg-remote-commits] [xrdp] 01/02: Import Debian patch 0.6.1-2

[Dominik George]

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

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

commit 2f0b6d1aba014f03d6fa28c4e5fc78359ee67fc3
Author: Vincent Bernat <bernat at debian.org>
Date:   Tue Oct 7 21:35:25 2014 +0200

    Import Debian patch 0.6.1-2
---
 debian/changelog                      | 13 ++++++++++++-
 debian/control                        |  2 +-
 debian/patches/libtoolize_check.patch | 15 +++++++++++++++
 debian/patches/series                 |  1 +
 4 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ea434fa..b013cb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,15 @@
-xrdp (0.6.1-1) UNRELEASED; urgency=low
+xrdp (0.6.1-2) unstable; urgency=medium
+
+  [ Johannes Schauer ]
+  * Check for libtoolize rather than libtool. Closes: #761793
+
+  [ Vincent Bernat ]
+  * Upload to unstable.
+  * Bump Standards-Version to 3.9.6.
+
+ -- Vincent Bernat <bernat at debian.org>  Tue, 07 Oct 2014 21:35:25 +0200
+
+xrdp (0.6.1-1) unstable; urgency=low
 
   * New upstream release.
   * Add Norvegian keyboard definition, thanks to Dag-Erling
diff --git a/debian/control b/debian/control
index 69a37e7..8e03e01 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Vincent Bernat <bernat at debian.org>
 Build-Depends: debhelper (>= 9), libssl-dev, libpam0g-dev,
 	       autoconf (>= 2.59), automake (>= 1.6), libtool,
 	       libx11-dev, libxfixes-dev, libfreerdp-dev, pkg-config
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Homepage: http://xrdp.sourceforge.net
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/xrdp.git
 Vcs-Git: git://anonscm.debian.org/collab-maint/xrdp.git
diff --git a/debian/patches/libtoolize_check.patch b/debian/patches/libtoolize_check.patch
new file mode 100644
index 0000000..8ed9ad2
--- /dev/null
+++ b/debian/patches/libtoolize_check.patch
@@ -0,0 +1,15 @@
+Description: check for libtoolize rather than libtool
+Author: Johannes Schauer <j.schauer at email.de>
+Forwarded: no
+
+--- xrdp-0.6.1.orig/bootstrap
++++ xrdp-0.6.1/bootstrap
+@@ -14,7 +14,7 @@ then
+   exit 1
+ fi
+ 
+-which libtool
++which libtoolize
+ if ! test $? -eq 0
+ then
+   echo "error, install libtool"
diff --git a/debian/patches/series b/debian/patches/series
index b662024..055dcd7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 08-format-security.patch
 10-km-0414.patch
 xrdp-default-keymap.patch
+libtoolize_check.patch

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