[DRE-commits] [SCM] rails-4.0.git branch, master, updated. debian/4.0.0_rc1-1-18-gbcd6e5c

[Ondřej Surý]

The following commit has been merged in the master branch:
commit bcd6e5c3bfdd2940457be93b5715b5ac50448888
Author: Ondřej Surý <ondrej at sury.org>
Date:   Fri Jul 19 15:45:32 2013 +0200

    prepare 4.0.0+dfsg-1 release

diff --git a/debian/changelog b/debian/changelog
index 1edcc2f..deb3ec0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ rails-4.0 (4.0.0+dfsg-1) unstable; urgency=low
   * Migrate to use dh_ruby multi-binary support
 
   [ Ondřej Surý ]
+  * Initial release of Rails 4.0
+  * Merge ruby-{active,action}*-X.Y packages into rails-4.0
+  * Add Copyright headers for syntaxhighlighter
   * New upstream version 4.0.0+dfsg
   * Update the package based on ftp-master review:
     + Weaken some Conflicts to Breaks (Keeping Conflicts for virtual
@@ -12,7 +15,7 @@ rails-4.0 (4.0.0+dfsg-1) unstable; urgency=low
       build using racc
     + Fix copyright to include correct year: (c) 2004-2013 David
       Heinemeier Hansson
-    + Add MIT and/or CC-BY license for HTML selector by Assaf Arkin  
+    + Add MIT or CC-BY license for HTML selector by Assaf Arkin  
     + PD-Art license is inconclusive, so we just remove the wikimedia Mona
       Lisa picture and patch out the tests that were using it.
       (http://commons.wikimedia.org/wiki/Commons:Reuse_of_PD-Art_photographs)
@@ -24,11 +27,3 @@ rails-4.0 (4.0.0+dfsg-1) unstable; urgency=low
   * Add dversionmangle to debian/watch
 
  -- Ondřej Surý <ondrej at debian.org>  Fri, 19 Jul 2013 15:35:13 +0200
-
-rails-4.0 (4.0.0~rc1-1) experimental; urgency=low
-
-  * Initial release of Rails 4.0
-  * Merge ruby-{active,action}*-X.Y packages into rails-4.0
-  * Add Copyright headers for syntaxhighlighter
-
- -- Ondřej Surý <ondrej at debian.org>  Tue, 28 May 2013 15:37:24 +0200

-- 
rails-4.0.git