summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2013-03-20 20:30:21 +0000
committerIgor Pashev <pashev.igor@gmail.com>2013-03-20 20:30:21 +0000
commitc93fd96867b854ba80e46c5cd3ba77aa0db84698 (patch)
tree176c2b14af84617210c85a9d8c6d07662406abf4
parent46a0344d45f3724fa9d761c218b767da3f1aaa05 (diff)
downloadmysql-5.5-c93fd96867b854ba80e46c5cd3ba77aa0db84698.tar.gz
dh_installinit is not executeddyson/5.5.30+dfsg-1+dyson1
-rw-r--r--debian/changelog2
-rwxr-xr-xdebian/rules17
2 files changed, 9 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog
index b9f9ecf..03ac240 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,7 +13,7 @@ mysql-5.5 (5.5.30+dfsg-1+dyson1) unstable; urgency=low
* Fix logrotate script to use pkill (portable) instead of killall
(non-portable)
- -- Igor Pashev <pashev.igor@gmail.com> Wed, 20 Mar 2013 13:11:18 +0000
+ -- Igor Pashev <pashev.igor@gmail.com> Wed, 20 Mar 2013 20:29:42 +0000
mysql-5.5 (5.5.29+dfsg-1) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 2e85c87..ad18c7a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -203,6 +203,14 @@ auto_install-stamp:
override_dh_install:
dh_movefiles
dh_install
+ifeq (illumos,$(ARCH_OS))
+ mkdir -p debian/mysql-server-5.5/lib/svc/manifest/application/database
+ mkdir -p debian/mysql-server-5.5/lib/svc/method
+ install -m 644 -t debian/mysql-server-5.5/lib/svc/manifest/application/database \
+ debian/smf/mysql.xml
+ install -m 755 -t debian/mysql-server-5.5/lib/svc/method \
+ debian/smf/mysql
+endif
override_dh_installchangelogs:
dh_installchangelogs Docs/ChangeLog
@@ -216,16 +224,7 @@ override_dh_installlogrotate-arch:
# Start mysql in runlevel 19 before 20 where apache, proftpd etc gets
# started which might depend on a running database server.
override_dh_installinit-arch:
-ifeq (illumos,$(ARCH_OS))
- mkdir -p debian/mysql-server-5.5/lib/svc/manifest/application/database
- mkdir -p debian/mysql-server-5.5/lib/svc/method
- install -m 644 -t debian/mysql-server-5.5/lib/svc/manifest/application/database \
- debian/smf/mysql.xml
- install -m 755 -t debian/mysql-server-5.5/lib/svc/method \
- debian/smf/mysql
-else
dh_installinit --name=mysql -- defaults 19 21
-endif
override_dh_installcron-arch:
dh_installcron --name mysql-server