[Pkg-mysql-commits] r1853 - in mysql-dfsg-5.1/branches/unstable/debian: . patches

[Norbert Tretkowski]

Author: nobse
Date: 2010-03-17 07:36:31 +0000 (Wed, 17 Mar 2010)
New Revision: 1853

Removed:
   mysql-dfsg-5.1/branches/unstable/debian/patches/10_readline_build_fix.dpatch
Modified:
   mysql-dfsg-5.1/branches/unstable/debian/changelog
   mysql-dfsg-5.1/branches/unstable/debian/patches/00list
Log:
Drop patch 10_readline_build_fix.dpatch.

Modified: mysql-dfsg-5.1/branches/unstable/debian/changelog
===================================================================
--- mysql-dfsg-5.1/branches/unstable/debian/changelog	2010-03-17 07:32:13 UTC (rev 1852)
+++ mysql-dfsg-5.1/branches/unstable/debian/changelog	2010-03-17 07:36:31 UTC (rev 1853)
@@ -1,6 +1,8 @@
 mysql-5.1 (5.1.45-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Drop patches:
+    + 10_readline_build_fix.dpatch
   * Rename source package to mysql-5.1.
 
  -- Norbert Tretkowski <norbert at tretkowski.de>  Wed, 17 Mar 2010 08:31:17 +0100

Modified: mysql-dfsg-5.1/branches/unstable/debian/patches/00list
===================================================================
--- mysql-dfsg-5.1/branches/unstable/debian/patches/00list	2010-03-17 07:32:13 UTC (rev 1852)
+++ mysql-dfsg-5.1/branches/unstable/debian/patches/00list	2010-03-17 07:36:31 UTC (rev 1853)
@@ -1,7 +1,6 @@
 01_MAKEFILES__Docs_Images_Makefile.in.dpatch
 01_MAKEFILES__Docs_Makefile.in.dpatch
 02_no_builtin_ndbcluster_plugin.dpatch
-10_readline_build_fix.dpatch
 11_init_available_charsets.dpatch
 20_disabled_tests.dpatch
 33_scripts__mysql_create_system_tables__no_test.dpatch

Deleted: mysql-dfsg-5.1/branches/unstable/debian/patches/10_readline_build_fix.dpatch
===================================================================
--- mysql-dfsg-5.1/branches/unstable/debian/patches/10_readline_build_fix.dpatch	2010-03-17 07:32:13 UTC (rev 1852)
+++ mysql-dfsg-5.1/branches/unstable/debian/patches/10_readline_build_fix.dpatch	2010-03-17 07:36:31 UTC (rev 1853)
@@ -1,31 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_readline_build_fix.dpatch by Norbert Tretkowski <norbert at tretkowski.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: http://bugs.mysql.com/bug.php?id=35250
-
- at DPATCH@
-diff -Nur mysql-dfsg-5.1-5.1.41.orig/configure mysql-dfsg-5.1-5.1.41/configure
---- mysql-dfsg-5.1-5.1.41.orig/configure        2009-11-04 19:37:28.000000000 +0100
-+++ mysql-dfsg-5.1-5.1.41/configure     2009-11-20 13:39:48.000000000 +0100
-@@ -48782,7 +48782,7 @@
-     fi
- 
-     # if there is no readline, but we want to build with readline, we fail
--    if test "$want_to_use_readline" = "yes" && test ! -d "./cmd-line-utils/readline"
-+    if test "$want_to_use_readline" = "yes" && test ! -d "$srcdir/cmd-line-utils/readline"
-     then
-        { { $as_echo "$as_me:$LINENO: error: This commercially licensed MySQL source package can't
-              be built with libreadline. Please use --with-libedit to use
-diff -Nur mysql-dfsg-5.1-5.1.41.orig/configure.in mysql-dfsg-5.1-5.1.41/configure.in
---- mysql-dfsg-5.1-5.1.41.orig/configure.in     2009-11-04 19:28:09.000000000 +0100
-+++ mysql-dfsg-5.1-5.1.41/configure.in  2009-11-20 13:39:14.000000000 +0100
-@@ -2691,7 +2691,7 @@
-     fi
- 
-     # if there is no readline, but we want to build with readline, we fail
--    if [test "$want_to_use_readline" = "yes"] && [test ! -d "./cmd-line-utils/readline"]
-+    if [test "$want_to_use_readline" = "yes"] && [test ! -d "$srcdir/cmd-line-utils/readline"]
-     then
-        AC_MSG_ERROR([This commercially licensed MySQL source package can't
-              be built with libreadline. Please use --with-libedit to use