> 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 | 1050 +++++ subprojects/gvc/gvc-mixer-stream.h | 135 + subprojects/gvc/gvc-mixer-ui-device.c | 730 ++++ subprojects/gvc/gvc-mixer-ui-device.h | 85 + subprojects/gvc/gvc-pulseaudio-fake.h | 34 + subprojects/gvc/libgnome-volume-control.doap | 32 + subprojects/gvc/meson.build | 133 + subprojects/gvc/meson_options.txt | 41 + subprojects/gvc/test-audio-device-selection.c | 84 + subprojects/gvc/tests-include/config.h | 3 + 83 files changed, 15098 insertions(+), 272 deletions(-) $ git diff salsa/debian/master ubuntu/master --stat debian/README.Ubuntu | 61 + debian/changelog | 1612 ++++++++++++++++++++ debian/control | 23 +- debian/control.in | 23 +- debian/gbp.conf | 3 +- debian/gnome-shell-common.install | 3 + debian/gnome-shell-common.postinst | 10 + debian/gnome-shell-common.preinst | 12 + debian/gnome-shell-common.prerm | 12 + ...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 | 18 + ...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 + 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 | 6 + debian/ubuntu-session-mods/ubuntu.json | 6 + 30 files changed, 3347 insertions(+), 13 deletions(-) -- 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 [email protected] https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
