[Pkg-mysql-commits] r1100 - in trunk: . debian

[Monty Taylor]

Author: mtaylor-guest
Date: 2007-12-19 16:03:59 +0000 (Wed, 19 Dec 2007)
New Revision: 1100

Modified:
   trunk/
   trunk/debian/changelog
   trunk/debian/control
Log:
* Added Conflicts on mysql-doc-5.0 which contains conflicting versions of
  man pages.


Property changes on: trunk
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2007-12-19 11:37:03.479000092 -0200
committer: Monty Taylor <monty at inaugust.com>
properties: 
	branch-nick: trunk

   + timestamp: 2007-12-19 14:03:33.663000107 -0200
committer: Monty Taylor <monty at inaugust.com>
properties: 
	branch-nick: trunk

Name: bzr:revision-id:v3-trunk0
   - 588 monty at inaugust.com-20071218115655-e9a3qdeanxkm37q0
589 monty at inaugust.com-20071219010144-z07rx72f4aryuxd5
590 monty at inaugust.com-20071219010251-1xj8ebk20xcavzzz
591 monty at inaugust.com-20071219133703-cfc7gcr1mfrbff5k

   + 588 monty at inaugust.com-20071218115655-e9a3qdeanxkm37q0
589 monty at inaugust.com-20071219010144-z07rx72f4aryuxd5
590 monty at inaugust.com-20071219010251-1xj8ebk20xcavzzz
591 monty at inaugust.com-20071219133703-cfc7gcr1mfrbff5k
594 monty at inaugust.com-20071219160333-4t3d5sm5ou2cnx42


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-12-19 15:17:47 UTC (rev 1099)
+++ trunk/debian/changelog	2007-12-19 16:03:59 UTC (rev 1100)
@@ -7,11 +7,13 @@
     mysql_upgrade_shell anymore and use mysql_upgrade instead.
   * Removed 88_mctype_attrib. http://bugs.mysql.com/bug.php?id=25118 is closed
     with http://lists.mysql.com/commits/24337
+  * Added Conflicts on mysql-doc-5.0 which contains conflicting versions of
+    man pages.
 
   [ Norbert Tretkowski ]
   * New patch 54_ssl-client-support.dpatch to fix SSL client support.
 
- -- Norbert Tretkowski <nobse at debian.org>  Wed, 19 Dec 2007 16:13:38 +0100
+ -- Monty Taylor <monty at inaugust.com>  Wed, 19 Dec 2007 14:02:55 -0200
 
 mysql-dfsg-5.0 (5.0.51-1) unstable; urgency=low
 

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2007-12-19 15:17:47 UTC (rev 1099)
+++ trunk/debian/control	2007-12-19 16:03:59 UTC (rev 1100)
@@ -27,7 +27,7 @@
 Architecture: any
 Section: libdevel
 Depends: libmysqlclient15off (>= ${binary:Version}), zlib1g-dev, ${shlibs:Depends}
-Conflicts: libmysqlclient14-dev, libmysqlclient12-dev, libmysqlclient10-dev
+Conflicts: libmysqlclient14-dev, libmysqlclient12-dev, libmysqlclient10-dev, mysql-doc-5.0
 Provides: libmysqlclient-dev
 Description: MySQL database development files
  MySQL is a fast, stable and true multi-user, multi-threaded SQL database
@@ -55,7 +55,7 @@
 Depends: debianutils (>=1.6), libdbi-perl, libdbd-mysql-perl (>= 1.2202), mysql-common (>= ${source:Version}), libmysqlclient15off (>= ${binary:Version}), ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Recommends: libterm-readkey-perl
 Provides: virtual-mysql-client, mysql-client
-Conflicts: mysql-client (<< ${source:Version})
+Conflicts: mysql-client (<< ${source:Version}), mysql-doc-5.0
 Replaces: mysql-client (<< ${source:Version}), mysql-server
 Description: MySQL database client binaries
  MySQL is a fast, stable and true multi-user, multi-threaded SQL database
@@ -72,7 +72,7 @@
 Recommends: mailx
 Pre-Depends: mysql-common (>= ${source:Version}), adduser (>= 3.40), debconf
 Depends: mysql-client-5.0 (>= ${binary:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10)
-Conflicts: mysql-server (<< ${source:Version})
+Conflicts: mysql-server (<< ${source:Version}), mysql-doc-5.0
 Provides: mysql-server, virtual-mysql-server
 Replaces: mysql-server (<< ${source:Version})
 Description: MySQL database server binaries