* Removed doxygen-latex, ghostscript as build dependency

  as these were needed only for the NDB docs
* Dropped mailx to Suggests clause (Closes: #535496)

git-svn-id: svn://svn.debian.org/svn/pkg-mysql/mysql-5.5/branches/unstable@2110 bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1

4 files changed, 11 insertions, 8 deletions

diff --git a/debian/changelog b/debian/changelog
index da76909..57ad11e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,12 +16,14 @@ mysql-5.5 (5.5.23-3) UNRELEASED; urgency=low
   * Removed the numerical prefix from the patch files
   * Applied fix-mysqldump-test.patch from Ubuntu
   * Located and installed upstream changelog
-  * Removed doxygen-latex as build dependency
+  * Removed doxygen-latex, ghostscript as build dependency
+    as these were needed only for the NDB docs
   * Added lintian overrides
     - spelling false positive: yuR
     - long lines in man pages that cannot be reformatted
     - missing symbols file (cf. #590905)
   * Added patch for hyphen/minus sign confusion
+  * Dropped mailx to Suggests clause (Closes: #535496)
 
  -- Nicholas Bamber <nicholas@periapt.co.uk>  Tue, 08 May 2012 09:04:25 +0100
 
diff --git a/debian/control b/debian/control
index 019536b..6d1e412 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
 Uploaders: Norbert Tretkowski <norbert@tretkowski.de>,
  Clint Byrum <clint@ubuntu.com>, Nicholas Bamber <nicholas@periapt.co.uk>
-Build-Depends: debhelper (>= 8.1.3~), libaio-dev[linux-any], libncurses5-dev (>= 5.0-6), perl, libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline-dev, po-debconf, psmisc, chrpath, ghostscript, gawk, bison, lsb-release, hardening-wrapper, cmake, libssl-dev
+Build-Depends: debhelper (>= 8.1.3~), libaio-dev[linux-any], libncurses5-dev (>= 5.0-6), perl, libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline-dev, po-debconf, psmisc, chrpath, gawk, bison, lsb-release, hardening-wrapper, cmake, libssl-dev
 Standards-Version: 3.9.3
 Homepage: http://dev.mysql.com/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-mysql/mysql-5.5/
@@ -110,8 +110,8 @@ Description: MySQL database server binaries
 
 Package: mysql-server-5.5
 Architecture: any
-Suggests: tinyca
-Recommends: mailx, libhtml-template-perl
+Recommends: libhtml-template-perl
+Suggests: tinyca, mailx
 Pre-Depends: mysql-common (>= ${source:Version}), adduser (>= 3.40), debconf
 Depends: mysql-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mysql-server-core-5.5 (= ${binary:Version})
 Breaks: mysql-server (<< ${source:Version}), mysql-server-5.1, libmysqlclient-dev ( << 5.5.17~), mysql-client-5.1
diff --git a/debian/mysql-server-5.5.examples b/debian/mysql-server-5.5.examples
index 185732a..e0d832f 100644
--- a/debian/mysql-server-5.5.examples
+++ b/debian/mysql-server-5.5.examples
@@ -1,2 +1,3 @@
+debian/tmp/usr/share/mysql/*cnf
 debian/tmp/usr/share/mysql/magic
 debian/tmp/usr/lib/mysql/plugin/daemon_example.ini
diff --git a/debian/rules b/debian/rules
index 44d2d7e..3e10053 100755
--- a/debian/rules
+++ b/debian/rules
@@ -161,9 +161,7 @@ auto_install-stamp:
 	install -m 0644 -o root -g root $(BUILDDIR_PIC)/libmysqld/libmysqld.a $(TMP)/usr/lib/mysql/libmysqld_pic.a
 	# mysql_config won't report the -fPIC, so give libmysqld-pic users a way to get their flags
 	install -m 0755 -o root -g root $(BUILDDIR_PIC)/scripts/mysql_config $(TMP)/usr/bin/mysql_config_pic
-	# mysql-server
-	mkdir -p $(TMP)/usr/share/doc/mysql-server-5.5/examples
-	mv $(TMP)/usr/share/mysql/*cnf 	    $(TMP)/usr/share/doc/mysql-server-5.5/examples/
+	mkdir -p $(TMP)/usr/share/doc/mysql-server-5.5
 	nm -n $(BUILDDIR)/sql/mysqld |gzip -9 > $(TMP)/usr/share/doc/mysql-server-5.5/mysqld.sym.gz
 	# This seems to be the only safe place to fix permissions issues
         # not handled by dh_fixperms.
@@ -188,6 +186,7 @@ auto_install-stamp:
 #       usr/share/mysql/magic                           M-server-5.5    example
 #       usr/bin/mysqlaccess.conf                        M-client-5.5    example
 #       usr/lib/mysql/plugin/daemon_example.ini         M-server-5.5    example
+#       usr/share/mysql/my-                             M-server-5.5    example
 # Note: lintian complains about the upstream supplied info file
 # and we don't have the source to fix it.
 # 
@@ -208,7 +207,8 @@ override_dh_install:
         -Xusr/share/mysql/mi_test_all                   \
         -Xusr/share/mysql/mysql-log-rotate              \
         -Xusr/share/mysql/mysql.server                  \
-        -Xusr/share/mysql/binary-configure
+        -Xusr/share/mysql/binary-configure              \
+        -Xusr/share/mysql/my-
 
 libmysqlclient-links-stamp: auto_install-stamp
 	@echo "RULES.$@"