diff -Nru pinot-0.95/debian/changelog pinot-0.95/debian/changelog --- pinot-0.95/debian/changelog 2009-11-14 17:24:22.000000000 +0530 +++ pinot-0.95/debian/changelog 2010-01-27 12:05:39.000000000 +0530 @@ -1,3 +1,11 @@ +pinot (0.95-1ubuntu1) lucid; urgency=low + + * Merge from debian testing. Remaining changes: LP: #513123 + - deskbar-plugins-pinot: conflicts with pinot-applet (<= 0.82-0ubuntu1) + - pinot-applet: transitional package which brings deskbar-plugins-pinot + + -- Bhavani Shankar Wed, 27 Jan 2010 12:03:03 +0530 + pinot (0.95-1) unstable; urgency=low * New upstream release. @@ -17,6 +25,14 @@ -- Jonas Smedegaard Sat, 14 Nov 2009 12:54:20 +0100 +pinot (0.94-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + - deskbar-plugins-pinot: conflicts with pinot-applet (<= 0.82-0ubuntu1) + - pinot-applet: transitional package which brings deskbar-plugins-pinot + + -- Gauvain Pocentek Sun, 05 Jul 2009 18:13:40 +0200 + pinot (0.94-1) unstable; urgency=low * New upstream release. @@ -32,6 +48,14 @@ -- Jonas Smedegaard Sun, 28 Jun 2009 19:31:24 +0200 +pinot (0.93-3ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + - deskbar-plugins-pinot: conflicts with pinot-applet (<= 0.82-0ubuntu1) + - pinot-applet: transitional package which brings deskbar-plugins-pinot + + -- Gauvain Pocentek Thu, 18 Jun 2009 21:48:13 +0200 + pinot (0.93-3) unstable; urgency=low * Define FILE_OFFSET_BITS=64 in CPPFLAGS (not CFLAGS). Closes: @@ -39,6 +63,16 @@ -- Jonas Smedegaard Sat, 13 Jun 2009 23:50:54 +0200 +pinot (0.93-2ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + - deskbar-plugins-pinot: conflicts with pinot-applet (<= 0.82-0ubuntu1) + - pinot-applet: transitional package which brings deskbar-plugins-pinot + - debian/patches/1003_fix_FTBFS_file_offset.patch: cherry pick from svn + (r1635), add -D_FILE_OFFSET_BITS=64 to CFLAGS (fixes FTBFS) + + -- Gauvain Pocentek Sat, 13 Jun 2009 16:29:32 +0200 + pinot (0.93-2) unstable; urgency=low * Define FILE_OFFSET_BITS=64 in CFLAGS to fix >2TB file support. @@ -54,6 +88,16 @@ -- Jonas Smedegaard Sun, 07 Jun 2009 19:24:23 +0200 +pinot (0.93-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + - deskbar-plugins-pinot: conflicts with pinot-applet (<= 0.82-0ubuntu1) + - pinot-applet: transitional package which brings deskbar-plugins-pinot + * debian/patches/1003_fix_FTBFS_file_offset.patch: cherry pick from svn + (r1635), add -D_FILE_OFFSET_BITS=64 to CFLAGS (fixes FTBFS) + + -- Gauvain Pocentek Wed, 03 Jun 2009 18:22:58 +0200 + pinot (0.93-1) unstable; urgency=low [ David Paleino ] @@ -86,6 +130,14 @@ -- David Paleino Mon, 02 Feb 2009 22:01:04 +0100 +pinot (0.89-1ubuntu1) jaunty; urgency=low + + * Merge from debian experimental. Remaining changes: + - deskbar-plugins-pinot: conflicts with pinot-applet (<= 0.82-0ubuntu1) + - pinot-applet: transitional package which brings deskbar-plugins-pinot + + -- Gauvain Pocentek Sat, 17 Jan 2009 05:28:02 +0100 + pinot (0.89-1) experimental; urgency=low * New upstream release @@ -103,6 +155,21 @@ -- David Paleino Sat, 08 Nov 2008 14:35:29 +0100 +pinot (0.85-1ubuntu2) intrepid; urgency=low + + * No-change rebuild for libxml++2.6c2a -> libxml++2.6-2 transistion. + + -- Steve Kowalik Wed, 06 Aug 2008 17:00:40 +1000 + +pinot (0.85-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - deskbar-plugins-pinot: conflicts with pinot-applet (<= 0.82-0ubuntu1) + - pinot-applet: transitional package which brings deskbar-plugins-pinot + - Adhere to DebianMaintainerField + + -- Gauvain Pocentek Sun, 15 Jun 2008 18:08:44 +0200 + pinot (0.85-1) unstable; urgency=low * New upstream release @@ -113,6 +180,22 @@ -- David Paleino Sat, 24 May 2008 11:15:42 +0200 +pinot (0.84-1ubuntu2) intrepid; urgency=low + + * Adhere to DebianMaintainerField + + -- Gauvain Pocentek Wed, 21 May 2008 07:16:44 +0200 + +pinot (0.84-1ubuntu1) intrepid; urgency=low + + * Entirely replace the Ubuntu package with the Debian one + * debian/control: + - deskbar-plugins-pinot: conflicts with pinot-applet (<= 0.82-0ubuntu1) + - pinot-applet: new transitional package which brings + deskbar-plugins-pinot + + -- Gauvain Pocentek Tue, 06 May 2008 07:06:17 +0200 + pinot (0.84-1) unstable; urgency=low * New upstream release @@ -147,3 +230,87 @@ * Initial release (Closes: #446517) -- David Paleino Thu, 21 Feb 2008 09:09:44 +0100 + +pinot (0.82-0ubuntu1) hardy; urgency=low + + * New upstream release + * Build Depends on libgtkmm-2.4-dev (>= 2.10) + + -- Gauvain Pocentek Fri, 8 Feb 2008 12:27:23 +0100 + +pinot (0.81-0ubuntu1) hardy; urgency=low + + * New upstream release + * 00_desktop_file_install.patch: updated + * 02_applet_shebang.patch: applied upstream + * debian/rules: don't call dh_python + * debian/control: Build-Depends on libxapian-dev >= 1.0.3 + + -- Gauvain Pocentek Sat, 1 Dec 2007 12:09:01 +0100 + +pinot (0.75-0ubuntu1) gutsy; urgency=low + + * New upstream release + * Drop 03-xapian-1-fixes.patch, fixed upstream + + -- Gauvain Pocentek Sat, 28 Jul 2007 07:28:58 +0200 + +pinot (0.72-0ubuntu5) gutsy; urgency=low + + * Rebuild for the libcurl transition mess. + + -- Steve Kowalik Thu, 5 Jul 2007 00:14:56 +1000 + +pinot (0.72-0ubuntu4) gutsy; urgency=low + + * Rebuild against glib, now that the fix is actually applied. + + -- Daniel Holbach Mon, 25 Jun 2007 16:29:50 +0200 + +pinot (0.72-0ubuntu3) gutsy; urgency=low + + * Rebuild for glib ABI change. + + -- Daniel Holbach Mon, 25 Jun 2007 11:26:45 +0200 + +pinot (0.72-0ubuntu2) gutsy; urgency=low + + * Rebuild for the libxapian transition. + * Fix to build against the new libxapian. + + -- Steve Kowalik Thu, 21 Jun 2007 17:25:45 +1000 + +pinot (0.72-0ubuntu1) gutsy; urgency=low + + * New upstream release + * python policy: + - add missing debian/pycompat + - Build Depend on debhelper (>= 5.0.37.2) + * 02_applet_shebang.patch: drop applet script shebang + + -- Gauvain Pocentek Sat, 28 Apr 2007 18:45:50 +0200 + +pinot (0.65-0ubuntu2) feisty; urgency=low + + * Move usr/lib/pinot/tokenizers from pinot-applet to pinot + (LP: #91057) + * Build Depend on libboost-dev + (LP: #91058) + + -- Gauvain Pocentek Sun, 11 Mar 2007 08:26:12 +0100 + +pinot (0.65-0ubuntu1) feisty; urgency=low + + * New upstream release + * 00_desktop_file_install.patch: updated + + -- Gauvain Pocentek Sun, 24 Dec 2006 10:30:18 +0100 + +pinot (0.62-0ubuntu1) feisty; urgency=low + + * Initial release + * debian/patches/00_desktop_file_install.patch: + - Do not use desktop-file-install to install the .desktop file + + -- Gauvain Pocentek Fri, 20 Oct 2006 17:44:12 +0200 + diff -Nru pinot-0.95/debian/control pinot-0.95/debian/control --- pinot-0.95/debian/control 2009-11-14 16:45:50.000000000 +0530 +++ pinot-0.95/debian/control 2010-01-27 12:04:52.000000000 +0530 @@ -1,7 +1,8 @@ Source: pinot Section: x11 Priority: optional -Maintainer: Jonas Smedegaard +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Jonas Smedegaard Build-Depends: cdbs (>= 0.4.39), autotools-dev, devscripts (>= 2.10.7), debhelper (>= 6), libcurl4-openssl-dev, libxapian-dev (>= 1.0.3), gsoap, libboost-dev, libtextcat-dev, libtag1-dev (>= 1.4), libsqlite3-dev (>= 3.1), libgmime-2.4-dev, libxml++2.6-dev (>= 2.12), libdbus-glib-1-dev, libsigc++-2.0-dev (>= 2.0), libglib2.0-dev (>= 2.6), libssl-dev (>= 0.9.7), libglibmm-2.4-dev (>= 2.6), libgtkmm-2.4-dev (>= 2.10), shared-mime-info, desktop-file-utils, libexif-dev (>= 0.6), python-support Standards-Version: 3.8.2 Homepage: http://pinot.berlios.de @@ -27,6 +28,7 @@ Architecture: all Depends: ${python:Depends}, ${misc:Depends}, deskbar-applet (>= 2.20), pinot, python-gnome2, python-gobject, python-dbus +Conflicts: pinot-applet (<= 0.82-0ubuntu1) Description: deskbar plugin to search files with pinot Pinot provides a D-Bus service that crawls, indexes your documents and monitors them for changes. This service can then be used via a command-line @@ -39,3 +41,16 @@ . This package provides a plugin for the GNOME Deskbar applet to search for files using Pinot. + +Package: pinot-applet +Architecture: all +Depends: deskbar-plugins-pinot +Description: dummy transitional package + This dummy package is now part of pinot. + . + Pinot provides a D-Bus service that crawls, indexes your documents and + monitors them for changes. This service can then be used via a command-line + interface, or through a GTK-based GUI that enables to query the index built + by the service and your favourite Web engines, and display and analyze the + results. + diff -Nru pinot-0.95/debian/control.in pinot-0.95/debian/control.in --- pinot-0.95/debian/control.in 2009-11-14 17:23:35.000000000 +0530 +++ pinot-0.95/debian/control.in 2009-11-26 07:00:22.000000000 +0530 @@ -1,7 +1,8 @@ Source: pinot Section: x11 Priority: optional -Maintainer: Jonas Smedegaard +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Jonas Smedegaard Build-Depends: @cdbs@ Standards-Version: 3.8.3 Homepage: http://pinot.berlios.de @@ -27,6 +28,7 @@ Architecture: all Depends: ${python:Depends}, ${misc:Depends}, deskbar-applet (>= 2.20), pinot, python-gnome2, python-gobject, python-dbus +Conflicts: pinot-applet (<= 0.82-0ubuntu1) Description: deskbar plugin to search files with pinot Pinot provides a D-Bus service that crawls, indexes your documents and monitors them for changes. This service can then be used via a command-line @@ -39,3 +41,16 @@ . This package provides a plugin for the GNOME Deskbar applet to search for files using Pinot. + +Package: pinot-applet +Architecture: all +Depends: deskbar-plugins-pinot +Description: dummy transitional package + This dummy package is now part of pinot. + . + Pinot provides a D-Bus service that crawls, indexes your documents and + monitors them for changes. This service can then be used via a command-line + interface, or through a GTK-based GUI that enables to query the index built + by the service and your favourite Web engines, and display and analyze the + results. +