[DRE-commits] r5775 - in trunk/libfeedtools-ruby/debian: . patches

[Marc Dequènes]

Author: duck
Date: 2010-08-17 01:14:01 +0000 (Tue, 17 Aug 2010)
New Revision: 5775

Removed:
   trunk/libfeedtools-ruby/debian/patches/rails_load_path
Modified:
   trunk/libfeedtools-ruby/debian/changelog
   trunk/libfeedtools-ruby/debian/control
   trunk/libfeedtools-ruby/debian/control.in
   trunk/libfeedtools-ruby/debian/patches/series
Log:
[fix] remove rails patch causing load error

Modified: trunk/libfeedtools-ruby/debian/changelog
===================================================================
--- trunk/libfeedtools-ruby/debian/changelog	2010-08-16 23:32:59 UTC (rev 5774)
+++ trunk/libfeedtools-ruby/debian/changelog	2010-08-17 01:14:01 UTC (rev 5775)
@@ -1,3 +1,11 @@
+libfeedtools-ruby (0.2.29+dfsg1-4) unstable; urgency=high
+
+  * Removed obsolete patch 'rails_load_path' causing loading error since
+    Rails packaging is now split (Closes: #593078).
+  * Increased Standards-Version to 3.9.1 (no changes).
+
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Tue, 17 Aug 2010 02:28:43 +0200
+
 libfeedtools-ruby (0.2.29+dfsg1-3) unstable; urgency=low
 
   * Added Vcs fields.

Modified: trunk/libfeedtools-ruby/debian/control
===================================================================
--- trunk/libfeedtools-ruby/debian/control	2010-08-16 23:32:59 UTC (rev 5774)
+++ trunk/libfeedtools-ruby/debian/control	2010-08-17 01:14:01 UTC (rev 5775)
@@ -7,7 +7,7 @@
 Build-Depends-Indep: ruby1.8, ruby1.9.1, rdoc1.8, rdoc1.9.1, graphviz
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ruby-extras/trunk/libfeedtools-ruby/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-ruby-extras/trunk/libfeedtools-ruby/
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Homepage: http://sporkmonger.com/projects/feedtools
 
 Package: libfeedtools-ruby1.8

Modified: trunk/libfeedtools-ruby/debian/control.in
===================================================================
--- trunk/libfeedtools-ruby/debian/control.in	2010-08-16 23:32:59 UTC (rev 5774)
+++ trunk/libfeedtools-ruby/debian/control.in	2010-08-17 01:14:01 UTC (rev 5775)
@@ -7,7 +7,7 @@
 Build-Depends-Indep: ruby1.8, ruby1.9.1, rdoc1.8, rdoc1.9.1, graphviz
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ruby-extras/trunk/libfeedtools-ruby/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-ruby-extras/trunk/libfeedtools-ruby/
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Homepage: http://sporkmonger.com/projects/feedtools
 
 Package: libfeedtools-ruby1.8

Deleted: trunk/libfeedtools-ruby/debian/patches/rails_load_path
===================================================================
--- trunk/libfeedtools-ruby/debian/patches/rails_load_path	2010-08-16 23:32:59 UTC (rev 5774)
+++ trunk/libfeedtools-ruby/debian/patches/rails_load_path	2010-08-17 01:14:01 UTC (rev 5775)
@@ -1,19 +0,0 @@
-Index: libfeedtools-ruby-0.2.29+dfsg1/lib/feed_tools.rb
-===================================================================
---- libfeedtools-ruby-0.2.29+dfsg1.orig/lib/feed_tools.rb	2009-06-28 17:48:55.000000000 +0200
-+++ libfeedtools-ruby-0.2.29+dfsg1/lib/feed_tools.rb	2009-06-28 17:48:59.000000000 +0200
-@@ -21,6 +21,14 @@
- # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- #++
- 
-+# add Rails load path for Debian, until rails framework is split properly
-+DEB_RAILS_PATH = "/usr/share/rails"
-+Dir.new(DEB_RAILS_PATH).each do |file|
-+	next if file =~ /^\./
-+	path = File.join(DEB_RAILS_PATH, file, "lib")
-+	$: << path if File.directory?(path)
-+end
-+
- if Object.const_defined?(:FEED_TOOLS_NAMESPACES)
-   warn("FeedTools may have been loaded improperly.  This may be caused " +
-     "by the presence of the RUBYOPT environment variable or by using " +

Modified: trunk/libfeedtools-ruby/debian/patches/series
===================================================================
--- trunk/libfeedtools-ruby/debian/patches/series	2010-08-16 23:32:59 UTC (rev 5774)
+++ trunk/libfeedtools-ruby/debian/patches/series	2010-08-17 01:14:01 UTC (rev 5775)
@@ -1,2 +1 @@
 useless_rubygems_dep
-rails_load_path