- up to 2.1.1

[packages/amarok.git] / amarok-mongrel.patch

diff --git a/amarok-mongrel.patch b/amarok-mongrel.patch
index 8807615933cb1a75e713f1427fb2367279fcbe68..cd12b3195f093a536390696c958dba033af28547 100644 (file)
--- a/amarok-mongrel.patch
+++ b/amarok-mongrel.patch
@@ -10,10 +10,14 @@
      if( !m_server->start( KProcIO::NotifyOnExit, true ) ) {
          error() << "Failed to start amarok_daapserver.rb" << endl;
          return;
---- amarok-1.4.9.1/amarok/src/mediadevice/daap/Makefile.am~    2008-05-03 20:42:53.000000000 +0300
-+++ amarok-1.4.9.1/amarok/src/mediadevice/daap/Makefile.am     2008-05-03 20:43:00.885572020 +0300
-@@ -39,7 +39,7 @@
- SUBDIRS = daapreader mongrel
+--- amarok-1.4.9.1/amarok/src/mediadevice/daap/Makefile.am     2008-05-03 20:43:00.885572020 +0300
++++ amarok-1.4.9.1/amarok/src/mediadevice/daap/Makefile.am     2008-05-03 20:47:24.272751916 +0300
+@@ -36,10 +36,10 @@
+ 
+ bin_SCRIPTS = amarok_daapserver.rb
+ 
+-SUBDIRS = daapreader mongrel
++SUBDIRS = daapreader
  
  amarokrubylibdir = \
 -    $(kde_datadir)/amarok/ruby_lib
@@ -50,3 +54,14 @@
  
  rubydebug_DATA = \
      debug.rb
+--- amarok-1.4.9.1/amarok/src/scripts/lyrics_lyrc/lyrics_lyrc.rb~      2008-05-03 20:49:32.000000000 +0300
++++ amarok-1.4.9.1/amarok/src/scripts/lyrics_lyrc/lyrics_lyrc.rb       2008-05-04 13:10:28.364031973 +0300
+@@ -12,7 +12,7 @@
+ 
+ require "net/http"
+ require "rexml/document"
+-# require File.dirname( File.expand_path( __FILE__ ) ) + "/../ruby_debug/debug.rb"
++# require "amarok/debug"
+ require "uri"
+ 
+ @app_name = "Lyrics_Lyrc"