Removed debian dir. It was a mistake to embed it in the tree in the first place.

BitKeeper/deleted/.del-Makefile.am~2cb643bedd5f474:
  Delete: debian/Makefile.am
BitKeeper/deleted/.del-README.Maintainer:
  Delete: debian/README.Maintainer
BitKeeper/deleted/.del-changelog:
  Delete: debian/changelog
BitKeeper/deleted/.del-compat:
  Delete: debian/compat
BitKeeper/deleted/.del-control.in:
  Delete: debian/control.in
BitKeeper/deleted/.del-copyright.more:
  Delete: debian/copyright.more
BitKeeper/deleted/.del-copyright:
  Delete: debian/copyright
BitKeeper/deleted/.del-defs.mk.in:
  Delete: debian/defs.mk.in
BitKeeper/deleted/.del-libmysqlclientSLIB-dev.README.Maintainer.in:
  Delete: debian/libmysqlclientSLIB-dev.README.Maintainer.in
BitKeeper/deleted/.del-libmysqlclientSLIB-dev.dirs.in:
  Delete: debian/libmysqlclientSLIB-dev.dirs.in
BitKeeper/deleted/.del-libmysqlclientSLIB-dev.docs.in:
  Delete: debian/libmysqlclientSLIB-dev.docs.in
BitKeeper/deleted/.del-libmysqlclientSLIB-dev.examples.in:
  Delete: debian/libmysqlclientSLIB-dev.examples.in
BitKeeper/deleted/.del-libmysqlclientSLIB-dev.files.in:
  Delete: debian/libmysqlclientSLIB-dev.files.in
BitKeeper/deleted/.del-libmysqlclientSLIB-dev.links.in:
  Delete: debian/libmysqlclientSLIB-dev.links.in
BitKeeper/deleted/.del-libmysqlclientSLIBoff.README.Debian.in:
  Delete: debian/libmysqlclientSLIBoff.README.Debian.in
BitKeeper/deleted/.del-libmysqlclientSLIBoff.dirs.in:
  Delete: debian/libmysqlclientSLIBoff.dirs.in
BitKeeper/deleted/.del-libmysqlclientSLIBoff.docs.in:
  Delete: debian/libmysqlclientSLIBoff.docs.in
BitKeeper/deleted/.del-libmysqlclientSLIBoff.files.in:
  Delete: debian/libmysqlclientSLIBoff.files.in
BitKeeper/deleted/.del-libmysqlclientSLIBoff.postinst.in:
  Delete: debian/libmysqlclientSLIBoff.postinst.in
BitKeeper/deleted/.del-libndbclientNLIB-dev.dirs.in:
  Delete: debian/libndbclientNLIB-dev.dirs.in
BitKeeper/deleted/.del-libndbclientNLIB-dev.files.in:
  Delete: debian/libndbclientNLIB-dev.files.in
BitKeeper/deleted/.del-libndbclientNLIB-dev.links.in:
  Delete: debian/libndbclientNLIB-dev.links.in
BitKeeper/deleted/.del-libndbclientNLIB.README.Debian.in:
  Delete: debian/libndbclientNLIB.README.Debian.in
BitKeeper/deleted/.del-libndbclientNLIB.dirs.in:
  Delete: debian/libndbclientNLIB.dirs.in
BitKeeper/deleted/.del-libndbclientNLIB.files.in:
  Delete: debian/libndbclientNLIB.files.in
BitKeeper/deleted/.del-libndbclientNLIB.postinst.in:
  Delete: debian/libndbclientNLIB.postinst.in
BitKeeper/deleted/.del-mysql-client-BASE.NEWS.in:
  Delete: debian/mysql-client-BASE.NEWS.in
BitKeeper/deleted/.del-mysql-client-BASE.README.Debian.in:
  Delete: debian/mysql-client-BASE.README.Debian.in
BitKeeper/deleted/.del-mysql-client-BASE.dirs.in:
  Delete: debian/mysql-client-BASE.dirs.in
BitKeeper/deleted/.del-mysql-client-BASE.docs.in:
  Delete: debian/mysql-client-BASE.docs.in
BitKeeper/deleted/.del-mysql-client-BASE.files.in:
  Delete: debian/mysql-client-BASE.files.in
BitKeeper/deleted/.del-mysql-client-BASE.lintian-overrides.in:
  Delete: debian/mysql-client-BASE.lintian-overrides.in
BitKeeper/deleted/.del-mysql-common.README.Debian.in:
  Delete: debian/mysql-common.README.Debian.in
BitKeeper/deleted/.del-mysql-common.dirs.in:
  Delete: debian/mysql-common.dirs.in
BitKeeper/deleted/.del-mysql-common.files.in:
  Delete: debian/mysql-common.files.in
BitKeeper/deleted/.del-mysql-common.postrm.in:
  Delete: debian/mysql-common.postrm.in
BitKeeper/deleted/.del-mysql-common.preinst.in:
  Delete: debian/mysql-common.preinst.in
BitKeeper/deleted/.del-mysql-extra-BASE.dirs.in:
  Delete: debian/mysql-extra-BASE.dirs.in
BitKeeper/deleted/.del-mysql-extra-BASE.files.in:
  Delete: debian/mysql-extra-BASE.files.in
BitKeeper/deleted/.del-mysql-management-BASE.dirs.in:
  Delete: debian/mysql-management-BASE.dirs.in
BitKeeper/deleted/.del-mysql-management-BASE.files.in:
  Delete: debian/mysql-management-BASE.files.in
BitKeeper/deleted/.del-mysql-management-BASE.mysql-management.init.in:
  Delete: debian/mysql-management-BASE.mysql-management.init.in
BitKeeper/deleted/.del-mysql-server-BASE.NEWS.in:
  Delete: debian/mysql-server-BASE.NEWS.in
BitKeeper/deleted/.del-mysql-server-BASE.README.Debian.in:
  Delete: debian/mysql-server-BASE.README.Debian.in
BitKeeper/deleted/.del-mysql-server-BASE.config.in:
  Delete: debian/mysql-server-BASE.config.in
BitKeeper/deleted/.del-mysql-server-BASE.dirs.in:
  Delete: debian/mysql-server-BASE.dirs.in
BitKeeper/deleted/.del-mysql-server-BASE.docs.in:
  Delete: debian/mysql-server-BASE.docs.in
BitKeeper/deleted/.del-mysql-server-BASE.files.in:
  Delete: debian/mysql-server-BASE.files.in
BitKeeper/deleted/.del-mysql-server-BASE.links.in:
  Delete: debian/mysql-server-BASE.links.in
BitKeeper/deleted/.del-mysql-server-BASE.lintian-overrides.in:
  Delete: debian/mysql-server-BASE.lintian-overrides.in
BitKeeper/deleted/.del-mysql-server-BASE.logcheck.ignore.paranoid.in:
  Delete: debian/mysql-server-BASE.logcheck.ignore.paranoid.in
BitKeeper/deleted/.del-my.cnf:
  Delete: debian/additions/my.cnf
BitKeeper/deleted/.del-mysql-server-BASE.logcheck.ignore.server.in:
  Delete: debian/mysql-server-BASE.logcheck.ignore.server.in
BitKeeper/deleted/.del-mysql-server-BASE.logcheck.ignore.workstation.in:
  Delete: debian/mysql-server-BASE.logcheck.ignore.workstation.in
BitKeeper/deleted/.del-mysql-server-BASE.mysql-server.logrotate.in:
  Delete: debian/mysql-server-BASE.mysql-server.logrotate.in
BitKeeper/deleted/.del-mysql-server-BASE.postinst.in:
  Delete: debian/mysql-server-BASE.postinst.in
BitKeeper/deleted/.del-mysql-server-BASE.postrm.in:
  Delete: debian/mysql-server-BASE.postrm.in
BitKeeper/deleted/.del-mysql-server-BASE.preinst.in:
  Delete: debian/mysql-server-BASE.preinst.in
BitKeeper/deleted/.del-mysql-server-BASE.prerm.in:
  Delete: debian/mysql-server-BASE.prerm.in
BitKeeper/deleted/.del-mysql-server-BASE.templates.in:
  Delete: debian/mysql-server-BASE.templates.in
BitKeeper/deleted/.del-mysql-server-PREV.preinst.in:
  Delete: debian/mysql-server-PREV.preinst.in
BitKeeper/deleted/.del-mysql-server.lintian-overrides:
  Delete: debian/additions/mysql-server.lintian-overrides
BitKeeper/deleted/.del-mysql-server.preinst.in:
  Delete: debian/mysql-server.preinst.in
BitKeeper/deleted/.del-mysql-storage-BASE.dirs.in:
  Delete: debian/mysql-storage-BASE.dirs.in
BitKeeper/deleted/.del-mysql-storage-BASE.files.in:
  Delete: debian/mysql-storage-BASE.files.in
BitKeeper/deleted/.del-mysql-storage-BASE.mysql-storage.init.in:
  Delete: debian/mysql-storage-BASE.mysql-storage.init.in
BitKeeper/deleted/.del-mysql-test-BASE.dirs.in:
  Delete: debian/mysql-test-BASE.dirs.in
BitKeeper/deleted/.del-mysql-test-BASE.files.in:
  Delete: debian/mysql-test-BASE.files.in
BitKeeper/deleted/.del-mysql-tools-BASE.dirs.in:
  Delete: debian/mysql-tools-BASE.dirs.in
BitKeeper/deleted/.del-mysql-tools-BASE.files.in:
  Delete: debian/mysql-tools-BASE.files.in
BitKeeper/deleted/.del-rules:
  Delete: debian/rules
BitKeeper/deleted/.del-source.lintian-overrides.in:
  Delete: debian/source.lintian-overrides.in
BitKeeper/deleted/.del-watch:
  Delete: debian/watch
BitKeeper/deleted/.del-POTFILES.in.in:
  Delete: debian/po/POTFILES.in.in
BitKeeper/deleted/.del-ca.po:
  Delete: debian/po/ca.po
BitKeeper/deleted/.del-cs.po:
  Delete: debian/po/cs.po
BitKeeper/deleted/.del-da.po:
  Delete: debian/po/da.po
BitKeeper/deleted/.del-de.po:
  Delete: debian/po/de.po
BitKeeper/deleted/.del-es.po:
  Delete: debian/po/es.po
BitKeeper/deleted/.del-eu.po:
  Delete: debian/po/eu.po
BitKeeper/deleted/.del-fr.po:
  Delete: debian/po/fr.po
BitKeeper/deleted/.del-gl.po:
  Delete: debian/po/gl.po
BitKeeper/deleted/.del-it.po:
  Delete: debian/po/it.po
BitKeeper/deleted/.del-ja.po:
  Delete: debian/po/ja.po
BitKeeper/deleted/.del-nb.po:
  Delete: debian/po/nb.po
BitKeeper/deleted/.del-ndb_mgmd.cnf:
  Delete: debian/additions/ndb_mgmd.cnf
BitKeeper/deleted/.del-nl.po:
  Delete: debian/po/nl.po
BitKeeper/deleted/.del-pt.po:
  Delete: debian/po/pt.po
BitKeeper/deleted/.del-pt_BR.po:
  Delete: debian/po/pt_BR.po
BitKeeper/deleted/.del-ro.po:
  Delete: debian/po/ro.po
BitKeeper/deleted/.del-ru.po:
  Delete: debian/po/ru.po
BitKeeper/deleted/.del-sv.po:
  Delete: debian/po/sv.po
BitKeeper/deleted/.del-templates.pot:
  Delete: debian/po/templates.pot
BitKeeper/deleted/.del-tr.po:
  Delete: debian/po/tr.po

3 files changed, 0 insertions, 171 deletions

diff --git a/debian/additions/my.cnf b/debian/additions/my.cnf
deleted file mode 100644
index a569c041401..00000000000
--- a/debian/additions/my.cnf
+++ /dev/null
@@ -1,134 +0,0 @@
-#
-# The MySQL database server configuration file.
-#
-# You can copy this to one of:
-# - "/etc/mysql/my.cnf" to set global options,
-# - "~/.my.cnf" to set user-specific options.
-# 
-# One can use all long options that the program supports.
-# Run program with --help to get a list of available options and with
-# --print-defaults to see which it would actually understand and use.
-#
-# For explanations see
-# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
-
-# This will be passed to all mysql clients
-# It has been reported that passwords should be enclosed with ticks/quotes
-# escpecially if they contain "#" chars...
-# Remember to edit /etc/mysql/debian.cnf when changing the socket location.
-[client]
-port		= 3306
-socket		= /var/run/mysqld/mysqld.sock
-
-# Here is entries for some specific programs
-# The following values assume you have at least 32M ram
-
-# This was formally known as [safe_mysqld]. Both versions are currently parsed.
-[mysqld_safe]
-socket		= /var/run/mysqld/mysqld.sock
-nice		= 0
-
-[mysqld]
-#
-# * Basic Settings
-#
-user		= mysql
-pid-file	= /var/run/mysqld/mysqld.pid
-socket		= /var/run/mysqld/mysqld.sock
-port		= 3306
-basedir		= /usr
-datadir		= /var/lib/mysql
-tmpdir		= /tmp
-language	= /usr/share/mysql/english
-skip-external-locking
-#
-# Instead of skip-networking the default is now to listen only on
-# localhost which is more compatible and is not less secure.
-bind-address		= 127.0.0.1
-#
-# * Fine Tuning
-#
-key_buffer		= 16M
-max_allowed_packet	= 16M
-thread_stack		= 128K
-thread_cache_size	= 8
-#
-# * Query Cache Configuration
-#
-query_cache_limit	= 1048576
-query_cache_size        = 16777216
-query_cache_type        = 1
-#
-# * Logging and Replication
-#
-# Both location gets rotated by the cronjob.
-# Be aware that this log type is a performance killer.
-#log		= /var/log/mysql/mysql.log
-#
-# Error logging goes to syslog. This is a Debian improvement :)
-#
-# Here you can see queries with especially long duration
-#log_slow_queries	= /var/log/mysql/mysql-slow.log
-#
-# The following can be used as easy to replay backup logs or for replication.
-#server-id		= 1
-log_bin			= /var/log/mysql/mysql-bin.log
-# WARNING: Using expire_logs_days without bin_log crashes the server! See README.Debian!
-expire_logs_days	= 10
-max_binlog_size         = 100M
-#binlog_do_db		= include_database_name
-#binlog_ignore_db	= include_database_name
-#
-# * BerkeleyDB
-#
-# Using BerkeleyDB is now discouraged as its support will cease in 5.1.12.
-skip-bdb
-#
-# * InnoDB
-#
-# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
-# Read the manual for more InnoDB related options. There are many!
-# You might want to disable InnoDB to shrink the mysqld process by circa 100MB.
-#skip-innodb
-#
-# * Security Features
-#
-# Read the manual, too, if you want chroot!
-# chroot = /var/lib/mysql/
-#
-# For generating SSL certificates I recommend the OpenSSL GUI "tinyca".
-#
-# ssl-ca=/etc/mysql/cacert.pem
-# ssl-cert=/etc/mysql/server-cert.pem
-# ssl-key=/etc/mysql/server-key.pem
-
-
-
-[mysqldump]
-quick
-quote-names
-max_allowed_packet	= 16M
-
-[mysql]
-#no-auto-rehash	# faster start of mysql but no tab completition
-
-[isamchk]
-key_buffer		= 16M
-
-#
-# * NDB Cluster
-#
-# See /usr/share/doc/mysql-server-*/README.Debian for more information.
-#
-# The following configuration is read by the NDB Data Nodes (ndbd processes)
-# not from the NDB Management Nodes (ndb_mgmd processes).
-#
-# [MYSQL_CLUSTER]
-# ndb-connectstring=127.0.0.1
-
-
-#
-# * IMPORTANT: Additional settings that can override those from this file!
-#
-!includedir /etc/mysql/conf.d/
-
diff --git a/debian/additions/mysql-server.lintian-overrides b/debian/additions/mysql-server.lintian-overrides
deleted file mode 100644
index 9d741cf16e9..00000000000
--- a/debian/additions/mysql-server.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-W: mysql-dfsg source: maintainer-script-lacks-debhelper-token debian/mysql-server.postinst
-W: mysql-server: possible-bashism-in-maintainer-script postinst:68 'p{("a".."z","A".."Z",0..9)[int(rand(62))]}'
diff --git a/debian/additions/ndb_mgmd.cnf b/debian/additions/ndb_mgmd.cnf
deleted file mode 100644
index d94a28ff705..00000000000
--- a/debian/additions/ndb_mgmd.cnf
+++ /dev/null
@@ -1,35 +0,0 @@
-[NDBD DEFAULT]
-NoOfReplicas=2
-DataMemory=10MB
-IndexMemory=25MB
-MaxNoOfTables=256
-MaxNoOfOrderedIndexes=256
-MaxNoOfUniqueHashIndexes=128
-
-[MYSQLD DEFAULT]
-
-[NDB_MGMD DEFAULT]
-
-[TCP DEFAULT]
-
-[NDB_MGMD]
-Id=1                            # the NDB Management Node (this one)
-HostName=127.0.0.1          
-
-[NDBD]
-Id=2                            # the first NDB Data Node
-HostName=127.0.0.1          
-DataDir= /var/lib/mysql-cluster
-
-[NDBD]
-Id=3                            # the second NDB Data Node
-HostName=127.0.0.1          
-DataDir=/var/lib/mysql-cluster
-
-[MYSQLD]
-Id=4                            # the first SQL node
-HostName=127.0.0.1
-
-# [MYSQLD]
-# Id=5                          # the second SQL node
-# HostName=127.0.0.10