[DRE-commits] [taskwarrior-web] 01/01: Use js/css from Debian where available.

[Ben Armstrong]

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

synrg pushed a commit to branch master
in repository taskwarrior-web.

commit 2ecd280b6483fa3c40c09a1aba0094e23947341d
Author: Ben Armstrong <synrg at debian.org>
Date:   Sun Aug 18 14:51:37 2013 -0300

    Use js/css from Debian where available.
---
 debian/control |    2 +-
 debian/rules   |   10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 0afbaa2..52d8765 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ XS-Ruby-Versions: ruby1.9.1
 Package: taskwarrior-web
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.9.1, ruby-sinatra, ruby-parseconfig, ruby-vegas, ruby-rinku, ruby-versionomy, ruby-activesupport-3.2, ruby-sinatra-simple-navigation, ruby-rack-flash3, ruby-json
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.9.1, ruby-sinatra, ruby-parseconfig, ruby-vegas, ruby-rinku, ruby-versionomy, ruby-activesupport-3.2, ruby-sinatra-simple-navigation, ruby-rack-flash3, ruby-json, libjs-twitter-bootstrap, libjs-jquery, libjs-jquery-hotkeys
 Description: Web frontend for the Taskwarrior todo application
  A lightweight, Sinatra-based web interface for the wonderful Taskwarrior todo
  application.
diff --git a/debian/rules b/debian/rules
index a5e7dc8..b4a28be 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,3 +13,13 @@
 
 %:
 	dh $@ --buildsystem=ruby --with ruby
+
+override_dh_auto_install:
+	dh_auto_install
+# Replace upstream javascript/css with Debian-provided versions
+	rm -f debian/taskwarrior-web/usr/lib/ruby/vendor_ruby/taskwarrior-web/public/js/bootstrap.js
+	rm -f debian/taskwarrior-web/usr/lib/ruby/vendor_ruby/taskwarrior-web/public/js/jquery.hotkeys.js
+	# FIXME: dfsg repack will make these three unnecessary and is essential before uploading
+	rm -f debian/taskwarrior-web/usr/lib/ruby/vendor_ruby/taskwarrior-web/public/js/jquery.min.js
+	rm -f debian/taskwarrior-web/usr/lib/ruby/vendor_ruby/taskwarrior-web/public/css/bootstrap.min.css
+	rm -f debian/taskwarrior-web/usr/lib/ruby/vendor_ruby/taskwarrior-web/public/css/bootstrap-responsive.min.css

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