[Pkg-mysql-commits] r1999 - mysql-5.5/branches/experimental/debian

Norbert Tretkowski nobse at alioth.debian.org
Thu Jun 23 20:06:33 UTC 2011


Author: nobse
Date: 2011-06-23 20:06:32 +0000 (Thu, 23 Jun 2011)
New Revision: 1999

Modified:
   mysql-5.5/branches/experimental/debian/mysql-client-5.5.lintian-overrides
   mysql-5.5/branches/experimental/debian/mysql-server-5.5.config
   mysql-5.5/branches/experimental/debian/mysql-server-5.5.lintian-overrides
   mysql-5.5/branches/experimental/debian/mysql-server-5.5.postrm
   mysql-5.5/branches/experimental/debian/mysql-server-5.5.templates
   mysql-5.5/branches/experimental/debian/source.lintian-overrides
   mysql-5.5/branches/experimental/debian/watch
Log:
Some more 5.1 -> 5.5 changes.

Modified: mysql-5.5/branches/experimental/debian/mysql-client-5.5.lintian-overrides
===================================================================
--- mysql-5.5/branches/experimental/debian/mysql-client-5.5.lintian-overrides	2011-06-23 19:55:31 UTC (rev 1998)
+++ mysql-5.5/branches/experimental/debian/mysql-client-5.5.lintian-overrides	2011-06-23 20:06:32 UTC (rev 1999)
@@ -1,5 +1,5 @@
-mysql-client-5.1: package-has-a-duplicate-relation
-mysql-client-5.1: wrong-name-for-upstream-changelog usr/share/doc/mysql-client-5.1/changelog.innotop.gz
-mysql-client-5.1: pkg-not-in-package-test innotop
-mysql-client-5.1: binary-without-manpage usr/bin/innochecksum
-mysql-client-5.1: binary-without-manpage usr/bin/mysqltest_embedded
+mysql-client-5.5: package-has-a-duplicate-relation
+mysql-client-5.5: wrong-name-for-upstream-changelog usr/share/doc/mysql-client-5.5/changelog.innotop.gz
+mysql-client-5.5: pkg-not-in-package-test innotop
+mysql-client-5.5: binary-without-manpage usr/bin/innochecksum
+mysql-client-5.5: binary-without-manpage usr/bin/mysqltest_embedded

Modified: mysql-5.5/branches/experimental/debian/mysql-server-5.5.config
===================================================================
--- mysql-5.5/branches/experimental/debian/mysql-server-5.5.config	2011-06-23 19:55:31 UTC (rev 1998)
+++ mysql-5.5/branches/experimental/debian/mysql-server-5.5.config	2011-06-23 20:06:32 UTC (rev 1999)
@@ -9,7 +9,7 @@
 
 # Beware that there are two ypwhich one of them needs the 2>/dev/null!
 if test -n "`which ypwhich 2>/dev/null`"  &&  ypwhich >/dev/null 2>&1; then
-  db_input high mysql-server-5.1/nis_warning || true
+  db_input high mysql-server-5.5/nis_warning || true
   db_go
 fi
 

Modified: mysql-5.5/branches/experimental/debian/mysql-server-5.5.lintian-overrides
===================================================================
--- mysql-5.5/branches/experimental/debian/mysql-server-5.5.lintian-overrides	2011-06-23 19:55:31 UTC (rev 1998)
+++ mysql-5.5/branches/experimental/debian/mysql-server-5.5.lintian-overrides	2011-06-23 20:06:32 UTC (rev 1999)
@@ -1,5 +1,5 @@
-mysql-server-5.1: command-with-path-in-maintainer-script postinst
-mysql-server-5.1: possible-bashism-in-maintainer-script postinst:81 'p{("a".."z","A".."Z",0..9)[int(rand(62))]}'
-mysql-server-5.1: possible-bashism-in-maintainer-script preinst:33 '${cmd/ */}'
-mysql-server-5.1: statically-linked-binary ./usr/bin/mysql_tzinfo_to_sql
-mysql-server-5.1: statically-linked-binary ./usr/sbin/mysqld
+mysql-server-5.5: command-with-path-in-maintainer-script postinst
+mysql-server-5.5: possible-bashism-in-maintainer-script postinst:81 'p{("a".."z","A".."Z",0..9)[int(rand(62))]}'
+mysql-server-5.5: possible-bashism-in-maintainer-script preinst:33 '${cmd/ */}'
+mysql-server-5.5: statically-linked-binary ./usr/bin/mysql_tzinfo_to_sql
+mysql-server-5.5: statically-linked-binary ./usr/sbin/mysqld

Modified: mysql-5.5/branches/experimental/debian/mysql-server-5.5.postrm
===================================================================
--- mysql-5.5/branches/experimental/debian/mysql-server-5.5.postrm	2011-06-23 19:55:31 UTC (rev 1998)
+++ mysql-5.5/branches/experimental/debian/mysql-server-5.5.postrm	2011-06-23 20:06:32 UTC (rev 1999)
@@ -52,9 +52,9 @@
   rm -f /var/log/mysql.{log,err}{,.0,.[1234567].gz}
   rm -rf /var/log/mysql
 
-  db_input high mysql-server-5.1/postrm_remove_databases || true
+  db_input high mysql-server-5.5/postrm_remove_databases || true
   db_go || true
-  db_get mysql-server-5.1/postrm_remove_databases || true
+  db_get mysql-server-5.5/postrm_remove_databases || true
   if [ "$RET" = "true" ]; then
     # never remove the debian.cnf when the databases are still existing
     # else we ran into big trouble on the next install!
@@ -78,6 +78,6 @@
 fi
 # (normally) End automatically added section
 
-# no DEBHELPER here, "update-rc.d remove" fails if mysql-server-5.1 is installed
+# no DEBHELPER here, "update-rc.d remove" fails if mysql-server-5.5 is installed
 
 exit 0

Modified: mysql-5.5/branches/experimental/debian/mysql-server-5.5.templates
===================================================================
--- mysql-5.5/branches/experimental/debian/mysql-server-5.5.templates	2011-06-23 19:55:31 UTC (rev 1998)
+++ mysql-5.5/branches/experimental/debian/mysql-server-5.5.templates	2011-06-23 20:06:32 UTC (rev 1999)
@@ -7,7 +7,7 @@
 # Even minor modifications require translation updates and such
 # changes should be coordinated with translators and reviewers.
 
-Template: mysql-server-5.1/really_downgrade
+Template: mysql-server-5.5/really_downgrade
 Type: boolean
 Default: false
 _Description: Really proceed with downgrade?
@@ -19,7 +19,7 @@
  There is no guarantee that the version you're currently installing
  will be able to use the current databases.
 
-Template: mysql-server-5.1/nis_warning
+Template: mysql-server-5.5/nis_warning
 Type: note
 #flag:translate!:3,5
 _Description: Important note for NIS/YP users
@@ -33,7 +33,7 @@
  .
   /var/lib/mysql: drwxr-xr-x   mysql    mysql
 
-Template: mysql-server-5.1/postrm_remove_databases
+Template: mysql-server-5.5/postrm_remove_databases
 Type: boolean
 Default: false
 _Description: Remove all MySQL databases?
@@ -44,7 +44,7 @@
  recent version or if a different mysql-server package is already
  using it, the data should be kept.
 
-Template: mysql-server-5.1/start_on_boot
+Template: mysql-server-5.5/start_on_boot
 Type: boolean
 Default: true
 _Description: Start the MySQL server on boot?
@@ -73,7 +73,7 @@
  .
  You should check the account's password after the package installation.
  .
- Please read the /usr/share/doc/mysql-server-5.1/README.Debian file
+ Please read the /usr/share/doc/mysql-server-5.5/README.Debian file
  for more information.
 
 Template: mysql-server/password_mismatch
@@ -84,6 +84,6 @@
 Template: mysql-server/no_upgrade_when_using_ndb
 Type: error
 _Description: NDB Cluster seems to be in use
- MySQL-5.1 no longer provides NDB Cluster support. Please migrate to the new
+ MySQL-5.5 no longer provides NDB Cluster support. Please migrate to the new
  mysql-cluster-server package and remove all lines starting with "ndb" from
  all config files below /etc/mysql/.

Modified: mysql-5.5/branches/experimental/debian/source.lintian-overrides
===================================================================
--- mysql-5.5/branches/experimental/debian/source.lintian-overrides	2011-06-23 19:55:31 UTC (rev 1998)
+++ mysql-5.5/branches/experimental/debian/source.lintian-overrides	2011-06-23 20:06:32 UTC (rev 1999)
@@ -1,2 +1,2 @@
-maintainer-script-lacks-debhelper-token debian/mysql-server-5.1.postinst
-maintainer-script-lacks-debhelper-token debian/mysql-server-5.1.postrm
+maintainer-script-lacks-debhelper-token debian/mysql-server-5.5.postinst
+maintainer-script-lacks-debhelper-token debian/mysql-server-5.5.postrm

Modified: mysql-5.5/branches/experimental/debian/watch
===================================================================
--- mysql-5.5/branches/experimental/debian/watch	2011-06-23 19:55:31 UTC (rev 1998)
+++ mysql-5.5/branches/experimental/debian/watch	2011-06-23 20:06:32 UTC (rev 1999)
@@ -1,3 +1,3 @@
 version=3
 opts="uversionmangle=s/-(rc|beta)/$1/" \
-  ftp://sunsite.informatik.rwth-aachen.de/pub/mirror/www.mysql.com/Downloads/MySQL-5.1/mysql-([\d\.]*(?:-beta|-rc)?).tar.gz debian
+  ftp://sunsite.informatik.rwth-aachen.de/pub/mirror/www.mysql.com/Downloads/MySQL-5.5/mysql-([\d\.]*(?:-beta|-rc)?).tar.gz debian




More information about the Pkg-mysql-commits mailing list