[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#859020: marked as done (unblock: ruby-bootstrap-sass/3.3.5.1-4)

Your message dated Sun, 02 Apr 2017 06:22:00 +0000
with message-id <f8ac7e6b-f771-eeb5-51ba-ae20f875e500@thykier.net>
and subject line Re: Bug#859020: unblock: ruby-bootstrap-sass/3.3.5.1-4
has caused the Debian Bug report #859020,
regarding unblock: ruby-bootstrap-sass/3.3.5.1-4
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
859020: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=859020
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package ruby-bootstrap-sass

This release fixes the integration with compass.

the debdiff against the package in testing is attached. You will notice
that it is mostly removing stuff that was wrong or unecessary.

There were a few changes that were staged in git for a while and ended
up not being properly documented in the changelog, by my mistake:

- debhelper compatibility bumped from 7 to 9
- Standards-Version bump
- https:// in Vcs-*
- removal of commented-out build dependencies

The only of those that is not cosmetic is the debhelper compatibility
level, but almost all of the other Ruby packages are at 9 with no bad
consequences, so there are no real consequences.

unblock ruby-bootstrap-sass/3.3.5.1-4

-- System Information:
Debian Release: 9.0
  APT prefers unstable-debug
  APT policy: (500, 'unstable-debug'), (500, 'testing-debug'), (500, 'unstable'), (500, 'testing'), (1, 'experimental-debug'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.9.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=pt_BR.UTF-8, LC_CTYPE=pt_BR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

diff -Nru ruby-bootstrap-sass-3.3.5.1/debian/changelog ruby-bootstrap-sass-3.3.5.1/debian/changelog
--- ruby-bootstrap-sass-3.3.5.1/debian/changelog	2015-09-23 17:09:27.000000000 -0300
+++ ruby-bootstrap-sass-3.3.5.1/debian/changelog	2017-03-29 09:18:25.000000000 -0300
@@ -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@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 -Nru ruby-bootstrap-sass-3.3.5.1/debian/compass-bootstrap-sass-plugin.install ruby-bootstrap-sass-3.3.5.1/debian/compass-bootstrap-sass-plugin.install
--- ruby-bootstrap-sass-3.3.5.1/debian/compass-bootstrap-sass-plugin.install	2015-09-23 17:09:27.000000000 -0300
+++ ruby-bootstrap-sass-3.3.5.1/debian/compass-bootstrap-sass-plugin.install	1969-12-31 21:00:00.000000000 -0300
@@ -1,2 +0,0 @@
-assets/* usr/share/compass/frameworks/bootstrap-sass/assets
-templates usr/share/compass/frameworks/bootstrap-sass
diff -Nru ruby-bootstrap-sass-3.3.5.1/debian/compat ruby-bootstrap-sass-3.3.5.1/debian/compat
--- ruby-bootstrap-sass-3.3.5.1/debian/compat	2015-09-23 17:09:27.000000000 -0300
+++ ruby-bootstrap-sass-3.3.5.1/debian/compat	2017-03-29 09:18:25.000000000 -0300
@@ -1 +1 @@
-7
+9
diff -Nru ruby-bootstrap-sass-3.3.5.1/debian/control ruby-bootstrap-sass-3.3.5.1/debian/control
--- ruby-bootstrap-sass-3.3.5.1/debian/control	2015-09-23 17:09:27.000000000 -0300
+++ ruby-bootstrap-sass-3.3.5.1/debian/control	2017-03-29 09:18:25.000000000 -0300
@@ -3,22 +3,11 @@
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers@lists.alioth.debian.org>
 Uploaders: Pirate Praveen <praveen@debian.org>
-Build-Depends: debhelper (>= 7.0.50~),
-               gem2deb (>= 0.7.5~),
-#               ruby-capybara,
-#               ruby-compass,
-#               ruby-jquery-rails,
-#               ruby-poltergeist,
-#               ruby-sass (>=3.2~),
-#               ruby-sass-rails (>=3.2~),
-#               ruby-slim-rails,
-#               ruby-term-ansicolor,
-#               ruby-test-unit,
-#               ruby-tzinfo,
-#               ruby-uglifier,
-Standards-Version: 3.9.6
-Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-bootstrap-sass.git
-Vcs-Browser: http://anonscm.debian.org/?p=pkg-ruby-extras/ruby-bootstrap-sass.git;a=summary
+Build-Depends: debhelper (>= 9~),
+               gem2deb
+Standards-Version: 3.9.7
+Vcs-Git: https://anonscm.debian.org/git/pkg-ruby-extras/ruby-bootstrap-sass.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-bootstrap-sass.git
 Homepage: http://github.com/thomas-mcdonald/bootstrap-sass
 Testsuite: autopkgtest
 XS-Ruby-Versions: all
@@ -43,7 +32,7 @@
 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 -Nru ruby-bootstrap-sass-3.3.5.1/debian/install ruby-bootstrap-sass-3.3.5.1/debian/install
--- ruby-bootstrap-sass-3.3.5.1/debian/install	2015-09-23 17:09:27.000000000 -0300
+++ ruby-bootstrap-sass-3.3.5.1/debian/install	1969-12-31 21:00:00.000000000 -0300
@@ -1 +0,0 @@
-assets usr/share/ruby-bootstrap-sass
diff -Nru ruby-bootstrap-sass-3.3.5.1/debian/patches/assets_path.patch ruby-bootstrap-sass-3.3.5.1/debian/patches/assets_path.patch
--- ruby-bootstrap-sass-3.3.5.1/debian/patches/assets_path.patch	2015-09-23 17:09:27.000000000 -0300
+++ ruby-bootstrap-sass-3.3.5.1/debian/patches/assets_path.patch	1969-12-31 21:00:00.000000000 -0300
@@ -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@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 -Nru ruby-bootstrap-sass-3.3.5.1/debian/patches/engine-root.patch ruby-bootstrap-sass-3.3.5.1/debian/patches/engine-root.patch
--- ruby-bootstrap-sass-3.3.5.1/debian/patches/engine-root.patch	2015-09-23 17:09:27.000000000 -0300
+++ ruby-bootstrap-sass-3.3.5.1/debian/patches/engine-root.patch	1969-12-31 21:00:00.000000000 -0300
@@ -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 -Nru ruby-bootstrap-sass-3.3.5.1/debian/patches/series ruby-bootstrap-sass-3.3.5.1/debian/patches/series
--- ruby-bootstrap-sass-3.3.5.1/debian/patches/series	2015-09-23 17:09:27.000000000 -0300
+++ ruby-bootstrap-sass-3.3.5.1/debian/patches/series	1969-12-31 21:00:00.000000000 -0300
@@ -1,2 +0,0 @@
-engine-root.patch
-assets_path.patch
diff -Nru ruby-bootstrap-sass-3.3.5.1/debian/ruby-bootstrap-sass.docs ruby-bootstrap-sass-3.3.5.1/debian/ruby-bootstrap-sass.docs
--- ruby-bootstrap-sass-3.3.5.1/debian/ruby-bootstrap-sass.docs	2015-09-23 17:09:27.000000000 -0300
+++ ruby-bootstrap-sass-3.3.5.1/debian/ruby-bootstrap-sass.docs	2017-03-29 09:18:25.000000000 -0300
@@ -1,2 +1,2 @@
-README.md
 CONTRIBUTING.md
+README.md
diff -Nru ruby-bootstrap-sass-3.3.5.1/debian/rules ruby-bootstrap-sass-3.3.5.1/debian/rules
--- ruby-bootstrap-sass-3.3.5.1/debian/rules	2015-09-23 17:09:27.000000000 -0300
+++ ruby-bootstrap-sass-3.3.5.1/debian/rules	2017-03-29 09:18:25.000000000 -0300
@@ -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 -Nru ruby-bootstrap-sass-3.3.5.1/debian/tests/compass ruby-bootstrap-sass-3.3.5.1/debian/tests/compass
--- ruby-bootstrap-sass-3.3.5.1/debian/tests/compass	1969-12-31 21:00:00.000000000 -0300
+++ ruby-bootstrap-sass-3.3.5.1/debian/tests/compass	2017-03-29 09:18:25.000000000 -0300
@@ -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 -Nru ruby-bootstrap-sass-3.3.5.1/debian/tests/control ruby-bootstrap-sass-3.3.5.1/debian/tests/control
--- ruby-bootstrap-sass-3.3.5.1/debian/tests/control	2015-09-23 17:09:27.000000000 -0300
+++ ruby-bootstrap-sass-3.3.5.1/debian/tests/control	2017-03-29 09:18:25.000000000 -0300
@@ -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

Attachment: signature.asc
Description: PGP signature


--- End Message ---
--- Begin Message --- 
Antonio Terceiro:
> On Sat, Apr 01, 2017 at 06:33:00PM +0000, Niels Thykier wrote:
>> Antonio Terceiro:
>>> On Thu, Mar 30, 2017 at 07:55:00PM +0000, Niels Thykier wrote:
>>>> Thanks for the changeset.
>>>>
>>>> Unfortunately, as a matter of policy I would strongly prefer if the
>>>> compat bump was undone.  They have "actions at a distance" that are hard
>>>> to reason about in general, so it is easier to simply say "no" than
>>>> manually verify it.
>>>>
>>>> Without the compat bump, I am happy to accept the other changes.
>>>
>>> Fair enough. However, I just did a local build with it changed back to 7, and
>>> the produced binaries are bit-by-bit identical (I didn't change anything else,
>>> just to test).
>>>
>>
>> It would be awesome if we had better tooling our side that could easily
>> make us verify such (it would hopefully make a lot of things easier on
>> our side).  But for now, ...
>>
>>> That said, I can do a new upload if you say so.
>>>
>>
>> Please do, it would make it easier for me.
> 
> OK. Just uploaded this:
> 
> [...]

Thanks, unblocked.

~Niels

--- End Message ---
Reply to: