* Distributed unused resources amongst packages appropriately

* Located and installed upstream changelog
* Removed doxygen-latex as build dependency

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

19 files changed, 25 insertions, 38 deletions

diff --git a/debian/changelog b/debian/changelog
index b8b5b2e..e292303 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,9 @@ 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
   * Added --fail-missing to dh_install to catch binaries not being installed
+  * Distributed unused resources amongst packages appropriately
+  * Located and installed upstream changelog
+  * Removed doxygen-latex as build dependency
 
  -- Nicholas Bamber <nicholas@periapt.co.uk>  Tue, 08 May 2012 09:04:25 +0100
 
diff --git a/debian/control b/debian/control
index b87c900..019536b 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, doxygen-latex, 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, ghostscript, 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/
diff --git a/debian/copyright b/debian/copyright
index 3d8ba73..ff1c97d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -160,6 +160,7 @@ License: GPL-2
  of which version of the GPL is applied is otherwise unspecified.
 
 Files: BUILD/*
+ Docs/*
  client/*
  client/echo.c
  client/get_password.c
diff --git a/debian/libmysqlclient-dev.lintian-overrides b/debian/libmysqlclient-dev.lintian-overrides
deleted file mode 100644
index 7396e47..0000000
--- a/debian/libmysqlclient-dev.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# See http://dev.mysql.com/doc/refman/5.5/en/news-5-5-x.html
-libmysqlclient-dev: no-upstream-changelog
diff --git a/debian/libmysqlclient18.lintian-overrides b/debian/libmysqlclient18.lintian-overrides
deleted file mode 100644
index 984e5b1..0000000
--- a/debian/libmysqlclient18.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# See http://dev.mysql.com/doc/refman/5.5/en/news-5-5-x.html
-libmysqlclient18: no-upstream-changelog
diff --git a/debian/libmysqld-dev.lintian-overrides b/debian/libmysqld-dev.lintian-overrides
deleted file mode 100644
index 4ea7596..0000000
--- a/debian/libmysqld-dev.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# See http://dev.mysql.com/doc/refman/5.5/en/news-5-5-x.html
-libmysqld-dev: no-upstream-changelog
diff --git a/debian/libmysqld-pic.lintian-overrides b/debian/libmysqld-pic.lintian-overrides
deleted file mode 100644
index 8bec3e6..0000000
--- a/debian/libmysqld-pic.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# See http://dev.mysql.com/doc/refman/5.5/en/news-5-5-x.html
-libmysqld-pic: no-upstream-changelog
diff --git a/debian/mysql-client-5.5.examples b/debian/mysql-client-5.5.examples
new file mode 100644
index 0000000..ef08ce1
--- /dev/null
+++ b/debian/mysql-client-5.5.examples
@@ -0,0 +1 @@
+debian/tmp/usr/bin/mysqlaccess.conf
diff --git a/debian/mysql-client-5.5.lintian-overrides b/debian/mysql-client-5.5.lintian-overrides
index b571d11..3f6672a 100644
--- a/debian/mysql-client-5.5.lintian-overrides
+++ b/debian/mysql-client-5.5.lintian-overrides
@@ -1,5 +1,3 @@
-# There is a patched bug report to split out innotop - #660087
-mysql-client-5.5: wrong-name-for-upstream-changelog usr/share/doc/mysql-client-5.5/changelog.innotop.gz
 # Will look at man pages later 
 # 2012-03-08 periapt
 mysql-client-5.5: binary-without-manpage usr/bin/innochecksum
diff --git a/debian/mysql-client.lintian-overrides b/debian/mysql-client.lintian-overrides
deleted file mode 100644
index f650a9f..0000000
--- a/debian/mysql-client.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# See http://dev.mysql.com/doc/refman/5.5/en/news-5-5-x.html
-mysql-client: no-upstream-changelog
diff --git a/debian/mysql-common.lintian-overrides b/debian/mysql-common.lintian-overrides
deleted file mode 100644
index 48ba481..0000000
--- a/debian/mysql-common.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# See http://dev.mysql.com/doc/refman/5.5/en/news-5-5-x.html
-mysql-common: no-upstream-changelog
diff --git a/debian/mysql-server-5.5.examples b/debian/mysql-server-5.5.examples
new file mode 100644
index 0000000..185732a
--- /dev/null
+++ b/debian/mysql-server-5.5.examples
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/mysql/magic
+debian/tmp/usr/lib/mysql/plugin/daemon_example.ini
diff --git a/debian/mysql-server-5.5.lintian-overrides b/debian/mysql-server-5.5.lintian-overrides
deleted file mode 100644
index 4531087..0000000
--- a/debian/mysql-server-5.5.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# See http://dev.mysql.com/doc/refman/5.5/en/news-5-5-x.html
-mysql-server-5.5: no-upstream-changelog
diff --git a/debian/mysql-server-core-5.5.lintian-overrides b/debian/mysql-server-core-5.5.lintian-overrides
deleted file mode 100644
index c43267c..0000000
--- a/debian/mysql-server-core-5.5.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# See http://dev.mysql.com/doc/refman/5.5/en/news-5-5-x.html
-mysql-server-core-5.5: no-upstream-changelog
diff --git a/debian/mysql-server.lintian-overrides b/debian/mysql-server.lintian-overrides
deleted file mode 100644
index 2955912..0000000
--- a/debian/mysql-server.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# See http://dev.mysql.com/doc/refman/5.5/en/news-5-5-x.html
-mysql-server: no-upstream-changelog
diff --git a/debian/mysql-source-5.5.lintian-overrides b/debian/mysql-source-5.5.lintian-overrides
deleted file mode 100644
index 04aea24..0000000
--- a/debian/mysql-source-5.5.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# See http://dev.mysql.com/doc/refman/5.5/en/news-5-5-x.html
-mysql-source-5.5: no-upstream-changelog
diff --git a/debian/mysql-testsuite-5.5.install b/debian/mysql-testsuite-5.5.install
index a00d364..241d0aa 100644
--- a/debian/mysql-testsuite-5.5.install
+++ b/debian/mysql-testsuite-5.5.install
@@ -1 +1,4 @@
-/usr/share/mysql-test/* /usr/lib/mysql-testsuite/
+usr/share/mysql-test/* usr/lib/mysql-testsuite/
+usr/bin/mysql_client_test_embedded
+usr/bin/mysql_embedded
+usr/bin/mysqltest_embedded
diff --git a/debian/mysql-testsuite-5.5.lintian-overrides b/debian/mysql-testsuite-5.5.lintian-overrides
deleted file mode 100644
index 61242dd..0000000
--- a/debian/mysql-testsuite-5.5.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# See http://dev.mysql.com/doc/refman/5.5/en/news-5-5-x.html
-mysql-testsuite-5.5: no-upstream-changelog
diff --git a/debian/rules b/debian/rules
index 07ca8d2..682e579 100755
--- a/debian/rules
+++ b/debian/rules
@@ -182,14 +182,15 @@ auto_install-stamp:
 	touch $@
 
 # Use the --fail-missing to check for stuff that we should be installing
-# Exclusions:
-#       usr/share/man/  -       dh_installman
-#       libmysqlclient_r.so     dh_links
-#       usr/share/info          [dh_installinfo - mysql-client ]
-#       usr/share/mysql/magic   [dh_installexamples - mysql-server]
-#       usr/lib/mysql/plugin/daemon_example.ini [to investigate]
-#       usr/bin/mysqlaccess.conf [dh_installexamples - mysql-client]
-#       embdedded               [-> test suite ?]
+#       Exclusion                                       Package         Type
+#       usr/share/man/                                  various         man
+#       libmysqlclient_r.so                             libMclient-dev  links
+#       usr/share/info                                  don't install
+#       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
+# Note: lintian complains about the upstream supplied info file
+# and we don't have the source to fix it.
 override_dh_install:
 	dh_install --fail-missing                       \
         -Xusr/share/man/                                \
@@ -197,10 +198,7 @@ override_dh_install:
         -Xusr/share/info                                \
         -Xusr/share/mysql/magic                         \
         -Xusr/lib/mysql/plugin/daemon_example.ini       \
-        -Xusr/bin/mysqlaccess.conf                      \
-        -Xusr/bin/mysql_client_test_embedded            \
-        -Xusr/bin/mysql_embedded                        \
-        -Xusr/bin/mysqltest_embedded
+        -Xusr/bin/mysqlaccess.conf
 
 libmysqlclient-links-stamp: auto_install-stamp
 	@echo "RULES.$@"
@@ -226,6 +224,9 @@ override_dh_installlogrotate-arch:
 	  dh_apparmor -pmysql-server-5.5 --profile-name=usr.sbin.mysqld; \
 	fi
 
+override_dh_installchangelogs:
+	dh_installchangelogs Docs/ChangeLog
+
 # Start mysql in runlevel 19 before 20 where apache, proftpd etc gets
 # started which might depend on a running database server.
 override_dh_installinit-arch: