lp:~noskcaj/ubuntu/utopic/gnome-tweak-tool/merge

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/utopic/gnome-tweak-tool

Tim Lunn (community): Approve on 2014-06-14

Ubuntu branches: Pending requested 2014-06-13

Diff: 25139 lines (+9457/-8816)

72 files modified

.pc/fix_crash_for_non-shell_use.patch/gtweak/tweaks/tweak_group_shell.py (+1/-1)
ABOUT-NLS (+0/-1068)
Makefile.am (+2/-0)
Makefile.in (+263/-166)
NEWS (+14/-8)
aclocal.m4 (+561/-283)
compile (+347/-0)
config.guess (+0/-1517)
config.rpath (+0/-666)
config.sub (+0/-1760)
configure (+379/-136)
configure.ac (+1/-1)
data/Makefile.am (+6/-4)
data/Makefile.in (+185/-160)
data/gnome-tweak-tool.appdata.xml (+0/-19)
data/gnome-tweak-tool.appdata.xml.in (+19/-0)
data/icons/Makefile.in (+72/-33)
data/shell.css (+11/-0)
data/shell.ui (+1/-5)
debian/changelog (+22/-0)
debian/control (+1/-1)
debian/control.in (+1/-1)
debian/patches/fix_crash_for_non-shell_use.patch (+1/-1)
gnome-tweak-tool (+0/-6)
gtweak/defs.py (+6/-6)
gtweak/gshellwrapper.py (+0/-1)
gtweak/mainwindow.py (+0/-3)
gtweak/tweaks/tweak_group_desktop.py (+3/-0)
gtweak/tweaks/tweak_group_font.py (+3/-1)
gtweak/tweaks/tweak_group_keymouse.py (+6/-1)
gtweak/tweaks/tweak_group_shell.py (+1/-1)
gtweak/tweaks/tweak_group_shell_extensions.py (+0/-6)
gtweak/tweaks/tweak_group_startup.py (+5/-3)
gtweak/tweaks/tweak_group_windows.py (+31/-7)
gtweak/tweakview.py (+9/-1)
gtweak/utils.py (+9/-0)
install-sh (+21/-14)
m4/nls.m4 (+0/-31)
missing (+159/-320)
po/POTFILES.in (+1/-0)
po/cs.po (+76/-50)
po/da.po (+94/-50)
po/de.po (+90/-55)
po/el.po (+515/-150)
po/es.po (+85/-47)
po/eu.po (+521/-102)
po/fi.po (+119/-96)
po/fr.po (+507/-111)
po/gl.po (+82/-45)
po/he.po (+83/-48)
po/hu.po (+88/-48)
po/id.po (+74/-49)
po/it.po (+90/-64)
po/ko.po (+79/-73)
po/lt.po (+79/-47)
po/lv.po (+85/-67)
po/nb.po (+487/-100)
po/pa.po (+515/-145)
po/pl.po (+79/-48)
po/pt.po (+508/-157)
po/pt_BR.po (+104/-63)
po/ru.po (+127/-84)
po/sk.po (+471/-140)
po/sl.po (+80/-49)
po/sr.po (+479/-141)
po/sr@latin.po (+479/-141)
po/th.po (+73/-40)
po/uk.po (+535/-108)
po/zh_CN.po (+504/-151)
po/zh_HK.po (+80/-47)
po/zh_TW.po (+82/-47)
py-compile (+46/-22)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

13. By Jackson Doak on 2014-06-13

* Merge from Debian unstable. Remaining changes:
  - debian/patches/fix_crash_for_non-shell_use.patch:
    + Don't crash if gnome-shell is not running.

12. By Jackson Doak on 2014-03-24

* Merge from Debian unstable. Remaining changes:
  - debian/patches/fix_crash_for_non-shell_use.patch:
    + Don't crash if gnome-shell is not running.

11. By Artur Rona on 2014-03-16

* Merge from Debian unstable. Remaining changes:
  - debian/patches/fix_crash_for_non-shell_use.patch:
    + Don't crash if gnome-shell is not running.

10. By Tim Lunn on 2014-01-31

* New upstream release
* debian/patches/fix_crash_for_non-shell_use.patch: Don't crash if
  gnome-shell is not running. (LP: #1266307)

[ Rico Tzschichholz ]
* debian/patches/drop-gconf.patch: Dropped, is upstream
* debian/control.in:
  - Add build-dep on libgtk-3-dev (>= 3.9.10)
  - Drop build-dep on libgconf2-dev
  - Require gir1.2-gtk-3.0 (>= 3.9.10)

9. By Michael Biebl on 2013-10-14

* Upload to unstable.
* Bump Standards-Version to 3.9.4. No further changes.

8. By Michael Biebl on 2012-05-30

Upload to unstable.

7. By Michael Biebl on 2012-02-23

* 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.

6. By Michael Biebl on 2011-12-17

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

[ Michael Biebl ]
* Upload to unstable.

5. By Michael Biebl on 2011-10-14

[ Josselin Mouette ]
* Add missing dependencies on pygobject and GIR packages.

[ Michael Biebl ]
* Upload to unstable.
* debian/watch:
  - Switch to version 3.
  - Switch to .xz tarballs.
* Bump debhelper compatibility level to 8.
* debian/control.in:
  - Add Vcs-* fields.
  - Add Homepage field.

4. By Martin Pitt on 2011-06-15

[ 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).