diff --git a/debian/changelog b/debian/changelog index 0a6ab071..f415669f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,11 @@ gnome-shell-extensions (3.26.2-3) UNRELEASED; urgency=medium + [ Jeremy Bicha ] * Update Vcs fields for migration to https://salsa.debian.org/ + [ Simon McVittie ] + * d/patches: Re-export with gbp pq export + -- Jeremy Bicha Fri, 19 Jan 2018 20:44:11 -0500 gnome-shell-extensions (3.26.2-2) unstable; urgency=medium diff --git a/debian/patches/dont-require-nautilus-classic.patch b/debian/patches/dont-require-nautilus-classic.patch index 5f18c367..569d537e 100644 --- a/debian/patches/dont-require-nautilus-classic.patch +++ b/debian/patches/dont-require-nautilus-classic.patch @@ -1,7 +1,14 @@ -Description: Don't use nautilus-classic since it forces desktop icons -Author: Jeremy Bicha -Bug: https://bugzilla.gnome.org/695088 +From: Jeremy Bicha +Date: Tue, 30 Jan 2018 09:04:03 +0000 +Subject: Don't use nautilus-classic since it forces desktop icons +Bug: https://bugzilla.gnome.org/695088 +--- + data/gnome-classic.session.desktop.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/gnome-classic.session.desktop.in b/data/gnome-classic.session.desktop.in +index 392ec37..258096e 100644 --- a/data/gnome-classic.session.desktop.in +++ b/data/gnome-classic.session.desktop.in @@ -1,3 +1,3 @@ diff --git a/debian/patches/gnome-session-classic-wrapper-script.patch b/debian/patches/gnome-session-classic-wrapper-script.patch index 15bae5a4..6c264bab 100644 --- a/debian/patches/gnome-session-classic-wrapper-script.patch +++ b/debian/patches/gnome-session-classic-wrapper-script.patch @@ -1,19 +1,24 @@ -Description: Use a wrapper script to start GNOME classic session - Xsession currently doesn't allow to pass more then one argument, as it - otherwise fails with - Xsession: unable to launch "gnome-session --session classic" X session --- - "gnome-session --session classic" not found; falling back to default session. - . - This is due to [1]. Add a wrapper script to start the GNOME classic session - as a workaround. Once [1] is fixed, this should be removed again. - . - [1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=653327. -Author: Michael Biebl +From: Michael Biebl +Date: Tue, 30 Jan 2018 09:04:03 +0000 +Subject: Use a wrapper script to start GNOME classic session -Index: gnome-shell-extensions-3.21.90/data/gnome-classic.desktop.in -=================================================================== ---- gnome-shell-extensions-3.21.90.orig/data/gnome-classic.desktop.in -+++ gnome-shell-extensions-3.21.90/data/gnome-classic.desktop.in +Xsession currently doesn't allow to pass more then one argument, as it +otherwise fails with +Xsession: unable to launch "gnome-session --session classic" X session --- +"gnome-session --session classic" not found; falling back to default session. + +This is due to [1]. Add a wrapper script to start the GNOME classic session +as a workaround. Once [1] is fixed, this should be removed again. + +[1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=653327. +--- + data/gnome-classic.desktop.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/gnome-classic.desktop.in b/data/gnome-classic.desktop.in +index 055ce64..34827ee 100644 +--- a/data/gnome-classic.desktop.in ++++ b/data/gnome-classic.desktop.in @@ -1,7 +1,7 @@ [Desktop Entry] Name=GNOME Classic