Ubuntu
nautilus package

Merge ~3v1n0/ubuntu/+source/nautilus:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master

  1. Git
  2. lp:~3v1n0/ubuntu/+source/nautilus
  3. ubuntu/master
  4. Merge into ubuntu/master
Proposed by Marco Trevisan (Treviño)
Status: Merged
Merged at revision: fef449a1f6558cec75acc040f9d11cb48c726df7
Proposed branch: ~3v1n0/ubuntu/+source/nautilus:ubuntu/master
Merge into: ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master
Diff against target: 201 lines (+35/-29)
8 files modified
debian/changelog (+7/-0)
debian/control (+2/-2)
debian/gbp.conf (+12/-0)
debian/nautilus.install (+0/-2)
debian/patches/03_translations_list_update.patch (+4/-5)
debian/patches/12_unity_launcher_support.patch (+6/-8)
debian/patches/zg_activity_logging.patch (+4/-4)
debian/rules (+0/-8)
Reviewer Review Type Date Requested Status
Ubuntu Desktop Pending
Review via email: mp+355192@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Khurshid Alam (khurshid-alam) wrote :

On Cosmic/Disco, after this zeitgeist complains like

zeitgeist-fts[1572]: Unable to get info on application://nautilus.desktop

Not sure why though....ZEITGEIST_NAUTILUS_ACTOR clearly defined fine.

Does it needs to be fixed in zeitgeist too ?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/changelog b/debian/changelog
index 4ceff74..f643623 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
1nautilus (1:3.26.4-0ubuntu4) UNRELEASED; urgency=medium
2
3 * gbp.conf: update default settings as per debian suggested
4 * debian: remove legacy nautilus.desktop and use new one everywhere (LP: #1763763)
5
6 -- Marco Trevisan (Treviño) <marco@ubuntu.com> Fri, 28 Sep 2018 03:27:55 -0500
7
1nautilus (1:3.26.4-0ubuntu3) cosmic; urgency=medium8nautilus (1:3.26.4-0ubuntu3) cosmic; urgency=medium
29
3 * d/p/ubuntu/shell-search-provider-implement-XUbuntuCancel-to-request-.patch:10 * d/p/ubuntu/shell-search-provider-implement-XUbuntuCancel-to-request-.patch:
diff --git a/debian/control b/debian/control
index 0e523a2..0499a7c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
1# This file is autogenerated. DO NOT EDIT!1# This file is autogenerated. DO NOT EDIT!
2# 2#
3# Modifications should be made to debian/control.in instead.3# Modifications should be made to debian/control.in instead.
4# This file is regenerated automatically in the clean target.4# This file is regenerated automatically in the clean target.
5Source: nautilus5Source: nautilus
@@ -7,7 +7,7 @@ Section: gnome
7Priority: optional7Priority: optional
8Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>8Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
9XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>9XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
10Uploaders: Jeremy Bicha <jbicha@ubuntu.com>, Michael Biebl <biebl@debian.org>10Uploaders: Laurent Bigonville <bigon@debian.org>, Michael Biebl <biebl@debian.org>
11Build-Depends: debhelper (>= 10.3),11Build-Depends: debhelper (>= 10.3),
12 dpkg-dev (>= 1.17.14),12 dpkg-dev (>= 1.17.14),
13 gnome-pkg-tools (>= 0.19.4ubuntu1),13 gnome-pkg-tools (>= 0.19.4ubuntu1),
diff --git a/debian/gbp.conf b/debian/gbp.conf
index e0a871e..84905e4 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -4,3 +4,15 @@ upstream-branch=upstream/3.26.x
4debian-tag=ubuntu/%(version)s4debian-tag=ubuntu/%(version)s
5upstream-vcs-tag=%(version)s5upstream-vcs-tag=%(version)s
6pristine-tar=True6pristine-tar=True
7
8[buildpackage]
9sign-tags = True
10
11[dch]
12multimaint-merge = True
13
14[import-orig]
15postimport = dch -v%(version)s New upstream release; git add debian/changelog; debcommit
16
17[pq]
18patch-numbers = False
diff --git a/debian/nautilus.install b/debian/nautilus.install
index 76be1d6..ccb80de 100644
--- a/debian/nautilus.install
+++ b/debian/nautilus.install
@@ -1,6 +1,4 @@
1debian/nautilus-home.desktop usr/share/applications
2debian/mount-archive.desktop usr/share/applications1debian/mount-archive.desktop usr/share/applications
3debian/nautilus-folder-handler.desktop usr/share/applications
4usr/bin2usr/bin
5usr/lib/*/nautilus/extensions-3.0/*.so3usr/lib/*/nautilus/extensions-3.0/*.so
6usr/share/applications4usr/share/applications
diff --git a/debian/patches/03_translations_list_update.patch b/debian/patches/03_translations_list_update.patch
index 7fc36f0..1125c31 100644
--- a/debian/patches/03_translations_list_update.patch
+++ b/debian/patches/03_translations_list_update.patch
@@ -3,19 +3,18 @@ Date: Fri, 20 Jul 2018 03:25:37 +0200
3Subject: _translations_list_update3Subject: _translations_list_update
44
5---5---
6 po/POTFILES.in | 2 ++6 po/POTFILES.in | 1 +
7 1 file changed, 2 insertions(+)7 1 file changed, 1 insertion(+)
88
9diff --git a/po/POTFILES.in b/po/POTFILES.in9diff --git a/po/POTFILES.in b/po/POTFILES.in
10index 277a7ff..2960c09 10064410index 277a7ff..80d90ff 100644
11--- a/po/POTFILES.in11--- a/po/POTFILES.in
12+++ b/po/POTFILES.in12+++ b/po/POTFILES.in
13@@ -4,6 +4,8 @@ data/nautilus-autorun-software.desktop.in13@@ -4,6 +4,7 @@ data/nautilus-autorun-software.desktop.in
14 data/org.gnome.Nautilus.appdata.xml.in14 data/org.gnome.Nautilus.appdata.xml.in
15 data/org.gnome.Nautilus.desktop.in15 data/org.gnome.Nautilus.desktop.in
16 data/org.gnome.nautilus.gschema.xml16 data/org.gnome.nautilus.gschema.xml
17+debian/mount-archive.desktop.in17+debian/mount-archive.desktop.in
18+debian/nautilus-home.desktop.in
19 eel/eel-canvas.c18 eel/eel-canvas.c
20 eel/eel-glib-extensions.c19 eel/eel-glib-extensions.c
21 eel/eel-gnome-extensions.c20 eel/eel-gnome-extensions.c
diff --git a/debian/patches/12_unity_launcher_support.patch b/debian/patches/12_unity_launcher_support.patch
index 180934e..08acc60 100644
--- a/debian/patches/12_unity_launcher_support.patch
+++ b/debian/patches/12_unity_launcher_support.patch
@@ -1,5 +1,5 @@
1From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>1From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
2Date: Thu, 12 Apr 2018 16:54:13 -05002Date: Thu, 12 Apr 2018 23:54:13 +0200
3Subject: _unity_launcher_support3Subject: _unity_launcher_support
44
5---5---
@@ -9,11 +9,11 @@ Subject: _unity_launcher_support
9 src/meson.build | 10 +++9 src/meson.build | 10 +++
10 src/nautilus-application.c | 8 +++10 src/nautilus-application.c | 8 +++
11 src/nautilus-toolbar.c | 21 ++++++11 src/nautilus-toolbar.c | 21 ++++++
12 src/unity-bookmarks-handler.c | 147 +++++++++++++++++++++++++++++++++++++12 src/unity-bookmarks-handler.c | 147 ++++++++++++++++++++++++++++++++++++++
13 src/unity-bookmarks-handler.h | 31 ++++++++13 src/unity-bookmarks-handler.h | 31 ++++++++
14 src/unity-quicklist-handler.c | 163 ++++++++++++++++++++++++++++++++++++++++++14 src/unity-quicklist-handler.c | 161 ++++++++++++++++++++++++++++++++++++++++++
15 src/unity-quicklist-handler.h | 72 +++++++++++++++++++15 src/unity-quicklist-handler.h | 72 +++++++++++++++++++
16 10 files changed, 465 insertions(+)16 10 files changed, 463 insertions(+)
17 create mode 100644 src/unity-bookmarks-handler.c17 create mode 100644 src/unity-bookmarks-handler.c
18 create mode 100644 src/unity-bookmarks-handler.h18 create mode 100644 src/unity-bookmarks-handler.h
19 create mode 100644 src/unity-quicklist-handler.c19 create mode 100644 src/unity-quicklist-handler.c
@@ -378,10 +378,10 @@ index 0000000..a887648
378+#endif /* __UNITY_BOOKMARKS_HANDLER_H__*/378+#endif /* __UNITY_BOOKMARKS_HANDLER_H__*/
379diff --git a/src/unity-quicklist-handler.c b/src/unity-quicklist-handler.c379diff --git a/src/unity-quicklist-handler.c b/src/unity-quicklist-handler.c
380new file mode 100644380new file mode 100644
381index 0000000..e11da55381index 0000000..3133ecb
382--- /dev/null382--- /dev/null
383+++ b/src/unity-quicklist-handler.c383+++ b/src/unity-quicklist-handler.c
384@@ -0,0 +1,163 @@384@@ -0,0 +1,161 @@
385+/*unity-quicklist-handler.c: handle Unity quicklists385+/*unity-quicklist-handler.c: handle Unity quicklists
386+ *386+ *
387+ * Copyright (C) 2012 Canonical387+ * Copyright (C) 2012 Canonical
@@ -514,8 +514,6 @@ index 0000000..e11da55
514+ UnityQuicklistHandlerPriv);514+ UnityQuicklistHandlerPriv);
515+515+
516+ unity_quicklist_handler_launcher_entry_add (self, "org.gnome.Nautilus.desktop");516+ unity_quicklist_handler_launcher_entry_add (self, "org.gnome.Nautilus.desktop");
517+ unity_quicklist_handler_launcher_entry_add (self, "nautilus.desktop");
518+ unity_quicklist_handler_launcher_entry_add (self, "nautilus-home.desktop");
519+ g_return_if_fail (g_list_length (self->priv->launcher_entries) != 0);517+ g_return_if_fail (g_list_length (self->priv->launcher_entries) != 0);
520+}518+}
521+519+
diff --git a/debian/patches/zg_activity_logging.patch b/debian/patches/zg_activity_logging.patch
index c713a3f..257baf3 100644
--- a/debian/patches/zg_activity_logging.patch
+++ b/debian/patches/zg_activity_logging.patch
@@ -27,7 +27,7 @@ index 4d2acf2..21991e9 100644
27 27
28 conf = configuration_data ()28 conf = configuration_data ()
29diff --git a/src/nautilus-file-operations.c b/src/nautilus-file-operations.c29diff --git a/src/nautilus-file-operations.c b/src/nautilus-file-operations.c
30index c641ec5..93ff3fe 10064430index c641ec5..ca59024 100644
31--- a/src/nautilus-file-operations.c31--- a/src/nautilus-file-operations.c
32+++ b/src/nautilus-file-operations.c32+++ b/src/nautilus-file-operations.c
33@@ -61,6 +61,8 @@33@@ -61,6 +61,8 @@
@@ -43,7 +43,7 @@ index c641ec5..93ff3fe 100644
43 #define MERGE_ALL _("Merge _All")43 #define MERGE_ALL _("Merge _All")
44 #define COPY_FORCE _("Copy _Anyway")44 #define COPY_FORCE _("Copy _Anyway")
45 45
46+#define ZEITGEIST_NAUTILUS_ACTOR "application://nautilus.desktop"46+#define ZEITGEIST_NAUTILUS_ACTOR "application://org.gnome.Nautilus.desktop"
47+47+
48+static void48+static void
49+send_event_to_zeitgeist (ZeitgeistEvent *event)49+send_event_to_zeitgeist (ZeitgeistEvent *event)
@@ -278,7 +278,7 @@ index c641ec5..93ff3fe 100644
278 if (job->src)278 if (job->src)
279 {279 {
280diff --git a/src/nautilus-file.c b/src/nautilus-file.c280diff --git a/src/nautilus-file.c b/src/nautilus-file.c
281index 3a7c9a4..3f6a69f 100644281index 3a7c9a4..22ea199 100644
282--- a/src/nautilus-file.c282--- a/src/nautilus-file.c
283+++ b/src/nautilus-file.c283+++ b/src/nautilus-file.c
284@@ -87,6 +87,9 @@284@@ -87,6 +87,9 @@
@@ -286,7 +286,7 @@ index 3a7c9a4..3f6a69f 100644
286 #define MEGA_TO_BASE_RATE 1048576286 #define MEGA_TO_BASE_RATE 1048576
287 287
288+#include <zeitgeist.h>288+#include <zeitgeist.h>
289+#define ZEITGEIST_NAUTILUS_ACTOR "application://nautilus.desktop"289+#define ZEITGEIST_NAUTILUS_ACTOR "application://org.gnome.Nautilus.desktop"
290+290+
291 /* Files that start with these characters sort after files that don't. */291 /* Files that start with these characters sort after files that don't. */
292 #define SORT_LAST_CHAR1 '.'292 #define SORT_LAST_CHAR1 '.'
diff --git a/debian/rules b/debian/rules
index e9f65e3..37ac6de 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,14 +39,6 @@ override_dh_auto_test:
39override_dh_install:39override_dh_install:
40 dh_install --list-missing40 dh_install --list-missing
4141
42 /usr/bin/pkg-gnome-compat-desktop-file \
43 debian/nautilus/usr/share/applications/org.gnome.Nautilus.desktop \
44 debian/nautilus/usr/share/applications/nautilus.desktop
45 sed -i 's/NoDisplay=true/OnlyShowIn=Unity;GNOME;/' \
46 debian/nautilus/usr/share/applications/org.gnome.Nautilus.desktop
47 sed -i 's/\[Desktop Entry\]/\0\nNotShowIn=Unity;GNOME;/' \
48 debian/nautilus/usr/share/applications/nautilus.desktop
49
50override_dh_translations:42override_dh_translations:
51 ninja -C obj-$(DEB_HOST_GNU_TYPE) nautilus-pot43 ninja -C obj-$(DEB_HOST_GNU_TYPE) nautilus-pot
52 dh_translations44 dh_translations

Subscribers

People subscribed via source and target branches