Package: mysql-dfsg-5.1
Severity: normal
Tags: patch

Attached is a patch the re-enables readline. I had to nuke the
commercial source check, because it thought I was building
commercial...

I'm not sure if the Build-Depends on libedit-dev is needed or not.

-- System Information:
Debian Release: squeeze/sid
  APT prefers testing
  APT policy: (500, 'testing'), (500, 'stable'), (100, 'unstable'), (1, 
'experimental')
Architecture: i386 (i686)

Kernel: Linux 2.6.30-1-686 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -rdBU3 mysql-dfsg-5.1-5.1.39.old/configure.in mysql-dfsg-5.1-5.1.39.new/configure.in
--- mysql-dfsg-5.1-5.1.39.old/configure.in	2009-09-04 12:17:29.000000000 -0400
+++ mysql-dfsg-5.1-5.1.39.new/configure.in	2009-10-22 11:43:42.000000000 -0400
@@ -2672,13 +2672,6 @@
 	fi
     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"]
-    then
-	AC_MSG_ERROR([This commercially licensed MySQL source package can't
-	      be built with libreadline. Please use --with-libedit to use
-	      the bundled version of libedit instead.])
-    fi
     ;;
 esac
 
diff -rdBU3 mysql-dfsg-5.1-5.1.39.old/debian/changelog mysql-dfsg-5.1-5.1.39.new/debian/changelog
--- mysql-dfsg-5.1-5.1.39.old/debian/changelog	2009-10-22 14:59:20.000000000 -0400
+++ mysql-dfsg-5.1-5.1.39.new/debian/changelog	2009-10-22 11:25:59.000000000 -0400
@@ -1,3 +1,10 @@
+mysql-dfsg-5.1 (5.1.39-1.1~asd1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Enable readline, dammit.
+
+ -- Anthony DeRobertis <anth...@tao.metrics.net>  Thu, 22 Oct 2009 11:25:46 -0400
+
 mysql-dfsg-5.1 (5.1.39-1) unstable; urgency=low
 
   * New upstream release.
diff -rdBU3 mysql-dfsg-5.1-5.1.39.old/debian/control mysql-dfsg-5.1-5.1.39.new/debian/control
--- mysql-dfsg-5.1-5.1.39.old/debian/control	2009-10-22 14:59:20.000000000 -0400
+++ mysql-dfsg-5.1-5.1.39.new/debian/control	2009-10-22 11:29:04.000000000 -0400
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian MySQL Maintainers <pkg-mysql-ma...@lists.alioth.debian.org>
 Uploaders: Norbert Tretkowski <no...@debian.org>, Christian Hammers <c...@debian.org>
-Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper (>= 7.0.15), file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, ghostscript, dpatch, gawk, bison, lsb-release, hardening-wrapper
+Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper (>= 7.0.15), file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, ghostscript, dpatch, gawk, bison, lsb-release, hardening-wrapper, libedit-dev
 Standards-Version: 3.8.3
 Homepage: http://dev.mysql.com/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-mysql/mysql-dfsg-5.1/
diff -rdBU3 mysql-dfsg-5.1-5.1.39.old/debian/rules mysql-dfsg-5.1-5.1.39.new/debian/rules
--- mysql-dfsg-5.1-5.1.39.old/debian/rules	2009-10-22 14:59:20.000000000 -0400
+++ mysql-dfsg-5.1-5.1.39.new/debian/rules	2009-10-22 11:28:07.000000000 -0400
@@ -112,6 +112,8 @@
 		--without-ndbcluster \
 		\
 		--with-embedded-server \
+		--without-readline \
+		--without-libedit \
 		--with-embedded-privilege-control'
 		
 	#       --sysconfdir=/etc/mysql  -- Appends /etc/mysql after ~/ in the my.cnf search patch!

Reply via email to