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

Proposed by Marco Trevisan (Treviño) on 2018-09-18
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 2018-09-18 Pending
Review via email: mp+355192@code.launchpad.net
To post a comment you must log in.
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
1diff --git a/debian/changelog b/debian/changelog
2index 4ceff74..f643623 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+nautilus (1:3.26.4-0ubuntu4) UNRELEASED; urgency=medium
7+
8+ * gbp.conf: update default settings as per debian suggested
9+ * debian: remove legacy nautilus.desktop and use new one everywhere (LP: #1763763)
10+
11+ -- Marco Trevisan (Treviño) <marco@ubuntu.com> Fri, 28 Sep 2018 03:27:55 -0500
12+
13 nautilus (1:3.26.4-0ubuntu3) cosmic; urgency=medium
14
15 * d/p/ubuntu/shell-search-provider-implement-XUbuntuCancel-to-request-.patch:
16diff --git a/debian/control b/debian/control
17index 0e523a2..0499a7c 100644
18--- a/debian/control
19+++ b/debian/control
20@@ -1,5 +1,5 @@
21 # This file is autogenerated. DO NOT EDIT!
22-#
23+#
24 # Modifications should be made to debian/control.in instead.
25 # This file is regenerated automatically in the clean target.
26 Source: nautilus
27@@ -7,7 +7,7 @@ Section: gnome
28 Priority: optional
29 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
30 XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
31-Uploaders: Jeremy Bicha <jbicha@ubuntu.com>, Michael Biebl <biebl@debian.org>
32+Uploaders: Laurent Bigonville <bigon@debian.org>, Michael Biebl <biebl@debian.org>
33 Build-Depends: debhelper (>= 10.3),
34 dpkg-dev (>= 1.17.14),
35 gnome-pkg-tools (>= 0.19.4ubuntu1),
36diff --git a/debian/gbp.conf b/debian/gbp.conf
37index e0a871e..84905e4 100644
38--- a/debian/gbp.conf
39+++ b/debian/gbp.conf
40@@ -4,3 +4,15 @@ upstream-branch=upstream/3.26.x
41 debian-tag=ubuntu/%(version)s
42 upstream-vcs-tag=%(version)s
43 pristine-tar=True
44+
45+[buildpackage]
46+sign-tags = True
47+
48+[dch]
49+multimaint-merge = True
50+
51+[import-orig]
52+postimport = dch -v%(version)s New upstream release; git add debian/changelog; debcommit
53+
54+[pq]
55+patch-numbers = False
56diff --git a/debian/nautilus.install b/debian/nautilus.install
57index 76be1d6..ccb80de 100644
58--- a/debian/nautilus.install
59+++ b/debian/nautilus.install
60@@ -1,6 +1,4 @@
61-debian/nautilus-home.desktop usr/share/applications
62 debian/mount-archive.desktop usr/share/applications
63-debian/nautilus-folder-handler.desktop usr/share/applications
64 usr/bin
65 usr/lib/*/nautilus/extensions-3.0/*.so
66 usr/share/applications
67diff --git a/debian/patches/03_translations_list_update.patch b/debian/patches/03_translations_list_update.patch
68index 7fc36f0..1125c31 100644
69--- a/debian/patches/03_translations_list_update.patch
70+++ b/debian/patches/03_translations_list_update.patch
71@@ -3,19 +3,18 @@ Date: Fri, 20 Jul 2018 03:25:37 +0200
72 Subject: _translations_list_update
73
74 ---
75- po/POTFILES.in | 2 ++
76- 1 file changed, 2 insertions(+)
77+ po/POTFILES.in | 1 +
78+ 1 file changed, 1 insertion(+)
79
80 diff --git a/po/POTFILES.in b/po/POTFILES.in
81-index 277a7ff..2960c09 100644
82+index 277a7ff..80d90ff 100644
83 --- a/po/POTFILES.in
84 +++ b/po/POTFILES.in
85-@@ -4,6 +4,8 @@ data/nautilus-autorun-software.desktop.in
86+@@ -4,6 +4,7 @@ data/nautilus-autorun-software.desktop.in
87 data/org.gnome.Nautilus.appdata.xml.in
88 data/org.gnome.Nautilus.desktop.in
89 data/org.gnome.nautilus.gschema.xml
90 +debian/mount-archive.desktop.in
91-+debian/nautilus-home.desktop.in
92 eel/eel-canvas.c
93 eel/eel-glib-extensions.c
94 eel/eel-gnome-extensions.c
95diff --git a/debian/patches/12_unity_launcher_support.patch b/debian/patches/12_unity_launcher_support.patch
96index 180934e..08acc60 100644
97--- a/debian/patches/12_unity_launcher_support.patch
98+++ b/debian/patches/12_unity_launcher_support.patch
99@@ -1,5 +1,5 @@
100 From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
101-Date: Thu, 12 Apr 2018 16:54:13 -0500
102+Date: Thu, 12 Apr 2018 23:54:13 +0200
103 Subject: _unity_launcher_support
104
105 ---
106@@ -9,11 +9,11 @@ Subject: _unity_launcher_support
107 src/meson.build | 10 +++
108 src/nautilus-application.c | 8 +++
109 src/nautilus-toolbar.c | 21 ++++++
110- src/unity-bookmarks-handler.c | 147 +++++++++++++++++++++++++++++++++++++
111+ src/unity-bookmarks-handler.c | 147 ++++++++++++++++++++++++++++++++++++++
112 src/unity-bookmarks-handler.h | 31 ++++++++
113- src/unity-quicklist-handler.c | 163 ++++++++++++++++++++++++++++++++++++++++++
114+ src/unity-quicklist-handler.c | 161 ++++++++++++++++++++++++++++++++++++++++++
115 src/unity-quicklist-handler.h | 72 +++++++++++++++++++
116- 10 files changed, 465 insertions(+)
117+ 10 files changed, 463 insertions(+)
118 create mode 100644 src/unity-bookmarks-handler.c
119 create mode 100644 src/unity-bookmarks-handler.h
120 create mode 100644 src/unity-quicklist-handler.c
121@@ -378,10 +378,10 @@ index 0000000..a887648
122 +#endif /* __UNITY_BOOKMARKS_HANDLER_H__*/
123 diff --git a/src/unity-quicklist-handler.c b/src/unity-quicklist-handler.c
124 new file mode 100644
125-index 0000000..e11da55
126+index 0000000..3133ecb
127 --- /dev/null
128 +++ b/src/unity-quicklist-handler.c
129-@@ -0,0 +1,163 @@
130+@@ -0,0 +1,161 @@
131 +/*unity-quicklist-handler.c: handle Unity quicklists
132 + *
133 + * Copyright (C) 2012 Canonical
134@@ -514,8 +514,6 @@ index 0000000..e11da55
135 + UnityQuicklistHandlerPriv);
136 +
137 + unity_quicklist_handler_launcher_entry_add (self, "org.gnome.Nautilus.desktop");
138-+ unity_quicklist_handler_launcher_entry_add (self, "nautilus.desktop");
139-+ unity_quicklist_handler_launcher_entry_add (self, "nautilus-home.desktop");
140 + g_return_if_fail (g_list_length (self->priv->launcher_entries) != 0);
141 +}
142 +
143diff --git a/debian/patches/zg_activity_logging.patch b/debian/patches/zg_activity_logging.patch
144index c713a3f..257baf3 100644
145--- a/debian/patches/zg_activity_logging.patch
146+++ b/debian/patches/zg_activity_logging.patch
147@@ -27,7 +27,7 @@ index 4d2acf2..21991e9 100644
148
149 conf = configuration_data ()
150 diff --git a/src/nautilus-file-operations.c b/src/nautilus-file-operations.c
151-index c641ec5..93ff3fe 100644
152+index c641ec5..ca59024 100644
153 --- a/src/nautilus-file-operations.c
154 +++ b/src/nautilus-file-operations.c
155 @@ -61,6 +61,8 @@
156@@ -43,7 +43,7 @@ index c641ec5..93ff3fe 100644
157 #define MERGE_ALL _("Merge _All")
158 #define COPY_FORCE _("Copy _Anyway")
159
160-+#define ZEITGEIST_NAUTILUS_ACTOR "application://nautilus.desktop"
161++#define ZEITGEIST_NAUTILUS_ACTOR "application://org.gnome.Nautilus.desktop"
162 +
163 +static void
164 +send_event_to_zeitgeist (ZeitgeistEvent *event)
165@@ -278,7 +278,7 @@ index c641ec5..93ff3fe 100644
166 if (job->src)
167 {
168 diff --git a/src/nautilus-file.c b/src/nautilus-file.c
169-index 3a7c9a4..3f6a69f 100644
170+index 3a7c9a4..22ea199 100644
171 --- a/src/nautilus-file.c
172 +++ b/src/nautilus-file.c
173 @@ -87,6 +87,9 @@
174@@ -286,7 +286,7 @@ index 3a7c9a4..3f6a69f 100644
175 #define MEGA_TO_BASE_RATE 1048576
176
177 +#include <zeitgeist.h>
178-+#define ZEITGEIST_NAUTILUS_ACTOR "application://nautilus.desktop"
179++#define ZEITGEIST_NAUTILUS_ACTOR "application://org.gnome.Nautilus.desktop"
180 +
181 /* Files that start with these characters sort after files that don't. */
182 #define SORT_LAST_CHAR1 '.'
183diff --git a/debian/rules b/debian/rules
184index e9f65e3..37ac6de 100755
185--- a/debian/rules
186+++ b/debian/rules
187@@ -39,14 +39,6 @@ override_dh_auto_test:
188 override_dh_install:
189 dh_install --list-missing
190
191- /usr/bin/pkg-gnome-compat-desktop-file \
192- debian/nautilus/usr/share/applications/org.gnome.Nautilus.desktop \
193- debian/nautilus/usr/share/applications/nautilus.desktop
194- sed -i 's/NoDisplay=true/OnlyShowIn=Unity;GNOME;/' \
195- debian/nautilus/usr/share/applications/org.gnome.Nautilus.desktop
196- sed -i 's/\[Desktop Entry\]/\0\nNotShowIn=Unity;GNOME;/' \
197- debian/nautilus/usr/share/applications/nautilus.desktop
198-
199 override_dh_translations:
200 ninja -C obj-$(DEB_HOST_GNU_TYPE) nautilus-pot
201 dh_translations

Subscribers

People subscribed via source and target branches