diff -u beagle-0.3.7/debian/rules beagle-0.3.7/debian/rules --- beagle-0.3.7/debian/rules +++ beagle-0.3.7/debian/rules @@ -79,18 +79,19 @@ mv debian/beagle/usr/lib/beagle/Backends/Evolution* debian/beagle-backend-evolution/usr/lib/beagle/Backends/ - # install Iceweasel and Icedove extensions - unzip firefox-extension/beagle.xpi -d $(CURDIR)/debian/iceweasel-beagle/usr/lib/iceweasel/extensions/{fda00e13-8c62-4f63-9d19-d168115b11ca}/ + # install Mozilla and Thunderbird extensions + unzip firefox-extension/beagle.xpi -d $(CURDIR)/debian/mozilla-beagle/usr/lib/firefox/extensions/{fda00e13-8c62-4f63-9d19-d168115b11ca}/ # install missing sidebar.xul and beagleSearch.js cp $(CURDIR)/debian/sidebar.xul \ $(CURDIR)/debian/beagleSearch.js \ - $(CURDIR)/debian/iceweasel-beagle/usr/lib/iceweasel/extensions/{fda00e13-8c62-4f63-9d19-d168115b11ca}/chrome/content/ + $(CURDIR)/debian/mozilla-beagle/usr/lib/firefox/extensions/{fda00e13-8c62-4f63-9d19-d168115b11ca}/chrome/content/ # install missing sidebar.css cp $(CURDIR)/debian/sidebar.css \ - $(CURDIR)/debian/iceweasel-beagle/usr/lib/iceweasel/extensions/{fda00e13-8c62-4f63-9d19-d168115b11ca}/chrome/skin/classic/ - unzip thunderbird-extension/beagle.xpi -d $(CURDIR)/debian/icedove-beagle/usr/lib/icedove/extensions/{b656ef18-fd76-45e6-95cc-8043f26361e7} + $(CURDIR)/debian/mozilla-beagle/usr/lib/firefox/extensions/{fda00e13-8c62-4f63-9d19-d168115b11ca}/chrome/skin/classic/ + unzip thunderbird-extension/beagle.xpi -d \ + $(CURDIR)/debian/thunderbird-beagle/usr/lib/thunderbird/extensions/{b656ef18-fd76-45e6-95cc-8043f26361e7} # fix permissions, this isn't crappy windows with +x on everything - find debian/iceweasel-beagle/usr/lib/iceweasel/extensions -type f -exec chmod -x {} \; + find debian/mozilla-beagle/usr/lib/firefox/extensions -type f -exec chmod -x {} \; binary-indep: build install dh_testdir diff -u beagle-0.3.7/debian/changelog beagle-0.3.7/debian/changelog --- beagle-0.3.7/debian/changelog +++ beagle-0.3.7/debian/changelog @@ -1,3 +1,18 @@ +beagle (0.3.7-1ubuntu1) intrepid; urgency=low + + * Merge from Debian unstable. (LP: #225746) Remaining Ubuntu changes: + - debian/control: + + Rename ice{weasel,dove}-beagle to {mozilla,thunderbird}-beagle and + and update the dependencies accordingly. + + Change Maintainer to Ubuntu Mono Team. + - debian/rules: + + Install the mozilla-beagle and thunderbird-beagle extensions. + - ice{dove,weasel}.dirs: + + Renamed to {mozilla,thunderbird}-beagle.dirs. + + Fixed paths to point to usr/lib/{firefox,thunderbird} + + -- Stefan Ebner Sat, 26 Apr 2008 11:32:09 +0200 + beagle (0.3.7-1) unstable; urgency=low [ Mirco Bauer ] @@ -51,6 +66,27 @@ -- Jose Carlos Garcia Sogo Tue, 18 Mar 2008 22:39:46 +0100 +beagle (0.3.3-2ubuntu1) hardy; urgency=low + + [ Stefan Ebner ] + * Merge from Debian unstable. (LP: #193715, #194608) + Remaining Ubuntu changes: + - debian/control: + + Rename ice{weasel,dove}-beagle to {mozilla,thunderbird}-beagle and + and update the dependencies accordingly. + + Change Maintainer to Ubuntu Mono Team. + - debian/rules: + + Install the mozilla-beagle and thunderbird-beagle extensions. + - ice{dove,weasel}.dirs: + + Renamed to {mozilla,thunderbird}-beagle.dirs. + + Fixed paths to point to usr/lib/{firefox,thunderbird} + + [ Luca Falavigna ] + * debian/patches/glib-sharp-2.0-support.dpatch: + - Add /glib-sharp-2.0 support, fix FTBFS. + + -- Luca Falavigna Tue, 18 Mar 2008 11:58:20 +0100 + beagle (0.3.3-2) unstable; urgency=low [ Jose Carlos Garcia Sogo ] @@ -77,6 +113,23 @@ -- Mirco Bauer Mon, 18 Feb 2008 23:27:00 +0100 +beagle (0.3.3-1ubuntu1) hardy; urgency=low + + * Merge from Debian unstable (LP: #189162), Ubuntu remaining changes: + - debian/control: + + B-d on libtaglib2.0-cil + + Rename ice{weasel,dove}-beagle to {mozilla,thunderbird}-beagle and + and update the dependencies accordingly. + + Suggest schedutils for beagle. + + Change Maintainer to Ubuntu Mono Team. + - debian/rules: + + Install the mozilla-beagle and thunderbird-beagle extensions. + - ice{dove,weasel}.dirs: + + Renamed to {mozilla,thunderbird}-beagle.dirs. + + Fixed paths to point to usr/lib/{firefox,thunderbird} + + -- Pedro Fragoso Sun, 03 Feb 2008 21:40:43 +0000 + beagle (0.3.3-1) unstable; urgency=low * New upstream version. @@ -94,6 +147,22 @@ -- Jose Carlos Garcia Sogo Sun, 03 Feb 2008 12:40:09 +0100 +beagle (0.3.2-1ubuntu1) hardy; urgency=low + + * Merge from Debian unstable, remaining Ubuntu changes: + - debian/control: + + Rename ice{weasel,dove}-beagle to {mozilla,thunderbird}-beagle and + and update the dependencies accordingly. + + Suggest schedutils for beagle. + + Change Maintainer to Ubuntu Mono Team. + - debian/rules: + + Install the mozilla-beagle and thunderbird-beagle extensions. + - ice{dove,weasel}.dirs: + + Renamed to {mozilla,thunderbird}-beagle.dirs. + + Fixed paths to point to usr/lib/{firefox,thunderbird} + + -- Emilio Pozuelo Monfort Tue, 08 Jan 2008 22:40:26 +0100 + beagle (0.3.2-1) unstable; urgency=low [ Mirco Bauer ] @@ -133,6 +202,23 @@ -- Mirco Bauer Fri, 28 Dec 2007 19:14:34 +0100 +beagle (0.3.1-2ubuntu1) hardy; urgency=low + + * Merge from Debian unstable, remaining Ubuntu changes: + - debian/control: + + Rename iceweasel-beagle and icedove-beagle to mozilla-beagle and + thunderbird-beagle, change the Recommends to Depends and update + them accordingly. + + Suggest schedutils for beagle. + + Change Maintainer to Ubuntu Mono Team. + - debian/rules: + + Install the mozilla-beagle and thunderbird-beagle extensions. + - ice{dove,weasel}.dirs: + + Renamed to {mozilla,thunderbird}-beagle.dirs. + + Fixed paths to point to usr/lib/{firefox,thunderbird} + + -- Emilio Pozuelo Monfort Mon, 24 Dec 2007 17:25:05 +0100 + beagle (0.3.1-2) unstable; urgency=low * debian/control: @@ -229,6 +315,33 @@ -- Mirco Bauer Fri, 21 Sep 2007 15:47:06 +0200 +beagle (0.2.18-0ubuntu3) gutsy; urgency=low + + * Replace libevolution2.0-cil with libevolution3.0-cil in the + Build-Depends. + + -- Steve Kowalik Mon, 1 Oct 2007 22:03:38 +1000 + +beagle (0.2.18-0ubuntu2) gutsy; urgency=low + + * Added an upstream patch to fix a bug with the HTML filters. + + -- Kevin Kubasik Thu, 06 Sep 2007 21:40:00 -0400 + +beagle (0.2.18-0ubuntu1) gutsy; urgency=low + + * Inital 0.2.18 merge of beagle + * debian directory cleanup of unused patches + * Updated libevolution2.0-cli depenancy to 0.13.1 + * Merge several upstream fixes + * Remove redundant patches (upstream had fixes already) + * All old dpatch patches were removed (cruft) + * Updated control to handle the Ubuntu maintainers correctly + * Made 2 small changes to rules to handle the latest api changes + without warnings + + -- Kevin Kubasik Wed, 29 Aug 2007 22:55:53 -0400 + beagle (0.2.17-2) unstable; urgency=medium [ Jose Carlos Garcia Sogo ] @@ -248,6 +361,46 @@ -- Mirco Bauer Thu, 09 Aug 2007 22:37:24 +0200 +beagle (0.2.17-1ubuntu3) gutsy; urgency=low + + * update and fix build + + -- Kevin Kubasik Thu, 23 Aug 2007 22:15:48 -0400 + +beagle (0.2.17-1ubuntu4) gutsy; urgency=low + + * debian/control: suggest schedutils (LP: #75338) + * debian/control: DebianMaintainerField + * debian/control: fixed package-has-a-duplicate-build-relation + (libxss-dev) + + -- dAniel hAhler Tue, 04 Sep 2007 02:40:30 +0200 + +beagle (0.2.17-1ubuntu3) gutsy; urgency=low + + * Added beagle as a dependency for mozilla-beagle (LP: #89525) + * Set maintainer to Ubuntu Core Developers + + -- Nathan Handler Tue, 04 Sep 2007 17:59:14 +0200 + +beagle (0.2.17-1ubuntu2) gutsy; urgency=low + + * No-change upload to trigger creation of a build record for lpia. + + -- Adam Conrad Tue, 14 Aug 2007 01:39:49 +1000 + +beagle (0.2.17-1ubuntu1) gutsy; urgency=low + + * Synchronize with Debian + * Remaining Ubuntu changes: + - Use Firefox, not Iceweasel + - Rename iceweasel-beagle to mozilla-beagle + - Don't build with galago, not in main + - Build-depend on libglade2.0-cil, libgconf2.0-cil + - python-beagle.install: install from usr/lib/python2.5 + + -- Brandon Hale Sat, 19 May 2007 06:56:20 -040 + beagle (0.2.17-1) unstable; urgency=low * New upstream release. diff -u beagle-0.3.7/debian/control beagle-0.3.7/debian/control --- beagle-0.3.7/debian/control +++ beagle-0.3.7/debian/control @@ -1,7 +1,8 @@ Source: beagle Section: gnome Priority: optional -Maintainer: Debian CLI Applications Team +Maintainer: Ubuntu Mono Team +XSBC-Original-Maintainer: Debian CLI Applications Team Uploaders: Jose Carlos Garcia Sogo , Mirco Bauer Build-Depends: debhelper (>= 5.0.37.2), cli-common-dev (>= 0.5.4), @@ -68,20 +69,20 @@ At the moment, it can index filesystems, Pidgin logs, Evolution mail and data, RSS and other. -Package: iceweasel-beagle +Package: mozilla-beagle Architecture: all -Depends: beagle (>= ${source:Version}), beagle (<< ${source:Version}.1~), iceweasel -Description: Beagle extension for Iceweasel +Depends: beagle (>= ${source:Version}), beagle (<< ${source:Version}.1~), firefox +Description: Beagle extension for Firefox Extension that allows Beagle indexing webpages visited by the user. . Beagle is a desktop search util for indexing and searching user's data. At the moment, it can index filesystems, Pidgin logs, Evolution mail and data, RSS and other. -Package: icedove-beagle +Package: thunderbird-beagle Architecture: all -Depends: beagle (>= ${source:Version}), beagle (<< ${source:Version}.1~), icedove -Description: Beagle extension for Icedove +Depends: beagle (>= ${source:Version}), beagle (<< ${source:Version}.1~), thunderbird +Description: Beagle extension for Thunderbird Extension that allows Beagle indexing mails read by the user. . Beagle is a desktop search util for indexing and searching user's data. diff -u beagle-0.3.7/debian/patches/00list beagle-0.3.7/debian/patches/00list --- beagle-0.3.7/debian/patches/00list +++ beagle-0.3.7/debian/patches/00list @@ -8,0 +9 @@ + only in patch2: unchanged: --- beagle-0.3.7.orig/debian/thunderbird-beagle.dirs +++ beagle-0.3.7/debian/thunderbird-beagle.dirs @@ -0,0 +1 @@ +usr/lib/thunderbird/extensions/{b656ef18-fd76-45e6-95cc-8043f26361e7} only in patch2: unchanged: --- beagle-0.3.7.orig/debian/mozilla-beagle.dirs +++ beagle-0.3.7/debian/mozilla-beagle.dirs @@ -0,0 +1 @@ +usr/lib/firefox/extensions/{fda00e13-8c62-4f63-9d19-d168115b11ca}