r45189 - in /desktop/unstable/notification-daemon: ./ debian/changelog debian/compat debian/control debian/control.in debian/notification-daemon.desktop debian/notification-daemon.install debian/patches/ debian/rules
mitya57 at users.alioth.debian.org
mitya57 at users.alioth.debian.org
Sun Jun 14 18:30:41 UTC 2015
Author: mitya57
Date: Sun Jun 14 18:30:41 2015
New Revision: 45189
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=45189
Log:
Merge experimental branch into unstable
Removed:
desktop/unstable/notification-daemon/debian/notification-daemon.desktop
desktop/unstable/notification-daemon/debian/notification-daemon.install
desktop/unstable/notification-daemon/debian/patches/
Modified:
desktop/unstable/notification-daemon/ (props changed)
desktop/unstable/notification-daemon/debian/changelog
desktop/unstable/notification-daemon/debian/compat
desktop/unstable/notification-daemon/debian/control
desktop/unstable/notification-daemon/debian/control.in
desktop/unstable/notification-daemon/debian/rules
Propchange: desktop/unstable/notification-daemon/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jun 14 18:30:41 2015
@@ -1 +1,2 @@
+/desktop/experimental/notification-daemon:43970-45186
/packages/experimental/notification-daemon:28353-29268
Modified: desktop/unstable/notification-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/notification-daemon/debian/changelog?rev=45189&op=diff
==============================================================================
--- desktop/unstable/notification-daemon/debian/changelog [utf-8] (original)
+++ desktop/unstable/notification-daemon/debian/changelog [utf-8] Sun Jun 14 18:30:41 2015
@@ -1,3 +1,33 @@
+notification-daemon (3.17.2-1) UNRELEASED; urgency=medium
+
+ * debian/changelog: Remove tabs from an old changelog entry.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Sat, 06 Jun 2015 12:50:52 +0300
+
+notification-daemon (3.17.1-1) experimental; urgency=medium
+
+ * New upstream release.
+ - Timeout option is now supported (closes: #664248).
+ * Build-depend on libgtk-3-dev 3.15.2 (according to configure.ac).
+ * debian/control: Fix Vcs-Browser field.
+ * Install the correct file (NEWS) as upstream changelog.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Sun, 24 May 2015 21:39:48 +0300
+
+notification-daemon (3.14.1-1) experimental; urgency=medium
+
+ * New upstream release.
+ * Drop all patches, applied upstream.
+ * Build-depend on libgtk-3-dev 3.8.0 (according to configure.ac).
+ * Drop debian/notification-daemon.desktop, the autostart file
+ is now provided by upstream.
+ * Update Homepage field.
+ * Bump Standards-Version to 3.9.6, no changes needed.
+ * Update debhelper compatibility level to 9.
+ * Drop ancient Conflicts on notify-daemon.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Sun, 30 Nov 2014 20:25:07 +0300
+
notification-daemon (0.7.6-2) unstable; urgency=medium
* Team upload.
@@ -229,11 +259,11 @@
notification-daemon (0.3.5-2) unstable; urgency=low
* added patches:
- 01_removed-daemon-meamleak.patch
- 03_xinerama.patch
- 04_dont_crash_on_critical_warnings.patch
- 05_dont_crash_on_0_sized_icons.patch
- 06_fix_assertion_with_newer_gtk.patch
+ 01_removed-daemon-meamleak.patch
+ 03_xinerama.patch
+ 04_dont_crash_on_critical_warnings.patch
+ 05_dont_crash_on_0_sized_icons.patch
+ 06_fix_assertion_with_newer_gtk.patch
-- Riccardo Setti <giskard at debian.org> Thu, 21 Sep 2006 19:44:10 +0200
Modified: desktop/unstable/notification-daemon/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/notification-daemon/debian/compat?rev=45189&op=diff
==============================================================================
--- desktop/unstable/notification-daemon/debian/compat [utf-8] (original)
+++ desktop/unstable/notification-daemon/debian/compat [utf-8] Sun Jun 14 18:30:41 2015
@@ -1 +1 @@
-7
+9
Modified: desktop/unstable/notification-daemon/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/notification-daemon/debian/control?rev=45189&op=diff
==============================================================================
--- desktop/unstable/notification-daemon/debian/control [utf-8] (original)
+++ desktop/unstable/notification-daemon/debian/control [utf-8] Sun Jun 14 18:30:41 2015
@@ -2,30 +2,27 @@
#
# Modifications should be made to debian/control.in instead.
# This file is regenerated automatically in the clean target.
-
Source: notification-daemon
Section: x11
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Laurent Bigonville <bigon at debian.org>, Martin Pitt <mpitt at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Dmitry Shachnev <mitya57 at debian.org>, Michael Biebl <biebl at debian.org>
Build-Depends: cdbs (>= 0.4.23-1.1),
- debhelper (>= 7),
+ debhelper (>= 9),
gnome-pkg-tools,
libglib2.0-dev (>= 2.27.0),
- libgtk-3-dev (>= 2.91.0),
+ libgtk-3-dev (>= 3.15.2),
libcanberra-gtk3-dev (>= 0.4),
intltool (>= 0.40.0)
-Standards-Version: 3.9.3
-Vcs-Svn: svn://svn.debian.org/pkg-gnome/desktop/unstable/notification-daemon
+Standards-Version: 3.9.6
+Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/notification-daemon
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/notification-daemon/
-Homepage: http://www.galago-project.org/specs/notification/index.php
+Homepage: https://git.gnome.org/browse/notification-daemon/
Package: notification-daemon
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
-Conflicts: notify-daemon
-Replaces: notify-daemon
Description: daemon for displaying passive pop-up notifications
notification-daemon displays passive pop-up notifications, as per
the Desktop Notifications Specification.
Modified: desktop/unstable/notification-daemon/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/notification-daemon/debian/control.in?rev=45189&op=diff
==============================================================================
--- desktop/unstable/notification-daemon/debian/control.in [utf-8] (original)
+++ desktop/unstable/notification-daemon/debian/control.in [utf-8] Sun Jun 14 18:30:41 2015
@@ -4,23 +4,21 @@
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: @GNOME_TEAM@
Build-Depends: cdbs (>= 0.4.23-1.1),
- debhelper (>= 7),
+ debhelper (>= 9),
gnome-pkg-tools,
libglib2.0-dev (>= 2.27.0),
- libgtk-3-dev (>= 2.91.0),
+ libgtk-3-dev (>= 3.15.2),
libcanberra-gtk3-dev (>= 0.4),
intltool (>= 0.40.0)
-Standards-Version: 3.9.3
-Vcs-Svn: svn://svn.debian.org/pkg-gnome/desktop/unstable/notification-daemon
+Standards-Version: 3.9.6
+Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/notification-daemon
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/notification-daemon/
-Homepage: http://www.galago-project.org/specs/notification/index.php
+Homepage: https://git.gnome.org/browse/notification-daemon/
Package: notification-daemon
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
-Conflicts: notify-daemon
-Replaces: notify-daemon
Description: daemon for displaying passive pop-up notifications
notification-daemon displays passive pop-up notifications, as per
the Desktop Notifications Specification.
Modified: desktop/unstable/notification-daemon/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/notification-daemon/debian/rules?rev=45189&op=diff
==============================================================================
--- desktop/unstable/notification-daemon/debian/rules [utf-8] (original)
+++ desktop/unstable/notification-daemon/debian/rules [utf-8] Sun Jun 14 18:30:41 2015
@@ -7,3 +7,5 @@
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+
+DEB_INSTALL_CHANGELOGS_ALL = ./NEWS
More information about the pkg-gnome-commits
mailing list