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

[Monty Taylor]

Author: mtaylor-guest
Date: 2007-12-27 23:26:57 +0000 (Thu, 27 Dec 2007)
New Revision: 1109

Modified:
   trunk/
   trunk/debian/control
Log:
Merged in changes related to community provides/conflicts addition. 
Also brought over some changes to deal with some lintian carping. 



Property changes on: trunk
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2007-12-27 17:12:32.842000008 -0600
committer: Monty Taylor <monty at inaugust.com>
properties: 
	branch-nick: trunk

   + timestamp: 2007-12-27 17:15:33.654000044 -0600
committer: Monty Taylor <monty at inaugust.com>
properties: 
	branch-nick: trunk

Name: bzr:ancestry:v3-trunk0
   - svn-v3-trunk0:bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1:trunk:1093

   + svn-v3-trunk0:bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1:trunk:1093
monty at inaugust.com-20071219005821-v5qtsv9qvi70s0mt

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
594 monty at inaugust.com-20071219160333-4t3d5sm5ou2cnx42
600 monty at inaugust.com-20071227231232-38mmb4bf89bai9tz

   + 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
600 monty at inaugust.com-20071227231232-38mmb4bf89bai9tz
601 monty at inaugust.com-20071227231533-6u75bgvr52589l9d


Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2007-12-27 23:13:14 UTC (rev 1108)
+++ trunk/debian/control	2007-12-27 23:26:57 UTC (rev 1109)
@@ -54,8 +54,8 @@
 Architecture: any
 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})
+Provides: virtual-mysql-client, mysql-client, mysql-community-client-5.0
+Conflicts: mysql-client (<< ${source:Version}), mysql-enterprise-client-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
@@ -73,8 +73,8 @@
 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})
-Provides: mysql-server, virtual-mysql-server
-Replaces: mysql-server (<< ${source:Version})
+Provides: mysql-server, virtual-mysql-server, mysql-community-server-5.0
+Replaces: mysql-server (<< ${source:Version}), mysql-enterprise-server-5.0
 Description: MySQL database server binaries
  MySQL is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query