Ted Gould has proposed merging
lp:~indicator-applet-developers/evolution-indicator/packaging into
lp:~ubuntu-core-dev/evolution-indicator/ubuntu.
Requested reviews:
Ubuntu Sponsors for main (ubuntu-main-sponsors): sponsoring
Update to the Evolution Indicator plugin to fix some bugs. Changelog entry:
evolution-indicator (0.1.10-0ubuntu1) jaunty; urgency=low
* New upstream version.
* Corrects icon (LP: #337304)
* Build fixes to get full distcheck
* Counts IDs correctly to remove warnings from applet
-- Ted Gould <[email protected]> Sun, 15 Mar 2009 07:17:14 -0500
--
https://code.launchpad.net/~indicator-applet-developers/evolution-indicator/packaging/+merge/4546
Your team Indicator Applet Developers is subscribed to branch
lp:~indicator-applet-developers/evolution-indicator/packaging.
=== modified file 'Makefile.am'
--- Makefile.am 2009-02-04 17:00:43 +0000
+++ Makefile.am 2009-03-15 11:49:22 +0000
@@ -2,6 +2,8 @@
#MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp install-sh ltmain.sh Makefile.in missing
+DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
+
snapshot:
$(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
=== modified file 'configure.ac'
--- configure.ac 2009-02-17 11:17:28 +0000
+++ configure.ac 2009-03-15 12:05:59 +0000
@@ -1,5 +1,5 @@
AC_PREREQ(2.53)
-AC_INIT(evolution-indicator, 0.1.9, [])
+AC_INIT(evolution-indicator, 0.1.10, [])
AM_INIT_AUTOMAKE()
AC_CONFIG_SRCDIR(src/evolution-indicator.c)
AM_CONFIG_HEADER(config.h)
@@ -10,11 +10,25 @@
AC_STDC_HEADERS
AC_PROG_LIBTOOL
+dnl ******************************
dnl Install in correct location
-EVO_PLUGIN_DIR=`pkg-config --variable=plugindir evolution-plugin`
+dnl ******************************
+
+with_localinstall="no"
+
+AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall], [install in the local build directory instead of the system one (for distcheck)]), with_localinstall=$enableval, with_localinstall=no)
+if test "x$with_localinstall" = "xyes"; then
+ EVO_PLUGIN_DIR="${libdir}/evolution/2.26/plugins"
+else
+ EVO_PLUGIN_DIR=`pkg-config --variable=plugindir evolution-plugin`
+fi
AC_SUBST(EVO_PLUGIN_DIR)
+
+dnl ******************************
dnl i18n
+dnl ******************************
+
GETTEXT_PACKAGE=evolution-indicator
AC_SUBST(GETTEXT_PACKAGE)
AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS'])
=== modified file 'debian/changelog'
--- debian/changelog 2009-02-17 12:00:24 +0000
+++ debian/changelog 2009-03-15 13:42:07 +0000
@@ -1,6 +1,15 @@
+evolution-indicator (0.1.10-0ubuntu1) jaunty; urgency=low
+
+ * New upstream version.
+ * Corrects icon (LP: #337304)
+ * Build fixes to get full distcheck
+ * Counts IDs correctly to remove warnings from applet
+
+ -- Ted Gould <[email protected]> Sun, 15 Mar 2009 07:17:14 -0500
+
evolution-indicator (0.1.9-0ubuntu1) jaunty; urgency=low
- * Initial release, based on X team's PPA packaging branch.
+ * 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.
=== modified file 'src/evolution-indicator.c'
--- src/evolution-indicator.c 2009-02-09 15:27:51 +0000
+++ src/evolution-indicator.c 2009-03-09 13:56:49 +0000
@@ -137,7 +137,7 @@
title = g_strdup_printf (trans, message_count);
notify_notification_update (notification,
- title, NULL, "mail-new");
+ title, NULL, "notification-message-email");
/* This plays a libcanberra sound */
if (play_sound)
=== modified file 'src/mail-server.c'
--- src/mail-server.c 2009-02-16 03:22:31 +0000
+++ src/mail-server.c 2009-03-15 11:21:09 +0000
@@ -193,9 +193,9 @@
for (i = 0; i < diff; i++)
added ? indicate_server_emit_indicator_added (INDICATE_SERVER (server),
- 0, "message")
+ i + 1, "message")
: indicate_server_emit_indicator_removed (INDICATE_SERVER (server),
- 0, "message");
+ diff - i, "message");
}
/*
_______________________________________________
Mailing list: https://launchpad.net/~dx-team
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dx-team
More help : https://help.launchpad.net/ListHelp
