1 --- amarok-1.4.9.1/amarok/src/mediadevice/daap/daapserver.cpp~ 2008-04-10 23:16:37.000000000 +0300
2 +++ amarok-1.4.9.1/amarok/src/mediadevice/daap/daapserver.cpp 2008-05-03 20:38:40.854585305 +0300
4 m_server = new KProcIO();
5 m_server->setComm( KProcess::All );
6 *m_server << "amarok_daapserver.rb";
7 - *m_server << locate( "data", "amarok/ruby_lib/" );
8 - *m_server << locate( "lib", "ruby_lib/" );
9 - *m_server << locate( "data", "amarok/scripts/ruby_debug/debug.rb" );
10 if( !m_server->start( KProcIO::NotifyOnExit, true ) ) {
11 error() << "Failed to start amarok_daapserver.rb" << endl;
13 --- amarok-1.4.9.1/amarok/src/mediadevice/daap/Makefile.am 2008-05-03 20:43:00.885572020 +0300
14 +++ amarok-1.4.9.1/amarok/src/mediadevice/daap/Makefile.am 2008-05-03 20:47:24.272751916 +0300
17 bin_SCRIPTS = amarok_daapserver.rb
19 -SUBDIRS = daapreader mongrel
23 - $(kde_datadir)/amarok/ruby_lib
24 + $(ruby_rubylibdir)/amarok
26 amarokrubylib_DATA = \
28 --- amarok-1.4.9.1/amarok/src/mediadevice/daap/amarok_daapserver.rb~ 2008-04-10 23:16:37.000000000 +0300
29 +++ amarok-1.4.9.1/amarok/src/mediadevice/daap/amarok_daapserver.rb 2008-05-03 20:43:49.504374104 +0300
32 # (c) 2006 Ian Monroe <ian@monroe.nu>
33 # License: GNU General Public License V2
34 -$LOAD_PATH.push(ARGV[0])
35 -puts "here it is: #{ARGV[0]}"
36 -$LOAD_PATH.push(ARGV[1])
37 -puts "here it is: #{ARGV[1]}"
40 +require "amarok/codes"
42 -require "#{ARGV[2]}" #debug.rb
44 +require "amarok/debug"
48 --- amarok-1.4.9.1/amarok/src/scripts/ruby_debug/Makefile.am~ 2008-04-10 23:16:37.000000000 +0300
49 +++ amarok-1.4.9.1/amarok/src/scripts/ruby_debug/Makefile.am 2008-05-03 20:44:52.908028283 +0300
52 - $(kde_datadir)/amarok/scripts/ruby_debug
53 + $(ruby_rubylibdir)/amarok
57 --- amarok-1.4.9.1/amarok/src/scripts/lyrics_lyrc/lyrics_lyrc.rb~ 2008-05-03 20:49:32.000000000 +0300
58 +++ amarok-1.4.9.1/amarok/src/scripts/lyrics_lyrc/lyrics_lyrc.rb 2008-05-04 13:10:28.364031973 +0300
62 require "rexml/document"
63 -# require File.dirname( File.expand_path( __FILE__ ) ) + "/../ruby_debug/debug.rb"
64 +# require "amarok/debug"
67 @app_name = "Lyrics_Lyrc"