--- kerry-0.09.orig/debian/changelog +++ kerry-0.09/debian/changelog @@ -0,0 +1,30 @@ +kerry (0.09-0ubuntu4) dapper; urgency=low + + * Added kubuntu_05_shortkey.diff: Remove Alt-Space shortcut to stop + conflicting with Katapult. + + -- Jonathan Patrick Davies Fri, 07 Apr 2006 21:11:45 +0200 + +kerry (0.09-0ubuntu3) dapper; urgency=low + + * Added kubuntu_04_no_core_kmenu_entry.desktop.patch to avoid double entry + in Kmenu + + -- Anthony Mercatante Tue, 29 Mar 2006 3:30:37 +0100 + +kerry (0.09-0ubuntu2) dapper; urgency=low + + * Switched to cdbs + * Added kubuntu_01_kdepot.patch for pot file extraction to Rosetta + * kubuntu_01_kerry.diff becomes kubuntu_02_fix_shutdown_script_path.patch + * Added kubuntu_03_no_beagle_autostart.diff to remove autostart desktop file + for beagle as new beagle package already has it + + -- Anthony Mercatante Mon, 28 Mar 2006 20:50:37 +0100 + +kerry (0.09-0ubuntu1) dapper; urgency=low + + * Initial release. + * Created kubuntu_01_kerry.diff - install scripts to /usr/bin. + + -- Jonathan Patrick Davies Sun, 26 Mar 2006 15:51:20 +0200 --- kerry-0.09.orig/debian/compat +++ kerry-0.09/debian/compat @@ -0,0 +1 @@ +5 --- kerry-0.09.orig/debian/patches/kubuntu_05_shortkey.diff +++ kerry-0.09/debian/patches/kubuntu_05_shortkey.diff @@ -0,0 +1,10 @@ +--- ./src/kerryapp.cpp 2006-02-10 14:59:58.000000000 +0100 ++++ ./src/kerryapp.cpp 2006-04-07 21:07:34.000000000 +0200 +@@ -111,7 +111,6 @@ void KerryApplication::init(const KAbout + keys->insert( "Program:kerry", i18n("Kerry Beagle Search") ); + + KShortcut showDialogShortcut = KShortcut(Key_F12); +- showDialogShortcut.append( KKey( ALT+Key_Space) ); + 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(); --- kerry-0.09.orig/debian/patches/kubuntu_01_kdepot.patch +++ kerry-0.09/debian/patches/kubuntu_01_kdepot.patch @@ -0,0 +1,20 @@ +diff -Nur kerry-0.09/admin/cvs.sh kerry-0.09.new/admin/cvs.sh +--- kerry-0.09/admin/cvs.sh 2006-03-17 22:30:20.000000000 +0100 ++++ kerry-0.09.new/admin/cvs.sh 2006-03-28 21:19:41.000000000 +0200 +@@ -537,6 +537,8 @@ + if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi + export EXTRACTRC PREPARETIPS + ++kdepotpath=/usr/include/kde/kde.pot ++ + for subdir in $dirs; do + test -z "$VERBOSE" || echo "Making messages in $subdir" + (cd $subdir +@@ -554,7 +556,6 @@ + fi + perl -e '$mes=0; while () { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile + +- kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot + if ! test -f $kdepotpath; then + kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot + fi --- kerry-0.09.orig/debian/patches/kubuntu_02_fix_shutdown_script_path.patch +++ kerry-0.09/debian/patches/kubuntu_02_fix_shutdown_script_path.patch @@ -0,0 +1,12 @@ +diff -Nur kerry-0.09/src/Makefile.am kerry-0.09.new/src/Makefile.am +--- kerry-0.09/src/Makefile.am 2006-03-07 20:20:38.000000000 +0100 ++++ kerry-0.09.new/src/Makefile.am 2006-03-28 21:20:31.000000000 +0200 +@@ -35,7 +35,7 @@ + autostartdir = $(datadir)/autostart + autostart_DATA = kerry.autostart.desktop beagled.desktop + +-shutdowndir = $(prefix)/shutdown ++shutdowndir = $(prefix)/bin + shutdown_SCRIPTS = beagled-shutdown.sh + + kde_apps_DATA = kerry.desktop --- kerry-0.09.orig/debian/patches/kubuntu_04_no_core_kmenu_entry.desktop.patch +++ kerry-0.09/debian/patches/kubuntu_04_no_core_kmenu_entry.desktop.patch @@ -0,0 +1,12 @@ +diff -ruNad kerry-0.09-orig/src/kerry.desktop kerry-0.09/src/kerry.desktop +--- kerry-0.09-orig/src/kerry.desktop 2006-03-28 15:44:45.000000000 +0800 ++++ kerry-0.09/src/kerry.desktop 2006-03-28 15:46:06.000000000 +0800 +@@ -6,7 +6,7 @@ + Exec=kerry --show-searchdialog + Icon=kerry + Type=Application +-Categories=Qt;KDE;Application;Core;Utility;Filesystem; ++Categories=Qt;KDE;Application;Utility;Filesystem; + Terminal=false + X-DCOP-ServiceType=Unique + X-KDE-StartupNotify=false --- kerry-0.09.orig/debian/patches/kubuntu_03_no_beagled_autostart.patch +++ kerry-0.09/debian/patches/kubuntu_03_no_beagled_autostart.patch @@ -0,0 +1,12 @@ +diff -Nur kerry-0.09/src/Makefile.am kerry-0.09.new/src/Makefile.am +--- kerry-0.09/src/Makefile.am 2006-03-28 21:21:03.000000000 +0200 ++++ kerry-0.09.new/src/Makefile.am 2006-03-28 21:21:17.000000000 +0200 +@@ -33,7 +33,7 @@ + KDE_ICON = kerry + + autostartdir = $(datadir)/autostart +-autostart_DATA = kerry.autostart.desktop beagled.desktop ++autostart_DATA = kerry.autostart.desktop + + shutdowndir = $(prefix)/bin + shutdown_SCRIPTS = beagled-shutdown.sh --- kerry-0.09.orig/debian/kerry.1.docbook +++ kerry-0.09/debian/kerry.1.docbook @@ -0,0 +1,109 @@ + + + + + + Jonathan Patrick + Davies + jpatrick@ubuntu.com + + + 2006 + Jonathan Patrick Davies + + + + 2006-03-26 + + + + kerry + 1 + + + kerry + a Beagle frontend for KDE + + + + kautoclick + + + + + + + + + + DESCRIPTION + + Kerry is a frontend for Beagle for the KDE desktop. + + + + OPTIONS + + All KDE and Qt + programs accept a some common command-line options. Kerry has no + application-specific options. + + + + Generic options: + + + Show help about options + + + + Show Qt specific options + + + + Show KDE specific options + + + + Show all options + + + + Show author information + + + , + Show version information + + + + Show license information + + + + Indicates end of options + + + + + + + COPYRIGHT + + This manual page was written by Jonathan Patrick Davies + jpatrick@ubuntu.com for the + Ubuntu system (but may be used by others). + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU General Public License, + Version 2 or any later version published by the Free Software Foundation. + + + On Debian systems, the complete text of the GNU General Public + License can be found in + /usr/share/common-licenses/GPL. + + + --- kerry-0.09.orig/debian/copyright +++ kerry-0.09/debian/copyright @@ -0,0 +1,35 @@ +This package was debianized by Jonathan Patrick Davies on +Sun, 26 Mar 2006 15:51:20 +0200. + +It was downloaded from http://www.kde-apps.org/content/show.php?content=36832 + +Upstream Authors: Stephan Binner + Debajyoti Bera + + +Copyright: + Copyright (C) 2005 Novell, Inc. + Copyright (C) 2005 Petri Damst�n + Copyright (C) 2005 Debajyoti Bera + Copyright (C) 1998 Kurt Granroth + Copyright (C) 2000 Peter Putzer + Copyright (C) 2005 Jaroslaw Staniek + +License: + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the + Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL-2'. --- kerry-0.09.orig/debian/control +++ kerry-0.09/debian/control @@ -0,0 +1,17 @@ +Source: kerry +Section: kde +Priority: optional +Maintainer: Jonathan Patrick Davies +Build-Depends: debhelper (>= 5.0.0), cdbs, kdelibs4-dev, libkonq4-dev, libqt3-mt-dev, autoconf, automake1.9, beagle-dev (>= 0.2.3), docbook2x +Standards-Version: 3.6.2 + +Package: kerry +Architecture: any +Depends: ${shlibs:Depends}, beagle (>= 0.2.3) +Description: a KDE frontend for the Beagle desktop search daemon + Kerry is a KDE frontend for the Beagle desktop search daemon. + . + A program for indexing and searching user's data. At the moment, it can index + filesystems, chat logs, mail and data, RSS and other. + . + Homepage: http://en.opensuse.org/Kerry --- kerry-0.09.orig/debian/rules +++ kerry-0.09/debian/rules @@ -0,0 +1,16 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/kde.mk + +DEB_INSTALL_MANPAGES_kerry = kerry.1 + +makebuilddir/kerry:: + make -f admin/Makefile.common + +build/kerry:: + docbook2x-man debian/kerry.1.docbook + +clean:: + rm -f kerry.1