[DRE-commits] [ruby-sprockets] 01/01: Merge branch 'master-2.4'

[Christian Hofstaedtler]

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

zeha pushed a commit to branch master
in repository ruby-sprockets.

commit 8d65bf95336b68033533770e86e1862b17162a14
Merge: da40e70 21c2d32
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Mon Dec 2 22:24:36 2013 +0100

    Merge branch 'master-2.4'
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/changelog | 19 +++++++++++++++++++
 debian/control   |  6 +++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 3bd1ef6,6475f02..e33d504
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,22 +1,31 @@@
 +ruby-sprockets (2.10.0-1) UNRELEASED; urgency=low
 +
 +  * Team upload.
 +  * New upstream release.
 +  * Bump Standards-Version to 3.9.4 (no changes required).
 +  * Build against gem2deb >= 0.5.0~ to add ruby2.0 and drop ruby1.8 support.
 +
 + -- Hleb Valoshka <375gnu at gmail.com>  Sat, 12 Oct 2013 23:54:16 +0300
 +
+ ruby-sprockets (2.4.3-2) unstable; urgency=low
+ 
+   Team upload.
+ 
+   [ Antonio Terceiro ]
+   * Workaround the fact that Rails depends on an old version of sprockets
+   * Add myself to Uploaders:
+ 
+   [ Cédric Boutillier ]
+   * debian/control: remove obsolete DM-Upload-Allowed flag
+   * use canonical URI in Vcs-* fields
+   * debian/copyright: use DEP5 copyright-format/1.0 official URL for Format field
+ 
+   [ Christian Hofstaedtler ]
+   * Add alternative dependency on ruby-rack1.4
+   * Update Standards-Version to 3.9.5 (no changes)
+ 
+  -- Christian Hofstaedtler <zeha at debian.org>  Mon, 02 Dec 2013 22:23:07 +0100
+ 
  ruby-sprockets (2.4.3-1) unstable; urgency=low
  
    * New upstream release
diff --cc debian/control
index 0a9707b,f39dbeb..39f48fd
--- a/debian/control
+++ b/debian/control
@@@ -6,10 -6,10 +6,10 @@@ Uploaders
   Ondřej Surý <ondrej at debian.org>,
   Antonio Terceiro <terceiro at debian.org>,
  Build-Depends: debhelper (>= 7.0.50~),
 -	       gem2deb (>= 0.3.0~),
 +	       gem2deb (>= 0.5.0~),
  	       ruby-hike (>= 1.2),
  	       ruby-multi-json (>= 1.0),
- 	       ruby-rack (>= 1.0),
+ 	       ruby-rack (>= 1.0) | ruby-rack1.4,
  	       ruby-tilt (>= 1.3.1)
  # Development dependencies
  #	       ruby-coffee-script (>= 2.0),

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