[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 1803971776288fdac76280338ad4357394e07c2e
Author: Ondřej Surý <ondrej at sury.org>
Date:   Fri Jul 19 15:26:12 2013 +0200

    prepare 4.0.0+dfsg-1 release

diff --git a/debian/changelog b/debian/changelog
index eb1d863..04e76f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,26 @@
-rails-4.0 (4.0.0-1~1.gbp988ca5) UNRELEASED; urgency=low
-
-  ** SNAPSHOT build @988ca53ef7e37ad282a43b8da237a0efe9cbdb27 **
+rails-4.0 (4.0.0+dfsg-1) experimental; urgency=low
 
   [ Antonio Terceiro ]
   * Migrate to use dh_ruby multi-binary support
 
   [ Ondřej Surý ]
-  * New upstream version 4.0.0
+  * New upstream version 4.0.0+dfsg
+  * Update the package based on ftp-master review:
+    + Weaken some Conflicts to Breaks (Keeping Conflicts for virtual
+      packages)
+    + Generate actionpack/lib/action_dispatch/journey/parser.rb in the
+      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  
+    + 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)
+    + Just remove whole guides.rubyonrails.org content from source tarball
+      (We'll repackage it to ruby-rails-guides-4.0 as soon as we clear the
+      licensing with upstream.)
 
- -- Antonio Terceiro <terceiro at debian.org>  Fri, 19 Jul 2013 13:58:35 +0200
+ -- Ondřej Surý <ondrej at debian.org>  Fri, 19 Jul 2013 15:23:01 +0200
 
 rails-4.0 (4.0.0~rc1-1) experimental; urgency=low
 

-- 
rails-4.0.git