Hello community,
here is the log from the commit of package kdebase3
checked in at Mon Oct 16 18:45:52 CEST 2006.
--------
--- KDE/kdebase3/kdebase3.changes 2006-10-13 18:51:18.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdebase3/kdebase3.changes 2006-10-16 12:50:02.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Oct 16 12:49:25 CEST 2006 - stbinner@suse.de
+
+- update kickoff.diff from SVN and break it into parts
+
+-------------------------------------------------------------------
New:
----
khelpcenter-beagle.diff
kickoff-kcm.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase3.spec ++++++
--- /var/tmp/diff_new_pack.VkfU6W/_old 2006-10-16 18:44:59.000000000 +0200
+++ /var/tmp/diff_new_pack.VkfU6W/_new 2006-10-16 18:44:59.000000000 +0200
@@ -51,7 +51,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://www.kde.org/
Version: 3.5.5
-Release: 9
+Release: 11
%define kde_version 3.5.5
Source0: kdebase-%{kde_version}.tar.bz2
Source3: startkde.suse.sh
@@ -159,8 +159,12 @@
Patch157: kcmsamba_log.diff
Patch160: khelpcenter-localindices.patch
Patch161: switch-applet-lock-logout.diff
-# svn di -r594132:HEAD .
+# svn branches/KDE/3.5/kdebase/kicker@594132 branches/work/suse_kickoff/kicker@HEAD
Patch162: kickoff.diff
+# svn diff -r 551296:HEAD kcontrol
+Patch158: kickoff-kcm.diff
+# svn diff -r 551296:HEAD khelpcenter
+Patch159: khelpcenter-beagle.diff
Patch163: xinerama.patch
Patch164: kdm-path.diff
Patch165: optional-compmgr.diff
@@ -357,7 +361,7 @@
Summary: Set and list fileshares
Group: System/Management
Version: 2.0
-Release: 138
+Release: 140
%description -n fileshareset
This package contains the the fileshareset utility to allow users to
@@ -489,7 +493,11 @@
%patch160
%if %suse_version > 1010
%patch161
+cd kicker
%patch162
+cd ..
+%patch158
+%patch159
%patch165
%patch166
%patch167
@@ -1448,6 +1456,8 @@
%endif
%changelog -n kdebase3
+* Mon Oct 16 2006 - stbinner@suse.de
+- update kickoff.diff from SVN and break it into parts
* Fri Oct 13 2006 - llunak@suse.cz
- add patch for KDE#135250 to 3_5 branch diff
- systray ordering (fate #301154)
++++++ khelpcenter-beagle.diff ++++++
Index: khelpcenter/searchhandlers/khc_beagle_search.py
===================================================================
--- khelpcenter/searchhandlers/khc_beagle_search.py (.../KDE/3.5/kdebase/khelpcenter) (revision 0)
+++ khelpcenter/searchhandlers/khc_beagle_search.py (.../work/suse_kickoff/khelpcenter) (revision 595959)
@@ -0,0 +1,97 @@
+#!/usr/bin/env python
+
+import sys, os
+import string
+import urllib
+
+def isBeagleRunning():
+ status = os.popen("beagle-ping", "r").read()
+ return status.startswith("Daemon version:")
+
+def formatHTML(query, hits):
+ '''Format raw list of apps found, prints HTML formatted document on stdout
+
+ @param query: the original query words
+ @param hits: list of help:/ hits
+ '''
+
+ print "<html>\n"
+ print "<body>"
+ print "<ul>"
+
+ for hit in hits:
+ print "<li>" + hit + "</li>"
+
+ print "</ul>\n</body>\n</html>\n"
+
+def beagleQuery(words, method = 'and', maxnum = 100):
+ '''Perform a beagle-query search.
+
+ @param words: space separated query
+ @param method: search method (AND, OR)
+ @param maxnum: maximum number of hits returned
+
+ @return a list of help:/ links separated by \n
+ '''
+ # Syntax: beagle-query --type DocbookEntry --max-hits=<maxnum> <words>
+ hits = []
+ pipe = os.popen("beagle-query --type DocbookEntry --type File --max-hits %s %s ext:docbook" % (maxnum, words), "r")
+
+ if pipe:
+ for line in pipe:
+ uri = urllib.unquote(line.strip())
+ uri = uri.replace("file://", "") # remove protocol
+ #print uri
+ helpLink = makeHelpLink(uri)
+ if helpLink not in hits:
+ hits.append(helpLink)
+
+ pipe.close()
+ return hits
+
+def makeHelpLink(path):
+ '''
+ Try to figure out the name of the application from the path to its index.docbook file
+
+ @param path: path to the .docbook file
+
+ @return HTML-formatted help:/ link
+ '''
+ appName = path.split(os.sep)[-2]
+ appName2 = path.split(os.sep)[-3]
+
+ if (appName == appName2 or appName2 == "doc" or len(appName2) == 2): # just the app
+ return "" + appName + "</a>"
+ else: # things like kcontrol/colors
+ return "" + appName + " (" + appName2 + ")</a>"
+
+def main():
+ import getopt
+ try:
+ opts, args = getopt.getopt(sys.argv[1:], "", ["method=", "maxnum="])
+ except getopt.GetoptError:
+ sys.exit("Command line syntax error")
+
+ method = 'and'
+ maxnum = 100
+ docid, words = None
+
+ for o, a in opts:
+ if o == "--method":
+ method = a
+ if o == "--maxnum":
+ maxnum = a
+ if args:
+ words = args[0].replace('+', ' ') # replace + signs by spaces
+ else:
+ sys.exit("No search term specified")
+
+ if (isBeagleRunning()):
+ hits = beagleQuery(words, method, maxnum)
+ else:
+ hits = ["The Beagle daemon is not running, search is not available"]
+
+ formatHTML(words, hits)
+
+if __name__ == '__main__':
+ main()
Property changes on: khelpcenter/searchhandlers/khc_beagle_search.py
___________________________________________________________________
Name: svn:executable
+ *
Index: khelpcenter/searchhandlers/docbook.desktop
===================================================================
--- khelpcenter/searchhandlers/docbook.desktop (.../KDE/3.5/kdebase/khelpcenter) (revision 551296)
+++ khelpcenter/searchhandlers/docbook.desktop (.../work/suse_kickoff/khelpcenter) (revision 595959)
@@ -2,5 +2,5 @@
DocumentTypes=text/docbook
-SearchCommand=khc_htsearch.pl --docbook --indexdir=%d --config=%i --words=%w --method=%o --maxnum=%m --lang=en
-IndexCommand=khc_docbookdig.pl --indexdir=%d --docpath=%p --identifier=%i
+SearchCommand=khc_beagle_search.py --method=%o --maxnum=%m %w
+#IndexCommand=khc_docbookdig.pl --indexdir=%d --docpath=%p --identifier=%i
Index: khelpcenter/searchhandlers/Makefile.am
===================================================================
--- khelpcenter/searchhandlers/Makefile.am (.../KDE/3.5/kdebase/khelpcenter) (revision 551296)
+++ khelpcenter/searchhandlers/Makefile.am (.../work/suse_kickoff/khelpcenter) (revision 595959)
@@ -3,7 +3,7 @@
searchhandlersdir = $(kde_datadir)/khelpcenter/searchhandlers
kde_bin_SCRIPTS = khc_htdig.pl khc_htsearch.pl khc_mansearch.pl \
- khc_docbookdig.pl
+ khc_docbookdig.pl khc_beagle_search.py
htdigdata_DATA = htdig_long.html
++++++ kickoff-kcm.diff ++++++
Index: kcontrol/kicker/menutab_impl.h
===================================================================
--- kcontrol/kicker/menutab_impl.h (.../KDE/3.5/kdebase/kcontrol) (revision 551296)
+++ kcontrol/kicker/menutab_impl.h (.../work/suse_kickoff/kcontrol) (revision 595959)
@@ -61,6 +61,7 @@
public slots:
void launchMenuEditor();
+ void menuStyleChanged();
protected:
kSubMenuItem *m_bookmarkMenu;
Index: kcontrol/kicker/menutab_impl.cpp
===================================================================
--- kcontrol/kicker/menutab_impl.cpp (.../KDE/3.5/kdebase/kcontrol) (revision 551296)
+++ kcontrol/kicker/menutab_impl.cpp (.../work/suse_kickoff/kcontrol) (revision 595959)
@@ -16,12 +16,16 @@
*/
#include