Marco Trevisan (Treviño) has proposed merging ~3v1n0/ubuntu/+source/nautilus:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master.
Requested reviews: Ubuntu Desktop (ubuntu-desktop) For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/355192 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/nautilus:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master.
diff --git a/debian/control b/debian/control index 0e523a2..0499a7c 100644 --- a/debian/control +++ b/debian/control @@ -1,5 +1,5 @@ # This file is autogenerated. DO NOT EDIT! -# +# # Modifications should be made to debian/control.in instead. # This file is regenerated automatically in the clean target. Source: nautilus @@ -7,7 +7,7 @@ Section: gnome Priority: optional Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com> XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintain...@lists.alioth.debian.org> -Uploaders: Jeremy Bicha <jbi...@ubuntu.com>, Michael Biebl <bi...@debian.org> +Uploaders: Laurent Bigonville <bi...@debian.org>, Michael Biebl <bi...@debian.org> Build-Depends: debhelper (>= 10.3), dpkg-dev (>= 1.17.14), 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 debian-tag=ubuntu/%(version)s upstream-vcs-tag=%(version)s pristine-tar=True + +[buildpackage] +sign-tags = True + +[dch] +multimaint-merge = True + +[import-orig] +postimport = dch -v%(version)s New upstream release; git add debian/changelog; debcommit + +[pq] +patch-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 @@ -debian/nautilus-home.desktop usr/share/applications debian/mount-archive.desktop usr/share/applications -debian/nautilus-folder-handler.desktop usr/share/applications usr/bin usr/lib/*/nautilus/extensions-3.0/*.so usr/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 Subject: _translations_list_update --- - po/POTFILES.in | 2 ++ - 1 file changed, 2 insertions(+) + po/POTFILES.in | 1 + + 1 file changed, 1 insertion(+) diff --git a/po/POTFILES.in b/po/POTFILES.in -index 277a7ff..2960c09 100644 +index 277a7ff..80d90ff 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in -@@ -4,6 +4,8 @@ data/nautilus-autorun-software.desktop.in +@@ -4,6 +4,7 @@ data/nautilus-autorun-software.desktop.in data/org.gnome.Nautilus.appdata.xml.in data/org.gnome.Nautilus.desktop.in data/org.gnome.nautilus.gschema.xml +debian/mount-archive.desktop.in -+debian/nautilus-home.desktop.in eel/eel-canvas.c eel/eel-glib-extensions.c 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 @@ From: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com> -Date: Thu, 12 Apr 2018 16:54:13 -0500 +Date: Thu, 12 Apr 2018 23:54:13 +0200 Subject: _unity_launcher_support --- @@ -9,11 +9,11 @@ Subject: _unity_launcher_support src/meson.build | 10 +++ src/nautilus-application.c | 8 +++ src/nautilus-toolbar.c | 21 ++++++ - src/unity-bookmarks-handler.c | 147 +++++++++++++++++++++++++++++++++++++ + src/unity-bookmarks-handler.c | 147 ++++++++++++++++++++++++++++++++++++++ src/unity-bookmarks-handler.h | 31 ++++++++ - src/unity-quicklist-handler.c | 163 ++++++++++++++++++++++++++++++++++++++++++ + src/unity-quicklist-handler.c | 161 ++++++++++++++++++++++++++++++++++++++++++ src/unity-quicklist-handler.h | 72 +++++++++++++++++++ - 10 files changed, 465 insertions(+) + 10 files changed, 463 insertions(+) create mode 100644 src/unity-bookmarks-handler.c create mode 100644 src/unity-bookmarks-handler.h create mode 100644 src/unity-quicklist-handler.c @@ -378,10 +378,10 @@ index 0000000..a887648 +#endif /* __UNITY_BOOKMARKS_HANDLER_H__*/ diff --git a/src/unity-quicklist-handler.c b/src/unity-quicklist-handler.c new file mode 100644 -index 0000000..e11da55 +index 0000000..3133ecb --- /dev/null +++ b/src/unity-quicklist-handler.c -@@ -0,0 +1,163 @@ +@@ -0,0 +1,161 @@ +/*unity-quicklist-handler.c: handle Unity quicklists + * + * Copyright (C) 2012 Canonical @@ -514,8 +514,6 @@ index 0000000..e11da55 + UnityQuicklistHandlerPriv); + + unity_quicklist_handler_launcher_entry_add (self, "org.gnome.Nautilus.desktop"); -+ unity_quicklist_handler_launcher_entry_add (self, "nautilus.desktop"); -+ unity_quicklist_handler_launcher_entry_add (self, "nautilus-home.desktop"); + g_return_if_fail (g_list_length (self->priv->launcher_entries) != 0); +} + 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 conf = configuration_data () diff --git a/src/nautilus-file-operations.c b/src/nautilus-file-operations.c -index c641ec5..93ff3fe 100644 +index c641ec5..ca59024 100644 --- a/src/nautilus-file-operations.c +++ b/src/nautilus-file-operations.c @@ -61,6 +61,8 @@ @@ -43,7 +43,7 @@ index c641ec5..93ff3fe 100644 #define MERGE_ALL _("Merge _All") #define COPY_FORCE _("Copy _Anyway") -+#define ZEITGEIST_NAUTILUS_ACTOR "application://nautilus.desktop" ++#define ZEITGEIST_NAUTILUS_ACTOR "application://org.gnome.Nautilus.desktop" + +static void +send_event_to_zeitgeist (ZeitgeistEvent *event) @@ -278,7 +278,7 @@ index c641ec5..93ff3fe 100644 if (job->src) { diff --git a/src/nautilus-file.c b/src/nautilus-file.c -index 3a7c9a4..3f6a69f 100644 +index 3a7c9a4..22ea199 100644 --- a/src/nautilus-file.c +++ b/src/nautilus-file.c @@ -87,6 +87,9 @@ @@ -286,7 +286,7 @@ index 3a7c9a4..3f6a69f 100644 #define MEGA_TO_BASE_RATE 1048576 +#include <zeitgeist.h> -+#define ZEITGEIST_NAUTILUS_ACTOR "application://nautilus.desktop" ++#define ZEITGEIST_NAUTILUS_ACTOR "application://org.gnome.Nautilus.desktop" + /* Files that start with these characters sort after files that don't. */ #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: override_dh_install: dh_install --list-missing - /usr/bin/pkg-gnome-compat-desktop-file \ - debian/nautilus/usr/share/applications/org.gnome.Nautilus.desktop \ - debian/nautilus/usr/share/applications/nautilus.desktop - sed -i 's/NoDisplay=true/OnlyShowIn=Unity;GNOME;/' \ - debian/nautilus/usr/share/applications/org.gnome.Nautilus.desktop - sed -i 's/\[Desktop Entry\]/\0\nNotShowIn=Unity;GNOME;/' \ - debian/nautilus/usr/share/applications/nautilus.desktop - override_dh_translations: ninja -C obj-$(DEB_HOST_GNU_TYPE) nautilus-pot dh_translations
-- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop