Merge lp://staging/~alivema4ever/ubuntu/trusty/smtube/lp-1350406-fix into lp://staging/ubuntu/trusty/smtube
Proposed by
Alif M. Ahmad
Status: | Rejected | ||||
---|---|---|---|---|---|
Rejected by: | Jamie Strandboge | ||||
Proposed branch: | lp://staging/~alivema4ever/ubuntu/trusty/smtube/lp-1350406-fix | ||||
Merge into: | lp://staging/ubuntu/trusty/smtube | ||||
Diff against target: |
47084 lines (+23271/-10307) 109 files modified
Changelog (+59/-0) Readme.txt (+1/-1) Release_notes.txt (+17/-0) create_deb.sh (+1/-1) debian-rvm/changelog-orig (+19/-0) debian-rvm/rules (+1/-1) debian/changelog (+21/-0) debian/control (+3/-3) debian/copyright (+1/-1) smtube.desktop (+2/-2) src/Amiga/AmigaOS4_ReadMe.txt (+66/-0) src/Amiga/OpenWorkbench.rexx (+17/-0) src/Amiga/PlayVideo.rexx (+103/-0) src/Amiga/Populate_info.rexx (+9/-0) src/about.cpp (+54/-33) src/about.h (+1/-1) src/codedownloader.cpp (+2/-0) src/codedownloader.h (+1/-1) src/configdialog.cpp (+19/-44) src/configdialog.h (+7/-1) src/configdialog.ui (+39/-31) src/downloadfile.cpp (+5/-7) src/downloadfile.h (+1/-1) src/filechooser.cpp (+1/-1) src/filechooser.h (+1/-1) src/fontpref.h (+28/-0) src/hcplayer.h (+53/-0) src/icons.qrc (+12/-0) src/lineedit_with_icon.cpp (+1/-1) src/lineedit_with_icon.h (+1/-1) src/main.cpp (+15/-3) src/myborder.cpp (+1/-1) src/myborder.h (+1/-1) src/myicon.cpp (+1/-1) src/myicon.h (+1/-1) src/players.cpp (+15/-5) src/players.h (+1/-1) src/qtsingleapplication/qtlocalpeer.cpp (+18/-15) src/qtsingleapplication/qtlocalpeer.h (+15/-14) src/qtsingleapplication/qtlockedfile.cpp (+12/-11) src/qtsingleapplication/qtlockedfile.h (+15/-14) src/qtsingleapplication/qtlockedfile_unix.cpp (+12/-11) src/qtsingleapplication/qtlockedfile_win.cpp (+17/-12) src/qtsingleapplication/qtsingleapplication.cpp (+17/-14) src/qtsingleapplication/qtsingleapplication.h (+18/-15) src/qtsingleapplication/qtsingleapplication.pri (+1/-0) src/qtsingleapplication/qtsinglecoreapplication.cpp (+12/-11) src/qtsingleapplication/qtsinglecoreapplication.h (+13/-12) src/recordingdialog.cpp (+135/-31) src/recordingdialog.h (+6/-5) src/regions.cpp (+87/-0) src/regions.h (+38/-0) src/retrieveyoutubeurl.cpp (+358/-44) src/retrieveyoutubeurl.h (+28/-6) src/rvu.cpp (+1/-1) src/rvu.h (+1/-1) src/searchbox.cpp (+1/-1) src/searchbox.h (+1/-1) src/smtube.pro (+53/-17) src/smtube.rc (+2/-2) src/translations/.tx/config (+1/-1) src/translations/smtube_ar.ts (+979/-0) src/translations/smtube_bg.ts (+510/-417) src/translations/smtube_ca.ts (+976/-0) src/translations/smtube_cs.ts (+444/-334) src/translations/smtube_de.ts (+970/-0) src/translations/smtube_el.ts (+507/-450) src/translations/smtube_en.ts (+447/-337) src/translations/smtube_es.ts (+733/-288) src/translations/smtube_et.ts (+975/-0) src/translations/smtube_eu.ts (+444/-334) src/translations/smtube_fi.ts (+447/-337) src/translations/smtube_fr.ts (+970/-0) src/translations/smtube_gl.ts (+451/-353) src/translations/smtube_he_IL.ts (+453/-338) src/translations/smtube_hr.ts (+444/-334) src/translations/smtube_hu.ts (+484/-426) src/translations/smtube_id.ts (+480/-382) src/translations/smtube_it.ts (+970/-0) src/translations/smtube_ja.ts (+447/-337) src/translations/smtube_ka.ts (+445/-331) src/translations/smtube_ko.ts (+970/-0) src/translations/smtube_lt.ts (+454/-362) src/translations/smtube_ms_MY.ts (+444/-334) src/translations/smtube_nn_NO.ts (+451/-373) src/translations/smtube_nqo.ts (+974/-0) src/translations/smtube_pl.ts (+548/-480) src/translations/smtube_pt.ts (+452/-342) src/translations/smtube_pt_BR.ts (+467/-374) src/translations/smtube_ru_RU.ts (+454/-324) src/translations/smtube_sr.ts (+447/-337) src/translations/smtube_sv.ts (+450/-372) src/translations/smtube_tr.ts (+491/-425) src/translations/smtube_uk.ts (+444/-334) src/translations/smtube_vi.ts (+451/-353) src/translations/smtube_zh_CN.ts (+479/-421) src/translations/smtube_zh_TW.ts (+974/-0) src/version.cpp (+2/-2) src/version.h (+1/-1) src/ytdataapi.cpp (+4/-4) src/ytdataapi.h (+1/-1) src/ytdelegate.cpp (+12/-10) src/ytdelegate.h (+1/-1) src/ytdialog.cpp (+191/-32) src/ytdialog.h (+20/-4) src/ytsig.cpp (+50/-30) src/ytsig.h (+8/-6) src/yttabbar.cpp (+11/-2) src/yttabbar.h (+1/-1) |
||||
To merge this branch: | bzr merge lp://staging/~alivema4ever/ubuntu/trusty/smtube/lp-1350406-fix | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jamie Strandboge | Disapprove | ||
Review via email: mp+228885@code.staging.launchpad.net |
Description of the change
Built for use with smplayer 14.3.0
To post a comment you must log in.
Unmerged revisions
- 7. By Alif M. Ahmad
-
Packaging 2.1-2 for trusty (lp: #1350406)
- 6. By Alessio Treglia
-
Add mpv as optional dependency. (Closes: #752590)
- 5. By Alessio Treglia
-
* New upstream release.
* Fix VCS field. (Closes: #722434)
* Update copyright holders of debian/* files.
* Bump Standards.
Thank you for preparing this merge request. Updating trusty to a new version like this does not meet the SRU criteria as laid out in https:/ /wiki.ubuntu. com/StableRelea seUpdates. This would be better served to include in trusty-backports. See https:/ /help.ubuntu. com/community/ UbuntuBackports.