SOURCES: beagle-crawl.patch, beagle-epiphany-2.20.patch (REMOVED), ...

deejay1 deejay1 at pld-linux.org
Sun Feb 3 18:19:30 CET 2008 

Author: deejay1                      Date: Sun Feb  3 17:19:30 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- merged from DEVEL for 0.3.3

---- Files affected:
SOURCES:
   beagle-crawl.patch (1.8 -> 1.9) , beagle-epiphany-2.20.patch (1.1 -> NONE)  (REMOVED), beagle-desktop.patch (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: SOURCES/beagle-crawl.patch
diff -u SOURCES/beagle-crawl.patch:1.8 SOURCES/beagle-crawl.patch:1.9
--- SOURCES/beagle-crawl.patch:1.8	Mon Feb  5 18:29:35 2007
+++ SOURCES/beagle-crawl.patch	Sun Feb  3 18:19:25 2008
@@ -1,6 +1,17 @@
-diff -aurN beagle-0.2.7.orig/tools/crawl-rules/crawl-applications beagle-0.2.7/tools/crawl-rules/crawl-applications
---- beagle-0.2.7.orig/tools/crawl-rules/crawl-applications	2006-04-07 18:16:02.000000000 +0200
-+++ beagle-0.2.7/tools/crawl-rules/crawl-applications	2006-06-27 20:24:01.295867816 +0200
+diff -ur beagle-0.3.3/configure.in beagle-0.3.3-crawl/configure.in
+--- beagle-0.3.3/configure.in	2008-01-02 08:14:48.000000000 +0100
++++ beagle-0.3.3-crawl/configure.in	2008-02-03 17:47:18.000000000 +0100
+@@ -624,6 +624,7 @@
+ Filters/Makefile
+ tools/Makefile
+ tools/beagle-settings.desktop.in
++tools/beagle-crawl-system
+ search/Makefile
+ search/beagle-search.desktop.in
+ ImLogViewer/Makefile
+diff -ur beagle-0.3.3/tools/crawl-rules/crawl-applications beagle-0.3.3-crawl/tools/crawl-rules/crawl-applications
+--- beagle-0.3.3/tools/crawl-rules/crawl-applications	2008-01-02 04:00:22.000000000 +0100
++++ beagle-0.3.3-crawl/tools/crawl-rules/crawl-applications	2008-02-03 17:43:23.000000000 +0100
 @@ -2,7 +2,7 @@
  
  CRAWL_INDEX_NAME="applications"
@@ -10,9 +21,9 @@
  
  CRAWL_RECURSIVE="yes"
  
-diff -aurN beagle-0.2.7.orig/tools/crawl-rules/crawl-documentation beagle-0.2.7/tools/crawl-rules/crawl-documentation
---- beagle-0.2.7.orig/tools/crawl-rules/crawl-documentation	2006-06-19 19:54:27.000000000 +0200
-+++ beagle-0.2.7/tools/crawl-rules/crawl-documentation	2006-06-27 20:25:28.212654456 +0200
+diff -ur beagle-0.3.3/tools/crawl-rules/crawl-documentation beagle-0.3.3-crawl/tools/crawl-rules/crawl-documentation
+--- beagle-0.3.3/tools/crawl-rules/crawl-documentation	2007-12-13 09:27:46.000000000 +0100
++++ beagle-0.3.3-crawl/tools/crawl-rules/crawl-documentation	2008-02-03 17:44:49.000000000 +0100
 @@ -2,7 +2,7 @@
  
  CRAWL_INDEX_NAME="documentation"
@@ -20,26 +31,33 @@
 -CRAWL_PATHS="/usr/share/doc /usr/local/share/doc /opt/kde3/share/doc /opt/gnome/share/gnome/help /usr/share/gnome/help /opt/gnome/share/gtk-doc/html /usr/share/gtk-doc/html /usr/share/gnome/html"
 +CRAWL_PATHS="/usr/share/doc /usr/share/gnome/help"
  
- CRAWL_ALLOW_PATTERNS="*.xml,*.html,*.docbook"
- 
-diff -aurN beagle-0.2.7.orig/tools/Makefile.am beagle-0.2.7/tools/Makefile.am
---- beagle-0.2.7.orig/tools/Makefile.am	2006-06-19 19:54:27.000000000 +0200
-+++ beagle-0.2.7/tools/Makefile.am	2006-06-27 20:25:56.806307560 +0200
-@@ -35,7 +35,6 @@
- 	chmod +x $(CRAWL_WRAPPER)
+ CRAWL_ALLOW_PATTERNS="*.xml,*.html,*.docbook,*.pdf"
  
- CRAWL_RULES = \
--	$(srcdir)/crawl-rules/crawl-windows		\
+diff -ur beagle-0.3.3/tools/crawl-rules/crawl-monodoc beagle-0.3.3-crawl/tools/crawl-rules/crawl-monodoc
+--- beagle-0.3.3/tools/crawl-rules/crawl-monodoc	2007-12-13 10:37:03.000000000 +0100
++++ beagle-0.3.3-crawl/tools/crawl-rules/crawl-monodoc	2008-02-03 17:46:26.000000000 +0100
+@@ -1,8 +1,8 @@
+-CRAWL_ENABLED="no"
++CRAWL_ENABLED="yes"
+ 
+ CRAWL_INDEX_NAME="monodoc"
+ 
+-CRAWL_PATHS="/usr/lib/monodoc/sources /usr/local/lib/monodoc/sources"
++CRAWL_PATHS="/usr/lib/monodoc/sources"
+ 
+ # Indexing Mono.zip will take a long time. It might be a good idea to add Mono.zip to deny patterns.
+ 
+diff -ur beagle-0.3.3/tools/Makefile.am beagle-0.3.3-crawl/tools/Makefile.am
+--- beagle-0.3.3/tools/Makefile.am	2008-01-02 00:25:15.000000000 +0100
++++ beagle-0.3.3-crawl/tools/Makefile.am	2008-02-03 17:45:38.000000000 +0100
+@@ -39,8 +39,7 @@
  	$(srcdir)/crawl-rules/crawl-applications	\
- 	$(srcdir)/crawl-rules/crawl-documentation
- 
---- beagle-0.2.15.1/configure.in~	2007-02-05 18:07:14.000000000 +0100
-+++ beagle-0.2.15.1/configure.in	2007-02-05 18:25:44.000000000 +0100
-@@ -696,6 +696,7 @@
- Filters/Makefile
- tools/Makefile
- tools/beagle-settings.desktop.in
-+tools/beagle-crawl-system
- search/Makefile
- search/beagle-search.desktop.in
- ImLogViewer/Makefile
+ 	$(srcdir)/crawl-rules/crawl-documentation	\
+ 	$(srcdir)/crawl-rules/crawl-manpages		\
+-	$(srcdir)/crawl-rules/crawl-monodoc		\
+-	$(srcdir)/crawl-rules/crawl-windows
++	$(srcdir)/crawl-rules/crawl-monodoc
+ 
+ # FIXME: Per-distribution specific crawl rules
+ configdir = $(sysconfdir)/beagle
+

================================================================
Index: SOURCES/beagle-desktop.patch
diff -u SOURCES/beagle-desktop.patch:1.13 SOURCES/beagle-desktop.patch:1.14
--- SOURCES/beagle-desktop.patch:1.13	Sat Mar 17 14:06:04 2007
+++ SOURCES/beagle-desktop.patch	Sun Feb  3 18:19:25 2008
@@ -1,64 +1,55 @@
-diff -urN beagle-0.2.16.3/beagled/beagled-autostart.desktop beagle-0.2.16.3.new/beagled/beagled-autostart.desktop
---- beagle-0.2.16.3/beagled/beagled-autostart.desktop	2007-03-15 21:17:13.000000000 +0100
-+++ beagle-0.2.16.3.new/beagled/beagled-autostart.desktop	2007-03-17 13:41:18.000000000 +0100
+diff -ur beagle-0.3.3/beagled/beagled-autostart.desktop beagle-0.3.3-desktop/beagled/beagled-autostart.desktop
+--- beagle-0.3.3/beagled/beagled-autostart.desktop	2007-11-27 02:50:05.000000000 +0100
++++ beagle-0.3.3-desktop/beagled/beagled-autostart.desktop	2008-02-03 17:34:30.000000000 +0100
 @@ -1,8 +1,13 @@
  [Desktop Entry]
- Encoding=UTF-8
++Encoding=UTF-8
 +Name=Beagle
 +Comment=A system for searching and managing your personal information space
 +Comment[pl]=System przeszukiwania informacji osobistych i zarządzania nimi
  Exec=beagled --replace
 -Name=Beagle Search Daemon
-+Icon=stock_init
++Icon=stock-init
  Terminal=false
-+Type=Application
+ Type=Application
+ StartupNotify=false
  X-KDE-autostart-phase=2
  X-KDE-autostart-after=panel
- X-KDE-StartupNotify=false
 +X-GNOME-Autostart-enabled=true
-diff -urN beagle-0.2.16.3/search/beagle-search-autostart.desktop beagle-0.2.16.3.new/search/beagle-search-autostart.desktop
---- beagle-0.2.16.3/search/beagle-search-autostart.desktop	2007-02-07 20:04:11.000000000 +0100
-+++ beagle-0.2.16.3.new/search/beagle-search-autostart.desktop	2007-03-17 13:59:53.000000000 +0100
-@@ -3,6 +3,7 @@
- Exec=beagle-search --icon
- Name=Beagle Search Tool
+diff -ur beagle-0.3.3/search/beagle-search.desktop.in beagle-0.3.3-desktop/search/beagle-search.desktop.in
+--- beagle-0.3.3/search/beagle-search.desktop.in	2008-01-02 08:59:43.000000000 +0100
++++ beagle-0.3.3-desktop/search/beagle-search.desktop.in	2008-02-03 17:36:00.000000000 +0100
+@@ -7,7 +7,7 @@
  Terminal=false
-+Type=Application
- X-KDE-autostart-phase=2
- X-KDE-autostart-after=panel
- X-KDE-StartupNotify=false
-diff -urN beagle-0.2.16.3/search/beagle-search.desktop.in.in beagle-0.2.16.3.new/search/beagle-search.desktop.in.in
---- beagle-0.2.16.3/search/beagle-search.desktop.in.in	2007-02-07 20:04:11.000000000 +0100
-+++ beagle-0.2.16.3.new/search/beagle-search.desktop.in.in	2007-03-17 13:44:21.000000000 +0100
-@@ -1,5 +1,4 @@
- [Desktop Entry]
--X-SuSE-translate=true
- _Name=Search
- _GenericName=Search
- _Comment=Search for data on your desktop
-@@ -9,7 +8,7 @@
  Type=Application
  StartupNotify=true
- Encoding=UTF-8
--Categories=GNOME;GTK;Application;Core;Utility;Filesystem;
+-Categories=GNOME;GTK;Core;Utility;Filesystem;
 +Categories=GNOME;GTK;Utility;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=beagle
  X-GNOME-Bugzilla-Component=General
-diff -urN beagle-0.2.16.3/tools/beagle-settings.desktop.in.in beagle-0.2.16.3.new/tools/beagle-settings.desktop.in.in
---- beagle-0.2.16.3/tools/beagle-settings.desktop.in.in	2007-02-07 20:04:11.000000000 +0100
-+++ beagle-0.2.16.3.new/tools/beagle-settings.desktop.in.in	2007-03-17 14:00:15.000000000 +0100
-@@ -1,12 +1,11 @@
- [Desktop Entry]
- Encoding=UTF-8
--X-SuSE-translate=true
- _Name=Search & Indexing
- _GenericName=Configure Desktop Search
+diff -ur beagle-0.3.3/search/beagle-search.desktop.in.in beagle-0.3.3-desktop/search/beagle-search.desktop.in.in
+--- beagle-0.3.3/search/beagle-search.desktop.in.in	2007-11-27 02:49:58.000000000 +0100
++++ beagle-0.3.3-desktop/search/beagle-search.desktop.in.in	2008-02-03 17:35:49.000000000 +0100
+@@ -7,7 +7,7 @@
+ Terminal=false
+ Type=Application
+ StartupNotify=true
+-Categories=GNOME;GTK;Core;Utility;Filesystem;
++Categories=GNOME;GTK;Utility;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=beagle
+ X-GNOME-Bugzilla-Component=General
+diff -ur beagle-0.3.3/tools/beagle-settings.desktop.in.in beagle-0.3.3-desktop/tools/beagle-settings.desktop.in.in
+--- beagle-0.3.3/tools/beagle-settings.desktop.in.in	2007-11-27 02:49:57.000000000 +0100
++++ beagle-0.3.3-desktop/tools/beagle-settings.desktop.in.in	2008-02-03 17:36:48.000000000 +0100
+@@ -4,7 +4,7 @@
  Exec=beagle-settings
  Icon=system-search
  Type=Application
--Categories=Application;Settings;AdvancedSettings;Utility;Filesystem;X-Ximian-Settings;
+-Categories=Settings;Utility;Filesystem;X-Ximian-Settings;
 +Categories=GTK;GNOME;Settings;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=beagle
  X-GNOME-Bugzilla-Component=General
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/beagle-crawl.patch?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/beagle-desktop.patch?r1=1.13&r2=1.14&f=u

More information about the pld-cvs-commit mailing list