Hi, I have uploaded a NMU for rails, fixing one serious (missing dependencies) and one normal (new rails projects get created with a wrong symlink making them not usable) bug. I am attaching the patches to this mail. Please unblock and accept this version into Squeeze. Cc:ing Adam Majer, the Rails package maintainer.
From c21054203d5783f51f8ab9abb8df8bf378f2f024 Mon Sep 17 00:00:00 2001
From: Gunnar Wolf <gwolf@gwolf.org>
Date: Thu, 26 Aug 2010 12:31:59 -0500
Subject: [PATCH 1/2] Added missing dependencies to close #587048
---
debian/changelog | 9 +++++++++
debian/control | 5 ++++-
2 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3a14f67..8d085a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+rails (2.3.5-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Added missing build-dependencies for rails-ruby1.8 on libactionpack-
+ ruby1.8, libactionmailer-ruby1.8 and libactiveresource-ruby1.8
+ (Closes: #587048)
+
+ -- Gunnar Wolf <gwolf@debian.org> Thu, 26 Aug 2010 12:21:06 -0500
+
rails (2.3.5-1) unstable; urgency=low
* New upstream release (closes: #547658)
diff --git a/debian/control b/debian/control
index 7edef24..3a23c78 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,10 @@ Depends: ${misc:Depends}, ruby1.8 (>=1.8.2-3), rake (>>0.8.3),
libredcloth-ruby1.8, liberb-ruby1.8, libruby1.8-extras, libjs-prototype,
libbuilder-ruby1.8 (>>2.1.2), rubygems1.8,
libtext-format-ruby1.8 (>>0.6.3), libtmail-ruby1.8 (>>1.2.3),
- libactiverecord-ruby1.8 (= ${binary:Version})
+ libactiverecord-ruby1.8 (= ${binary:Version}),
+ libactionpack-ruby1.8 (= ${binary:Version}),
+ libactionmailer-ruby1.8 (= ${binary:Version}),
+ libactiveresource-ruby1.8 (= ${binary:Version})
Recommends: irb1.8, libmocha-ruby1.8
Conflicts: libdevel-logger-ruby1.8
Suggests: thin1.8 | libapache2-mod-ruby | libapache2-mod-fcgid, libfcgi-ruby1.8
--
1.7.1
From 48c1e247d81ac04ddc501b11d70658ede462a96d Mon Sep 17 00:00:00 2001
From: Gunnar Wolf <gwolf@gwolf.org>
Date: Thu, 26 Aug 2010 12:36:35 -0500
Subject: [PATCH 2/2] Fixed broken symlink to railties on new project generator (Closes: #583219)
---
debian/changelog | 4 +++-
.../generators/applications/app/app_generator.rb | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8d085a8..a277d15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ rails (2.3.5-1.1) unstable; urgency=low
* Added missing build-dependencies for rails-ruby1.8 on libactionpack-
ruby1.8, libactionmailer-ruby1.8 and libactiveresource-ruby1.8
(Closes: #587048)
+ * Fixed broken symlink to railties on new project generator (Closes:
+ #583219)
- -- Gunnar Wolf <gwolf@debian.org> Thu, 26 Aug 2010 12:21:06 -0500
+ -- Gunnar Wolf <gwolf@debian.org> Thu, 26 Aug 2010 12:36:28 -0500
rails (2.3.5-1) unstable; urgency=low
diff --git a/railties/lib/rails_generator/generators/applications/app/app_generator.rb b/railties/lib/rails_generator/generators/applications/app/app_generator.rb
index 2377799..9bc461b 100644
--- a/railties/lib/rails_generator/generators/applications/app/app_generator.rb
+++ b/railties/lib/rails_generator/generators/applications/app/app_generator.rb
@@ -250,7 +250,7 @@ class AppGenerator < Rails::Generator::Base
def create_debian_railties_link(m)
m.symlink "/usr/share/rails-ruby1.8", "vendor/rails"
- m.symlink "/usr/share/rails/railties-ruby1.8", "vendor/railties"
+ m.symlink "/usr/share/rails-ruby1.8/railties", "vendor/railties"
end
@@ -267,4 +267,4 @@ class AppGenerator < Rails::Generator::Base
"/opt/lampp/var/mysql/mysql.sock" # xampp for linux
].find { |f| File.exist?(f) } unless RUBY_PLATFORM =~ /(:?mswin|mingw)/
end
-end
\ No newline at end of file
+end
--
1.7.1
Attachment:
signature.asc
Description: Digital signature