[DRE-commits] [ruby-handlebars-assets] 01/01: use embedded js and install as gem
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Fri Jul 8 17:25:54 UTC 2016
This is an automated email from the git hooks/post-receive script.
praveen pushed a commit to branch master
in repository ruby-handlebars-assets.
commit d45a9138e55bd26aa23e0b0a5e55c0216dc9f196
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Fri Jul 8 22:29:03 2016 +0530
use embedded js and install as gem
---
debian/changelog | 10 +++++---
debian/control | 11 +++++----
debian/links | 5 ++--
debian/patches/0005-remove-git-from-gemspec.patch | 19 --------------
debian/patches/engine-root.patch | 30 -----------------------
debian/patches/series | 2 --
debian/rules | 10 ++++++++
7 files changed, 26 insertions(+), 61 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 249f06b..febe678 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-ruby-handlebars-assets (2:0.23.0-2) UNRELEASED; urgency=medium
+ruby-handlebars-assets (2:0.23.0-2) unstable; urgency=medium
- * Update autopkgtest test dependencies
+ * Update autopkgtest test dependencies
+ * Remove patch 0005-remove-git-from-gemspec.patch
+ (gem2deb handles it correctly now) (Closes: #830317)
+ * Install as gem (export DH_RUBY = --gem-install)
+ * Use embedded copy of handlebars (Closes: #829254)
- -- Pirate Praveen <praveen at debian.org> Fri, 08 Jul 2016 12:53:13 +0530
+ -- Pirate Praveen <praveen at debian.org> Fri, 08 Jul 2016 22:21:07 +0530
ruby-handlebars-assets (2:0.23.0-1) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index 5084fe9..0618027 100644
--- a/debian/control
+++ b/debian/control
@@ -11,9 +11,9 @@ Build-Depends: debhelper (>= 9~),
ruby-slim,
ruby-sprockets,
ruby-tilt,
- libjs-handlebars (>= 3:4.0.5~),
- libjs-handlebars.runtime (>= 3:4.0.5~)
-Standards-Version: 3.9.7
+# libjs-handlebars (>= 3:4.0.5~),
+# libjs-handlebars.runtime (>= 3:4.0.5~)
+Standards-Version: 3.9.8
Vcs-Git: https://anonscm.debian.org/git/pkg-ruby-extras/ruby-handlebars-assets.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-handlebars-assets.git
Homepage: https://github.com/leshill/handlebars_assets
@@ -22,8 +22,9 @@ XS-Ruby-Versions: all
Package: ruby-handlebars-assets
Architecture: all
XB-Ruby-Versions: ${ruby:Versions}
-Depends: libjs-handlebars (>= 3:4.0.5~),
- libjs-handlebars.runtime (>= 3:4.0.5~),
+Depends:
+# libjs-handlebars (>= 3:4.0.5~),
+# libjs-handlebars.runtime (>= 3:4.0.5~),
ruby | ruby-interpreter,
ruby-execjs,
ruby-multi-json,
diff --git a/debian/links b/debian/links
index e96ec6b..d604604 100644
--- a/debian/links
+++ b/debian/links
@@ -1,2 +1,3 @@
-usr/share/javascript/handlebars/handlebars.js usr/share/ruby-handlebars-assets/vendor/assets/javascripts/handlebars.js
-usr/share/javascript/handlebars.runtime/handlebars.runtime.js usr/share/ruby-handlebars-assets/vendor/assets/javascripts/handlebars.runtime.js
+#usr/share/javascript/handlebars/handlebars.js usr/share/rubygems-integration/all/gems/handlebars_assets-0.23.0/vendor/assets/javascripts/handlebars.js
+#usr/share/javascript/handlebars/handlebars usr/share/rubygems-integration/all/gems/handlebars_assets-0.23.0/vendor/assets/javascripts/handlebars
+#usr/share/javascript/handlebars.runtime/handlebars.runtime.js usr/share/rubygems-integration/all/gems/handlebars_assets-0.23.0/vendor/assets/javascripts/handlebars.runtime.js
diff --git a/debian/patches/0005-remove-git-from-gemspec.patch b/debian/patches/0005-remove-git-from-gemspec.patch
deleted file mode 100644
index b4770c9..0000000
--- a/debian/patches/0005-remove-git-from-gemspec.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-git commands don't work
-
-Index: ruby-handlebars-assets/handlebars_assets.gemspec
-===================================================================
---- ruby-handlebars-assets.orig/handlebars_assets.gemspec
-+++ ruby-handlebars-assets/handlebars_assets.gemspec
-@@ -14,9 +14,9 @@ Gem::Specification.new do |s|
-
- s.rubyforge_project = "handlebars_assets"
-
-- s.files = `git ls-files`.split("\n")
-- s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
-- s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-+ s.files = ''
-+ s.test_files = ''
-+ s.executables = ''
- s.require_paths = ["lib"]
-
- s.add_runtime_dependency "execjs", "~> 2.0"
diff --git a/debian/patches/engine-root.patch b/debian/patches/engine-root.patch
deleted file mode 100644
index 6953176..0000000
--- a/debian/patches/engine-root.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: change path for assets
- This patch is debian specific.
-Author: Pirate Praveen <praveen at debian.org>
-Last-Updated: 2014-05-04
-
-Index: ruby-handlebars-assets/lib/handlebars_assets/engine.rb
-===================================================================
---- ruby-handlebars-assets.orig/lib/handlebars_assets/engine.rb
-+++ ruby-handlebars-assets/lib/handlebars_assets/engine.rb
-@@ -1,6 +1,7 @@
- module HandlebarsAssets
- # NOTE: must be an engine because we are including assets in the gem
- class Engine < ::Rails::Engine
-+ config.root = '/usr/share/ruby-handlebars-assets'
- initializer "handlebars_assets.assets.register", :group => :all do |app|
- config.assets.configure do |sprockets_env|
- ::HandlebarsAssets::register_extensions(sprockets_env)
-Index: ruby-handlebars-assets/lib/handlebars_assets.rb
-===================================================================
---- ruby-handlebars-assets.orig/lib/handlebars_assets.rb
-+++ ruby-handlebars-assets/lib/handlebars_assets.rb
-@@ -6,7 +6,7 @@ module HandlebarsAssets
- autoload(:HandlebarsTemplate, 'handlebars_assets/handlebars_template')
- autoload(:HandlebarsProcessor, 'handlebars_assets/handlebars_template')
-
-- PATH = File.expand_path('../../vendor/assets/javascripts', __FILE__)
-+ PATH = File.expand_path('/usr/share/ruby-handlebars-assets/vendor/assets/javascripts', __FILE__)
-
- def self.path
- PATH
diff --git a/debian/patches/series b/debian/patches/series
index 456945a..917d596 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-engine-root.patch
0002-Fix-slimbars-test.patch
0003-Reset-path-before-each-test-to-fix-the-first-one.patch
0004-require-slim-haml.patch
-0005-remove-git-from-gemspec.patch
diff --git a/debian/rules b/debian/rules
index 3454d59..e1d0029 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,16 @@
#!/usr/bin/make -f
export GEM2DEB_TEST_RUNNER = --check-dependencies
+export DH_RUBY = --gem-install
%:
dh $@ --buildsystem=ruby --with ruby
+
+#override_dh_install:
+ #dh_install
+ # Make sure the symlinks are pointing to correct version
+ #if ! grep handlebars_assets-$(head -1 debian/changelog |cut -d' '\
+ #-f2 |cut -d: -f2|cut -d- -f1) debian/links; then echo \
+ #"Error: Broken links. Update debian/links with correct version";\
+ #exit 1; fi
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-handlebars-assets.git
More information about the Pkg-ruby-extras-commits
mailing list