Merge lp://staging/~noskcaj/ubuntu/vivid/snappy-player/1.0 into lp://staging/ubuntu/vivid/snappy-player

Proposed by Jackson Doak
Status: Needs review
Proposed branch: lp://staging/~noskcaj/ubuntu/vivid/snappy-player/1.0
Merge into: lp://staging/ubuntu/vivid/snappy-player
Diff against target: 92750 lines (+4376/-43617)
65 files modified
.gitignore (+22/-0)
.pc/.quilt_patches (+1/-0)
.pc/.quilt_series (+1/-0)
.pc/.version (+1/-0)
AUTHORS (+21/-3)
INSTALL (+10/-5)
Makefile.am (+15/-1)
Makefile.in (+0/-766)
README (+11/-0)
THANKS (+15/-1)
ToDo (+2/-0)
aclocal.m4 (+0/-1247)
autogen.sh (+21/-1577)
build-aux/compile (+0/-143)
build-aux/config.guess (+0/-1526)
build-aux/config.sub (+0/-1757)
build-aux/depcomp (+0/-630)
build-aux/install-sh (+0/-520)
build-aux/ltmain.sh (+0/-9636)
build-aux/missing (+0/-376)
config.h.in (+0/-83)
configure (+0/-14859)
configure.ac (+62/-45)
data/Makefile.am (+15/-6)
data/Makefile.in (+0/-446)
data/README (+2/-2)
data/audio-volume-high.svg (+47/-0)
data/audio-volume-low.svg (+20/-0)
data/fullscreen.svg (+27/-0)
data/icons/256x256/Makefile.am (+4/-0)
data/icons/256x256/Makefile.in (+509/-0)
data/icons/48x48/Makefile.am (+4/-0)
data/icons/48x48/Makefile.in (+509/-0)
data/icons/Makefile.am (+2/-0)
data/icons/Makefile.in (+633/-0)
data/media-actions-pause.svg (+16/-0)
data/media-actions-start.svg (+19/-0)
data/mpris.xml (+98/-0)
data/snappy.desktop (+15/-0)
data/subtitles-active.svg (+43/-0)
data/subtitles-inactive.svg (+42/-0)
debian/changelog (+21/-0)
debian/control (+17/-11)
debian/copyright (+2/-2)
docs/clutter_controls_layout (+49/-0)
docs/keyboard_controls (+42/-0)
m4/libtool.m4 (+0/-7844)
m4/ltoptions.m4 (+0/-369)
m4/ltsugar.m4 (+0/-123)
m4/ltversion.m4 (+0/-23)
m4/lt~obsolete.m4 (+0/-98)
snappy.doap (+25/-0)
src/Makefile.am (+2/-2)
src/Makefile.in (+0/-688)
src/dlna.c (+19/-111)
src/dlna.h (+4/-24)
src/gst_engine.c (+575/-125)
src/gst_engine.h (+24/-8)
src/screensaver.c (+21/-17)
src/screensaver.h (+4/-4)
src/snappy.c (+139/-62)
src/user_interface.c (+1148/-431)
src/user_interface.h (+68/-30)
src/utils.c (+22/-13)
src/utils.h (+7/-3)
To merge this branch: bzr merge lp://staging/~noskcaj/ubuntu/vivid/snappy-player/1.0
Reviewer Review Type Date Requested Status
Micah Gersten Needs Information
Review via email: mp+248186@code.staging.launchpad.net

Description of the change

New upstream release + sync from debian exp. Migrates package to clutter-gst-2.0, so clutter-gst can be removed

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

It looks like a changelog entry is missing?

Revision history for this message
Jackson Doak (noskcaj) wrote :

It would appear i pushed too early. Fixed.

5. By Jackson Doak

New upstream release.

Revision history for this message
Micah Gersten (micahg) wrote :

Needs an FFe at this point to get in

review: Needs Information

Unmerged revisions

5. By Jackson Doak

New upstream release.

4. By Jackson Doak

* New upstream release.
  + debian/control:
    - Update dependencies.
    - Add homepage and vcs links.
  + debian/copyright:
    - Update copyright years and download url.
* New upstream release.

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: