Merge lp://qastaging/~noskcaj/ubuntu/utopic/dvdstyler/2.7.2 into lp://qastaging/ubuntu/utopic/dvdstyler

Proposed by Jackson Doak
Status: Needs review
Proposed branch: lp://qastaging/~noskcaj/ubuntu/utopic/dvdstyler/2.7.2
Merge into: lp://qastaging/ubuntu/utopic/dvdstyler
Diff against target: 129614 lines (+40875/-29173)
186 files modified
.cvsignore (+3/-0)
.pc/applied-patches (+0/-3)
.pc/fix_desktop_file.patch/data/dvdstyler.desktop (+0/-11)
.pc/fix_no_audio.patch/src/mediatrc_ffmpeg.cpp (+0/-195)
.pc/genisoimage.patch/configure.in (+0/-218)
.pc/genisoimage.patch/src/Config.h (+0/-193)
AUTHORS (+3/-3)
ChangeLog (+50/-0)
DVDStyler.cbp (+14/-7)
Info.plist.in (+26/-4)
Makefile.am (+30/-2)
Makefile.in (+215/-144)
TODO (+8/-5)
aclocal.m4 (+337/-273)
backgrounds/Makefile.in (+93/-35)
buttons/Makefile.in (+93/-35)
buttons/pill.xml (+68/-78)
buttons/pill2.xml (+58/-65)
buttons/pill3.xml (+53/-55)
config.guess (+1558/-0)
config.sub (+1791/-0)
configure (+310/-100)
configure.in (+19/-11)
data/Makefile.in (+94/-37)
data/dvdstyler.desktop (+3/-2)
debian/changelog (+19/-0)
debian/control (+4/-3)
debian/patches/fix_libav10.patch (+109/-0)
debian/patches/fix_no_audio.patch (+0/-34)
debian/patches/genisoimage.patch (+4/-3)
debian/patches/series (+1/-1)
docs/DVDStylerGuide_pt.xml (+3/-3)
docs/Makefile.in (+93/-50)
installer/Important notes.rtf (+40/-0)
locale/Makefile.in (+1/-0)
locale/ar.po (+732/-586)
locale/ca.po (+747/-583)
locale/cs.po (+755/-608)
locale/da.po (+730/-599)
locale/de.po (+715/-567)
locale/dvdstyler.pot (+717/-549)
locale/el.po (+742/-579)
locale/es.po (+736/-612)
locale/es_ar.po (+747/-584)
locale/eu.po (+725/-569)
locale/fi.po (+711/-570)
locale/fr.po (+745/-570)
locale/hu.po (+715/-566)
locale/hy.po (+746/-582)
locale/it.po (+754/-633)
locale/ja.po (+746/-582)
locale/ko.po (+742/-582)
locale/mk.po (+744/-584)
locale/nb.po (+716/-585)
locale/nl.po (+737/-584)
locale/pl.po (+715/-584)
locale/pt.po (+725/-583)
locale/pt_BR.po (+851/-705)
locale/ro.po (+746/-571)
locale/ru.po (+748/-617)
locale/sk.po (+846/-715)
locale/sl.po (+744/-583)
locale/sr.po (+726/-569)
locale/sv.po (+742/-582)
locale/tr.po (+1120/-982)
locale/uk.po (+712/-584)
locale/uz.po (+731/-555)
locale/vi.po (+745/-581)
locale/zh_CN.po (+1242/-1136)
locale/zh_TW.po (+1187/-1135)
objects/Makefile.in (+93/-35)
pad-osx.xml (+9/-9)
pad-src.xml (+6/-6)
pad.xml (+9/-9)
src/About.h (+2/-2)
src/AudioPropDlg.cpp (+19/-10)
src/AudioPropDlg.h (+3/-1)
src/Authors.h (+3/-3)
src/BurnDlg.cpp (+338/-221)
src/BurnDlg.h (+97/-67)
src/BurnDlgOSX.mm (+2/-2)
src/Cache.cpp (+7/-13)
src/Cell.cpp (+100/-0)
src/Cell.h (+78/-0)
src/Config.h (+30/-4)
src/DVD.cpp (+83/-18)
src/DVD.h (+15/-4)
src/DVDAction.cpp (+15/-12)
src/DVDAction.h (+4/-1)
src/DVDPropDlg.cpp (+5/-3)
src/MainWin.cpp (+175/-49)
src/MainWin.h (+14/-9)
src/Makefile.am (+3/-3)
src/Makefile.in (+231/-169)
src/Menu.cpp (+29/-17)
src/Menu.h (+9/-4)
src/MenuActionsDlg.cpp (+1/-0)
src/MenuCellsDlg.cpp (+26/-3)
src/MenuCellsDlg.h (+2/-1)
src/MenuEditor.cpp (+191/-11)
src/MenuEditor.h (+11/-1)
src/MenuObject.cpp (+27/-6)
src/MenuObject.h (+5/-1)
src/MenuObjectPropDlg.cpp (+76/-34)
src/MenuObjectPropDlg.h (+2/-1)
src/MenuPalettes.cpp (+2/-2)
src/MenuPalettes.h (+2/-2)
src/MenuPropDlg.cpp (+25/-13)
src/MenuPropDlg.h (+4/-1)
src/MessageDlg.cpp (+6/-5)
src/MessageDlg.h (+2/-2)
src/NewProjectDlg.cpp (+2/-2)
src/Pgc.cpp (+43/-945)
src/Pgc.h (+9/-344)
src/ProgressDlg.cpp (+396/-75)
src/ProgressDlg.h (+6/-3)
src/SettingsDlg.cpp (+24/-4)
src/SettingsDlg.h (+2/-1)
src/SlideDlg.cpp (+118/-0)
src/SlideDlg.h (+51/-0)
src/Slideshow.cpp (+54/-6)
src/Slideshow.h (+52/-39)
src/StatusBar.cpp (+2/-2)
src/Stream.cpp (+113/-0)
src/Stream.h (+110/-0)
src/TemplateDlg.cpp (+97/-82)
src/TemplateDlg.h (+43/-35)
src/TextSub.cpp (+10/-1)
src/TextSub.h (+4/-1)
src/TitlePropDlg.cpp (+82/-26)
src/TitlePropDlg.h (+3/-1)
src/Titleset.cpp (+18/-17)
src/Titleset.h (+6/-6)
src/TitlesetManager.cpp (+264/-121)
src/TitlesetManager.h (+7/-4)
src/VideoPropDlg.cpp (+3/-3)
src/Vob.cpp (+827/-0)
src/Vob.h (+217/-0)
src/VobListBox.cpp (+43/-24)
src/VobListBox.h (+7/-3)
src/dvdstyler.cpp (+59/-8)
src/dvdstyler.wxg (+8/-659)
src/dvdvmy.c (+227/-340)
src/dvdvmy.h (+28/-8)
src/mediaenc_ffmpeg.cpp (+24/-3)
src/mediaenc_ffmpeg.h (+2/-1)
src/mediatrc.h (+7/-7)
src/mediatrc_ffmpeg.cpp (+15/-15)
src/mediatrc_ffmpeg.h (+10/-13)
src/rc/.cvsignore (+2/-0)
src/rc/Makefile.in (+93/-35)
src/rc/dvdstyler.png.h (+247/-402)
src/rc/justifyCenterSelected.png.h (+37/-0)
src/rc/justifyLeftSelected.png.h (+35/-0)
src/rc/justifyRightSelected.png.h (+34/-0)
src/rc/logo.png.h (+1371/-1278)
templates/Basic/turbulence.dvdt (+11/-11)
templates/Basic/turbulenceWS.dvdt (+200/-0)
templates/Makefile.in (+93/-35)
templates/category.xml (+1/-0)
transitions/.cvsignore (+2/-0)
transitions/Makefile.am (+2/-0)
transitions/Makefile.in (+502/-0)
transitions/fade.xml (+12/-0)
transitions/wipeBottomToTop.xml (+37/-0)
transitions/wipeLeftToRight.xml (+32/-0)
transitions/wipeRightToLeft.xml (+32/-0)
transitions/wipeTopToBottom.xml (+32/-0)
wxVillaLib/Makefile.am (+1/-1)
wxVillaLib/Makefile.in (+160/-73)
wxVillaLib/PipeExecute.cpp (+2/-2)
wxVillaLib/PropDlg.cpp (+7/-5)
wxVillaLib/PropDlg.h (+7/-11)
wxVillaLib/SingleThumbnailDlg.cpp (+89/-0)
wxVillaLib/SingleThumbnailDlg.h (+41/-0)
wxVillaLib/ThumbnailFactory.cpp (+16/-15)
wxVillaLib/ThumbnailFactory.h (+6/-2)
wxVillaLib/Thumbnails.cpp (+21/-6)
wxVillaLib/Thumbnails.h (+2/-2)
wxVillaLib/thumb_md5.cpp (+2/-3)
wxsmith/AudioPropDlg.wxs (+22/-10)
wxsmith/BurnDlg.wxs (+373/-0)
wxsmith/MenuCellsDlg.wxs (+1/-1)
wxsmith/SlideDlg.wxs (+69/-0)
wxsmith/TemplateDlg.wxs (+143/-0)
wxsmith/VideoPropDlg.wxs (+2/-2)
To merge this branch: bzr merge lp://qastaging/~noskcaj/ubuntu/utopic/dvdstyler/2.7.2
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Review via email: mp+224920@code.qastaging.launchpad.net

Description of the change

New upstream release

To post a comment you must log in.
36. By Jackson Doak

New upstream release. LP: #1264701

Revision history for this message
Daniel Holbach (dholbach) wrote :

Thanks. Uploaded.

review: Approve

Unmerged revisions

36. By Jackson Doak

New upstream release. LP: #1264701

35. By Jackson Doak

* New upstream release.
* Drop fix_no_audio.patch, fix_wxwidgets3.0.patch. Fixed upstream.

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: