Merge lp:~gnome3-team/gnome-shell/ubuntu into lp:gnome-shell
Status: | Rejected |
---|---|
Rejected by: | Данило Шеган |
Proposed branch: | lp:~gnome3-team/gnome-shell/ubuntu |
Merge into: | lp:gnome-shell |
Diff against target: |
868 lines (+796/-0) 14 files modified
debian/README.Debian (+39/-0) debian/changelog (+452/-0) debian/compat (+1/-0) debian/control (+94/-0) debian/control.in (+89/-0) debian/copyright (+52/-0) debian/gnome-shell.lintian-overrides (+4/-0) debian/patches/01_favorite_apps.patch (+13/-0) debian/patches/02_rpath-bluetooth-applet.patch (+28/-0) debian/patches/series (+2/-0) debian/rules (+18/-0) debian/shlibs.local (+1/-0) debian/source/format (+1/-0) debian/watch (+2/-0) |
To merge this branch: | bzr merge lp:~gnome3-team/gnome-shell/ubuntu |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Данило Шеган (community) | Disapprove | ||
Review via email: mp+75629@code.launchpad.net |
Unmerged revisions
- 12. By Rico Tzschichholz
-
* New upstream release 3.0.2
* Merge with debian/experimental, remaining changes:
+ 01_favorite_apps.patch
- Updated for Ubuntu default applications
+ debian/rules,debian/ upstream. gitlog:
- Drop upstream.gitlog
+ debian/control.in:
- lower build-dep on libxfixes-dev to fit ubuntu version
- don't require network-manager 0.9 - 11. By Rico Tzschichholz
-
* Merge with debian/experimental
- 10. By Rico Tzschichholz
-
New upstream release 3.0.1
- 9. By Bilal Akhtar
-
debian/control.in: Add dependency on gnome-themes-
standard - 8. By Rico Tzschichholz
-
New upstream release 3.0.0.2
- 7. By Rico Tzschichholz
-
* New upstream release 3.0.0.1
* debian/control.in:
+ update dependencies for gir1.2-mutter-3.0 - 6. By Rico Tzschichholz
-
* New upstream release 3.0.0
* debian/control.in:
+ bump build-dep on mutter (>= 3.0.0) - 5. By Rico Tzschichholz
-
* New upstream release 2.91.93
* debian/control.in:
+ added dependency on gnome-icon-theme-symbolic
+ bump build-dep on mutter (>= 2.91.93) - 4. By Rico Tzschichholz
-
release 2.91.92-
1ubuntu1~ build3 * New upstream release
* Sync with debian experimental, remaining changes:
+ debian/rules,debian/ upstream. gitlog:
- Drop upstream.gitlog
+ debian/gnome-shell. desktop, debian/rules:
- Add gnome-shell.desktop in /usr/share/xsessions/ to allow gdm to start
gnome shell
* debian/patches:
+ update 04_workaround_libmozjs_ build.patch
+ drop 05_fix_ftbs_missing_ x11.patch, is upstream
* debian/control.in:
+ lower build-dep on libxfixes-dev to fit natty and live with the consequences* New upstream release.
* debian/patches/, remove patches from upstream git:
+ 0001-altTab-fix-incorrect- positioning- with-multiple- monit.patch
+ 05_use_dbus_for_ shutdown_ and_logout. patch
* debian/control.in:
+ add build-dep on libtelepathy-logger- dev and gir1.2- telepathylogger -0.2.
+ bump build-dep on libxfixes-dev, it needs the one from experimental, for
pointer barriers.
* debian/patches/ 04_gnome_ session_ quit.patch: remove, replaced by:
* debian/patches/ 05_use_ dbus_for_ shutdown_ and_logout. patch: use Session
D-Bus interface for shutdown and logout. (from git) (closes: #618870)* New upstream release.
[ Emilio Pozuelo Monfort ]
* debian/control.in:
+ Depend on gsettings-desktop- schemas. Closes: #614945.
+ Depend on gir1.2-mutter-2.91. Closes: #615588.
[ Frederic Peters ]
* debian/control.in:
+ Don't depend on mutter, it now links against libmutter-wm0.
* debian/patches/ 03_fix_ dconf_service_ location. patch: remove, no longer
necessary now that gnome-shell is a real binary and doesn't try to arrange
its own environment.
* debian/patches/ 04_gnome_ session_ quit.patch: use gnome-session-save in
fallback if gnome-session-quit doesn't work, so gnome-shell keeps working
with older gnome-session versions.
[ Emilio Pozuelo Monfort ]
* d/p/0001-altTab- fix-incorrect- positioning- with-multiple- monit.patch:
+ Patch from upstream git, fix Alt+Tab with multiple monitors.
+ Update depends for new libgnomekbd gir package name. - 3. By Laurent Bigonville
-
* debian/control.in:
- Update depends for new libgnomekbd gir package name.
* debian/gnome-shell. desktop, debian/rules:
- Add gnome-shell.desktop in /usr/share/xsessions/ to allow gdm to start
gnome shell
You probably wanted to propose this merge against Ubuntu package, not against upstream gnome-shell code import.