diff -u kerry-0.2.1/debian/patches/kubuntu_04_no_core_kmenu_entry.desktop.patch kerry-0.2.1/debian/patches/kubuntu_04_no_core_kmenu_entry.desktop.patch --- kerry-0.2.1/debian/patches/kubuntu_04_no_core_kmenu_entry.desktop.patch +++ kerry-0.2.1/debian/patches/kubuntu_04_no_core_kmenu_entry.desktop.patch @@ -1,7 +1,14 @@ -diff -Nur kerry-0.2.1/kerry/src/kerry.desktop kerry-0.2.1.new/kerry/src/kerry.desktop +diff -Nur -x '*.orig' -x '*~' kerry-0.2.1/kerry/src/kerry.desktop kerry-0.2.1.new/kerry/src/kerry.desktop --- kerry-0.2.1/kerry/src/kerry.desktop 2006-12-04 14:35:38.000000000 +0100 -+++ kerry-0.2.1.new/kerry/src/kerry.desktop 2006-12-05 18:29:55.000000000 +0100 -@@ -25,7 +25,7 @@ ++++ kerry-0.2.1.new/kerry/src/kerry.desktop 2008-04-08 22:55:31.000000000 +0200 +@@ -1,6 +1,5 @@ + [Desktop Entry] + X-SuSE-translate=true +-Encoding=UTF-8 + Name=Kerry Beagle + GenericName=Desktop Search + GenericName[ar]=بحث على سطح المكتب +@@ -25,7 +24,7 @@ Exec=kerry --show-searchdialog Icon=kerry Type=Application diff -u kerry-0.2.1/debian/changelog kerry-0.2.1/debian/changelog --- kerry-0.2.1/debian/changelog +++ kerry-0.2.1/debian/changelog @@ -1,3 +1,24 @@ +kerry (1:0.2.1-0ubuntu5) hardy; urgency=low + + * Add patch kubuntu_08_libbeagle1_transition.patch to make configure + use libbeagle1, so binary objects are built. (LP: #211591). + * Add patch kubuntu_09_remove-sh.patch to remove .sh extension + from beagled-shutdown script. + * Add postinst and postrm scripts to run ldconfig when kerry is + installed or removed. + * denian/rules: remove rpath from the binary and library files. + * debian/control: + - set minimum version of libbeagle-dev to 0.3.0 in build-depends. + - add chrpath to build-depends. + - bump standards-version to 3.7.3, no further changes needed. + - move Homepage from description to control fields. + * Update kubuntu_04_no_core_kmenu_entry.desktop.patch to remove + deprecated encoding field. + * Add patch kubuntu_10_update-kcmbeagle-desktop.patch to remove + deprecated encoding field from the kcmbeagle desktop file. + + -- Albert Damen Tue, 08 Apr 2008 21:50:06 +0200 + kerry (1:0.2.1-0ubuntu4) hardy; urgency=low * Rebuild for libbeagle0 -> libbeagle1 transition (LP: #192262). diff -u kerry-0.2.1/debian/control kerry-0.2.1/debian/control --- kerry-0.2.1/debian/control +++ kerry-0.2.1/debian/control @@ -2,8 +2,9 @@ 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, libbeagle-dev, docbook2x -Standards-Version: 3.6.2 +Build-Depends: debhelper (>= 5.0.0), cdbs, kdelibs4-dev, libkonq4-dev, libqt3-mt-dev, autoconf, automake1.9, libbeagle-dev (>= 0.3.0), docbook2x, chrpath +Homepage: http://en.opensuse.org/Kerry +Standards-Version: 3.7.3 Package: kerry Architecture: any @@ -17 +17,0 @@ - Homepage: http://en.opensuse.org/Kerry diff -u kerry-0.2.1/debian/rules kerry-0.2.1/debian/rules --- kerry-0.2.1/debian/rules +++ kerry-0.2.1/debian/rules @@ -13,0 +14,6 @@ + +binary-post-install/kerry:: + chrpath -d debian/kerry/usr/lib/libkdeinit_kerry.so + chrpath -d debian/kerry/usr/bin/kerry + chrpath -d debian/kerry/usr/lib/kde3/kerry.so + chrpath -d debian/kerry/usr/lib/kde3/kcm_beagle.so only in patch2: unchanged: --- kerry-0.2.1.orig/debian/patches/kubuntu_09_remove-sh-extension.patch +++ kerry-0.2.1/debian/patches/kubuntu_09_remove-sh-extension.patch @@ -0,0 +1,34 @@ +diff -Nur -x '*.orig' -x '*~' kerry-0.2.1/kerry/src/beagled-shutdown kerry-0.2.1.new/kerry/src/beagled-shutdown +--- kerry-0.2.1/kerry/src/beagled-shutdown 1970-01-01 01:00:00.000000000 +0100 ++++ kerry-0.2.1.new/kerry/src/beagled-shutdown 2008-04-07 21:18:51.000000000 +0200 +@@ -0,0 +1,7 @@ ++#!/bin/sh ++ ++BEAGLED_PID=`pidof mono-beagled` ++ ++if test -n "$BEAGLED_PID"; then ++ beagle-shutdown ++fi +diff -Nur -x '*.orig' -x '*~' kerry-0.2.1/kerry/src/beagled-shutdown.sh kerry-0.2.1.new/kerry/src/beagled-shutdown.sh +--- kerry-0.2.1/kerry/src/beagled-shutdown.sh 2006-12-04 14:35:38.000000000 +0100 ++++ kerry-0.2.1.new/kerry/src/beagled-shutdown.sh 1970-01-01 01:00:00.000000000 +0100 +@@ -1,7 +0,0 @@ +-#!/bin/sh +- +-BEAGLED_PID=`pidof mono-beagled` +- +-if test -n "$BEAGLED_PID"; then +- beagle-shutdown +-fi +diff -Nur -x '*.orig' -x '*~' kerry-0.2.1/kerry/src/Makefile.am kerry-0.2.1.new/kerry/src/Makefile.am +--- kerry-0.2.1/kerry/src/Makefile.am 2008-04-07 21:18:50.000000000 +0200 ++++ kerry-0.2.1.new/kerry/src/Makefile.am 2008-04-07 21:19:15.000000000 +0200 +@@ -34,7 +34,7 @@ + autostart_DATA = kerry.autostart.desktop + + shutdowndir = $(prefix)/bin +-shutdown_SCRIPTS = beagled-shutdown.sh ++shutdown_SCRIPTS = beagled-shutdown + + xdg_apps_DATA = kerry.desktop + only in patch2: unchanged: --- kerry-0.2.1.orig/debian/patches/kubuntu_10_update-kcmbeagle-desktop.patch +++ kerry-0.2.1/debian/patches/kubuntu_10_update-kcmbeagle-desktop.patch @@ -0,0 +1,9 @@ +diff -Nur -x '*.orig' -x '*~' kerry-0.2.1/kerry/src/kcm/kcmbeagle.desktop kerry-0.2.1.new/kerry/src/kcm/kcmbeagle.desktop +--- kerry-0.2.1/kerry/src/kcm/kcmbeagle.desktop 2008-04-08 22:29:10.000000000 +0200 ++++ kerry-0.2.1.new/kerry/src/kcm/kcmbeagle.desktop 2008-04-08 22:31:01.000000000 +0200 +@@ -1,5 +1,4 @@ + [Desktop Entry] +-Encoding=UTF-8 + Type=Application + Icon=kerry + Exec=kcmshell beagle only in patch2: unchanged: --- kerry-0.2.1.orig/debian/patches/kubuntu_08_libbeagle1_transition.patch +++ kerry-0.2.1/debian/patches/kubuntu_08_libbeagle1_transition.patch @@ -0,0 +1,50 @@ +diff -Nur -x '*.orig' -x '*~' kerry-0.2.1/configure kerry-0.2.1.new/configure +--- kerry-0.2.1/configure 2006-12-04 14:36:37.000000000 +0100 ++++ kerry-0.2.1.new/configure 2008-04-04 12:39:45.000000000 +0200 +@@ -37562,10 +37562,10 @@ + # LIBBEAGLE_LIBADD: libbeagle libraries (-l options) + # LIBBEAGLE_LDFLAGS: flags containing path to libbeagle libraries (-L options) + +-LIBBEAGLE_PACKAGES="libbeagle-0.0" +-LIBBEAGLE_VERSION="0.2.5" +-{ echo "$as_me:$LINENO: checking for libbeagle-0.2.5 (at least $LIBBEAGLE_VERSION)" >&5 +-echo $ECHO_N "checking for libbeagle-0.2.5 (at least $LIBBEAGLE_VERSION)... $ECHO_C" >&6; } ++LIBBEAGLE_PACKAGES="libbeagle-1.0" ++LIBBEAGLE_VERSION="0.3.0" ++{ echo "$as_me:$LINENO: checking for libbeagle-0.3.0 (at least $LIBBEAGLE_VERSION)" >&5 ++echo $ECHO_N "checking for libbeagle-0.3.0 (at least $LIBBEAGLE_VERSION)... $ECHO_C" >&6; } + + if $PKG_CONFIG --atleast-pkgconfig-version 0.15 ; then + if $PKG_CONFIG --atleast-version $LIBBEAGLE_VERSION $LIBBEAGLE_PACKAGES >/dev/null 2>&1 ; then +diff -Nur -x '*.orig' -x '*~' kerry-0.2.1/configure.in kerry-0.2.1.new/configure.in +--- kerry-0.2.1/configure.in 2006-12-04 14:36:27.000000000 +0100 ++++ kerry-0.2.1.new/configure.in 2008-04-04 12:40:07.000000000 +0200 +@@ -134,9 +134,9 @@ + # LIBBEAGLE_LIBADD: libbeagle libraries (-l options) + # LIBBEAGLE_LDFLAGS: flags containing path to libbeagle libraries (-L options) + +-LIBBEAGLE_PACKAGES="libbeagle-0.0" +-LIBBEAGLE_VERSION="0.2.5" +-AC_MSG_CHECKING(for libbeagle-0.2.5 (at least $LIBBEAGLE_VERSION)) ++LIBBEAGLE_PACKAGES="libbeagle-1.0" ++LIBBEAGLE_VERSION="0.3.0" ++AC_MSG_CHECKING(for libbeagle-0.3.0 (at least $LIBBEAGLE_VERSION)) + + if $PKG_CONFIG --atleast-pkgconfig-version 0.15 ; then + if $PKG_CONFIG --atleast-version $LIBBEAGLE_VERSION $LIBBEAGLE_PACKAGES >/dev/null 2>&1 ; then +diff -Nur -x '*.orig' -x '*~' kerry-0.2.1/kerry/configure.in.in kerry-0.2.1.new/kerry/configure.in.in +--- kerry-0.2.1/kerry/configure.in.in 2006-12-04 14:35:38.000000000 +0100 ++++ kerry-0.2.1.new/kerry/configure.in.in 2008-04-04 12:40:28.000000000 +0200 +@@ -57,9 +57,9 @@ + # LIBBEAGLE_LIBADD: libbeagle libraries (-l options) + # LIBBEAGLE_LDFLAGS: flags containing path to libbeagle libraries (-L options) + +-LIBBEAGLE_PACKAGES="libbeagle-0.0" +-LIBBEAGLE_VERSION="0.2.5" +-AC_MSG_CHECKING(for libbeagle-0.2.5 (at least $LIBBEAGLE_VERSION)) ++LIBBEAGLE_PACKAGES="libbeagle-1.0" ++LIBBEAGLE_VERSION="0.3.0" ++AC_MSG_CHECKING(for libbeagle-0.3.0 (at least $LIBBEAGLE_VERSION)) + + if $PKG_CONFIG --atleast-pkgconfig-version 0.15 ; then + if $PKG_CONFIG --atleast-version $LIBBEAGLE_VERSION $LIBBEAGLE_PACKAGES >/dev/null 2>&1 ; then only in patch2: unchanged: --- kerry-0.2.1.orig/debian/postrm +++ kerry-0.2.1/debian/postrm @@ -0,0 +1,12 @@ +#!/bin/sh +# postrm script for kerry + +set -e + +if [ "$1" = "remove" ] ; then + ldconfig +fi + +#DEBHELPER# + +exit 0 only in patch2: unchanged: --- kerry-0.2.1.orig/debian/postinst +++ kerry-0.2.1/debian/postinst @@ -0,0 +1,12 @@ +#!/bin/sh +# postinst script for kerry + +set -e + +if [ "$1" = "configure" ] ; then + ldconfig +fi + +#DEBHELPER# + +exit 0