From f5245757e133f115bf6dd8b7e82a9ee7db1f3ce0 Mon Sep 17 00:00:00 2001
From: "mtaylor@qualinost.(none)" <>
Date: Fri, 20 Apr 2007 16:15:30 -0700
Subject: [PATCH] Made changes to debian control files to support building 5.1
 packages.

---
 debian/libmysqlclientSLIB-dev.files.in | 1 -
 debian/mysql-client-BASE.files.in      | 1 -
 debian/mysql-server-BASE.files.in      | 3 ---
 debian/mysql-test-BASE.files.in        | 4 ----
 debian/rules                           | 2 +-
 5 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/debian/libmysqlclientSLIB-dev.files.in b/debian/libmysqlclientSLIB-dev.files.in
index b4a87c1bb2b..e396b59b92f 100644
--- a/debian/libmysqlclientSLIB-dev.files.in
+++ b/debian/libmysqlclientSLIB-dev.files.in
@@ -1,5 +1,4 @@
 usr/bin/mysql_config
-usr/bin/comp_err
 usr/include/*
 usr/lib/libmysqlclient.a
 usr/lib/libmysqlclient.la
diff --git a/debian/mysql-client-BASE.files.in b/debian/mysql-client-BASE.files.in
index df635f5e911..3e3373b071c 100644
--- a/debian/mysql-client-BASE.files.in
+++ b/debian/mysql-client-BASE.files.in
@@ -1,7 +1,6 @@
 usr/bin/msql2mysql
 usr/bin/mysql
 usr/bin/mysql_find_rows
-usr/bin/mysql_tableinfo
 usr/bin/mysql_waitpid
 usr/bin/mysqlaccess
 usr/bin/mysqladmin
diff --git a/debian/mysql-server-BASE.files.in b/debian/mysql-server-BASE.files.in
index 3481faa968a..ff79ca73aa7 100644
--- a/debian/mysql-server-BASE.files.in
+++ b/debian/mysql-server-BASE.files.in
@@ -4,7 +4,6 @@ usr/bin/myisamchk
 usr/bin/myisamlog
 usr/bin/myisampack
 usr/bin/mysql_convert_table_format
-usr/bin/mysql_explain_log
 usr/bin/mysql_fix_extensions
 usr/bin/mysql_fix_privilege_tables
 usr/bin/mysql_install_db
@@ -34,7 +33,6 @@ usr/share/man/man1/myisam_ftdump.1
 usr/share/man/man1/myisamchk.1
 usr/share/man/man1/myisamlog.1
 usr/share/man/man1/myisampack.1
-usr/share/man/man1/mysql_explain_log.1
 usr/share/man/man8/mysqld.8
 usr/share/man/man1/mysqld_multi.1
 usr/share/man/man1/mysqld_safe.1
@@ -47,4 +45,3 @@ usr/share/man/man1/mysql_tzinfo_to_sql.1
 usr/share/man/man1/mysql_zap.1
 usr/share/man/man1/perror.1
 usr/share/man/man1/replace.1
-usr/share/man/man1/safe_mysqld.1
diff --git a/debian/mysql-test-BASE.files.in b/debian/mysql-test-BASE.files.in
index 7f99c28ca5e..a6d4841b074 100644
--- a/debian/mysql-test-BASE.files.in
+++ b/debian/mysql-test-BASE.files.in
@@ -1,6 +1,2 @@
 usr/share/mysql-test/*
 usr/bin/mysql_client_test
-usr/bin/mysqltestmanager
-usr/bin/mysqltestmanager-pwgen
-usr/bin/mysqltestmanagerc
-
diff --git a/debian/rules b/debian/rules
index 5bc73f5ebad..123cccac3f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -133,7 +133,7 @@ endif
 		$(USE_STATIC_MYSQLD) \
 		--without-bench \
 		--with-zlib-dir=bundled \
-		--with-yassl \
+		--with-ssl \
 		--with-readline \
 		--with-extra-charsets=all \
 		--with-innodb \