rev 4515 - in kde-extras/kerry/trunk/debian: . patches

Fathi Boudra fboudra-guest at costa.debian.org
Mon Sep 18 20:20:55 UTC 2006 

Author: fboudra-guest
Date: 2006-09-18 20:20:54 +0000 (Mon, 18 Sep 2006)
New Revision: 4515

Modified:
   kde-extras/kerry/trunk/debian/changelog
   kde-extras/kerry/trunk/debian/control
   kde-extras/kerry/trunk/debian/patches/11_shutdowndir_path.diff
   kde-extras/kerry/trunk/debian/patches/12_remove_sh_extension.diff
   kde-extras/kerry/trunk/debian/patches/13_remove_beagled.desktop.diff
   kde-extras/kerry/trunk/debian/patches/14_change_default_shortcut.diff
   kde-extras/kerry/trunk/debian/patches/15_remove_core_categories.diff
Log:
update to kerry 0.2 alpha 2 aka 0.1.91

Modified: kde-extras/kerry/trunk/debian/changelog
===================================================================
--- kde-extras/kerry/trunk/debian/changelog	2006-09-17 22:59:34 UTC (rev 4514)
+++ kde-extras/kerry/trunk/debian/changelog	2006-09-18 20:20:54 UTC (rev 4515)
@@ -1,3 +1,11 @@
+kerry (0.1.91-1) unstable; urgency=low
+
+  * New upstream release
+  * Improve description (Closes: #384897)
+  * Remove add autoconf 2.60 support patch, merged upstream
+
+ -- Fathi Boudra <fboudra at free.fr>  Mon, 18 Sep 2006 20:44:03 +0200
+
 kerry (0.1.90-1) unstable; urgency=low
 
   * Initial release (Closes: #376736)

Modified: kde-extras/kerry/trunk/debian/control
===================================================================
--- kde-extras/kerry/trunk/debian/control	2006-09-17 22:59:34 UTC (rev 4514)
+++ kde-extras/kerry/trunk/debian/control	2006-09-18 20:20:54 UTC (rev 4515)
@@ -16,35 +16,37 @@
  whatever you're looking for. Beagle can search in many different domains.
  .
  Using Beagle, you can easily find:
-  * documents 
-  * emails 
-  * web history 
-  * IM/IRC conversations 
-  * source code 
-  * images 
-  * music/video files 
+  * documents
+  * emails
+  * web history
+  * IM/IRC conversations
+  * source code
+  * images
+  * music/video files
   * applications
  .
  Beagle supports the following data sources: 
-  * File system 
-  * Evolution mail, calendar, and addressbook 
-  * Thunderbird mail, news, RSS feeds, and addressbook 
-  * Gaim and Kopete instant messaging and IRC logs 
-  * Firefox and Epiphany web pages (as you view them, through browser extensions) 
-  * Konqueror web pages 
-  * Blam, Liferea and Akregator RSS feeds 
-  * Tomboy notes 
+  * File system
+  * Evolution mail, calendar, and addressbook
+  * Thunderbird mail, news, RSS feeds, and addressbook
+  * Gaim and Kopete instant messaging and IRC logs
+  * Firefox and Epiphany web pages (as you view them,
+    through browser extensions)
+  * Konqueror web pages
+  * Blam, Liferea and Akregator RSS feeds
+  * Tomboy notes
   * KMail mail
  .
- and the following file formats: 
-  * Office Documents 
+ and the following file formats:
+  * Office Documents
   * Text Documents
-  * Documentation/Help Documents 
-  * Images (jpeg, png, bmp, tiff, gif) 
-  * Audio (mp3, ogg, flac) 
-  *  Video (mpeg, asf, wmv, mng, mp4, quicktime and other formats supported by mplayer) 
-  * Application launchers 
-  *  Linux packages (ebuild, rpm) 
+  * Documentation/Help Documents
+  * Images (jpeg, png, bmp, tiff, gif)
+  * Audio (mp3, ogg, flac)
+  * Video (mpeg, asf, wmv, mng, mp4, quicktime
+    and other formats supported by mplayer)
+  * Application launchers
+  * Linux packages (ebuild, rpm)
   * Generic XSLT files
  .
  Beagle also allows users to write simple filters based on external programs

Modified: kde-extras/kerry/trunk/debian/patches/11_shutdowndir_path.diff
===================================================================
--- kde-extras/kerry/trunk/debian/patches/11_shutdowndir_path.diff	2006-09-17 22:59:34 UTC (rev 4514)
+++ kde-extras/kerry/trunk/debian/patches/11_shutdowndir_path.diff	2006-09-18 20:20:54 UTC (rev 4515)
@@ -1,6 +1,6 @@
-diff -Nur kerry-0.1.90/src/Makefile.am kerry-0.1.90.new/src/Makefile.am
---- kerry-0.1.90/src/Makefile.am	2006-06-21 10:31:01.000000000 +0200
-+++ kerry-0.1.90.new/src/Makefile.am	2006-08-04 12:11:46.000000000 +0200
+diff -Nur kerry-0.1.91/kerry/src/Makefile.am kerry-0.1.91.new/kerry/src/Makefile.am
+--- kerry-0.1.91/kerry/src/Makefile.am	2006-09-18 16:09:57.000000000 +0200
++++ kerry-0.1.91.new/kerry/src/Makefile.am	2006-09-18 21:23:12.000000000 +0200
 @@ -35,7 +35,7 @@
  autostartdir = $(datadir)/autostart
  autostart_DATA = kerry.autostart.desktop beagled.desktop
@@ -10,15 +10,15 @@
  shutdown_SCRIPTS = beagled-shutdown.sh
  
  xdg_apps_DATA = kerry.desktop
-diff -Nur kerry-0.1.90/src/Makefile.in kerry-0.1.90.new/src/Makefile.in
---- kerry-0.1.90/src/Makefile.in	2006-06-23 07:38:51.000000000 +0200
-+++ kerry-0.1.90.new/src/Makefile.in	2006-08-04 12:12:14.000000000 +0200
-@@ -398,7 +398,7 @@
- KDE_ICON = kerry
+diff -Nur kerry-0.1.91/kerry/src/Makefile.in kerry-0.1.91.new/kerry/src/Makefile.in
+--- kerry-0.1.91/kerry/src/Makefile.in	2006-09-18 16:11:04.000000000 +0200
++++ kerry-0.1.91.new/kerry/src/Makefile.in	2006-09-18 21:24:26.000000000 +0200
+@@ -412,7 +412,7 @@
+ KDE_ICON = kerry kerry_systemtray
  autostartdir = $(datadir)/autostart
  autostart_DATA = kerry.autostart.desktop beagled.desktop
 -shutdowndir = $(prefix)/shutdown
 +shutdowndir = $(prefix)/bin
  shutdown_SCRIPTS = beagled-shutdown.sh
  xdg_apps_DATA = kerry.desktop
- #>- all: all-am
+ kerry_anim_datadir = $(datadir)/apps/kerry

Modified: kde-extras/kerry/trunk/debian/patches/12_remove_sh_extension.diff
===================================================================
--- kde-extras/kerry/trunk/debian/patches/12_remove_sh_extension.diff	2006-09-17 22:59:34 UTC (rev 4514)
+++ kde-extras/kerry/trunk/debian/patches/12_remove_sh_extension.diff	2006-09-18 20:20:54 UTC (rev 4515)
@@ -1,6 +1,6 @@
-diff -Nur kerry-0.1.90/src/beagled-shutdown kerry-0.1.90.new/src/beagled-shutdown
---- kerry-0.1.90/src/beagled-shutdown	1970-01-01 01:00:00.000000000 +0100
-+++ kerry-0.1.90.new/src/beagled-shutdown	2006-06-21 10:31:01.000000000 +0200
+diff -Nur kerry-0.1.91/kerry/src/beagled-shutdown kerry-0.1.91.new/kerry/src/beagled-shutdown
+--- kerry-0.1.91/kerry/src/beagled-shutdown	1970-01-01 01:00:00.000000000 +0100
++++ kerry-0.1.91.new/kerry/src/beagled-shutdown	2006-09-18 16:09:57.000000000 +0200
 @@ -0,0 +1,7 @@
 +#!/bin/sh
 +
@@ -9,9 +9,9 @@
 +if test -n "$BEAGLED_PID"; then
 +        beagle-shutdown
 +fi
-diff -Nur kerry-0.1.90/src/beagled-shutdown.sh kerry-0.1.90.new/src/beagled-shutdown.sh
---- kerry-0.1.90/src/beagled-shutdown.sh	2006-06-21 10:31:01.000000000 +0200
-+++ kerry-0.1.90.new/src/beagled-shutdown.sh	1970-01-01 01:00:00.000000000 +0100
+diff -Nur kerry-0.1.91/kerry/src/beagled-shutdown.sh kerry-0.1.91.new/kerry/src/beagled-shutdown.sh
+--- kerry-0.1.91/kerry/src/beagled-shutdown.sh	2006-09-18 16:09:57.000000000 +0200
++++ kerry-0.1.91.new/kerry/src/beagled-shutdown.sh	1970-01-01 01:00:00.000000000 +0100
 @@ -1,7 +0,0 @@
 -#!/bin/sh
 -
@@ -20,9 +20,9 @@
 -if test -n "$BEAGLED_PID"; then
 -        beagle-shutdown
 -fi
-diff -Nur kerry-0.1.90/src/Makefile.am kerry-0.1.90.new/src/Makefile.am
---- kerry-0.1.90/src/Makefile.am	2006-08-04 13:40:20.000000000 +0200
-+++ kerry-0.1.90.new/src/Makefile.am	2006-08-04 13:45:35.000000000 +0200
+diff -Nur kerry-0.1.91/kerry/src/Makefile.am kerry-0.1.91.new/kerry/src/Makefile.am
+--- kerry-0.1.91/kerry/src/Makefile.am	2006-09-18 21:25:11.000000000 +0200
++++ kerry-0.1.91.new/kerry/src/Makefile.am	2006-09-18 21:27:10.000000000 +0200
 @@ -36,7 +36,7 @@
  autostart_DATA = kerry.autostart.desktop beagled.desktop
  
@@ -32,24 +32,24 @@
  
  xdg_apps_DATA = kerry.desktop
  
-diff -Nur kerry-0.1.90/src/Makefile.in kerry-0.1.90.new/src/Makefile.in
---- kerry-0.1.90/src/Makefile.in	2006-08-04 13:40:20.000000000 +0200
-+++ kerry-0.1.90.new/src/Makefile.in	2006-08-04 13:46:10.000000000 +0200
-@@ -399,7 +399,7 @@
+diff -Nur kerry-0.1.91/kerry/src/Makefile.in kerry-0.1.91.new/kerry/src/Makefile.in
+--- kerry-0.1.91/kerry/src/Makefile.in	2006-09-18 21:25:11.000000000 +0200
++++ kerry-0.1.91.new/kerry/src/Makefile.in	2006-09-18 21:28:45.000000000 +0200
+@@ -413,7 +413,7 @@
  autostartdir = $(datadir)/autostart
  autostart_DATA = kerry.autostart.desktop beagled.desktop
  shutdowndir = $(prefix)/bin
 -shutdown_SCRIPTS = beagled-shutdown.sh
 +shutdown_SCRIPTS = beagled-shutdown
  xdg_apps_DATA = kerry.desktop
- #>- all: all-am
- #>+ 1
-@@ -938,7 +938,7 @@
- 	-rm -f  hitwidget.moc configdialog.moc kerryapp.moc searchdlg.moc kerrylabel.moc kwidgetlistbox.moc beaglesearch.moc
+ kerry_anim_datadir = $(datadir)/apps/kerry
+ kerry_anim_data_DATA = search-running.mng
+@@ -967,7 +967,7 @@
+ 	-rm -f  hitwidget.moc configdialog.moc kerryapp.moc searchdlg.moc kerrylabel.moc kwidgetlistbox.moc
  
  #>+ 2
--KDE_DIST=kerry.autostart.desktop select_privacy_resource.ui.h Makefile.in searchdlg_layout.ui hi64-app-kerry.png beagled-shutdown.sh select_privacy_resource.ui kerry.desktop beagled.desktop Makefile.am hitwidget_layout.ui.h hitwidget_layout.ui 
-+KDE_DIST=kerry.autostart.desktop select_privacy_resource.ui.h Makefile.in searchdlg_layout.ui hi64-app-kerry.png beagled-shutdown select_privacy_resource.ui kerry.desktop beagled.desktop Makefile.am hitwidget_layout.ui.h hitwidget_layout.ui 
+-KDE_DIST=kerry.autostart.desktop select_privacy_resource.ui.h hisc-app-kerry.svgz search-running.mng hi48-app-kerry_systemtray.png hi16-app-kerry_systemtray.png hitwidget_layout.ui hi16-app-kerry.png Makefile.in searchdlg_layout.ui hi64-app-kerry.png hi32-app-kerry_systemtray.png hisc-app-kerry_systemtray.svgz select_privacy_resource.ui searchdlg_layout.ui.h beagled-shutdown.sh hi48-app-kerry.png hi22-app-kerry_systemtray.png hi32-app-kerry.png kerry.desktop hi22-app-kerry.png beagled.desktop hi64-app-kerry_systemtray.png hi128-app-kerry_systemtray.png hi128-app-kerry.png Makefile.am hitwidget_layout.ui.h 
++KDE_DIST=kerry.autostart.desktop select_privacy_resource.ui.h hisc-app-kerry.svgz search-running.mng hi48-app-kerry_systemtray.png hi16-app-kerry_systemtray.png hitwidget_layout.ui hi16-app-kerry.png Makefile.in searchdlg_layout.ui hi64-app-kerry.png hi32-app-kerry_systemtray.png hisc-app-kerry_systemtray.svgz select_privacy_resource.ui searchdlg_layout.ui.h beagled-shutdown hi48-app-kerry.png hi22-app-kerry_systemtray.png hi32-app-kerry.png kerry.desktop hi22-app-kerry.png beagled.desktop hi64-app-kerry_systemtray.png hi128-app-kerry_systemtray.png hi128-app-kerry.png Makefile.am hitwidget_layout.ui.h 
  
  #>+ 5
  clean-idl:

Modified: kde-extras/kerry/trunk/debian/patches/13_remove_beagled.desktop.diff
===================================================================
--- kde-extras/kerry/trunk/debian/patches/13_remove_beagled.desktop.diff	2006-09-17 22:59:34 UTC (rev 4514)
+++ kde-extras/kerry/trunk/debian/patches/13_remove_beagled.desktop.diff	2006-09-18 20:20:54 UTC (rev 4515)
@@ -1,8 +1,8 @@
-diff -Nur kerry-0.1.90/src/Makefile.am kerry-0.1.90.new/src/Makefile.am
---- kerry-0.1.90/src/Makefile.am	2006-08-04 14:45:47.000000000 +0200
-+++ kerry-0.1.90.new/src/Makefile.am	2006-08-04 14:46:13.000000000 +0200
+diff -Nur kerry-0.1.91/kerry/src/Makefile.am kerry-0.1.91.new/kerry/src/Makefile.am
+--- kerry-0.1.91/kerry/src/Makefile.am	2006-09-18 21:29:12.000000000 +0200
++++ kerry-0.1.91.new/kerry/src/Makefile.am	2006-09-18 21:30:27.000000000 +0200
 @@ -33,7 +33,7 @@
- KDE_ICON = kerry
+ KDE_ICON = kerry kerry_systemtray
  
  autostartdir = $(datadir)/autostart
 -autostart_DATA = kerry.autostart.desktop beagled.desktop
@@ -10,24 +10,24 @@
  
  shutdowndir = $(prefix)/bin
  shutdown_SCRIPTS = beagled-shutdown
-diff -Nur kerry-0.1.90/src/Makefile.in kerry-0.1.90.new/src/Makefile.in
---- kerry-0.1.90/src/Makefile.in	2006-08-04 14:45:47.000000000 +0200
-+++ kerry-0.1.90.new/src/Makefile.in	2006-08-04 14:47:08.000000000 +0200
-@@ -397,7 +397,7 @@
+diff -Nur kerry-0.1.91/kerry/src/Makefile.in kerry-0.1.91.new/kerry/src/Makefile.in
+--- kerry-0.1.91/kerry/src/Makefile.in	2006-09-18 21:29:12.000000000 +0200
++++ kerry-0.1.91.new/kerry/src/Makefile.in	2006-09-18 21:32:06.000000000 +0200
+@@ -411,7 +411,7 @@
  kerry_la_LIBADD = libkdeinit_kerry.la
- KDE_ICON = kerry
+ KDE_ICON = kerry kerry_systemtray
  autostartdir = $(datadir)/autostart
 -autostart_DATA = kerry.autostart.desktop beagled.desktop
 +autostart_DATA = kerry.autostart.desktop
  shutdowndir = $(prefix)/bin
  shutdown_SCRIPTS = beagled-shutdown
  xdg_apps_DATA = kerry.desktop
-@@ -938,7 +938,7 @@
- 	-rm -f  hitwidget.moc configdialog.moc kerryapp.moc searchdlg.moc kerrylabel.moc kwidgetlistbox.moc beaglesearch.moc
+@@ -967,7 +967,7 @@
+ 	-rm -f  hitwidget.moc configdialog.moc kerryapp.moc searchdlg.moc kerrylabel.moc kwidgetlistbox.moc
  
  #>+ 2
--KDE_DIST=kerry.autostart.desktop select_privacy_resource.ui.h Makefile.in searchdlg_layout.ui hi64-app-kerry.png beagled-shutdown select_privacy_resource.ui kerry.desktop beagled.desktop Makefile.am hitwidget_layout.ui.h hitwidget_layout.ui 
-+KDE_DIST=kerry.autostart.desktop select_privacy_resource.ui.h Makefile.in searchdlg_layout.ui hi64-app-kerry.png beagled-shutdown select_privacy_resource.ui kerry.desktop Makefile.am hitwidget_layout.ui.h hitwidget_layout.ui 
+-KDE_DIST=kerry.autostart.desktop select_privacy_resource.ui.h hisc-app-kerry.svgz search-running.mng hi48-app-kerry_systemtray.png hi16-app-kerry_systemtray.png hitwidget_layout.ui hi16-app-kerry.png Makefile.in searchdlg_layout.ui hi64-app-kerry.png hi32-app-kerry_systemtray.png hisc-app-kerry_systemtray.svgz select_privacy_resource.ui searchdlg_layout.ui.h beagled-shutdown hi48-app-kerry.png hi22-app-kerry_systemtray.png hi32-app-kerry.png kerry.desktop hi22-app-kerry.png beagled.desktop hi64-app-kerry_systemtray.png hi128-app-kerry_systemtray.png hi128-app-kerry.png Makefile.am hitwidget_layout.ui.h 
++KDE_DIST=kerry.autostart.desktop select_privacy_resource.ui.h hisc-app-kerry.svgz search-running.mng hi48-app-kerry_systemtray.png hi16-app-kerry_systemtray.png hitwidget_layout.ui hi16-app-kerry.png Makefile.in searchdlg_layout.ui hi64-app-kerry.png hi32-app-kerry_systemtray.png hisc-app-kerry_systemtray.svgz select_privacy_resource.ui searchdlg_layout.ui.h beagled-shutdown hi48-app-kerry.png hi22-app-kerry_systemtray.png hi32-app-kerry.png kerry.desktop hi22-app-kerry.png hi64-app-kerry_systemtray.png hi128-app-kerry_systemtray.png hi128-app-kerry.png Makefile.am hitwidget_layout.ui.h 
  
  #>+ 5
  clean-idl:

Modified: kde-extras/kerry/trunk/debian/patches/14_change_default_shortcut.diff
===================================================================
--- kde-extras/kerry/trunk/debian/patches/14_change_default_shortcut.diff	2006-09-17 22:59:34 UTC (rev 4514)
+++ kde-extras/kerry/trunk/debian/patches/14_change_default_shortcut.diff	2006-09-18 20:20:54 UTC (rev 4515)
@@ -1,13 +1,12 @@
-diff -Nur kerry-0.1.90/src/kerryapp.cpp kerry-0.1.90.new/src/kerryapp.cpp
---- kerry-0.1.90/src/kerryapp.cpp	2006-06-21 10:31:01.000000000 +0200
-+++ kerry-0.1.90.new/src/kerryapp.cpp	2006-08-04 14:58:59.000000000 +0200
-@@ -109,8 +109,7 @@
+diff -Nur kerry-0.1.91/kerry/src/kerryapp.cpp kerry-0.1.91.new/kerry/src/kerryapp.cpp
+--- kerry-0.1.91/kerry/src/kerryapp.cpp	2006-09-18 16:09:57.000000000 +0200
++++ kerry-0.1.91.new/kerry/src/kerryapp.cpp	2006-09-18 21:34:40.000000000 +0200
+@@ -123,7 +123,7 @@
    KGlobalAccel* keys = globalKeys;
    keys->insert( "Program:kerry", i18n("Kerry Beagle Search") );
  
--  KShortcut showDialogShortcut = KShortcut(Key_F12);
--  showDialogShortcut.append( KKey( ALT+Key_Space) );
+-  KShortcut showDialogShortcut = KShortcut(ALT+Key_Space);
 +  KShortcut showDialogShortcut = KShortcut(CTRL+SHIFT+Key_Space);
+ //  showDialogShortcut.append( KKey( Key_F12 ) );
    keys->insert( "Show Kerry Dialog", i18n("Show Search Dialog"), QString::null, showDialogShortcut, showDialogShortcut, hitListWindow, SLOT(showSearchDialog()) );
    keys->insert( "Search Primary Selection with Kerry", i18n("Search Primary Selection"), QString::null, CTRL+ALT+Key_Space, CTRL+ALT+Key_Space, this, SLOT(searchPrimarySelection()) );
-   globalKeys->readSettings();

Modified: kde-extras/kerry/trunk/debian/patches/15_remove_core_categories.diff
===================================================================
--- kde-extras/kerry/trunk/debian/patches/15_remove_core_categories.diff	2006-09-17 22:59:34 UTC (rev 4514)
+++ kde-extras/kerry/trunk/debian/patches/15_remove_core_categories.diff	2006-09-18 20:20:54 UTC (rev 4515)
@@ -1,7 +1,7 @@
-diff -Nur kerry-0.1.90/src/kerry.desktop kerry-0.1.90.new/src/kerry.desktop
---- kerry-0.1.90/src/kerry.desktop	2006-06-21 10:31:01.000000000 +0200
-+++ kerry-0.1.90.new/src/kerry.desktop	2006-08-04 15:11:11.000000000 +0200
-@@ -17,7 +17,7 @@
+diff -Nur kerry-0.1.91/kerry/src/kerry.desktop kerry-0.1.91.new/kerry/src/kerry.desktop
+--- kerry-0.1.91/kerry/src/kerry.desktop	2006-09-18 16:09:57.000000000 +0200
++++ kerry-0.1.91.new/kerry/src/kerry.desktop	2006-09-18 21:35:35.000000000 +0200
+@@ -20,7 +20,7 @@
  Exec=kerry --show-searchdialog
  Icon=kerry
  Type=Application

More information about the pkg-kde-commits mailing list