[DRE-commits] [ruby-bootstrap-sass] 01/07: Merge tag 'debian/2.3.1.0-5'

[Antonio Terceiro]

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 4decc33ceedef38351f76baa5ae4b8ac0c143b71
Merge: 36ceb3c c7039cc
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Thu Mar 26 11:45:21 2015 -0300

    Merge tag 'debian/2.3.1.0-5'
    
    ruby-bootstrap-sass Debian release 2.3.1.0-5
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/changelog                 | 20 ++++++++++++++++++++
 debian/control                   |  5 +++--
 debian/install                   |  1 +
 debian/patches/engine-root.patch | 15 +++++++++++++++
 debian/patches/series            |  1 +
 5 files changed, 40 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 9c9029b,ce0a53b..f271524
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,23 +1,37 @@@
 +ruby-bootstrap-sass (3.1.1.0-1) UNRELEASED; urgency=low
 +
 +  [ Sebastien Badia ]
 +  * Team upload.
 +  * New upstream release (closes: #758181)
 +  * d/control: Wrap and sort control file (better maintenance)
 +  * d/control: Update Standards-Version to 3.9.5 (no changes)
 +  * d/control: relax dependencies to only suggest (fix for #739783)
 +
 +  [ Pirate Praveen ]
 +  * Build with gem2deb >= 0.7.5~ (install gemsepcs for all ruby versions)
 +
 + -- Pirate Praveen <praveen at debian.org>  Fri, 02 May 2014 21:48:19 +0530
 +
+ ruby-bootstrap-sass (2.3.1.0-5) unstable; urgency=medium
+ 
+   * Fix test failures (closes: #759919)
+   * Change ruby-sass-rails to suggests (closes: #739783)
+ 
+  -- Pirate Praveen <praveen at debian.org>  Tue, 25 Nov 2014 23:31:58 +0530
+ 
+ ruby-bootstrap-sass (2.3.1.0-4) unstable; urgency=medium
+ 
+   * Ship assets (closes: #770913) 
+ 
+  -- Pirate Praveen <praveen at debian.org>  Tue, 25 Nov 2014 13:33:31 +0530
+ 
+ ruby-bootstrap-sass (2.3.1.0-3) unstable; urgency=medium
+ 
+   * Rebuild for ruby 2.1 compatibility.
+   * Bump standards version to 3.9.6 (no changes).
+ 
+  -- Pirate Praveen <praveen at debian.org>  Sat, 22 Nov 2014 21:20:11 +0530
+ 
  ruby-bootstrap-sass (2.3.1.0-2) unstable; urgency=low
  
    * Upload to unstable
diff --cc debian/control
index 04587a5,04b49a5..7e1e12e
--- a/debian/control
+++ b/debian/control
@@@ -2,21 -2,9 +2,22 @@@ Source: ruby-bootstrap-sas
  Section: ruby
  Priority: optional
  Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
- Uploaders: Praveen Arimbrathodiyil <praveen at debian.org>
+ Uploaders: Pirate Praveen <praveen at debian.org>
 -Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~), ruby-sass (>=3.2~), ruby-sass-rails (>=3.2~), ruby-test-unit
 +Build-Depends: debhelper (>= 7.0.50~),
 +               gem2deb (>= 0.7.5~),
 +               phantomjs,
 +               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.5
+ 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
  Homepage: http://github.com/thomas-mcdonald/bootstrap-sass

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