[Pkg-samba-maint] [samba] 03/05: Remove readline63.patch, integrated upstream

[Ivo De Decker]

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

ivodd pushed a commit to branch master
in repository samba.

commit 1ea42069c2fe7d0de21ba3047452e5026d7d99a8
Author: Ivo De Decker <ivo.dedecker at ugent.be>
Date:   Fri Apr 18 22:04:00 2014 +0200

    Remove readline63.patch, integrated upstream
---
 debian/changelog                |  1 +
 debian/patches/readline63.patch | 35 -----------------------------------
 debian/patches/series           |  1 -
 3 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 250ebe0..eb0b15a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 samba (2:4.1.7+dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Remove readline63.patch, integrated upstream.
 
  -- Ivo De Decker <ivo.dedecker at ugent.be>  Fri, 18 Apr 2014 21:57:36 +0200
 
diff --git a/debian/patches/readline63.patch b/debian/patches/readline63.patch
deleted file mode 100644
index 56a9348..0000000
--- a/debian/patches/readline63.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-commit 29d779c7029f89e530994c45ae065707ffd62c43
-Author: Gustavo Zacarias <gustavo at zacarias.com.ar>
-Date:   Thu Mar 6 18:57:40 2014 -0300
-
-    smbreadline: switch to new-style readline typedef
-    
-    Function, CPFunction, CPPFunction and VFunction typedefs are considered
-    old-style (deprecated) starting from readline 4.2 (circa 2001).
-    Compatibility typedefs have been in place up to readline 6.2 but were
-    removed with the 6.3 release thus causing builds to break.
-    Switch to the new-style specific prototyped typedef.
-    
-    Return value is unused so the callback should still be void (see
-    readline/input.c around line 456 in version 6.3).
-    
-    Signed-off-by: Gustavo Zacarias <gustavo at zacarias.com.ar>
-    Reviewed-by: Jeremy Allison <jra at samba.org>
-    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
-    
-    Autobuild-User(master): Jeremy Allison <jra at samba.org>
-    Autobuild-Date(master): Thu Mar 13 00:21:47 CET 2014 on sn-devel-104
-
-diff --git a/libcli/smbreadline/smbreadline.c b/libcli/smbreadline/smbreadline.c
-index cff25a7..80e10b0 100644
---- a/libcli/smbreadline/smbreadline.c
-+++ b/libcli/smbreadline/smbreadline.c
-@@ -141,7 +141,7 @@ char *smb_readline(const char *prompt, void (*callback)(void),
- 
- #if HAVE_DECL_RL_EVENT_HOOK
- 	if (callback)
--		rl_event_hook = (Function *)callback;
-+		rl_event_hook = (rl_hook_func_t *)callback;
- #endif
- 	ret = readline(prompt);
- 	if (ret && *ret)
diff --git a/debian/patches/series b/debian/patches/series
index c276141..c8eec44 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,4 +13,3 @@ VERSION.patch
 waf_smbpasswd_location
 add-so-version-to-private-libraries
 do-not-install-smbclient4-and-nmbclient4
-readline63.patch

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