lp:~noskcaj/ubuntu/wily/gnome-music/merge

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/wily/gnome-music

Logan Rosen (community): Approve on 2015-05-28

Ubuntu branches: Pending requested 2015-05-27

Diff: 24332 lines (+8843/-7444)

87 files modified

AUTHORS (+24/-3)
NEWS (+166/-40)
config.h.in (+3/-12)
configure (+28/-43)
configure.ac (+3/-3)
data/AboutDialog.ui (+1/-1)
data/AlbumWidget.ui (+1/-1)
data/ArtistAlbumWidget.ui (+3/-2)
data/ArtistAlbumsWidget.ui (+2/-2)
data/NoMusic.ui (+40/-14)
data/PlaylistControls.ui (+15/-25)
data/TrackWidget.ui (+2/-2)
data/application.css (+3/-1)
data/gnome-music.desktop.in (+1/-0)
data/org.gnome.Music.gschema.xml (+15/-0)
debian/changelog (+20/-0)
debian/control (+2/-2)
debian/control.in (+2/-2)
gnomemusic/__init__.py (+23/-0)
gnomemusic/albumArtCache.py (+71/-23)
gnomemusic/application.py (+3/-1)
gnomemusic/grilo.py (+48/-24)
gnomemusic/mpris.py (+228/-6)
gnomemusic/notification.py (+12/-12)
gnomemusic/player.py (+167/-34)
gnomemusic/playlists.py (+147/-18)
gnomemusic/query.py (+354/-30)
gnomemusic/searchbar.py (+4/-4)
gnomemusic/toolbar.py (+3/-1)
gnomemusic/view.py (+404/-312)
gnomemusic/widgets.py (+207/-93)
gnomemusic/window.py (+76/-13)
help/de/de.po (+1/-1)
help/hu/hu.po (+8/-10)
help/hu/introduction.page (+2/-2)
libgd/libgd/gd-header-bar.c (+0/-1350)
libgd/libgd/gd-header-bar.h (+0/-75)
libgd/libgd/gd-header-button.c (+0/-488)
libgd/libgd/gd-header-button.h (+0/-67)
libgd/libgd/gd-main-toolbar.c (+0/-515)
libgd/libgd/gd-main-toolbar.h (+0/-111)
libgd/libgd/gd-notification.c (+821/-0)
libgd/libgd/gd-notification.h (+67/-0)
libgd/libgd/gd-stack-switcher.c (+0/-377)
libgd/libgd/gd-stack-switcher.h (+0/-66)
libgd/libgd/gd-stack.c (+0/-1419)
libgd/libgd/gd-stack.h (+0/-85)
po/LINGUAS (+2/-0)
po/POTFILES.in (+1/-0)
po/an.po (+201/-76)
po/as.po (+39/-35)
po/bs.po (+445/-0)
po/ca.po (+135/-58)
po/cs.po (+126/-54)
po/da.po (+137/-59)
po/de.po (+145/-60)
po/el.po (+148/-62)
po/eo.po (+243/-76)
po/es.po (+144/-58)
po/eu.po (+149/-58)
po/fi.po (+140/-61)
po/fr.po (+140/-58)
po/fur.po (+147/-82)
po/gl.po (+136/-58)
po/he.po (+140/-58)
po/hu.po (+143/-60)
po/id.po (+182/-83)
po/it.po (+128/-62)
po/ja.po (+194/-63)
po/kk.po (+451/-0)
po/ko.po (+132/-69)
po/lt.po (+137/-55)
po/nb.po (+127/-58)
po/pl.po (+129/-58)
po/pt.po (+0/-4)
po/pt_BR.po (+142/-58)
po/ro.po (+51/-52)
po/ru.po (+134/-61)
po/sk.po (+137/-58)
po/sl.po (+134/-58)
po/sr.po (+139/-62)
po/sr@latin.po (+139/-62)
po/sv.po (+130/-64)
po/tg.po (+203/-70)
po/tr.po (+133/-55)
po/uk.po (+140/-64)
po/zh_TW.po (+143/-65)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

12. By Jackson Doak on 2015-05-27

* Merge from debian. Remaining changes:
  - debian/control.in: Switch depends to grilo-plugins-0.2-extra
* Upload to unstable.
* New upstream release.
* Build against libmediaart-2.0. (Closes: #784677)

11. By Jackson Doak on 2015-05-27

Merging shared upstream rev into target branch.

10. By Jackson Doak on 2015-02-14

[ Jackson Doak]
* New upstream release.

[ Tim Lunn ]
* debian/control.in: Switch depends to grilo-plugins-0.2-extra

9. By Laurent Bigonville on 2014-10-19

[ Pedro Beja ]
* New upstream release.

[ Laurent Bigonville ]
* debian/control.in: Bump Standards-Version to 3.9.6 (no further changes)

8. By Andreas Henriksson on 2014-06-20

[ Emilio Pozuelo Monfort ]
* Build depend on python3 rather than python3-dev.

[ Andreas Henriksson ]
* New upstream release.

7. By Jackson Doak on 2014-06-14

New upstream release.

6. By Michael Biebl on 2014-05-10

* Drop alternative dependency on gir1.2-tracker-0.16.
* Bump Standards-Version to 3.9.5. No further changes.

5. By Tim Lunn on 2014-05-13

* Rebuild for tracker 1.0
  - debian/control.in: update dep for gir-1.2-tracker-1.0

4. By Tim Lunn on 2014-03-10

New upstream release

3. By Andreas Henriksson on 2013-12-27

* Add dependency on python3-dbus and gnome-settings-daemon (Closes: #731284)
  - g-s-d needs to actually be running, not just installed.