Merge lp://qastaging/~paolorotolo/gnome-tweaks/fix-for-956343 into lp://qastaging/gnome-tweaks

Proposed by Paolo Rotolo
Status: Needs review
Proposed branch: lp://qastaging/~paolorotolo/gnome-tweaks/fix-for-956343
Merge into: lp://qastaging/gnome-tweaks
Diff against target: 30367 lines (+29895/-0) (has conflicts)
90 files modified
.pc/.version (+1/-0)
.pc/01_menu_category.patch/data/gnome-tweak-tool.desktop.in (+10/-0)
.pc/applied-patches (+1/-0)
ABOUT-NLS (+1068/-0)
AUTHORS (+6/-0)
COPYING (+621/-0)
Makefile.am (+22/-0)
Makefile.in (+844/-0)
NEWS (+91/-0)
README (+20/-0)
acinclude.m4 (+50/-0)
aclocal.m4 (+3950/-0)
config.guess (+1517/-0)
config.rpath (+666/-0)
config.sub (+1760/-0)
configure (+9017/-0)
configure.ac (+38/-0)
data/Makefile.am (+17/-0)
data/Makefile.in (+460/-0)
data/gnome-tweak-tool.desktop.in (+10/-0)
data/shell.ui (+201/-0)
debian/changelog (+61/-0)
debian/compat (+1/-0)
debian/control (+39/-0)
debian/control.in (+35/-0)
debian/copyright (+31/-0)
debian/patches/01_menu_category.patch (+11/-0)
debian/patches/series (+1/-0)
debian/rules (+12/-0)
debian/source/format (+1/-0)
debian/watch (+3/-0)
gnome-tweak-tool (+77/-0)
gtweak/__init__.py (+18/-0)
gtweak/defs.py (+6/-0)
gtweak/defs.py.in (+6/-0)
gtweak/gconf.py (+84/-0)
gtweak/gsettings.py (+135/-0)
gtweak/gshellwrapper.py (+170/-0)
gtweak/mainwindow.py (+48/-0)
gtweak/tweakmodel.py (+162/-0)
gtweak/tweaks/__init__.py (+17/-0)
gtweak/tweaks/tweak_font.py (+33/-0)
gtweak/tweaks/tweak_interface.py (+105/-0)
gtweak/tweaks/tweak_nautilus.py (+53/-0)
gtweak/tweaks/tweak_shell.py (+202/-0)
gtweak/tweaks/tweak_shell_extensions.py (+172/-0)
gtweak/tweaks/tweak_test.py (+78/-0)
gtweak/tweaks/tweak_windows.py (+47/-0)
gtweak/tweakview.py (+200/-0)
gtweak/utils.py (+248/-0)
gtweak/widgets.py (+250/-0)
install-sh (+520/-0)
missing (+376/-0)
po/LINGUAS (+34/-0)
po/Makefile.in.in (+217/-0)
po/POTFILES.in (+12/-0)
po/ar.po (+202/-0)
po/ca.po (+179/-0)
po/cs.po (+197/-0)
po/da.po (+190/-0)
po/de.po (+209/-0)
po/el.po (+34/-0)
po/eo.po (+191/-0)
po/es.po (+204/-0)
po/eu.po (+194/-0)
po/fa.po (+208/-0)
po/fi.po (+196/-0)
po/gl.po (+203/-0)
po/he.po (+173/-0)
po/hu.po (+178/-0)
po/it.po (+193/-0)
po/ja.po (+205/-0)
po/lt.po (+194/-0)
po/lv.po (+198/-0)
po/nb.po (+169/-0)
po/pl.po (+195/-0)
po/pt.po (+196/-0)
po/pt_BR.po (+178/-0)
po/ru.po (+196/-0)
po/sl.po (+200/-0)
po/sr.po (+193/-0)
po/sr@latin.po (+193/-0)
po/sv.po (+34/-0)
po/te.po (+197/-0)
po/uk.po (+202/-0)
po/vi.po (+34/-0)
po/zh_CN.po (+191/-0)
po/zh_HK.po (+194/-0)
po/zh_TW.po (+194/-0)
py-compile (+146/-0)
Conflict adding file AUTHORS.  Moved existing file to AUTHORS.moved.
Conflict adding file COPYING.  Moved existing file to COPYING.moved.
Conflict adding file Makefile.am.  Moved existing file to Makefile.am.moved.
Conflict adding file NEWS.  Moved existing file to NEWS.moved.
Conflict adding file README.  Moved existing file to README.moved.
Conflict adding file acinclude.m4.  Moved existing file to acinclude.m4.moved.
Conflict adding file configure.ac.  Moved existing file to configure.ac.moved.
Conflict adding file data.  Moved existing file to data.moved.
Conflict adding file gnome-tweak-tool.  Moved existing file to gnome-tweak-tool.moved.
Conflict adding file gtweak.  Moved existing file to gtweak.moved.
Conflict adding file po.  Moved existing file to po.moved.
To merge this branch: bzr merge lp://qastaging/~paolorotolo/gnome-tweaks/fix-for-956343
Reviewer Review Type Date Requested Status
Registry Administrators Pending
Review via email: mp+97752@code.qastaging.launchpad.net

Description of the change

Remove gnome-shell from depends. (LP: #956343)

To post a comment you must log in.

Unmerged revisions

13. By Paolo Rotolo

debian/control: remove gnome-shell from depends. (LP: #956343)

12. By Jeremy Bícha

* New upstream release (LP: #955596)
* debian/watch: Watch for unstable releases

11. By Michael Biebl

* debian/patches/02_dont-crash-on-missing-schemas.patch:
  - Don't crash on missing gsettings schemas. Closes: #655535
    Patch cherry-picked and rebased from upstream Git.
* debian/control.in:
  - Remove Depends on gnome-shell-common. It is no longer necessary with the
    above patch.
  - Improve package description. Closes: #633823
* debian/patches/03_fix-user-theme-extension-UUID.patch:
  - Fix UUID for user-theme extension. Closes: #660428
    Patch cherry-picked from upstream Git.

10. By Michael Biebl

[ Josselin Mouette ]
* Replace python-gobject by python-gi.
* Depend on gnome-shell-common instead of gnome-shell.

[ Michael Biebl ]
* Upload to unstable.

9. By Michael Biebl

New upstream release.

8. By Michael Biebl

* New upstream release.
* Refresh debian/patches/01_menu_category.patch.
* debian/control:
  - Bump (Build-)Depends on gsettings-desktop-schemas(-dev) to (>= 3.0.0).
  - Bump (Build-)Depends on python-gobject(-dev) to (>= 2.29.0).

7. By Jeremy Bícha

* New upstream stable release.
  - Translation updates.

6. By Jeremy Bícha

* New upstream release.
  - Rename and re-organize some panels
  - Improved search

5. By Jeremy Bícha

* New upstream release.
  - Show in Unity also (LP: #803519)
  - New focus follows mouse tweak
  - New window focus mode tweak
  - New desktop item visibility tweaks
  - Window theme tweak moved to Interface panel
  - Change tweakgroup architecture
  - Translatable
  - Renamed in menus as 'Advanced Settings'
  - Change tweakgroup architecture
  - Translatable
  - Appearance improvements (theme install, sorted combo boxes)
  - Add a -v,--verbose option that prints changed settings
  - Add a -d,--debug option
* debian/control: Manually create m4 directory
* debian/patches/01_menu_category.patch: Refreshed
* debian/watch: Watch unstable releases also

4. By Martin Pitt

[ Josselin Mouette ]
* Phonetics goes between brackets.

[ Martin Pitt ]
* New upstream release.
* debian/control.in: Add dependency to gnome-shell. tweak-tool uses the
  org.gnome.shell.clock gsettings schema, which gnome-shell provides.
  Without it, it crashes on startup. (LP: #795084)
* debian/control.in: Bump Standards-Version to 3.9.2 (no changes necessary).

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: