ayatana-commits team mailing list archive

[Ted Gould <ted@xxxxxxxx>]

Ted Gould has proposed merging lp:~indicator-applet-developers/evolution-indicator/ubuntu into lp:evolution-indicator.

Requested reviews:
  Ken VanDine (ken-vandine)


0.2.7
-- 
https://code.launchpad.net/~indicator-applet-developers/evolution-indicator/ubuntu/+merge/20674
Your team ayatana-commits is subscribed to branch lp:evolution-indicator.

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2010-03-04 17:35:23 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+merge = True

=== modified file '.bzrignore'
--- .bzrignore	2009-09-09 17:04:22 +0000
+++ .bzrignore	2010-03-04 17:35:23 +0000
@@ -55,5 +55,6 @@
 src/liborg-freedesktop-evolution-indicator.la
 src/mail-server.lo
 src/org-freedesktop-evolution-indicator.eplug
+po/evolution-indicator.pot
 src/xutils.lo
 autom4te.cache

=== added directory 'debian'
=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2010-03-04 17:35:23 +0000
@@ -0,0 +1,182 @@
+evolution-indicator (0.2.7-0ubuntu1~ppa1) lucid; urgency=low
+
+  * Upstream Release 0.2.7
+    * Update to newer libindicate signaling
+    * Add in dynamic command items.
+  * debian/control: No depending on libindicate 0.3.0 or higher.
+
+ -- Ted Gould <ted@xxxxxxxxxx>  Thu, 04 Mar 2010 11:28:52 -0600
+
+evolution-indicator (0.2.6-0ubuntu3) lucid; urgency=low
+
+  * Rebuild to get the new gtkhtml shlib
+
+ -- Sebastien Bacher <seb128@xxxxxxxxxx>  Mon, 25 Jan 2010 18:46:43 +0100
+
+evolution-indicator (0.2.6-0ubuntu2) lucid; urgency=low
+
+  * debian/patches/launcher_path.patch:
+    - dropped the change is in the new version
+
+ -- Sebastien Bacher <seb128@xxxxxxxxxx>  Thu, 21 Jan 2010 22:57:52 +0100
+
+evolution-indicator (0.2.6-0ubuntu1) lucid; urgency=low
+
+  * New upstream version 
+
+ -- Sebastien Bacher <seb128@xxxxxxxxxx>  Thu, 21 Jan 2010 22:21:09 +0100
+
+evolution-indicator (0.2.4-0ubuntu6) lucid; urgency=low
+
+  * debian/patches/launcher_path.patch
+    - Fixed path to evolution.desktop, it moved
+
+ -- Ken VanDine <ken.vandine@xxxxxxxxxxxxx>  Thu, 17 Dec 2009 10:00:11 -0500
+
+evolution-indicator (0.2.4-0ubuntu5) lucid; urgency=low
+
+  * debian/rules:
+    - use the upstream evolution desktop entry there
+    
+  [ Ken VanDine ]
+  * debian/preinst:
+    - fixed the version compare to be friendly on new installs
+
+ -- Sebastien Bacher <seb128@xxxxxxxxxx>  Thu, 17 Dec 2009 10:56:28 +0100
+
+evolution-indicator (0.2.4-0ubuntu4) karmic-proposed; urgency=low
+
+  * debian/rules: use simple-patchsys.mk so the previous change does something
+
+ -- Sebastien Bacher <seb128@xxxxxxxxxx>  Wed, 02 Dec 2009 10:03:08 +0100
+
+evolution-indicator (0.2.4-0ubuntu3) karmic-proposed; urgency=low
+
+  * debian/patches/01_fix_pop3_notifications.patch
+    - Pull revision 55 from trunk to fix notifications for POP3 accounts by
+      adding a indicator for the default Inbox. (LP: #436755)
+
+ -- Neil J. Patel <neil.patel@xxxxxxxxxxxxx>  Fri, 20 Nov 2009 08:23:06 -0600
+
+evolution-indicator (0.2.4-0ubuntu2) karmic; urgency=low
+
+  * debian/rules: 
+    - Moved the indicator launcher to /usr/share (LP: #434097) 
+  * debian/postinst:
+    - remove the old indicator from /etc and remove the directory 
+      if it is empty
+
+ -- Ken VanDine <ken.vandine@xxxxxxxxxxxxx>  Thu, 24 Sep 2009 15:14:30 -0400
+
+evolution-indicator (0.2.4-0ubuntu1) karmic; urgency=low
+
+  * New upstream version:
+    - don't list the accounts which are not active or not configured to receive
+      (lp: #427501, #427504)
+
+ -- Sebastien Bacher <seb128@xxxxxxxxxx>  Thu, 17 Sep 2009 16:24:41 +0200
+
+evolution-indicator (0.2.2-0ubuntu1) karmic; urgency=low
+
+  * Relayout preferences to match MessagingMenu spec (LP: #427433)
+    - Needed to change the way we capitalise the labels to match the spec
+
+ -- Neil J. Patel <neil.patel@xxxxxxxxxxxxx>  Thu, 10 Sep 2009 18:05:30 +0100
+
+evolution-indicator (0.2.0-0ubuntu2) karmic; urgency=low
+
+  * debian/rules:
+    - Add evolution-mail launcher to the indicator (LP: #424478)
+
+ -- Ken VanDine <ken.vandine@xxxxxxxxxxxxx>  Thu, 10 Sep 2009 14:46:21 -0400
+
+evolution-indicator (0.2.0-0ubuntu1) karmic; urgency=low
+
+  * New Upstream release (LP: #427396)
+    - debian/control:
+      - Change branch owner in Vcs-Bzr to ~ubuntu-desktop
+      - Added Standards-Version
+
+  [ Neil J. Patel ]
+  * Bump required version of libindicate to >= 0.2.0
+  * Support for libindicate 0.2.0
+  * Updated preferences
+
+ -- Ken VanDine <ken.vandine@xxxxxxxxxxxxx>  Thu, 10 Sep 2009 11:21:17 -0400
+
+evolution-indicator (0.1.16-0ubuntu1) karmic; urgency=low
+
+  * Upstream 0.1.16 (LP: #375443)
+  * Fix build for Karmic (LP: #390360)
+  * debian/control, updating build depends for evolution reshuffling
+    done in Karmic.
+
+ -- Ted Gould <ted@xxxxxxxxxx>  Tue, 04 Aug 2009 18:22:11 +0100
+
+evolution-indicator (0.1.15-0ubuntu1) karmic; urgency=low
+
+  * Upstream release 0.1.15:  Brown paper bag.  Missing a '!' in
+    previous release.  Now really fixes LP: #359658
+  * Upstream release 0.1.14: Change to g_strcmp0 to check for a NULL
+    string and not crash when getting it.  LP: #359658
+
+ -- Ted Gould <ted@xxxxxxxxxx>  Mon, 11 May 2009 08:20:11 +0200
+
+evolution-indicator (0.1.13-0ubuntu1) jaunty; urgency=low
+
+  * New upstream version.
+    * Updating patch to fix internationalization issues so that Evolution
+      translations work along with the indicator's.  LP: #352657
+
+ -- Ted Gould <ted@xxxxxxxxxx>  Tue, 07 Apr 2009 11:06:47 -0500
+
+evolution-indicator (0.1.12-0ubuntu1) jaunty; urgency=low
+
+  * New upstream version.
+    * Patch from Neil Patel to fix LP: #342429 that looks to X to figure
+      out if an Evolution window is open before sending notifications.
+    * Patch from Timo Jyrinki which fixes LP: #352657 where the plugin
+      was using the wrong gettext domain.
+
+ -- Ted Gould <ted@xxxxxxxxxx>  Mon, 06 Apr 2009 12:09:23 -0500
+
+evolution-indicator (0.1.11-0ubuntu1) jaunty; urgency=low
+
+  * New upstream version.  Makes it so that notifications aren't
+    sent if the Evolution windows have focus.  (LP: #342429)
+
+ -- Ted Gould <ted@xxxxxxxxxx>  Thu, 19 Mar 2009 13:11:45 +0100
+
+evolution-indicator (0.1.10-0ubuntu1) jaunty; urgency=low
+
+  [ Ted Gould ]
+  * New upstream version.
+    - Corrects icon (LP: #337304)
+    - Build fixes to get full distcheck
+    - Counts IDs correctly to remove warnings from applet
+
+  [ Martin Pitt ]
+  * Add debian/watch.
+  * Add bzr-builddeb configuration (merge mode). Fortunately this doesn't
+    insist on having *only* debian/ in bzr. This gives us the best of both
+    worlds, bzd-bd auto-downloading orig.tar.gz and merging in the
+    pre-generated autoconf stuff, and retaining the possibility of merging
+    directly from trunk, since we keep the full upstream source in this branch.
+
+ -- Martin Pitt <martin.pitt@xxxxxxxxxx>  Tue, 17 Mar 2009 10:45:47 +0100
+
+evolution-indicator (0.1.9-0ubuntu1) jaunty; urgency=low
+
+  * Initial release, based on DX team's PPA packaging branch.
+    (lp:~indicator-applet-developers/evolution-indicator/packaging)
+  * debian/control: Add Homepage:, Vcs-Bzr:, and fix package
+    description.
+  * debian/copyright: Properly describe license and clean up some
+    boilerplate.
+  * debian/rules: Drop some unused cdbs includes.
+  * debian/rules: Remove .a/.la clutter (should be fixed upstream
+    eventually).
+  * debian/rules: Do not generate maintainer script snippets with
+    ldconfig.
+
+ -- Martin Pitt <martin.pitt@xxxxxxxxxx>  Tue, 17 Feb 2009 12:58:22 +0100

=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2010-03-04 17:35:23 +0000
@@ -0,0 +1,1 @@
+5

=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2010-03-04 17:35:23 +0000
@@ -0,0 +1,36 @@
+Source: evolution-indicator
+Section: gnome
+Priority: extra
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@xxxxxxxxxxxxxxxx>
+Build-Depends: cdbs, debhelper (>= 5), 
+  autotools-dev, 
+  gnome-pkg-tools (>= 0.10),
+  libglib2.0-dev (>= 2.15.5),
+  libpango1.0-dev (>= 1.18.0),
+  libgtk2.0-dev (>= 2.10.0),
+  libgconf2-dev (>= 2.16.0),
+  libcairo2-dev (>= 1.2.4),
+  libdbus-1-dev (>= 1.0),
+  libdbus-glib-1-dev (>= 0.7),
+  evolution-dev,
+  evolution-data-server-dev,
+  libindicate-dev (>= 0.3.0),
+  libnotify-dev,
+  libcanberra-dev,
+  libgtkhtml-editor-dev,
+  libgtkhtml3.14-dev,
+  libebook1.2-dev
+Standards-Version: 3.8.3
+Homepage: https://launchpad.net/evolution-indicator
+Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/evolution-indicator/ubuntu
+
+Standards-Version: 3.7.2
+Package: evolution-indicator
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: GNOME panel indicator applet for Evolution
+ indicator-applet is an applet to display information from
+ various applications consistently in the GNOME panel.
+ .
+ This package provides a plugin for Evolution that uses libindicate and
+ libnotify to provide additional information about Evolution's state.

=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2010-03-04 17:35:23 +0000
@@ -0,0 +1,33 @@
+This package was debianized by Neil J. Patel
+<neil.patel@xxxxxxxxxxxxx>.
+
+It was downloaded from https://launchpad.net/evolution-indicator
+
+Upstream Author: 
+
+    Neil J. Patel <neil.patel@xxxxxxxxxxxxx>
+
+Copyright: 
+
+    Copyright (C) 2009 Canonical Ltd
+
+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, version 3 of the License.
+
+  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 St, 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-3'.
+
+The Debian packaging is (C) 2008, Neil J. Patel <neil.patel@xxxxxxxxxxxxx> and
+is licensed under the GPL v3, see `/usr/share/common-licenses/GPL-3'.

=== added directory 'debian/patches'
=== added file 'debian/preinst'
--- debian/preinst	1970-01-01 00:00:00 +0000
+++ debian/preinst	2010-03-04 17:35:23 +0000
@@ -0,0 +1,12 @@
+#!/bin/sh -e
+
+case $1 in
+    install|upgrade)
+	if dpkg --compare-versions "$2" lt-nl "0.2.4-0ubuntu1"; then
+            rm "/etc/indicators/messages/applications/evolution" || true
+            rmdir --ignore-fail-on-non-empty "/etc/indicators/messages/applications/" || true
+        fi
+        ;;
+esac
+
+#DEBHELPER#

=== added file 'debian/rules'
--- debian/rules	1970-01-01 00:00:00 +0000
+++ debian/rules	2010-03-04 17:35:23 +0000
@@ -0,0 +1,15 @@
+#!/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/gnome.mk
+
+# do not generate ldconfig maintainer script stuff
+DEB_DH_MAKESHLIBS_ARGS=-X*
+
+binary-install/evolution-indicator::
+	# remove .a/.la clutter
+	rm -f debian/$(cdbs_curpkg)/usr/lib/evolution/*/plugins/*.a
+	rm -f debian/$(cdbs_curpkg)/usr/lib/evolution/*/plugins/*.la
+	# Add the launcher for evolution
+	mkdir -p debian/$(cdbs_curpkg)/usr/share/indicators/messages/applications
+	echo /usr/share/applications/evolution.desktop > debian/$(cdbs_curpkg)/usr/share/indicators/messages/applications/evolution

=== added file 'debian/watch'
--- debian/watch	1970-01-01 00:00:00 +0000
+++ debian/watch	2010-03-04 17:35:23 +0000
@@ -0,0 +1,2 @@
+version=3
+http://launchpad.net/evolution-indicator/+download .*/evolution-indicator-([0-9.]+)\.tar\.gz