[DRE-commits] [ruby-sprockets-rails] 01/01: Imported Debian patch 2.0.1-2

[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-rails.

commit dbb0b16f56a558d6b81d24bdde10fc2b9f8017a3
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Thu Jan 16 11:43:52 2014 +0100

    Imported Debian patch 2.0.1-2
---
 debian/changelog | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index fce4dbb..7de2cac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+ruby-sprockets-rails (2.0.1-2) unstable; urgency=medium
+
+  * Team upload.
+  * Conflict with ruby-actionpack-3.2
+    actionpack 3.2 ships files that have been moved to this package. As long
+    as Rails 3.2 stays in the archive, we need to Conflict with it.
+    (Closes: #732992)
+  * Bump Standards-Version to 3.9.5 (no changes)
+
+ -- Christian Hofstaedtler <zeha at debian.org>  Thu, 16 Jan 2014 11:43:52 +0100
+
 ruby-sprockets-rails (2.0.1-1) unstable; urgency=low
 
   [ Hleb Valoshka ]

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