rev 4867 - in kde-extras/kerry: tags tags/0.2-1/debian tags/0.2-1/debian/patches trunk/debian trunk/debian/patches

Fathi Boudra fboudra-guest at alioth.debian.org
Thu Nov 9 14:40:27 UTC 2006 

Author: fboudra-guest
Date: 2006-11-09 15:40:26 +0100 (Thu, 09 Nov 2006)
New Revision: 4867

Added:
   kde-extras/kerry/tags/0.2-1/
Modified:
   kde-extras/kerry/tags/0.2-1/debian/changelog
   kde-extras/kerry/tags/0.2-1/debian/patches/11_shutdowndir_path.diff
   kde-extras/kerry/tags/0.2-1/debian/patches/12_remove_sh_extension.diff
   kde-extras/kerry/tags/0.2-1/debian/patches/13_remove_beagled.desktop.diff
   kde-extras/kerry/tags/0.2-1/debian/patches/14_change_default_shortcut.diff
   kde-extras/kerry/tags/0.2-1/debian/patches/15_remove_core_categories.diff
   kde-extras/kerry/tags/0.2-1/debian/rules
   kde-extras/kerry/trunk/debian/changelog
   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
   kde-extras/kerry/trunk/debian/rules
Log:
tags kerry 0.2-1

Copied: kde-extras/kerry/tags/0.2-1 (from rev 4862, kde-extras/kerry/trunk)

Modified: kde-extras/kerry/tags/0.2-1/debian/changelog
===================================================================
--- kde-extras/kerry/trunk/debian/changelog	2006-11-08 00:41:16 UTC (rev 4862)
+++ kde-extras/kerry/tags/0.2-1/debian/changelog	2006-11-09 14:40:26 UTC (rev 4867)
@@ -1,11 +1,11 @@
-kerry (0.1.91-1) unstable; urgency=low
+kerry (0.2-1) unstable; urgency=low
 
   * New upstream release
   * Improve description (Closes: #384897)
   * Replace beagle-dev build-dependency by libbeagle-dev (Closes: #391725)
   * Remove add autoconf 2.60 support patch, merged upstream
 
- -- Fathi Boudra <fboudra at free.fr>  Mon, 18 Sep 2006 20:44:03 +0200
+ -- Fathi Boudra <fboudra at free.fr>  Thu,  9 Nov 2006 15:00:13 +0100
 
 kerry (0.1.90-1) unstable; urgency=low
 

Modified: kde-extras/kerry/tags/0.2-1/debian/patches/11_shutdowndir_path.diff
===================================================================
--- kde-extras/kerry/trunk/debian/patches/11_shutdowndir_path.diff	2006-11-08 00:41:16 UTC (rev 4862)
+++ kde-extras/kerry/tags/0.2-1/debian/patches/11_shutdowndir_path.diff	2006-11-09 14:40:26 UTC (rev 4867)
@@ -1,6 +1,6 @@
-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
+diff -Nur kerry-0.2/kerry/src/Makefile.am kerry-0.2.new/kerry/src/Makefile.am
+--- kerry-0.2/kerry/src/Makefile.am	2006-09-18 16:09:57.000000000 +0200
++++ kerry-0.2.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,9 +10,9 @@
  shutdown_SCRIPTS = beagled-shutdown.sh
  
  xdg_apps_DATA = kerry.desktop
-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
+diff -Nur kerry-0.2/kerry/src/Makefile.in kerry-0.2.new/kerry/src/Makefile.in
+--- kerry-0.2/kerry/src/Makefile.in	2006-09-18 16:11:04.000000000 +0200
++++ kerry-0.2.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

Modified: kde-extras/kerry/tags/0.2-1/debian/patches/12_remove_sh_extension.diff
===================================================================
--- kde-extras/kerry/trunk/debian/patches/12_remove_sh_extension.diff	2006-11-08 00:41:16 UTC (rev 4862)
+++ kde-extras/kerry/tags/0.2-1/debian/patches/12_remove_sh_extension.diff	2006-11-09 14:40:26 UTC (rev 4867)
@@ -1,6 +1,6 @@
-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
+diff -Nur kerry-0.2/kerry/src/beagled-shutdown kerry-0.2.new/kerry/src/beagled-shutdown
+--- kerry-0.2/kerry/src/beagled-shutdown	1970-01-01 01:00:00.000000000 +0100
++++ kerry-0.2.new/kerry/src/beagled-shutdown	2006-11-06 16:49:07.000000000 +0100
 @@ -0,0 +1,7 @@
 +#!/bin/sh
 +
@@ -9,9 +9,9 @@
 +if test -n "$BEAGLED_PID"; then
 +        beagle-shutdown
 +fi
-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
+diff -Nur kerry-0.2/kerry/src/beagled-shutdown.sh kerry-0.2.new/kerry/src/beagled-shutdown.sh
+--- kerry-0.2/kerry/src/beagled-shutdown.sh	2006-11-06 16:49:07.000000000 +0100
++++ kerry-0.2.new/kerry/src/beagled-shutdown.sh	1970-01-01 01:00:00.000000000 +0100
 @@ -1,7 +0,0 @@
 -#!/bin/sh
 -
@@ -20,10 +20,10 @@
 -if test -n "$BEAGLED_PID"; then
 -        beagle-shutdown
 -fi
-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 @@
+diff -Nur kerry-0.2/kerry/src/Makefile.am kerry-0.2.new/kerry/src/Makefile.am
+--- kerry-0.2/kerry/src/Makefile.am	2006-11-09 15:17:23.000000000 +0100
++++ kerry-0.2.new/kerry/src/Makefile.am	2006-11-09 15:18:42.000000000 +0100
+@@ -34,7 +34,7 @@
  autostart_DATA = kerry.autostart.desktop beagled.desktop
  
  shutdowndir = $(prefix)/bin
@@ -32,10 +32,10 @@
  
  xdg_apps_DATA = kerry.desktop
  
-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 @@
+diff -Nur kerry-0.2/kerry/src/Makefile.in kerry-0.2.new/kerry/src/Makefile.in
+--- kerry-0.2/kerry/src/Makefile.in	2006-11-09 15:17:23.000000000 +0100
++++ kerry-0.2.new/kerry/src/Makefile.in	2006-11-09 15:19:26.000000000 +0100
+@@ -426,7 +426,7 @@
  autostartdir = $(datadir)/autostart
  autostart_DATA = kerry.autostart.desktop beagled.desktop
  shutdowndir = $(prefix)/bin
@@ -44,12 +44,12 @@
  xdg_apps_DATA = kerry.desktop
  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
+@@ -1069,7 +1069,7 @@
+ 	-rm -f  hitwidget.moc kerryapp.moc searchdlg.moc kerrylabel.moc kwidgetlistbox.moc
  
  #>+ 2
--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 
+-KDE_DIST=kerry.autostart.desktop Makefile.in searchdlg_layout.ui beagled-shutdown.sh searchdlg_layout.ui.h search-running.mng kerry.desktop beagled.desktop Makefile.am hitwidget_layout.ui.h hitwidget_layout.ui 
++KDE_DIST=kerry.autostart.desktop Makefile.in searchdlg_layout.ui beagled-shutdown searchdlg_layout.ui.h search-running.mng kerry.desktop beagled.desktop Makefile.am hitwidget_layout.ui.h hitwidget_layout.ui 
  
  #>+ 5
  clean-idl:

Modified: kde-extras/kerry/tags/0.2-1/debian/patches/13_remove_beagled.desktop.diff
===================================================================
--- kde-extras/kerry/trunk/debian/patches/13_remove_beagled.desktop.diff	2006-11-08 00:41:16 UTC (rev 4862)
+++ kde-extras/kerry/tags/0.2-1/debian/patches/13_remove_beagled.desktop.diff	2006-11-09 14:40:26 UTC (rev 4867)
@@ -1,8 +1,8 @@
-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 kerry_systemtray
+diff -Nur kerry-0.2/kerry/src/Makefile.am kerry-0.2.new/kerry/src/Makefile.am
+--- kerry-0.2/kerry/src/Makefile.am	2006-11-09 15:21:29.000000000 +0100
++++ kerry-0.2.new/kerry/src/Makefile.am	2006-11-09 15:22:01.000000000 +0100
+@@ -31,7 +31,7 @@
+ kerry_la_LIBADD = -lkio -lkonq $(LIB_KDEUI) $(LIBBEAGLE_LIBADD) $(GLIB_LIBADD) $(LIB_KABC) 
  
  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.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 @@
+diff -Nur kerry-0.2/kerry/src/Makefile.in kerry-0.2.new/kerry/src/Makefile.in
+--- kerry-0.2/kerry/src/Makefile.in	2006-11-09 15:21:29.000000000 +0100
++++ kerry-0.2.new/kerry/src/Makefile.in	2006-11-09 15:22:26.000000000 +0100
+@@ -424,7 +424,7 @@
+ #>+ 1
  kerry_la_LIBADD = libkdeinit_kerry.la
- 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
-@@ -967,7 +967,7 @@
- 	-rm -f  hitwidget.moc configdialog.moc kerryapp.moc searchdlg.moc kerrylabel.moc kwidgetlistbox.moc
+@@ -1069,7 +1069,7 @@
+ 	-rm -f  hitwidget.moc kerryapp.moc searchdlg.moc kerrylabel.moc kwidgetlistbox.moc
  
  #>+ 2
--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 
+-KDE_DIST=kerry.autostart.desktop Makefile.in searchdlg_layout.ui beagled-shutdown searchdlg_layout.ui.h search-running.mng kerry.desktop beagled.desktop Makefile.am hitwidget_layout.ui.h hitwidget_layout.ui 
++KDE_DIST=kerry.autostart.desktop Makefile.in searchdlg_layout.ui beagled-shutdown searchdlg_layout.ui.h search-running.mng kerry.desktop Makefile.am hitwidget_layout.ui.h hitwidget_layout.ui 
  
  #>+ 5
  clean-idl:

Modified: kde-extras/kerry/tags/0.2-1/debian/patches/14_change_default_shortcut.diff
===================================================================
--- kde-extras/kerry/trunk/debian/patches/14_change_default_shortcut.diff	2006-11-08 00:41:16 UTC (rev 4862)
+++ kde-extras/kerry/tags/0.2-1/debian/patches/14_change_default_shortcut.diff	2006-11-09 14:40:26 UTC (rev 4867)
@@ -1,12 +1,12 @@
-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") );
+diff -Nur kerry-0.2/kerry/src/kerryapp.cpp kerry-0.2.new/kerry/src/kerryapp.cpp
+--- kerry-0.2/kerry/src/kerryapp.cpp	2006-11-06 16:49:07.000000000 +0100
++++ kerry-0.2.new/kerry/src/kerryapp.cpp	2006-11-09 15:24:18.000000000 +0100
+@@ -122,7 +122,7 @@
+   globalKeys = new KGlobalAccel(this);
+   globalKeys->insert( "Program:kerry", i18n("Kerry Beagle Search") );
  
 -  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()) );
+   showDialogShortcut.append( KKey( Key_F12 ) );
+   globalKeys->insert( "Show Kerry Dialog", i18n("Show Search Dialog"), QString::null, showDialogShortcut, showDialogShortcut, hitListWindow, SLOT(showSearchDialog()) );
+   globalKeys->insert( "Search Primary Selection with Kerry", i18n("Search Primary Selection"), QString::null, CTRL+ALT+Key_Space, CTRL+ALT+Key_Space, this, SLOT(searchPrimarySelection()) );

Modified: kde-extras/kerry/tags/0.2-1/debian/patches/15_remove_core_categories.diff
===================================================================
--- kde-extras/kerry/trunk/debian/patches/15_remove_core_categories.diff	2006-11-08 00:41:16 UTC (rev 4862)
+++ kde-extras/kerry/tags/0.2-1/debian/patches/15_remove_core_categories.diff	2006-11-09 14:40:26 UTC (rev 4867)
@@ -1,6 +1,6 @@
-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
+diff -Nur kerry-0.2/kerry/src/kerry.desktop kerry-0.2.new/kerry/src/kerry.desktop
+--- kerry-0.2/kerry/src/kerry.desktop	2006-09-18 16:09:57.000000000 +0200
++++ kerry-0.2.new/kerry/src/kerry.desktop	2006-09-18 21:35:35.000000000 +0200
 @@ -20,7 +20,7 @@
  Exec=kerry --show-searchdialog
  Icon=kerry

Modified: kde-extras/kerry/tags/0.2-1/debian/rules
===================================================================
--- kde-extras/kerry/trunk/debian/rules	2006-11-08 00:41:16 UTC (rev 4862)
+++ kde-extras/kerry/tags/0.2-1/debian/rules	2006-11-09 14:40:26 UTC (rev 4867)
@@ -3,6 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_INSTALL_MANPAGES_kerry := kerry.1
 

Modified: kde-extras/kerry/trunk/debian/changelog
===================================================================
--- kde-extras/kerry/trunk/debian/changelog	2006-11-09 10:27:30 UTC (rev 4866)
+++ kde-extras/kerry/trunk/debian/changelog	2006-11-09 14:40:26 UTC (rev 4867)
@@ -1,11 +1,11 @@
-kerry (0.1.91-1) unstable; urgency=low
+kerry (0.2-1) unstable; urgency=low
 
   * New upstream release
   * Improve description (Closes: #384897)
   * Replace beagle-dev build-dependency by libbeagle-dev (Closes: #391725)
   * Remove add autoconf 2.60 support patch, merged upstream
 
- -- Fathi Boudra <fboudra at free.fr>  Mon, 18 Sep 2006 20:44:03 +0200
+ -- Fathi Boudra <fboudra at free.fr>  Thu,  9 Nov 2006 15:00:13 +0100
 
 kerry (0.1.90-1) unstable; urgency=low
 

Modified: kde-extras/kerry/trunk/debian/patches/11_shutdowndir_path.diff
===================================================================
--- kde-extras/kerry/trunk/debian/patches/11_shutdowndir_path.diff	2006-11-09 10:27:30 UTC (rev 4866)
+++ kde-extras/kerry/trunk/debian/patches/11_shutdowndir_path.diff	2006-11-09 14:40:26 UTC (rev 4867)
@@ -1,6 +1,6 @@
-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
+diff -Nur kerry-0.2/kerry/src/Makefile.am kerry-0.2.new/kerry/src/Makefile.am
+--- kerry-0.2/kerry/src/Makefile.am	2006-09-18 16:09:57.000000000 +0200
++++ kerry-0.2.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,9 +10,9 @@
  shutdown_SCRIPTS = beagled-shutdown.sh
  
  xdg_apps_DATA = kerry.desktop
-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
+diff -Nur kerry-0.2/kerry/src/Makefile.in kerry-0.2.new/kerry/src/Makefile.in
+--- kerry-0.2/kerry/src/Makefile.in	2006-09-18 16:11:04.000000000 +0200
++++ kerry-0.2.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

Modified: kde-extras/kerry/trunk/debian/patches/12_remove_sh_extension.diff
===================================================================
--- kde-extras/kerry/trunk/debian/patches/12_remove_sh_extension.diff	2006-11-09 10:27:30 UTC (rev 4866)
+++ kde-extras/kerry/trunk/debian/patches/12_remove_sh_extension.diff	2006-11-09 14:40:26 UTC (rev 4867)
@@ -1,6 +1,6 @@
-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
+diff -Nur kerry-0.2/kerry/src/beagled-shutdown kerry-0.2.new/kerry/src/beagled-shutdown
+--- kerry-0.2/kerry/src/beagled-shutdown	1970-01-01 01:00:00.000000000 +0100
++++ kerry-0.2.new/kerry/src/beagled-shutdown	2006-11-06 16:49:07.000000000 +0100
 @@ -0,0 +1,7 @@
 +#!/bin/sh
 +
@@ -9,9 +9,9 @@
 +if test -n "$BEAGLED_PID"; then
 +        beagle-shutdown
 +fi
-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
+diff -Nur kerry-0.2/kerry/src/beagled-shutdown.sh kerry-0.2.new/kerry/src/beagled-shutdown.sh
+--- kerry-0.2/kerry/src/beagled-shutdown.sh	2006-11-06 16:49:07.000000000 +0100
++++ kerry-0.2.new/kerry/src/beagled-shutdown.sh	1970-01-01 01:00:00.000000000 +0100
 @@ -1,7 +0,0 @@
 -#!/bin/sh
 -
@@ -20,10 +20,10 @@
 -if test -n "$BEAGLED_PID"; then
 -        beagle-shutdown
 -fi
-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 @@
+diff -Nur kerry-0.2/kerry/src/Makefile.am kerry-0.2.new/kerry/src/Makefile.am
+--- kerry-0.2/kerry/src/Makefile.am	2006-11-09 15:17:23.000000000 +0100
++++ kerry-0.2.new/kerry/src/Makefile.am	2006-11-09 15:18:42.000000000 +0100
+@@ -34,7 +34,7 @@
  autostart_DATA = kerry.autostart.desktop beagled.desktop
  
  shutdowndir = $(prefix)/bin
@@ -32,10 +32,10 @@
  
  xdg_apps_DATA = kerry.desktop
  
-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 @@
+diff -Nur kerry-0.2/kerry/src/Makefile.in kerry-0.2.new/kerry/src/Makefile.in
+--- kerry-0.2/kerry/src/Makefile.in	2006-11-09 15:17:23.000000000 +0100
++++ kerry-0.2.new/kerry/src/Makefile.in	2006-11-09 15:19:26.000000000 +0100
+@@ -426,7 +426,7 @@
  autostartdir = $(datadir)/autostart
  autostart_DATA = kerry.autostart.desktop beagled.desktop
  shutdowndir = $(prefix)/bin
@@ -44,12 +44,12 @@
  xdg_apps_DATA = kerry.desktop
  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
+@@ -1069,7 +1069,7 @@
+ 	-rm -f  hitwidget.moc kerryapp.moc searchdlg.moc kerrylabel.moc kwidgetlistbox.moc
  
  #>+ 2
--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 
+-KDE_DIST=kerry.autostart.desktop Makefile.in searchdlg_layout.ui beagled-shutdown.sh searchdlg_layout.ui.h search-running.mng kerry.desktop beagled.desktop Makefile.am hitwidget_layout.ui.h hitwidget_layout.ui 
++KDE_DIST=kerry.autostart.desktop Makefile.in searchdlg_layout.ui beagled-shutdown searchdlg_layout.ui.h search-running.mng kerry.desktop beagled.desktop Makefile.am hitwidget_layout.ui.h hitwidget_layout.ui 
  
  #>+ 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-11-09 10:27:30 UTC (rev 4866)
+++ kde-extras/kerry/trunk/debian/patches/13_remove_beagled.desktop.diff	2006-11-09 14:40:26 UTC (rev 4867)
@@ -1,8 +1,8 @@
-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 kerry_systemtray
+diff -Nur kerry-0.2/kerry/src/Makefile.am kerry-0.2.new/kerry/src/Makefile.am
+--- kerry-0.2/kerry/src/Makefile.am	2006-11-09 15:21:29.000000000 +0100
++++ kerry-0.2.new/kerry/src/Makefile.am	2006-11-09 15:22:01.000000000 +0100
+@@ -31,7 +31,7 @@
+ kerry_la_LIBADD = -lkio -lkonq $(LIB_KDEUI) $(LIBBEAGLE_LIBADD) $(GLIB_LIBADD) $(LIB_KABC) 
  
  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.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 @@
+diff -Nur kerry-0.2/kerry/src/Makefile.in kerry-0.2.new/kerry/src/Makefile.in
+--- kerry-0.2/kerry/src/Makefile.in	2006-11-09 15:21:29.000000000 +0100
++++ kerry-0.2.new/kerry/src/Makefile.in	2006-11-09 15:22:26.000000000 +0100
+@@ -424,7 +424,7 @@
+ #>+ 1
  kerry_la_LIBADD = libkdeinit_kerry.la
- 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
-@@ -967,7 +967,7 @@
- 	-rm -f  hitwidget.moc configdialog.moc kerryapp.moc searchdlg.moc kerrylabel.moc kwidgetlistbox.moc
+@@ -1069,7 +1069,7 @@
+ 	-rm -f  hitwidget.moc kerryapp.moc searchdlg.moc kerrylabel.moc kwidgetlistbox.moc
  
  #>+ 2
--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 
+-KDE_DIST=kerry.autostart.desktop Makefile.in searchdlg_layout.ui beagled-shutdown searchdlg_layout.ui.h search-running.mng kerry.desktop beagled.desktop Makefile.am hitwidget_layout.ui.h hitwidget_layout.ui 
++KDE_DIST=kerry.autostart.desktop Makefile.in searchdlg_layout.ui beagled-shutdown searchdlg_layout.ui.h search-running.mng kerry.desktop Makefile.am hitwidget_layout.ui.h hitwidget_layout.ui 
  
  #>+ 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-11-09 10:27:30 UTC (rev 4866)
+++ kde-extras/kerry/trunk/debian/patches/14_change_default_shortcut.diff	2006-11-09 14:40:26 UTC (rev 4867)
@@ -1,12 +1,12 @@
-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") );
+diff -Nur kerry-0.2/kerry/src/kerryapp.cpp kerry-0.2.new/kerry/src/kerryapp.cpp
+--- kerry-0.2/kerry/src/kerryapp.cpp	2006-11-06 16:49:07.000000000 +0100
++++ kerry-0.2.new/kerry/src/kerryapp.cpp	2006-11-09 15:24:18.000000000 +0100
+@@ -122,7 +122,7 @@
+   globalKeys = new KGlobalAccel(this);
+   globalKeys->insert( "Program:kerry", i18n("Kerry Beagle Search") );
  
 -  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()) );
+   showDialogShortcut.append( KKey( Key_F12 ) );
+   globalKeys->insert( "Show Kerry Dialog", i18n("Show Search Dialog"), QString::null, showDialogShortcut, showDialogShortcut, hitListWindow, SLOT(showSearchDialog()) );
+   globalKeys->insert( "Search Primary Selection with Kerry", i18n("Search Primary Selection"), QString::null, CTRL+ALT+Key_Space, CTRL+ALT+Key_Space, this, SLOT(searchPrimarySelection()) );

Modified: kde-extras/kerry/trunk/debian/patches/15_remove_core_categories.diff
===================================================================
--- kde-extras/kerry/trunk/debian/patches/15_remove_core_categories.diff	2006-11-09 10:27:30 UTC (rev 4866)
+++ kde-extras/kerry/trunk/debian/patches/15_remove_core_categories.diff	2006-11-09 14:40:26 UTC (rev 4867)
@@ -1,6 +1,6 @@
-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
+diff -Nur kerry-0.2/kerry/src/kerry.desktop kerry-0.2.new/kerry/src/kerry.desktop
+--- kerry-0.2/kerry/src/kerry.desktop	2006-09-18 16:09:57.000000000 +0200
++++ kerry-0.2.new/kerry/src/kerry.desktop	2006-09-18 21:35:35.000000000 +0200
 @@ -20,7 +20,7 @@
  Exec=kerry --show-searchdialog
  Icon=kerry

Modified: kde-extras/kerry/trunk/debian/rules
===================================================================
--- kde-extras/kerry/trunk/debian/rules	2006-11-09 10:27:30 UTC (rev 4866)
+++ kde-extras/kerry/trunk/debian/rules	2006-11-09 14:40:26 UTC (rev 4867)
@@ -3,6 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_INSTALL_MANPAGES_kerry := kerry.1

More information about the pkg-kde-commits mailing list