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

[Nicholas Bamber]

Author: periapt
Date: 2012-04-28 06:38:59 +0000 (Sat, 28 Apr 2012)
New Revision: 2068

Added:
   mysql-5.5/branches/experimental/debian/mysql-common.install
Removed:
   mysql-5.5/branches/experimental/debian/mysql-common.files
Modified:
   mysql-5.5/branches/experimental/debian/changelog
   mysql-5.5/branches/experimental/debian/rules
Log:
Migrated mysql-source, mysql-testsuite, mysql-common from
dh_movefiles to dh_install

Modified: mysql-5.5/branches/experimental/debian/changelog
===================================================================
--- mysql-5.5/branches/experimental/debian/changelog	2012-04-27 20:30:26 UTC (rev 2067)
+++ mysql-5.5/branches/experimental/debian/changelog	2012-04-28 06:38:59 UTC (rev 2068)
@@ -73,7 +73,8 @@
     - Removed commented out lines
     - Removed obsolete -DINSTALL_LIBDIR clause from pic build
     - Overrode dh_auto_install so that the rules only run once
-    - Migrated mysql-source, mysql-testsuite from dh_movefiles to dh_install
+    - Migrated mysql-source, mysql-testsuite, mysql-common from
+    dh_movefiles to dh_install
 
  -- Clint Byrum <clint at ubuntu.com>  Tue, 14 Feb 2012 11:48:47 -0800
 

Deleted: mysql-5.5/branches/experimental/debian/mysql-common.files
===================================================================
--- mysql-5.5/branches/experimental/debian/mysql-common.files	2012-04-27 20:30:26 UTC (rev 2067)
+++ mysql-5.5/branches/experimental/debian/mysql-common.files	2012-04-28 06:38:59 UTC (rev 2068)
@@ -1 +0,0 @@
-etc/mysql/my.cnf

Added: mysql-5.5/branches/experimental/debian/mysql-common.install
===================================================================
--- mysql-5.5/branches/experimental/debian/mysql-common.install	                        (rev 0)
+++ mysql-5.5/branches/experimental/debian/mysql-common.install	2012-04-28 06:38:59 UTC (rev 2068)
@@ -0,0 +1 @@
+debian/additions/my.cnf etc/mysql/

Modified: mysql-5.5/branches/experimental/debian/rules
===================================================================
--- mysql-5.5/branches/experimental/debian/rules	2012-04-27 20:30:26 UTC (rev 2067)
+++ mysql-5.5/branches/experimental/debian/rules	2012-04-28 06:38:59 UTC (rev 2068)
@@ -187,9 +187,6 @@
 	install -m 0644 -o root -g root $(BUILDDIR_PIC)/libmysqld/libmysqld.a $(TMP)/usr/lib/mysql/libmysqld_pic.a
 	# mysql_config won't report the -fPIC, so give libmysqld-pic users a way to get their flags
 	install -m 0755 -o root -g root $(BUILDDIR_PIC)/scripts/mysql_config $(TMP)/usr/bin/mysql_config_pic
-	# mysql-common: We now provide our own config file.
-	install -d $(TMP)/etc/mysql
-	install -m 0644 debian/additions/my.cnf $(TMP)/etc/mysql/my.cnf
 	# mysql-client
 	install -m 0755 debian/additions/mysqlreport $(TMP)/usr/bin/
 	install -m 0755 debian/additions/innotop/innotop $(TMP)/usr/bin/