diff -Nru /tmp/keoGTIqIMg/synaptic-0.62.1ubuntu1~ppa1/configure /tmp/sEzHIWRYBB/synaptic-0.62.1ubuntu1~ppa2/configure --- /tmp/keoGTIqIMg/synaptic-0.62.1ubuntu1~ppa1/configure 2008-06-12 16:13:32.000000000 +0100 +++ /tmp/sEzHIWRYBB/synaptic-0.62.1ubuntu1~ppa2/configure 2008-06-13 11:20:06.000000000 +0100 @@ -2169,7 +2169,7 @@ # Define the identity of the package. PACKAGE=synaptic - VERSION=0.62.1ubuntu1~ppa1 + VERSION=0.62.1ubuntu1~ppa2 cat >>confdefs.h <<_ACEOF diff -Nru /tmp/keoGTIqIMg/synaptic-0.62.1ubuntu1~ppa1/configure.in /tmp/sEzHIWRYBB/synaptic-0.62.1ubuntu1~ppa2/configure.in --- /tmp/keoGTIqIMg/synaptic-0.62.1ubuntu1~ppa1/configure.in 2008-06-12 16:13:25.000000000 +0100 +++ /tmp/sEzHIWRYBB/synaptic-0.62.1ubuntu1~ppa2/configure.in 2008-06-13 11:19:58.000000000 +0100 @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(configure.in) -AM_INIT_AUTOMAKE(synaptic, 0.62.1ubuntu1~ppa1) +AM_INIT_AUTOMAKE(synaptic, 0.62.1ubuntu1~ppa2) AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE diff -Nru /tmp/keoGTIqIMg/synaptic-0.62.1ubuntu1~ppa1/debian/changelog /tmp/sEzHIWRYBB/synaptic-0.62.1ubuntu1~ppa2/debian/changelog --- /tmp/keoGTIqIMg/synaptic-0.62.1ubuntu1~ppa1/debian/changelog 2008-06-12 16:13:22.000000000 +0100 +++ /tmp/sEzHIWRYBB/synaptic-0.62.1ubuntu1~ppa2/debian/changelog 2008-06-13 11:10:05.000000000 +0100 @@ -1,3 +1,10 @@ +synaptic (0.62.1ubuntu1~ppa2) hardy; urgency=low + + * make apt-xapian-index a depends in hardy instead of a recommends + * tighten depends on latest apt-xapian-index in the ppa + + -- Michael Vogt Fri, 13 Jun 2008 12:08:59 +0200 + synaptic (0.62.1ubuntu1~ppa1) hardy; urgency=low * added support for quick search using xapian (thanks to diff -Nru /tmp/keoGTIqIMg/synaptic-0.62.1ubuntu1~ppa1/debian/control /tmp/sEzHIWRYBB/synaptic-0.62.1ubuntu1~ppa2/debian/control --- /tmp/keoGTIqIMg/synaptic-0.62.1ubuntu1~ppa1/debian/control 2008-06-12 15:18:10.000000000 +0100 +++ /tmp/sEzHIWRYBB/synaptic-0.62.1ubuntu1~ppa2/debian/control 2008-06-13 11:19:49.000000000 +0100 @@ -9,11 +9,11 @@ Package: synaptic Architecture: any -Depends: ${shlibs:Depends}, scrollkeeper +Depends: ${shlibs:Depends}, scrollkeeper, apt-xapian-index (>= 0.8ubuntu1~ppa1) Provides: gsynaptic Replaces: gsynaptic Conflicts: gsynaptic, menu (<< 2.1.11) -Recommends: gksu, deborphan, libgnome2-perl, software-properties-gtk, apt-xapian-index +Recommends: gksu, deborphan, libgnome2-perl, software-properties-gtk Suggests: dwww, menu Description: Graphical package manager Synaptic is a graphical package management tool based on GTK+ and APT. diff -Nru /tmp/keoGTIqIMg/synaptic-0.62.1ubuntu1~ppa1/gtk/rgmainwindow.cc /tmp/sEzHIWRYBB/synaptic-0.62.1ubuntu1~ppa2/gtk/rgmainwindow.cc --- /tmp/keoGTIqIMg/synaptic-0.62.1ubuntu1~ppa1/gtk/rgmainwindow.cc 2008-06-12 15:16:41.000000000 +0100 +++ /tmp/sEzHIWRYBB/synaptic-0.62.1ubuntu1~ppa2/gtk/rgmainwindow.cc 2008-06-13 11:08:37.000000000 +0100 @@ -820,6 +820,10 @@ void RGMainWindow::xapianDoIndexUpdate() { //std::cerr << "xapianDoIndexUpdate()" << std::endl; + // do not run if we don't have it + if(!FileExists("/usr/sbin/update-apt-xapian-index")) + return; + GPid pid; char *argp[] = {"/usr/bin/nice", "/usr/sbin/update-apt-xapian-index", @@ -1677,8 +1681,11 @@ // only enable fast search if its usable #ifdef WITH_EPT - if(!_lister->textsearch() || !_lister->textsearch()->hasData()) + if(!_lister->textsearch() || + !_lister->textsearch()->hasData() || + !FileExists("/usr/sbin/update-apt-xapian-index")) { gtk_widget_set_sensitive(glade_xml_get_widget(_gladeXML, "entry_fast_search"), FALSE); + } #else gtk_widget_hide(glade_xml_get_widget(_gladeXML, "vbox_fast_search")); #endif