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

[Jérémy Lal]

Author: kapouer-guest
Date: 2010-01-07 19:06:41 +0000 (Thu, 07 Jan 2010)
New Revision: 4498

Modified:
   trunk/redmine/debian/patches/revert_rails_2.3.patch
   trunk/redmine/debian/rules
Log:
Refresh patch.
Set SVN URL for get-orig-source to the 0.9-stable branch.

Modified: trunk/redmine/debian/patches/revert_rails_2.3.patch
===================================================================
--- trunk/redmine/debian/patches/revert_rails_2.3.patch	2010-01-07 19:06:30 UTC (rev 4497)
+++ trunk/redmine/debian/patches/revert_rails_2.3.patch	2010-01-07 19:06:41 UTC (rev 4498)
@@ -15,7 +15,7 @@
    # Remove broken cookie after upgrade from 0.8.x (#4292)
    # See https://rails.lighthouseapp.com/projects/8994/tickets/3360
 diff --git a/app/models/enumeration.rb b/app/models/enumeration.rb
-index 4836229..1b69fb4 100644
+index 3b7a434..947e7b7 100644
 --- a/app/models/enumeration.rb
 +++ b/app/models/enumeration.rb
 @@ -16,8 +16,6 @@
@@ -27,9 +27,9 @@
    belongs_to :project
    
    acts_as_list :scope => 'type = \'#{type}\''
-@@ -60,8 +58,8 @@ class Enumeration < ActiveRecord::Base
-   end
-   # End backwards compatiblity named_scopes
+@@ -30,8 +28,8 @@ class Enumeration < ActiveRecord::Base
+   validates_uniqueness_of :name, :scope => [:type, :project_id]
+   validates_length_of :name, :maximum => 30
  
 -  named_scope :shared, :conditions => { :project_id => nil }
 -  named_scope :active, :conditions => { :active => true }
@@ -52,7 +52,7 @@
    alias_method_chain :attributes=, :tracker_first
    
 diff --git a/app/models/mail_handler.rb b/app/models/mail_handler.rb
-index 98536a8..1f5130f 100644
+index ac05847..d69e20a 100644
 --- a/app/models/mail_handler.rb
 +++ b/app/models/mail_handler.rb
 @@ -89,7 +89,7 @@ class MailHandler < ActionMailer::Base
@@ -64,16 +64,6 @@
          send method_name, object_id
        else
          # ignoring it
-@@ -131,8 +131,7 @@ class MailHandler < ActionMailer::Base
-     if status && issue.new_statuses_allowed_to(user).include?(status)
-       issue.status = status
-     end
--    issue.subject = email.subject.chomp
--    issue.subject = issue.subject.toutf8 if issue.subject.respond_to?(:toutf8)
-+    issue.subject = email.subject.chomp.toutf8
-     if issue.subject.blank?
-       issue.subject = '(no subject)'
-     end
 diff --git a/app/models/mailer.rb b/app/models/mailer.rb
 index dfd2737..2f6a990 100644
 --- a/app/models/mailer.rb

Modified: trunk/redmine/debian/rules
===================================================================
--- trunk/redmine/debian/rules	2010-01-07 19:06:30 UTC (rev 4497)
+++ trunk/redmine/debian/rules	2010-01-07 19:06:41 UTC (rev 4498)
@@ -6,9 +6,13 @@
 
 # Get original source, used only because 0.9.0 is not released yet, so we package 0.9.0~svnXXXX
 DEB_UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | cut -d- -f1 )
-SVN_REVISION := $(shell echo $(DEB_UPSTREAM_VERSION) | awk -F"~" '{ print $$2 }' | sed 's/svn//' )
 TARBALL = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz
 
+# SVN_REVISION := $(shell echo $(DEB_UPSTREAM_VERSION) | awk -F"~" '{ print $$2 }' | sed 's/svn//' )
+# SVN_URL := -r $(SVN_REVISION) http://redmine.rubyforge.org/svn/trunk
+SVN_URL := http://redmine.rubyforge.org/svn/branches/0.9-stable/
+
+
 binary-install/redmine::
 	# Clean up the "extra" license files
 	rm -f debian/redmine/usr/share/redmine/doc/COPYING
@@ -72,7 +76,7 @@
 get-orig-source:
 	rm -rf get-orig-source $(TARBALL)
 	mkdir get-orig-source
-	svn export -r $(SVN_REVISION) http://redmine.rubyforge.org/svn/trunk get-orig-source/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)
+	svn export $(SVN_URL) get-orig-source/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)
 	GZIP=--best tar czf $(TARBALL) -C get-orig-source $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)
 	rm -rf get-orig-source
 	mv $(TARBALL) ..