[DRE-commits] [gitlab-shell] 02/02: install config.yml in /usr/share/doc

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository gitlab-shell.

commit fd02b430e0a92504683a5b1001560ed13ddf880f
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Jul 14 19:25:53 2016 +0530

    install config.yml in /usr/share/doc
---
 debian/changelog                                       |  7 +++++++
 debian/{gitlab-shell-config.yml => config.yml.example} |  0
 debian/install                                         |  3 +--
 debian/rules                                           | 10 ++++------
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ce9fd55..a588940 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gitlab-shell (3.0.0-4) unstable; urgency=medium
+
+  * Move config.yml to /usr/share/doc/gitlab-shell
+  * Handle bin directory in install target instead of build 
+
+ -- Pirate Praveen <praveen at debian.org>  Thu, 14 Jul 2016 19:24:45 +0530
+
 gitlab-shell (3.0.0-3) unstable; urgency=medium
 
   * Use tcp connection to redis instead of unix socket (redis default is tcp) 
diff --git a/debian/gitlab-shell-config.yml b/debian/config.yml.example
similarity index 100%
rename from debian/gitlab-shell-config.yml
rename to debian/config.yml.example
diff --git a/debian/install b/debian/install
index ec2960e..92ae325 100644
--- a/debian/install
+++ b/debian/install
@@ -1,4 +1,3 @@
 VERSION usr/share/gitlab-shell
-debian/bin usr/share/gitlab-shell
-debian/gitlab-shell-config.yml var/lib/gitlab
+debian/config.yml.example usr/share/doc/gitlab-shell
 hooks usr/share/gitlab-shell
diff --git a/debian/rules b/debian/rules
index 229030d..2abff0b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,9 +17,7 @@
 %:
 	dh $@ --buildsystem=ruby --with ruby
 
-override_dh_auto_build:
-	if test -d bin; then mv bin debian; fi
-
-clean:
-	if test -d debian/bin; then rm -rf bin;mv debian/bin .; fi
-	dh clean --buildsystem=ruby --with ruby
+override_dh_auto_install:
+	dh_auto_install
+	mkdir -p debian/gitlab-shell/usr/share/gitlab-shell
+	mv debian/gitlab-shell/usr/bin debian/gitlab-shell/usr/share/gitlab-shell

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