Re: [Merge] ~3v1n0/ubuntu/+source/ubuntu-settings:master into ~ubuntu-desktop/ubuntu/+source/ubuntu-settings:master
Review: Approve thanks -- https://code.launchpad.net/~3v1n0/ubuntu/+source/ubuntu-settings/+git/ubuntu-settings/+merge/353442 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/ubuntu-settings:master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~azzar1/ubuntu/+source/gedit:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gedit:ubuntu/master
The proposal to merge ~azzar1/ubuntu/+source/gedit:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gedit:ubuntu/master has been updated. Status: Needs review => Rejected For more details, see: https://code.launchpad.net/~azzar1/ubuntu/+source/gedit/+git/gedit/+merge/353512 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gedit:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gedit:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master-fix-install into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master
Package is building at https://bileto.ubuntu.com/#/ticket/3371 if that's fine to sync, I'll push here also the changelog finalization commit + tag, let me know. -- https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-session/+git/gnome-session/+merge/353513 Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master-fix-install into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master-fix-install into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master
Marco Trevisan (Treviño) has proposed merging ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master-fix-install into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master. Requested reviews: Ubuntu Desktop (ubuntu-desktop) Related bugs: Bug #1787748 in gnome-session (Ubuntu): "ubuntu.session is trying to write '/usr/share/gnome-session/sessions/ubuntu.session', which is also in the gnome-session" https://bugs.launchpad.net/ubuntu/+source/gnome-session/+bug/1787748 For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-session/+git/gnome-session/+merge/353513 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master-fix-install into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master. diff --git a/debian/changelog b/debian/changelog index 432151e..e86ff6e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,36 @@ +gnome-session (3.29.90-1ubuntu2) UNRELEASED; urgency=medium + + * debian/gnome-session.install: +- Revert change that was wrongly merged from debian, causing + gnome-session and ubuntu-session to have the same files (LP: #1787748) + * debian/control: +- Set Breaks/Replaces on gnome-shell <=> ubuntu-settings for versions + <= 3.29.90-1ubuntu1 (LP: #1787748) +- Build-depends on meson (>= 0.47.0) as per dict usage + * debian/gnome-session.install: +- install all gnome-provided *.session files + * d/p/ubuntu/post_install-install-gnome.desktop-session-in-wayland-ses.patch: +- Do not install gnome.session in xsessions (as defaults to wayland) + * d/p/ubuntu/ubuntu-sessions.patch: +- Install session X and wayland .desktop files only in the relative-type + directories, and cleanup the meson code using a dict. + * debian/rules: +- Use dh_missing --fail-missing + * d/p/53_add_sessionmigration.patch: +- Use Gbp-Pq topic, moved to d/p/ubuntu/add_sessionmigration.patch + * d/p/95_dbus_request_shutdown.patch: +- Use Gbp-Pq topic, moved to d/p/ubuntu/dbus_request_shutdown.patch + * d/p/ignore_gsettings_region.patch: +- Use Gbp-Pq topic, moved to d/p/ubuntu/ignore_gsettings_region.patch + * d/p/103_kill_the_fail_whale.patch: +- Use Gbp-Pq topic, moved to d/p/ubuntu/kill_the_fail_whale.patch + * d/p/51_remove_session_saving_from_gui.patch: +- Use Gbp-Pq topic, moved to d/p/ubuntu/remove_session_saving_from_gui.patch + * d/p/22_support_autostart_delay.patch: +- Use Gbp-Pq topic, moved to d/p/ubuntu/support_autostart_delay.patch + + -- Marco Trevisan (Treviño) Tue, 21 Aug 2018 16:11:31 +0200 + gnome-session (3.29.90-1ubuntu1) cosmic; urgency=medium * Merge with debian, remaining changes: diff --git a/debian/control b/debian/control index 9f1f0a0..dfc7921 100644 --- a/debian/control +++ b/debian/control @@ -56,8 +56,10 @@ Suggests: gnome-user-docs, # desktop-base, gnome-keyring Provides: x-session-manager -Breaks: gnome-session-wayland (<< 3.22.1) -Replaces: gnome-session-wayland (<< 3.22.1) +Breaks: gnome-session-wayland (<< 3.22.1), +ubuntu-session (<= 3.29.90-1ubuntu1), +Replaces: gnome-session-wayland (<< 3.22.1), + ubuntu-session (<= 3.29.90-1ubuntu1), Description: GNOME Session Manager - GNOME 3 session The GNOME Session Manager is in charge of starting the core components of the GNOME desktop, and applications that should be launched at @@ -105,10 +107,12 @@ Depends: ${misc:Depends}, Recommends: session-migration, python3, Provides: x-session-manager, -Breaks: unity (<< 7.5.0+17.10.20170619), +Breaks: gnome-session (<= 3.29.90-1ubuntu1), +unity (<< 7.5.0+17.10.20170619), unity-settings-daemon (<< 15.04.1+17.04.20170619), hud (<< 14.10+17.10.20170619), unity-gtk-module (<< 0.0.0+17.04.20170918), +Replaces: gnome-session (<= 3.29.90-1ubuntu1), Description: Ubuntu session with GNOME Shell This package contains the required components for running a GNOME 3 session with default Ubuntu configuration, based on the GNOME Shell. diff --git a/debian/control.in b/debian/control.in index 3b65c1d..756f405 100644 --- a/debian/control.in +++ b/debian/control.in @@ -25,7 +25,7 @@ Build-Depends: debhelper (>= 11.1.3), libgles2-mesa-dev, libxtst-dev, libxrender-dev, - meson (>= 0.43.0), + meson (>= 0.47.0), xmlto, xsltproc, xtrans-dev, @@ -52,8 +52,10 @@ Suggests: gnome-user-docs, # desktop-base, gnome-keyring Provides: x-session-manager -Breaks: gnome-session-wayland (<< 3.22.1) -Replaces: gnome-session-wayland (<< 3.22.1) +Breaks: gnome-session-wayland (<< 3.22.1), +ubuntu-session (<= 3.29.90-1ubuntu1), +Replaces: gnome-session-wayland (<< 3.22.1), + ubuntu-session (<= 3.29.90-1ubuntu1), Description: GNOME Session Manager - GNOME 3 session The GNOME Session Ma
[Merge] ~3v1n0/ubuntu/+source/ubuntu-settings:master into ~ubuntu-desktop/ubuntu/+source/ubuntu-settings:master
The proposal to merge ~3v1n0/ubuntu/+source/ubuntu-settings:master into ~ubuntu-desktop/ubuntu/+source/ubuntu-settings:master has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/ubuntu-settings/+git/ubuntu-settings/+merge/353442 -- Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/ubuntu-settings:master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master-fix-install into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master
Review: Approve thanks -- https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-session/+git/gnome-session/+merge/353513 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master-fix-install into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master
The proposal to merge ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master-fix-install into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-session/+git/gnome-session/+merge/353513 -- Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/ubuntu-settings:master into ~ubuntu-desktop/ubuntu/+source/ubuntu-settings:master
The proposal to merge ~3v1n0/ubuntu/+source/ubuntu-settings:master into ~ubuntu-desktop/ubuntu/+source/ubuntu-settings:master has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/ubuntu-settings/+git/ubuntu-settings/+merge/353442 -- Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/ubuntu-settings:master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master-fix-install into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master
The proposal to merge ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master-fix-install into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-session/+git/gnome-session/+merge/353513 -- Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~azzar1/ubuntu/+source/gedit:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gedit:ubuntu/master
Review: Disapprove Sorry for the inconvenience. We ended up syncing this instead since seb128 says we don't need the .desktop compatibility thing after Ubuntu 18.04 LTs. -- https://code.launchpad.net/~azzar1/ubuntu/+source/gedit/+git/gedit/+merge/353512 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gedit:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~azzar1/ubuntu/+source/gedit:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gedit:ubuntu/master
The proposal to merge ~azzar1/ubuntu/+source/gedit:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gedit:ubuntu/master has been updated. Description changed to: Requires to pull 'pristine-tar' and 'upstream/latest' branches from salsa. For more details, see: https://code.launchpad.net/~azzar1/ubuntu/+source/gedit/+git/gedit/+merge/353512 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gedit:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gedit:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master-fix-install into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master
The proposal to merge ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master-fix-install into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master has been updated. Description changed to: Fixed main issue, plus removed the --list-missing check as it's too fragile. Done some patches cleanup as said here: - https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-session/+git/gnome-session/+merge/353283/comments/919437 For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-session/+git/gnome-session/+merge/353513 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master-fix-install into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop