diff -Nru mate-notification-daemon-1.8.0/configure.ac mate-notification-daemon-1.8.1/configure.ac --- mate-notification-daemon-1.8.0/configure.ac 2014-03-01 11:05:11.000000000 +0000 +++ mate-notification-daemon-1.8.1/configure.ac 2014-10-22 21:44:12.000000000 +0000 @@ -3,7 +3,7 @@ dnl ################################################################ dnl # Initialize autoconf dnl ################################################################ -AC_INIT([mate-notification-daemon], [1.8.0], [http://www.mate-desktop.org]) +AC_INIT([mate-notification-daemon], [1.8.1], [http://www.mate-desktop.org]) AC_PREREQ(2.63) AC_CONFIG_HEADERS([config.h]) diff -Nru mate-notification-daemon-1.8.0/debian/changelog mate-notification-daemon-1.8.1/debian/changelog --- mate-notification-daemon-1.8.0/debian/changelog 2014-08-22 11:15:24.000000000 +0000 +++ mate-notification-daemon-1.8.1/debian/changelog 2015-01-20 13:59:04.000000000 +0000 @@ -1,9 +1,31 @@ -mate-notification-daemon (1.8.0-2~ppa1~precise1) precise; urgency=low +mate-notification-daemon (1.8.1-2~precise1) precise; urgency=medium - * Back ported from http://ftp.de.debian.org/debian/pool/main/m/mate- - notification-daemon/mate-notification-daemon_1.8.0-2.dsc + * debian/rules: + - Install mate-notification-daemon executable to non-multi-arch + libexecdir. (Closes: #769419). - -- Martin Wimpress Fri, 22 Aug 2014 12:15:24 +0100 + -- Mike Gabriel Fri, 12 Dec 2014 11:13:40 +0100 + +mate-notification-daemon (1.8.1-1) unstable; urgency=medium + + [ Vangelis Mouhtsis ] + * debian/rules: + + Replace on dh_install --list-missing -> --fail-missing + + Remove non-packaged *.a files after build. + * debian/control: + + Bump Standards: to 3.9.6. No changes needed. + + [ Mike Gabriel ] + * New upstream release. + * debian/control: + + Add Vangelis Mouthsis to Uploaders: field. + * debian/rules: + + Use upstream's NEWS file as upstream ChangeLog. + * debian/copyright: + + Really mention all upstream files. + + Remove information for files not shipped in upstream sources anymore. + + -- Mike Gabriel Thu, 23 Oct 2014 13:20:03 +0200 mate-notification-daemon (1.8.0-2) unstable; urgency=low diff -Nru mate-notification-daemon-1.8.0/debian/control mate-notification-daemon-1.8.1/debian/control --- mate-notification-daemon-1.8.0/debian/control 2014-05-02 08:15:10.000000000 +0000 +++ mate-notification-daemon-1.8.1/debian/control 2015-01-20 13:15:46.000000000 +0000 @@ -5,6 +5,7 @@ Uploaders: John Paul Adrian Glaubitz , Stefano Karapetsas , Mike Gabriel , + Vangelis Mouhtsis , Build-Depends: debhelper (>= 9), mate-common, libglib2.0-dev, @@ -16,7 +17,7 @@ libcanberra-gtk-dev, libnotify-dev, intltool, -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 Homepage: http://www.mate-desktop.org/ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-mate/mate-notification-daemon.git;a=summary Vcs-Git: git://anonscm.debian.org/pkg-mate/mate-notification-daemon.git diff -Nru mate-notification-daemon-1.8.0/debian/copyright mate-notification-daemon-1.8.1/debian/copyright --- mate-notification-daemon-1.8.0/debian/copyright 2014-03-13 15:32:33.000000000 +0000 +++ mate-notification-daemon-1.8.1/debian/copyright 2015-01-20 13:15:46.000000000 +0000 @@ -28,10 +28,6 @@ 2011, Perberos License: GPL-2+ -Files: ltmain.sh -Copyright: 1996-2006, Free Software Foundation, Inc. -License: GPL-2+ - Files: src/capplet/mate-notification-properties.c Copyright: 2007, Jonh Wendell 2011, Perberos @@ -49,11 +45,18 @@ License: GPL-3+ Files: po/*.po + po/Rules-quot + po/boldquot.sed + po/en@boldquot.header + po/en@quot.header + po/gnome-copyrights.txt + po/insert-header.sin + po/quot.sed Copyright: 2005-2011, THE PACKAGE's COPYRIGHT HOLDER License: GPL-2+ Using license information from COPYING file. -Files: Makefile.am +Files: .tx/config data/Makefile.am data/mate-notification-daemon.convert data/org.* @@ -66,13 +69,22 @@ src/daemon/Makefile.am src/Makefile.am src/capplet/Makefile.am + src/capplet/mate-notification-properties.1 + src/capplet/mate-notification-properties.desktop.in + src/capplet/mate-notification-properties.ui + src/daemon/notificationdaemon.xml acinclude.m4 - aclocal.m4 autogen.sh - config.h.in configure.ac po/LINGUAS po/POTFILES.in + AUTHORS + COPYING + ChangeLog + Makefile.am + NEWS + NEWS.GNOME + README Copyright: *No copyright* License: GPL-2+ Comment: diff -Nru mate-notification-daemon-1.8.0/debian/mate-notification-daemon.install mate-notification-daemon-1.8.1/debian/mate-notification-daemon.install --- mate-notification-daemon-1.8.0/debian/mate-notification-daemon.install 2014-05-02 08:19:18.000000000 +0000 +++ mate-notification-daemon-1.8.1/debian/mate-notification-daemon.install 2015-01-20 13:15:46.000000000 +0000 @@ -7,5 +7,5 @@ usr/share/locale/ usr/share/man/ usr/bin/mate-notification-properties -usr/lib/*/mate-notification-daemon/mate-notification-daemon +usr/lib/mate-notification-daemon/mate-notification-daemon usr/lib/*/mate-notification-daemon/engines/*.so diff -Nru mate-notification-daemon-1.8.0/debian/rules mate-notification-daemon-1.8.1/debian/rules --- mate-notification-daemon-1.8.0/debian/rules 2014-05-02 08:22:03.000000000 +0000 +++ mate-notification-daemon-1.8.1/debian/rules 2015-01-20 13:15:46.000000000 +0000 @@ -6,14 +6,18 @@ dh $@ $(DHFLAGS) override_dh_install: + rm -f debian/tmp/usr/lib/*/*/*/*.a rm -rfv debian/tmp/usr/lib/*/mate-notification-daemon/engines/*.la - dh_install --list-missing + dh_install --fail-missing + +override_dh_installchangelogs: + dh_installchangelogs NEWS override_dh_auto_configure: NOCONFIGURE=1 ./autogen.sh dh_auto_configure $(DHFLAGS) -- \ --disable-silent-rules \ - --libexecdir=/usr/lib/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)/mate-notification-daemon/ + --libexecdir=/usr/lib/mate-notification-daemon/ override_dh_strip: dh_strip --dbg-package=mate-notification-daemon-dbg diff -Nru mate-notification-daemon-1.8.0/NEWS mate-notification-daemon-1.8.1/NEWS --- mate-notification-daemon-1.8.0/NEWS 2014-03-01 11:05:11.000000000 +0000 +++ mate-notification-daemon-1.8.1/NEWS 2014-10-22 21:44:12.000000000 +0000 @@ -1,2 +1,6 @@ +1.8.1 + * Bugfixes + * Fix crash when active workspace us NULL + 1.8.0 * Switch to libwnck diff -Nru mate-notification-daemon-1.8.0/src/daemon/daemon.c mate-notification-daemon-1.8.1/src/daemon/daemon.c --- mate-notification-daemon-1.8.0/src/daemon/daemon.c 2014-03-01 11:05:11.000000000 +0000 +++ mate-notification-daemon-1.8.1/src/daemon/daemon.c 2014-10-22 21:44:12.000000000 +0000 @@ -1162,6 +1162,11 @@ wnck_workspace = wnck_screen_get_active_workspace (wnck_screen); + if (!wnck_workspace) + { + return FALSE; + } + for (l = wnck_screen_get_windows_stacked (wnck_screen); l != NULL; l = l->next) { WnckWindow *wnck_win = (WnckWindow *) l->data; diff -Nru mate-notification-daemon-1.8.0/src/daemon/stack.c mate-notification-daemon-1.8.1/src/daemon/stack.c --- mate-notification-daemon-1.8.0/src/daemon/stack.c 2014-03-01 11:05:11.000000000 +0000 +++ mate-notification-daemon-1.8.1/src/daemon/stack.c 2014-10-22 21:44:12.000000000 +0000 @@ -214,12 +214,19 @@ void notify_stack_destroy (NotifyStack *stack) { + GList* l; + g_assert (stack != NULL); if (stack->update_id != 0) { g_source_remove (stack->update_id); } + for (l = stack->windows; l != NULL; l = l->next) { + GtkWindow *nw = GTK_WINDOW (l->data); + g_signal_handlers_disconnect_by_data(G_OBJECT(nw), stack); + } + g_list_free (stack->windows); g_free (stack); } diff -Nru mate-notification-daemon-1.8.0/src/themes/coco/coco-theme.c mate-notification-daemon-1.8.1/src/themes/coco/coco-theme.c --- mate-notification-daemon-1.8.0/src/themes/coco/coco-theme.c 2014-03-01 11:05:11.000000000 +0000 +++ mate-notification-daemon-1.8.1/src/themes/coco/coco-theme.c 2014-10-22 21:44:12.000000000 +0000 @@ -144,6 +144,9 @@ static void draw_pie(GtkWidget *pie, WindowData *windata, cairo_t *cr) { + if (windata->timeout == 0) + return; + gdouble arc_angle = 1.0 - (gdouble)windata->remaining / (gdouble)windata->timeout; cairo_set_source_rgba (cr, 1.0, 0.4, 0.0, 0.3); cairo_move_to(cr, PIE_RADIUS, PIE_RADIUS); @@ -498,10 +501,8 @@ atkobj = gtk_widget_get_accessible(windata->body_label); atk_object_set_description(atkobj, "Notification body text."); - /* Disabled for now */ alignment = gtk_alignment_new(1, 0.5, 0, 0); gtk_widget_show(alignment); - gtk_widget_hide(alignment); gtk_box_pack_start(GTK_BOX(vbox), alignment, FALSE, TRUE, 0); windata->actions_box = gtk_hbox_new(FALSE, 6); diff -Nru mate-notification-daemon-1.8.0/src/themes/nodoka/nodoka-theme.c mate-notification-daemon-1.8.1/src/themes/nodoka/nodoka-theme.c --- mate-notification-daemon-1.8.0/src/themes/nodoka/nodoka-theme.c 2014-03-01 11:05:11.000000000 +0000 +++ mate-notification-daemon-1.8.1/src/themes/nodoka/nodoka-theme.c 2014-10-22 21:44:12.000000000 +0000 @@ -533,6 +533,9 @@ static void draw_pie(GtkWidget *pie, WindowData *windata, cairo_t *cr) { + if (windata->timeout == 0) + return; + gdouble arc_angle = 1.0 - (gdouble)windata->remaining / (gdouble)windata->timeout; cairo_set_source_rgba (cr, 1.0, 0.4, 0.0, 0.3); cairo_move_to(cr, PIE_RADIUS, PIE_RADIUS);