[DRE-commits] [ruby-remcached] 01/11: Rename d/start_memcached_and_auto_install.sh to d/start_memcached_and_run.sh

[Lucas Kanashiro]

This is an automated email from the git hooks/post-receive script.

kanashiro-guest pushed a commit to branch master
in repository ruby-remcached.

commit ffea05494c6afbdafa68b133fd180ca05dd2ac1e
Author: Lucas Kanashiro <kanashiro.duarte at gmail.com>
Date:   Wed Mar 2 10:05:01 2016 -0300

    Rename d/start_memcached_and_auto_install.sh to d/start_memcached_and_run.sh
    
    * Make it generic
    * Adapt all in debian/rules accordingly
---
 debian/changelog                                                 | 9 +++++++++
 debian/rules                                                     | 4 ++--
 ..._memcached_and_auto_install.sh => start_memcached_and_run.sh} | 7 +++----
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b694f69..4d0ac37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ruby-remcached (0.4.1-2.1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * rename debian/start_memcached_and_auto_install.sh to
+    debian/start_memcached_and_run.sh and make it generic; adapt all in
+    debian/rules accordingly.
+
+ -- Lucas Kanashiro <kanashiro.duarte at gmail.com>  Wed, 02 Mar 2016 10:02:57 -0300
+
 ruby-remcached (0.4.1-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/rules b/debian/rules
index 3b8e154..b777bda 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,5 +16,5 @@
 
 # need to start a memcached instance to run the tests
 override_dh_auto_install:
-	chmod +x debian/start_memcached_and_auto_install.sh
-	debian/start_memcached_and_auto_install.sh
+	chmod +x debian/start_memcached_and_run.sh
+	debian/start_memcached_and_run.sh dh_auto_install
diff --git a/debian/start_memcached_and_auto_install.sh b/debian/start_memcached_and_run.sh
similarity index 64%
rename from debian/start_memcached_and_auto_install.sh
rename to debian/start_memcached_and_run.sh
index f10eefa..2b341ed 100755
--- a/debian/start_memcached_and_auto_install.sh
+++ b/debian/start_memcached_and_run.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# start_memcached.sh - start a memcached instance, inspired from ruby-mysql2
+# start_memcached_and_run.sh - start a memcached instance, inspired fromruby-mysql2
 # It is in turn inspired by
 # debian/test_mysql.sh from libdbi-drivers source package.
 
@@ -11,8 +11,7 @@ PIDFILE=/tmp/memcached.pid
 # Start memcached
 /usr/bin/memcached -d -u ${MEMCACHED_USER} -P ${PIDFILE}
 
-dh_auto_install
+"$@"
 
 # Stop memcached and cleanup pid file
-kill -9 `cat /tmp/memcached.pid`
-rm /tmp/memcached.pid
+pkill memcached

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-remcached.git