[Pkg-mysql-commits] r872 - branches/sid-5.0/debian

[Sean Finney]

Author: seanius
Date: 2007-05-13 10:33:18 +0000 (Sun, 13 May 2007)
New Revision: 872

Modified:
   branches/sid-5.0/debian/changelog
   branches/sid-5.0/debian/control
Log:
whoops... bubulles changes reintroduced stuff in control

Modified: branches/sid-5.0/debian/changelog
===================================================================
--- branches/sid-5.0/debian/changelog	2007-05-12 10:23:29 UTC (rev 871)
+++ branches/sid-5.0/debian/changelog	2007-05-13 10:33:18 UTC (rev 872)
@@ -1,8 +1,9 @@
-mysql-dfsg-5.0 (5.0.41-2) UNRELEASED; urgency=low
+mysql-dfsg-5.0 (5.0.41-2) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * the previous "translation changes" inadvertently introduced unrelated
+    changes in the package control file.
 
- -- sean finney <seanius at debian.org>  Sat, 12 May 2007 12:23:08 +0200
+ -- sean finney <seanius at debian.org>  Sun, 13 May 2007 12:32:45 +0200
 
 mysql-dfsg-5.0 (5.0.41-1) unstable; urgency=low
 

Modified: branches/sid-5.0/debian/control
===================================================================
--- branches/sid-5.0/debian/control	2007-05-12 10:23:29 UTC (rev 871)
+++ branches/sid-5.0/debian/control	2007-05-13 10:33:18 UTC (rev 872)
@@ -38,9 +38,6 @@
 Section: misc
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: mysql-common-4.1
-Provides: mysql-common-4.1
-Replaces: mysql-common-4.1
 Description: MySQL database common files
  MySQL is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
@@ -53,9 +50,9 @@
 Package: mysql-client-5.0
 Architecture: any
 Depends: debianutils (>=1.6), libdbi-perl, libdbd-mysql-perl (>= 1.2202), mysql-common (>= ${Source-Version}), libmysqlclient15off (>= ${Source-Version}), ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Provides: virtual-mysql-client, mysql-client, mysql-client-4.1
-Conflicts: mysql-client (<< ${Source-Version}), mysql-client-4.1
-Replaces: mysql-client (<< ${Source-Version}), mysql-server, mysql-client-4.1
+Provides: virtual-mysql-client, mysql-client
+Conflicts: mysql-client (<< ${Source-Version})
+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
  server. SQL (Structured Query Language) is the most popular database query
@@ -65,11 +62,14 @@
  This package includes the client binaries.
 
 Package: mysql-server-5.0
-Architecture: any
-Depends: debianutils (>=1.6), libdbi-perl, libdbd-mysql-perl (>= 1.2202), mysql-common (>= ${Source-Version}), libmysqlclient15off (>= ${Source-Version}), ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Provides: virtual-mysql-client, mysql-client, mysql-client-4.1
-Conflicts: mysql-client (<< ${Source-Version}), mysql-client-4.1
-Replaces: mysql-client (<< ${Source-Version}), mysql-server, mysql-client-4.1
+Architecture: any                                                               
+Suggests: tinyca
+Recommends: mailx
+Pre-Depends: mysql-common (>= ${Source-Version}), adduser (>= 3.40)
+Depends: mysql-client-5.0 (>= ${Source-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})
 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
@@ -78,27 +78,14 @@
  .
  This package includes the server and ndb-cluster binaries.
 
-Package: mysql-server-4.1
-Architecture: any
-Section: oldlibs
-Priority: extra
-Depends: mysql-server-5.0
-Description: MySQL database server (transitional package)
- MySQL is a fast, stable and true multi-user, multi-threaded SQL database
- server. SQL (Structured Query Language) is the most popular database query
- language in the world. The main goals of MySQL are speed, robustness and
- ease of use.
- .
- This is an empty transitional package and can safely be removed.
-
 Package: mysql-server
 Architecture: all
 Depends: mysql-server-5.0
 Description: MySQL database server (meta package depending on the latest version)
- This is an empty package that depends on the current "best" version
- of mysql-server (currently mysql-server-5.0), as determined by the
- MySQL maintainers. Install this package if in doubt about which MySQL
- version you need. That will install the version recommended by the
+ This is an empty package that depends on the current "best" version 
+ of mysql-server (currently mysql-server-5.0), as determined by the 
+ MySQL maintainers.  Install this package if in doubt about which MySQL
+ version you need.  That will install the version recommended by the
  package maintainers.
  .
  MySQL is a fast, stable and true multi-user, multi-threaded SQL database