[Merge] ~gunnarhj/ubuntu/+source/gnome-control-center:serbian-fix into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master
Gunnar Hjalmarsson has proposed merging ~gunnarhj/ubuntu/+source/gnome-control-center:serbian-fix into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master. Requested reviews: Ubuntu Desktop (ubuntu-desktop) For more details, see: https://code.launchpad.net/~gunnarhj/ubuntu/+source/gnome-control-center/+git/gnome-control-center/+merge/365827 This MP partially addresses LP: #1823778; please see comment #8 in the bug report for details. -- Your team Ubuntu Desktop is requested to review the proposed merge of ~gunnarhj/ubuntu/+source/gnome-control-center:serbian-fix into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master. diff --git a/debian/changelog b/debian/changelog index 8455d8a..2826763 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +gnome-control-center (1:3.32.1-1ubuntu4) UNRELEASED; urgency=medium + + * debian/patches/series: +- Disable ubuntu-region-langpack-install.patch (partially fixes + LP: #1823778). + + -- Gunnar Hjalmarsson Thu, 11 Apr 2019 00:01:00 +0200 + gnome-control-center (1:3.32.1-1ubuntu3) disco; urgency=medium * debian/patches/0001-region-Fix-input-source-options-not-being-applied.patch: diff --git a/debian/patches/series b/debian/patches/series index ae7867f..057633f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,7 +11,7 @@ distro-logo.patch 71_ubuntu_dock_settings.patch 99_add_lock-on-suspend.patch ubuntu-region-packagekit.patch -ubuntu-region-langpack-install.patch +#ubuntu-region-langpack-install.patch ubuntu-language-support.patch ubuntu-printer-support.patch ubuntu-legacy-notifications.patch -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/mutter:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/master
The proposal to merge ~3v1n0/ubuntu/+source/mutter:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/master has been updated. Description changed to: Prepared packages at https://bileto.ubuntu.com/#/ticket/3699 For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/mutter/+git/mutter/+merge/365833 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/mutter:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/mutter: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-shell:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
Review: Abstain Aside from the size, I'm not familiar with any of the changes here. But I know we're also in a hurry. So maybe land it ASAP and defer to manual testing instead of a code review. -- https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/365834 Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-shell: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-shell:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
Diff 18486 lines (+4062/-3431) Are you sure that's correct? Got the right branch? -- https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/365834 Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~3v1n0/ubuntu/+source/mutter:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/master
Review: Approve Looks like what I was expecting... -- https://code.launchpad.net/~3v1n0/ubuntu/+source/mutter/+git/mutter/+merge/365833 Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/mutter:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
The proposal to merge ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master has been updated. Description changed to: Prepared packages at https://bileto.ubuntu.com/#/ticket/3699 As per theme changes, yaru isn't affected by neither https://gitlab.gnome.org/GNOME/gnome-shell/issues/1036 and https://gitlab.gnome.org/GNOME/gnome-shell/issues/1016 (which the relevant changes touch) For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/365834 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~3v1n0/ubuntu/+source/mutter:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/master
Review: Needs Fixing Listing things that this release does not change and calling them "changes" is a bit confusing. Maybe don't list such things... +mutter (3.32.0+git20190410-1ubuntu1) disco; urgency=medium + + * Merge with debian git snapshot (LP: #1820542), remaining changes: ++ debian/control: + - Update VCS flags to point to launchpad + - Update maintainer to ubuntu ++ debian/gbp.conf: update branch to point to ubuntu/master ++ debian/patches/x11-Add-support-for-fractional-scaling-using-Randr.patch: + - X11: Add support for fractional scaling using Randr -- https://code.launchpad.net/~3v1n0/ubuntu/+source/mutter/+git/mutter/+merge/365833 Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/mutter:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/mutter: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-shell:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
> Diff 18486 lines (+4062/-3431) > > Are you sure that's correct? Got the right branch? Yep, it's just that this contains both upstream and downstream diffs. To be sure just do `git diff de6512 marco/ubuntu/master --stat` or `git diff salsa/debian/master marco/ubuntu/master` (assuming your remote for lp:~3v1n0/ubuntu/+source/gnome-shell is called marco, and you've the salsa one too) To save you to do this: $ git diff de6512 ubuntu/master --stat .gitignore | 83 - .gitlab-ci.yml | 86 - .gitlab-ci/Dockerfile | 19 - .gitlab-ci/Dockerfile.extension-ci | 18 - .gitlab-ci/check-commit-log.sh | 31 - .gitlab-ci/checkout-mutter.sh | 31 - .gitmodules|3 - debian/README.Ubuntu | 61 + debian/changelog | 4130 debian/control | 149 + debian/control.in | 145 + debian/copyright | 52 + debian/gbp.conf| 18 + debian/gnome-shell-common.dirs |1 + debian/gnome-shell-common.install | 10 + debian/gnome-shell-common.postinst | 10 + debian/gnome-shell-common.preinst | 12 + debian/gnome-shell-common.prerm| 12 + debian/gnome-shell.docs|2 + debian/gnome-shell.gsettings-override |2 + debian/gnome-shell.install |7 + debian/gnome-shell.lintian-overrides |6 + debian/gnome-shell.postinst| 18 + ...e-possible-to-set-debug-flags-dynamically.patch | 238 ++ ...ursor-when-magnifier-is-enabled-and-scale.patch | 172 + ...d-backtrace-crashes-all-and-backtrace-all.patch | 47 + ...e-granularity-of-backtraces-in-SHELL_DEBU.patch | 170 + ...how-an-error-message-on-gnome-shell-crash.patch | 30 + debian/patches/optional-hot-corner.patch | 60 + debian/patches/series | 19 + ...Mode-add-support-for-debugFlags-parameter.patch | 42 + ...Handle-the-case-where-scrollbars-are-NULL.patch | 38 + ...w-Remove-scrollbars-references-on-dispose.patch | 33 + ...dlers-on-target-and-remove-them-on-destro.patch | 103 + debian/patches/ubuntu/background_login.patch | 58 + .../ubuntu/block_mode_extension_update.patch | 118 + debian/patches/ubuntu/desktop_detect.patch | 85 + debian/patches/ubuntu/gdm_alternatives.patch | 24 + debian/patches/ubuntu/lightdm-user-switching.patch | 80 + debian/patches/ubuntu/lock_on_suspend.patch| 48 + .../ubuntu/resolve_alternate_theme_path.patch | 50 + ...ntuCancel-method-on-providers-when-no-dat.patch | 167 + .../volume-Add-back-sound-feedback-on-scroll.patch | 111 + debian/rules | 41 + debian/shlibs.local|1 + debian/source/format |1 + debian/source_gnome-shell.py | 27 + debian/ubuntu-session-mods/ubuntu.json |6 + debian/watch |3 + subprojects/gvc|1 - subprojects/gvc/Makefile.am| 64 + subprojects/gvc/Makefile.tests | 43 + subprojects/gvc/README.md | 12 + subprojects/gvc/gvc-channel-map-private.h | 39 + subprojects/gvc/gvc-channel-map.c | 247 ++ subprojects/gvc/gvc-channel-map.h | 73 + subprojects/gvc/gvc-mixer-card-private.h | 35 + subprojects/gvc/gvc-mixer-card.c | 575 +++ subprojects/gvc/gvc-mixer-card.h | 102 + subprojects/gvc/gvc-mixer-control-private.h| 35 + subprojects/gvc/gvc-mixer-control.c| 3740 ++ subprojects/gvc/gvc-mixer-control.h| 155 + subprojects/gvc/gvc-mixer-event-role.c | 228 ++ subprojects/gvc/gvc-mixer-event-role.h | 57 + subprojects/gvc/gvc-mixer-sink-input.c | 159 + subprojects/gvc/gvc-mixer-sink-input.h | 57 + subprojects/gvc/gvc-mixer-sink.c | 189 + subprojects/gvc/gvc-mixer-sink.h | 57 + subprojects/gvc/gvc-mixer-source-output.c | 160 + subprojects/gvc/gvc-mixer-source-output.h | 57 + subprojects/gvc/gvc-mixer-source.c | 189 + subprojects/gvc/gvc-mixer-source.h | 57 + subprojects/gvc/gvc-mixer-stream-private.h | 34 + subprojects/gvc/gvc-mixer-stream.c
Re: [Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
Review: Needs Fixing Although... Listing things we didn't change is very confusing. Maybe don't do that: changelog: +gnome-shell (3.32.0+git20190410-1ubuntu1) disco; urgency=medium + + * Merging with debian git snapshot (LP: #1820775, LP: #1818790), +remaining changes: ... + all of these ... -- https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/365834 Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
