From 16b673f4fc79b589f51f750441f08fadfa673def Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Tue, 23 Feb 2016 10:24:27 +0000 Subject: [PATCH] =?UTF-8?q?*=20New=20upstream=20release=203.18.5=20*=20Bum?= =?UTF-8?q?p=20deps=20and=20build-deps=20to=20=E2=89=A5=203.18.5=20*=20d/p?= =?UTF-8?q?/0001-Add-.desktop-file-actions-for-compose-contacts-calen.patc?= =?UTF-8?q?h:=20Take=20=20=20patch=20from=20upstream=20bug=20-=20add=20som?= =?UTF-8?q?e=20actions=20to=20the=20desktop=20file.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///svn/pkg-evolution/unstable/evolution@2873 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 9 ++++ debian/control | 16 +++---- ...e-actions-for-compose-contacts-calen.patch | 44 +++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 62 insertions(+), 8 deletions(-) create mode 100644 debian/patches/0001-Add-.desktop-file-actions-for-compose-contacts-calen.patch diff --git a/debian/changelog b/debian/changelog index cb59adf148..31bbe4629b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +evolution (3.18.5-1) UNRELEASED; urgency=medium + + * New upstream release 3.18.5 + * Bump deps and build-deps to ≥ 3.18.5 + * d/p/0001-Add-.desktop-file-actions-for-compose-contacts-calen.patch: Take + patch from upstream bug - add some actions to the desktop file. + + -- Iain Lane Mon, 22 Feb 2016 17:48:49 +0000 + evolution (3.18.3-1) unstable; urgency=medium [ Michael Biebl ] diff --git a/debian/control b/debian/control index 380e73c7eb..ef25269050 100644 --- a/debian/control +++ b/debian/control @@ -24,13 +24,13 @@ Build-Depends: debhelper (>= 9), libgtk-3-dev (>= 3.10.0), libgail-3-dev (>= 3.0.2), libgdk-pixbuf2.0-dev (>= 2.24.0), - libcamel1.2-dev (>= 3.18.3), - libebook1.2-dev (>= 3.18.3), - libecal1.2-dev (>= 3.18.3), - libedataserver1.2-dev (>= 3.18.3), - libedataserverui1.2-dev (>= 3.18.3), - libebackend1.2-dev (>= 3.18.3), - evolution-data-server-dev (>= 3.18.3), + libcamel1.2-dev (>= 3.18.5), + libebook1.2-dev (>= 3.18.5), + libecal1.2-dev (>= 3.18.5), + libedataserver1.2-dev (>= 3.18.5), + libedataserverui1.2-dev (>= 3.18.5), + libebackend1.2-dev (>= 3.18.5), + evolution-data-server-dev (>= 3.18.5), evolution-data-server-dev (<< 3.19), libwebkitgtk-3.0-dev (>= 2.2.0), libgcr-3-dev (>= 3.4), @@ -79,7 +79,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, evolution-common (= ${source:Version}), - evolution-data-server (>= 3.18.3), + evolution-data-server (>= 3.18.5), evolution-data-server (<< 3.19), dbus, psmisc diff --git a/debian/patches/0001-Add-.desktop-file-actions-for-compose-contacts-calen.patch b/debian/patches/0001-Add-.desktop-file-actions-for-compose-contacts-calen.patch new file mode 100644 index 0000000000..37ca87dc3a --- /dev/null +++ b/debian/patches/0001-Add-.desktop-file-actions-for-compose-contacts-calen.patch @@ -0,0 +1,44 @@ +From 248efe1614c383727ee7b891541da7422b8f39e5 Mon Sep 17 00:00:00 2001 +From: Iain Lane +Date: Mon, 22 Feb 2016 17:54:35 +0000 +Subject: [PATCH] Add .desktop file actions for compose, contacts, calendar + +--- + data/evolution.desktop.in.in | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +diff --git a/data/evolution.desktop.in.in b/data/evolution.desktop.in.in +index 05c3aa7..2780d75 100644 +--- a/data/evolution.desktop.in.in ++++ b/data/evolution.desktop.in.in +@@ -4,6 +4,7 @@ _GenericName=Groupware Suite + _X-GNOME-FullName=Evolution Mail and Calendar + _Comment=Manage your email, contacts and schedule + _Keywords=email;calendar;contact;addressbook;task; ++Actions=new-window;Compose;Contacts;Calendar; + Exec=evolution %U + Icon=evolution + Terminal=false +@@ -17,3 +18,19 @@ X-GNOME-Bugzilla-Version=@BASE_VERSION@.x + X-GNOME-Bugzilla-OtherBinaries=evolution-addressbook-factory;evolution-calendar-factory;evolution-source-registry;evolution-user-prompter; + X-GNOME-UsesNotifications=true + MimeType=text/calendar;text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto; ++ ++[Desktop Action new-window] ++_Name=New Window ++Exec=evolution -c current ++ ++[Desktop Action Compose] ++_Name=Compose New Message ++Exec=evolution mailto: ++ ++[Desktop Action Contacts] ++_Name=Contacts ++Exec=evolution -c contacts ++ ++[Desktop Action Calendar] ++_Name=Calendar ++Exec=evolution -c calendar +-- +2.7.0 + diff --git a/debian/patches/series b/debian/patches/series index 5c8ca63c60..cf36329e8e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ +0001-Add-.desktop-file-actions-for-compose-contacts-calen.patch 02_nss_paths.patch 10_revert_libevolution_avoid-version.patch