[Slim-Checkins] r10160 - in /branches/6.5: platforms/debian/control server/slimserver.pl

[dsully at svn.slimdevices.com]

Author: dsully
Date: Tue Oct  3 14:13:24 2006
New Revision: 10160

URL: http://svn.slimdevices.com?rev=10160&view=rev
Log:
Bug: N/A
Description: Merge from trunk -r 10155:10156

Modified:
    branches/6.5/platforms/debian/control
    branches/6.5/server/slimserver.pl

Modified: branches/6.5/platforms/debian/control
URL: http://svn.slimdevices.com/branches/6.5/platforms/debian/control?rev=10160&r1=10159&r2=10160&view=diff
==============================================================================
--- branches/6.5/platforms/debian/control (original)
+++ branches/6.5/platforms/debian/control Tue Oct  3 14:13:24 2006
@@ -24,7 +24,7 @@
  libtie-cache-lru-expires-perl (>= 0.54-1), libxml-parser-perl, libfile-find-rule-perl,
  libdata-vstring-perl, libalgorithm-c3-perl, libclass-c3-perl, libproc-background-perl,
  libdbix-class-perl, libclass-inspector-perl, libxml-writer-perl, libxml-xspf-perl,
- libdata-dump-perl, libmpeg-audio-frame-perl, libnet-upnp-perl,
+ libdata-dump-perl, libmpeg-audio-frame-perl, libnet-upnp-perl, libxml-simple-perl (>= 2.15-1),
  libdbix-migration-perl, libyaml-syck-perl (>= 0.41-1), mysql-server-4.1 | mysql-server-5.0,
  libmysqlclient14-dev | libmysqlclient15-dev, mysql-client-4.1 | mysql-client-5.0,
  flac, sox, adduser

Modified: branches/6.5/server/slimserver.pl
URL: http://svn.slimdevices.com/branches/6.5/server/slimserver.pl?rev=10160&r1=10159&r2=10160&view=diff
==============================================================================
--- branches/6.5/server/slimserver.pl (original)
+++ branches/6.5/server/slimserver.pl Tue Oct  3 14:13:24 2006
@@ -97,7 +97,9 @@
 # Force XML::Simple to use XML::Parser for speed. This is done
 # here so other packages don't have to worry about it. If we
 # don't have XML::Parser installed, we fall back to PurePerl.
-use XML::Simple;
+# 
+# Only use XML::Simple 2.15 an above, which has support for pass-by-ref
+use XML::Simple qw(2.15);
 
 eval {
 	local($^W) = 0;      # Suppress warning from Expat.pm re File::Spec::load()