[DRE-commits] [SCM] ruby-railties-3.2.git branch, master, updated. debian/3.2.6-2-9-g4466df8

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 0a0b27bd22e3c4e516d33756d55b6877ef46c6ea
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Thu Jun 28 19:07:55 2012 -0300

    Do not mess with the default gemfile

diff --git a/debian/patches/disable-default-gemfile-content.patch b/debian/patches/disable-default-gemfile-content.patch
deleted file mode 100644
index 8e421aa..0000000
--- a/debian/patches/disable-default-gemfile-content.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Disable default contents of the Gemfile
- This patch disables the contents of the Gemfile as provided by Rails, so that
- new applications created under Debian are not *forced* to require packages
- installed with Rubygems.
-Author: Antonio Terceiro <terceiro at debian.org>
-
----
-
---- ruby-railties-3.2-3.2.3.orig/lib/rails/generators/rails/app/templates/Gemfile
-+++ ruby-railties-3.2-3.2.3/lib/rails/generators/rails/app/templates/Gemfile
-@@ -1,3 +1,12 @@
-+# Rails for Debian - note
-+#
-+# The content of this Gemfile is commented out so that you do not *have* to
-+# have packages installed without APT to run this application. If you want to
-+# use the original Gemfile created by Rails, delete everything *before* the
-+# __END__ mark below (including this note, if you wish).
-+
-+__END__
-+
- source 'https://rubygems.org'
- 
- <%= rails_gemfile_entry -%>
diff --git a/debian/patches/series b/debian/patches/series
index 5b73dff..0830401 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
 syntaxhighlighter-source.patch
 remove-rubygems.patch
-disable-default-gemfile-content.patch
-skip-bundle-by-default.patch
 dont-require-bundler-from-rubygems.patch
diff --git a/debian/patches/skip-bundle-by-default.patch b/debian/patches/skip-bundle-by-default.patch
deleted file mode 100644
index e6f1913..0000000
--- a/debian/patches/skip-bundle-by-default.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Skip bundle by default
- Do not run `bundle install` after creating a new app. This makes it possible
- to create applications without necessarily having to install packages outside
- of Debian itself.  .
- .
- If users wantr to use bundler, they can just edit the generated Gemfile and
- rnu `bundle install` by themselves.
-Author: Antonio Terceiro <terceiro at debian.org>
-
---- ruby-railties-3.2-3.2.3.orig/lib/rails/generators/app_base.rb
-+++ ruby-railties-3.2-3.2.3/lib/rails/generators/app_base.rb
-@@ -28,7 +28,7 @@ module Rails
-         class_option :skip_gemfile,       :type => :boolean, :default => false,
-                                           :desc => "Don't create a Gemfile"
- 
--        class_option :skip_bundle,        :type => :boolean, :default => false,
-+        class_option :skip_bundle,        :type => :boolean, :default => true,
-                                           :desc => "Don't run bundle install"
- 
-         class_option :skip_git,           :type => :boolean, :aliases => "-G", :default => false,

-- 
ruby-railties-3.2.git