Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

 ftp/museek+/DEPENDS         |    6 +++--
 ftp/museek+/DETAILS         |    1 
 ftp/museek+/HISTORY         |    6 +++++
 ftp/museek+/PRE_BUILD       |    1 
 ftp/museek+/no-syslog.patch |   51 
++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 63 insertions(+), 2 deletions(-)

New commits:
commit 1fe7eb72aff1067977e555ad97f0e88df134ab65
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    museek+: post-update fixes; syslog support was removed on daemon side 
since 0.2 NewNet branch

diff --git a/ftp/museek+/DEPENDS b/ftp/museek+/DEPENDS
index 17e62c6..748711a 100755
--- a/ftp/museek+/DEPENDS
+++ b/ftp/museek+/DEPENDS
@@ -48,10 +48,12 @@ optional_depends pygtk2 \
 
 optional_depends pyqt4 "" "" "for musetup-qt utility" &&
 
-optional_depends FAM "" "" "for file scanning daemon (muscand)" &&
-
 optional_depends libvorbis "" "" "for Ogg metadata generation" &&
 
+if list_find "$MUSEEKPLUS_OPTS" "-DNO_MUSCAN=OFF"; then
+  optional_depends FAM "" "" "for file scanning daemon (muscand)"
+fi &&
+
 if is_depends_enabled $SPELL ncurses || is_depends_enabled $SPELL pygtk2; 
then
   suggest_depends geoip-python "" "" "for GeoIP location support"
 fi &&
diff --git a/ftp/museek+/DETAILS b/ftp/museek+/DETAILS
index 8a56012..e8f18fb 100755
--- a/ftp/museek+/DETAILS
+++ b/ftp/museek+/DETAILS
@@ -1,5 +1,6 @@
            SPELL=museek+
          VERSION=0.2
+      PATCHLEVEL=1
           SOURCE=$SPELL-$VERSION.tar.bz2
      
SOURCE_HASH=sha512:778cee1f91a6d5ed6e78f1dd1f3e5afda6ebca052065e3f04bada58edfe0e10983f2cbc3d9c94ff546175d3852e193934412d3b30ad37839f36b46bde0c8bf72
    SOURCE_URL[0]=$SOURCEFORGE_URL/museek-plus/$SOURCE
diff --git a/ftp/museek+/HISTORY b/ftp/museek+/HISTORY
index 42a091a..eb72b7e 100644
--- a/ftp/museek+/HISTORY
+++ b/ftp/museek+/HISTORY
@@ -1,2 +1,8 @@
+2011-02-07 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: PATCHLEVEL=1
+       * DEPENDS: added condition for FAM check
+       * no-syslog.patch: added, to fix settings dialog in murmur
+       * PRE_BUILD: apply the patch
+
 2011-02-06 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS, DEPENDS, CONFIGURE, {PRE_,}BUILD, size.patch: spell created
diff --git a/ftp/museek+/PRE_BUILD b/ftp/museek+/PRE_BUILD
index b9659f7..ad12ccf 100755
--- a/ftp/museek+/PRE_BUILD
+++ b/ftp/museek+/PRE_BUILD
@@ -1,6 +1,7 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
 
+patch -p0 < "$SPELL_DIRECTORY/no-syslog.patch" &&
 patch -p0 < "$SPELL_DIRECTORY/size.patch" &&
 
 if [[ $MUSEEKPLUS_HASHLIB != none ]]; then
diff --git a/ftp/museek+/no-syslog.patch b/ftp/museek+/no-syslog.patch
new file mode 100644
index 0000000..5ea9193
--- /dev/null
+++ b/ftp/museek+/no-syslog.patch
@@ -0,0 +1,51 @@
+--- murmur/pymurmur/settings.py.orig   2008-09-22 12:49:33.000000000 +0400
++++ murmur/pymurmur/settings.py        2011-02-07 05:42:54.719910752 +0300
+@@ -292,11 +292,6 @@
+               if self.config != {}:
+                       self.config["transfers"]["download_rate"] = str(int( 
self.downloadRate.get_value() ))
+               
+-      def LoggingChanged(self, widget):
+-              if self.config != {}:
+-                      self.config["logging"]["output"] = str(int( 
self.LogMethod.get_active() ))
+-              
+-              
+       def DownloadDirChanged(self, widget):
+               if self.config != {}:
+                       self.config["transfers"]["download-dir"] = 
self.EntryDownloadDIr.get_text()
+@@ -1042,20 +1037,7 @@
+               self.hbox33.pack_start(self.LastPort, True, True, 0)
+       
+               self.vbox2.pack_start(self.hbox33, False, False, 0)
+-              self.LoggingHbox = gtk.HBox(False, 5)
+-              self.LoggingHbox.show()
+-              self.LoggingHbox.set_spacing(5)
+-              
+-              
+-              self.LogMethod = gtk.CheckButton()
+-              self.LogMethod.set_active(False)
+-              self.LogMethod.set_label(_("Output to Syslog instead of 
standard output"))
+-              self.LogMethod.show()
+-              self.LogMethod.connect("clicked", self.LoggingChanged)
+ 
+-              self.LoggingHbox.pack_end(self.LogMethod, False, True, 0)
+-      
+-              self.vbox2.pack_start(self.LoggingHbox, False, False, 0)
+               self.ServerSW.add_with_viewport(self.vbox2)
+       
+               
+@@ -3371,7 +3353,6 @@
+               self.networkEncoding.child.set_text("")
+               self.LastPort.set_value(0)
+               self.FirstPort.set_value(0)
+-              self.LogMethod.set_active(0)
+               # Museek Clients
+               self.interfacePassword.set_text("")
+               self.interfacesTreestore.clear()
+@@ -3452,7 +3433,6 @@
+                               
self.networkEncoding.child.set_text(self.config["encoding"]["network"])
+                       
self.LastPort.set_value(int(self.config["clients.bind"]["last"]))
+                       
self.FirstPort.set_value(int(self.config["clients.bind"]["first"]))
+-                      
self.LogMethod.set_active(int(self.config["logging"]["output"]))
+                       # Museek Clients
+                       
self.interfacePassword.set_text(str(self.config["interfaces"]["password"]))
+                       self.createTreeFor( self.interfacesTreestore, 
self.interfacesTreeview, "interfaces.bind")