[DRE-commits] [ruby-bootstrap-sass] 01/01: fix compass integration

Wed Mar 29 12:42:19 UTC 2017

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

terceiro pushed a commit to branch master
in repository ruby-bootstrap-sass.

commit 464f9223300d2c273120b05ce1bf97f2667890da
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Wed Mar 29 08:53:51 2017 -0300

    fix compass integration
---
 debian/changelog                             |  9 +++++++++
 debian/compass-bootstrap-sass-plugin.install |  2 --
 debian/control                               |  2 +-
 debian/install                               |  1 -
 debian/patches/assets_path.patch             | 20 --------------------
 debian/patches/engine-root.patch             | 10 ----------
 debian/patches/series                        |  2 --
 debian/rules                                 | 20 +++++++++-----------
 debian/tests/compass                         |  9 +++++++++
 debian/tests/control                         |  3 +++
 10 files changed, 31 insertions(+), 47 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index acd7d13..2d9309f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ruby-bootstrap-sass (3.3.5.1-4) unstable; urgency=medium
+
+  * Team upload
+  * Switch to Rubygems installation layout
+  * Symlink, and not duplicate, installation directory as compass plugin. This
+    fixes the compass integration (Closes: #858195)
+
+ -- Antonio Terceiro <terceiro at debian.org>  Wed, 29 Mar 2017 09:18:25 -0300
+
 ruby-bootstrap-sass (3.3.5.1-3) unstable; urgency=medium
 
   * Drop Build-Depends: on phantomjs (Closes: #796100). It was not actually
diff --git a/debian/compass-bootstrap-sass-plugin.install b/debian/compass-bootstrap-sass-plugin.install
deleted file mode 100644
index 25d72a0..0000000
--- a/debian/compass-bootstrap-sass-plugin.install
+++ /dev/null
@@ -1,2 +0,0 @@
-assets/* usr/share/compass/frameworks/bootstrap-sass/assets
-templates usr/share/compass/frameworks/bootstrap-sass
diff --git a/debian/control b/debian/control
index cb0a030..2be5061 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,7 @@ Package: compass-bootstrap-sass-plugin
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ruby | ruby-interpreter,
-         ruby-bootstrap-sass,
+         ruby-bootstrap-sass (= ${binary:Version}),
          ruby-compass | ruby-sass,
          ${misc:Depends},
          ${shlibs:Depends}
diff --git a/debian/install b/debian/install
deleted file mode 100644
index 275021c..0000000
--- a/debian/install
+++ /dev/null
@@ -1 +0,0 @@
-assets usr/share/ruby-bootstrap-sass
diff --git a/debian/patches/assets_path.patch b/debian/patches/assets_path.patch
deleted file mode 100644
index b8960f4..0000000
--- a/debian/patches/assets_path.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Set correct path to assets off Rails
- This makes bootstrap-sass on Debian work with standalone sprockets and e.g. in
- Sinatra apps.
-Author: Antonio Terceiro <terceiro at debian.org>
-Origin: vendor
-Forwarded: not-needed
-Last-Update: 2015-08-09
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/lib/bootstrap-sass.rb
-+++ b/lib/bootstrap-sass.rb
-@@ -32,7 +32,7 @@ module Bootstrap
-     end
- 
-     def assets_path
--      @assets_path ||= File.join gem_path, 'assets'
-+      @assets_path ||= '/usr/share/ruby-bootstrap-sass/assets'
-     end
- 
-     # Environment detection helpers
diff --git a/debian/patches/engine-root.patch b/debian/patches/engine-root.patch
deleted file mode 100644
index 429f5e8..0000000
--- a/debian/patches/engine-root.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/lib/bootstrap-sass/engine.rb
-+++ b/lib/bootstrap-sass/engine.rb
-@@ -1,6 +1,7 @@
- module Bootstrap
-   module Rails
-     class Engine < ::Rails::Engine
-+      config.root = '/usr/share/ruby-bootstrap-sass'
-       initializer 'bootstrap-sass.assets.precompile' do |app|
-         %w(stylesheets javascripts fonts images).each do |sub|
-           app.config.assets.paths << root.join('assets', sub).to_s
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b9fbf74..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-engine-root.patch
-assets_path.patch
diff --git a/debian/rules b/debian/rules
index f4a2b5f..33a8ba8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +1,17 @@
 #!/usr/bin/make -f
-#export DH_VERBOSE=1
-#
-# Uncomment to ignore all test failures (but the tests will run anyway)
-#export DH_RUBY_IGNORE_TESTS=all
-#
-# Uncomment to ignore some test failures (but the tests will run anyway).
-# Valid values:
-export DH_RUBY_IGNORE_TESTS=ruby1.8 
-#
-# If you need to specify the .gemspec (eg there is more than one)
-#export DH_RUBY_GEMSPEC=gem.gemspec
+
+export DH_RUBY = --gem-install
+version = $(shell dpkg-parsechangelog -SVersion | cut -d - -f 1)
 
 %:
 	dh $@ --buildsystem=ruby --with ruby
 
+override_dh_auto_install:
+	dh_auto_install
+	dh_link -p compass-bootstrap-sass-plugin \
+		/usr/share/rubygems-integration/all/gems/bootstrap-sass-$(version) \
+		/usr/share/compass/frameworks/bootstrap-sass
+
 override_dh_installchangelogs:
 	dh_installchangelogs CHANGELOG.md
 
diff --git a/debian/tests/compass b/debian/tests/compass
new file mode 100755
index 0000000..fc157bc
--- /dev/null
+++ b/debian/tests/compass
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+exec 2>&1
+set -ex
+
+cd ${ADTTMP:-/tmp}
+compass create myproject --using bootstrap-sass
+(cd myproject && find)
+rm -fr myproject
diff --git a/debian/tests/control b/debian/tests/control
index 776fc0d..e74c062 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,5 +1,8 @@
 Tests: smoke-test
 Depends: @, ruby-sprockets
 
+Tests: compass
+Depends: @, ruby-compass
+
 Test-Command: gem2deb-test-runner --autopkgtest --check-dependencies 2>&1
 Depends: @, gem2deb-test-runner

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

