[DRE-commits] [ruby-sidekiq] 01/02: jquery.timeago -> jquery-timeago

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository ruby-sidekiq.

commit 4721cf0de60513e596365b7ea81823a2bbbe655a
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Sep 9 20:33:45 2014 +0530

    jquery.timeago -> jquery-timeago
---
 debian/control | 2 +-
 debian/rules   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 6e50fff..e00ceaa 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Pirate Praveen <praveen at debian.org>
 Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.7.5~), ruby-celluloid,
  ruby-connection-pool, ruby-redis, ruby-redis-namespace, redis-server,
  ruby-coveralls, ruby-activerecord, ruby-actionmailer, ruby-sinatra, procps,
- libjs-jquery, libjs-jquery.timeago, libjs-d3, libjs-rickshaw
+ libjs-jquery, libjs-jquery-timeago, libjs-d3, libjs-rickshaw
 Standards-Version: 3.9.5
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-sidekiq.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/ruby-sidekiq.git;a=summary
diff --git a/debian/rules b/debian/rules
index d57f98a..722a724 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,6 +28,7 @@ override_dh_auto_build:
 	chmod -x web/assets/images/status/active.png
 	mv web/assets/javascripts/application.js web/assets/javascripts/application.js.orig
 	mv web/assets/javascripts/dashboard.js web/assets/javascripts/dashboard.js.orig
+	cat /usr/share/javascript/jquery/jquery.min.js /usr/share/javascript/jquery-timeago/jquery.timeago.min.js > web/assets/javascripts/application.js
 	cat /usr/share/javascript/d3/d3.min.js /usr/share/javascript/rickshaw/rickshaw.min.js > web/assets/javascripts/dashboard.js
 
 override_dh_auto_clean:

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