[DRE-commits] r4382 - in trunk/redmine/debian: . patches

[Jérémy Lal]

Author: kapouer-guest
Date: 2009-11-23 00:21:39 +0000 (Mon, 23 Nov 2009)
New Revision: 4382

Modified:
   trunk/redmine/debian/links
   trunk/redmine/debian/patches/revert_rails_2.3.patch
Log:
Links in diff don't work. Do them with dh_link.

Modified: trunk/redmine/debian/links
===================================================================
--- trunk/redmine/debian/links	2009-11-23 00:21:36 UTC (rev 4381)
+++ trunk/redmine/debian/links	2009-11-23 00:21:39 UTC (rev 4382)
@@ -4,3 +4,9 @@
 usr/share/javascript/scriptaculous/controls.js usr/share/redmine/public/javascripts/controls.js
 usr/share/javascript/scriptaculous/dragdrop.js usr/share/redmine/public/javascripts/dragdrop.js
 usr/share/javascript/scriptaculous/effects.js usr/share/redmine/public/javascripts/effects.js
+
+# Redmine is now rails 2.3 compatible, so these three links,
+# along with the debian/patches/revert_rails_2.3.patch, are here to get back rails 2.2.
+usr/share/redmine/app/controllers/application_controller.rb usr/share/redmine/app/controllers/application.rb
+usr/share/redmine/app/views/layouts/mailer.text.html.erb usr/share/redmine/app/views/mailer/layout.text.html.rhtml
+usr/share/redmine/app/views/layouts/mailer.text.plain.erb usr/share/redmine/app/views/mailer/layout.text.plain.rhtml

Modified: trunk/redmine/debian/patches/revert_rails_2.3.patch
===================================================================
--- trunk/redmine/debian/patches/revert_rails_2.3.patch	2009-11-23 00:21:36 UTC (rev 4381)
+++ trunk/redmine/debian/patches/revert_rails_2.3.patch	2009-11-23 00:21:39 UTC (rev 4382)
@@ -1,11 +1,3 @@
-diff --git a/app/controllers/application.rb b/app/controllers/application.rb
-new file mode 120000
-index 0000000..7c7952a
---- /dev/null
-+++ b/app/controllers/application.rb
-@@ -0,0 +1 @@
-+application_controller.rb
-\ No newline at end of file
 diff --git a/app/models/enumeration.rb b/app/models/enumeration.rb
 index 4836229..1b69fb4 100644
 --- a/app/models/enumeration.rb
@@ -227,22 +219,6 @@
    end
  
    # Makes partial rendering work with Rails 1.2 (retro-compatibility)
-diff --git a/app/views/mailer/layout.text.html.rhtml b/app/views/mailer/layout.text.html.rhtml
-new file mode 120000
-index 0000000..8f6ab49
---- /dev/null
-+++ b/app/views/mailer/layout.text.html.rhtml
-@@ -0,0 +1 @@
-+../layouts/mailer.text.html.erb
-\ No newline at end of file
-diff --git a/app/views/mailer/layout.text.plain.rhtml b/app/views/mailer/layout.text.plain.rhtml
-new file mode 120000
-index 0000000..36645de
---- /dev/null
-+++ b/app/views/mailer/layout.text.plain.rhtml
-@@ -0,0 +1 @@
-+../layouts/mailer.text.plain.erb
-\ No newline at end of file
 diff --git a/config/environment.rb b/config/environment.rb
 index e6d4259..936a296 100644
 --- a/config/environment.rb