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

[Norbert Tretkowski]

Author: nobse
Date: 2011-06-23 19:17:06 +0000 (Thu, 23 Jun 2011)
New Revision: 1997

Modified:
   mysql-5.5/branches/experimental/debian/changelog
   mysql-5.5/branches/experimental/debian/rules
Log:
Run dh_apparmor on Ubuntu only.

Modified: mysql-5.5/branches/experimental/debian/changelog
===================================================================
--- mysql-5.5/branches/experimental/debian/changelog	2011-06-23 18:34:02 UTC (rev 1996)
+++ mysql-5.5/branches/experimental/debian/changelog	2011-06-23 19:17:06 UTC (rev 1997)
@@ -1,6 +1,7 @@
 mysql-5.5 (5.5.13-2) UNRELEASED; urgency=low
 
   * Fix empty libmysqld-pic package.
+  * Run dh_apparmor on Ubuntu only.
 
  -- Norbert Tretkowski <norbert at tretkowski.de>  Thu, 23 Jun 2011 20:32:25 +0200
 

Modified: mysql-5.5/branches/experimental/debian/rules
===================================================================
--- mysql-5.5/branches/experimental/debian/rules	2011-06-23 18:34:02 UTC (rev 1996)
+++ mysql-5.5/branches/experimental/debian/rules	2011-06-23 19:17:06 UTC (rev 1997)
@@ -297,7 +297,9 @@
 	dh_installexamples -a
 	dh_installmenu -a
 	dh_installlogrotate -a --name mysql-server
-	#dh_apparmor -pmysql-server-5.5 --profile-name=usr.sbin.mysqld
+	if [ "$(DISTRIBUTION)" = "Ubuntu" ]; then \
+	  dh_apparmor -pmysql-server-5.5 --profile-name=usr.sbin.mysqld
+	fi
 	# Start mysql in runlevel 19 before 20 where apache, proftpd etc gets
 	# started which might depend on a running database server.
 	dh_installinit -a --name=mysql -- defaults 19 21