Merge lp://staging/~alivema4ever/ubuntu/trusty/smplayer/lp-1325330-fix into lp://staging/ubuntu/trusty/smplayer
Proposed by
Alif M. Ahmad
Status: | Rejected |
---|---|
Rejected by: | Jamie Strandboge |
Proposed branch: | lp://staging/~alivema4ever/ubuntu/trusty/smplayer/lp-1325330-fix |
Merge into: | lp://staging/ubuntu/trusty/smplayer |
Diff against target: |
463815 lines (+160698/-84983) 427 files modified
.pc/01-add-mplayer2-detection.patch/src/core.cpp (+252/-128) .pc/02-disable_updates.patch/src/updatechecker.cpp (+1/-1) Changelog (+113/-0) Readme.txt (+13/-1) Release_notes.txt (+19/-0) create_deb.sh (+1/-1) debian-rvm/changelog-orig (+20/-0) debian/changelog (+16/-0) debian/control (+8/-5) debian/smplayer-l10n.install (+1/-0) debian/smplayer-translations.install (+0/-1) qt-translations/qt_eu.ts (+34/-35) qt-translations/qt_ja.ts (+10236/-0) setup/scripts/make_pkgs.cmd (+197/-112) setup/scripts/make_pkgs64.cmd (+0/-259) setup/smplayer.nsi (+62/-35) setup/translations/albanian.nsh (+102/-0) setup/translations/arabic.nsh (+102/-0) setup/translations/basque.nsh (+16/-15) setup/translations/bulgarian.nsh (+102/-0) setup/translations/catalan.nsh (+1/-0) setup/translations/croatian.nsh (+74/-73) setup/translations/czech.nsh (+12/-11) setup/translations/danish.nsh (+1/-0) setup/translations/dutch.nsh (+1/-0) setup/translations/english.nsh (+1/-0) setup/translations/finnish.nsh (+1/-0) setup/translations/french.nsh (+6/-5) setup/translations/german.nsh (+53/-52) setup/translations/hebrew.nsh (+1/-0) setup/translations/hungarian.nsh (+1/-0) setup/translations/italian.nsh (+1/-0) setup/translations/japanese.nsh (+5/-4) setup/translations/korean.nsh (+72/-71) setup/translations/malay.nsh (+102/-0) setup/translations/norwegian.nsh (+1/-0) setup/translations/po_files/.tx/config (+40/-0) setup/translations/po_files/albanian.po (+294/-0) setup/translations/po_files/arabic.po (+294/-0) setup/translations/po_files/basque.po (+294/-0) setup/translations/po_files/bulgarian.po (+294/-0) setup/translations/po_files/catalan.po (+283/-0) setup/translations/po_files/croatian.po (+294/-0) setup/translations/po_files/czech.po (+294/-0) setup/translations/po_files/danish.po (+283/-0) setup/translations/po_files/dutch.po (+283/-0) setup/translations/po_files/english.pot (+255/-0) setup/translations/po_files/finnish.po (+283/-0) setup/translations/po_files/french.po (+294/-0) setup/translations/po_files/german.po (+295/-0) setup/translations/po_files/hebrew.po (+283/-0) setup/translations/po_files/hungarian.po (+292/-0) setup/translations/po_files/italian.po (+297/-0) setup/translations/po_files/japanese.po (+294/-0) setup/translations/po_files/korean.po (+294/-0) setup/translations/po_files/malay.po (+294/-0) setup/translations/po_files/norwegian.po (+283/-0) setup/translations/po_files/polish.po (+294/-0) setup/translations/po_files/portuguese.po (+294/-0) setup/translations/po_files/portuguesebrazil.po (+294/-0) setup/translations/po_files/russian.po (+295/-0) setup/translations/po_files/serbian.po (+294/-0) setup/translations/po_files/simpchinese.po (+294/-0) setup/translations/po_files/slovak.po (+283/-0) setup/translations/po_files/slovenian.po (+283/-0) setup/translations/po_files/spanish.po (+294/-0) setup/translations/po_files/thai.po (+283/-0) setup/translations/po_files/tradchinese.po (+283/-0) setup/translations/polish.nsh (+18/-16) setup/translations/portuguese.nsh (+10/-9) setup/translations/portuguesebrazil.nsh (+102/-0) setup/translations/russian.nsh (+9/-8) setup/translations/serbian.nsh (+102/-0) setup/translations/simpchinese.nsh (+9/-8) setup/translations/slovak.nsh (+1/-0) setup/translations/slovenian.nsh (+1/-0) setup/translations/spanish.nsh (+2/-1) setup/translations/thai.nsh (+1/-0) setup/translations/tradchinese.nsh (+1/-0) smplayer.desktop (+2/-2) smplayer.spec (+1/-1) smplayer_enqueue.desktop (+1/-1) src/about.cpp (+54/-72) src/about.h (+1/-1) src/about.ui (+5/-0) src/actionseditor.cpp (+6/-1) src/actionseditor.h (+1/-1) src/assstyles.cpp (+1/-1) src/assstyles.h (+1/-1) src/audioequalizer.cpp (+180/-11) src/audioequalizer.h (+21/-7) src/audioequalizerlist.h (+1/-1) src/autohidewidget.cpp (+187/-0) src/autohidewidget.h (+86/-0) src/basegui.cpp (+278/-161) src/basegui.h (+30/-21) src/baseguiplus.cpp (+1/-1) src/baseguiplus.h (+1/-1) src/chapters.cpp (+1/-1) src/chapters.h (+1/-1) src/cleanconfig.cpp (+3/-0) src/clhelp.cpp (+1/-1) src/clhelp.h (+1/-1) src/colorutils.cpp (+1/-1) src/colorutils.h (+1/-1) src/config.h (+1/-1) src/constants.h (+1/-1) src/core.cpp (+252/-128) src/core.h (+19/-2) src/defaultgui.cpp (+107/-96) src/defaultgui.h (+7/-7) src/desktopinfo.cpp (+1/-1) src/desktopinfo.h (+1/-1) src/deviceinfo.cpp (+1/-1) src/deviceinfo.h (+1/-1) src/discname.cpp (+13/-5) src/discname.h (+2/-2) src/editabletoolbar.cpp (+1/-1) src/editabletoolbar.h (+1/-1) src/eqslider.cpp (+1/-1) src/eqslider.h (+1/-1) src/errordialog.cpp (+1/-1) src/errordialog.h (+1/-1) src/extensions.cpp (+11/-2) src/extensions.h (+2/-1) src/favoriteeditor.cpp (+5/-1) src/favoriteeditor.h (+1/-1) src/favorites.cpp (+7/-1) src/favorites.h (+1/-1) src/filechooser.cpp (+1/-1) src/filechooser.h (+1/-1) src/filedialog.cpp (+1/-1) src/filedialog.h (+1/-1) src/filehash.cpp (+1/-1) src/filehash.h (+1/-1) src/filepropertiesdialog.cpp (+3/-3) src/filepropertiesdialog.h (+1/-1) src/filesettings.cpp (+1/-1) src/filesettings.h (+1/-1) src/filesettingsbase.cpp (+1/-1) src/filesettingsbase.h (+1/-1) src/filesettingshash.cpp (+1/-1) src/filesettingshash.h (+1/-1) src/filters.cpp (+1/-1) src/filters.h (+1/-1) src/findsubtitles/filedownloader/filedownloader.cpp (+69/-62) src/findsubtitles/filedownloader/filedownloader.h (+16/-16) src/findsubtitles/filedownloader/main.cpp (+1/-1) src/findsubtitles/findsubtitles.pro (+13/-12) src/findsubtitles/findsubtitlesconfigdialog.cpp (+3/-3) src/findsubtitles/findsubtitlesconfigdialog.h (+1/-1) src/findsubtitles/findsubtitlesconfigdialog.ui (+1/-1) src/findsubtitles/findsubtitleswindow.cpp (+2/-1) src/findsubtitles/findsubtitleswindow.h (+1/-1) src/findsubtitles/fixsubs.cpp (+1/-1) src/findsubtitles/fixsubs.h (+1/-1) src/findsubtitles/main.cpp (+1/-1) src/findsubtitles/osclient.cpp (+5/-6) src/findsubtitles/osclient.h (+1/-1) src/findsubtitles/osparser.cpp (+1/-1) src/findsubtitles/osparser.h (+1/-1) src/findsubtitles/subchooserdialog.cpp (+1/-1) src/findsubtitles/subchooserdialog.h (+1/-1) src/floatingwidget.cpp (+0/-171) src/floatingwidget.h (+0/-95) src/fontcache.cpp (+1/-1) src/fontcache.h (+1/-1) src/global.cpp (+1/-1) src/global.h (+1/-1) src/guiconfig.h (+1/-9) src/helper.cpp (+64/-4) src/helper.h (+10/-1) src/icons.qrc (+6/-0) src/images.cpp (+1/-1) src/images.h (+1/-1) src/infofile.cpp (+15/-3) src/infofile.h (+1/-1) src/infoprovider.cpp (+1/-1) src/infoprovider.h (+1/-1) src/inforeader.cpp (+7/-7) src/inforeader.h (+1/-1) src/inputdvddirectory.cpp (+1/-1) src/inputdvddirectory.h (+1/-1) src/inputdvddirectory.ui (+1/-1) src/inputmplayerversion.cpp (+1/-1) src/inputmplayerversion.h (+1/-1) src/inputurl.cpp (+1/-1) src/inputurl.h (+1/-1) src/languages.cpp (+47/-42) src/languages.h (+1/-1) src/lineedit_with_icon.cpp (+1/-1) src/lineedit_with_icon.h (+1/-1) src/logwindow.cpp (+1/-1) src/logwindow.h (+1/-1) src/main.cpp (+1/-1) src/mediadata.cpp (+2/-2) src/mediadata.h (+5/-1) src/mediasettings.cpp (+31/-11) src/mediasettings.h (+2/-2) src/minigui.cpp (+41/-43) src/minigui.h (+3/-6) src/mpcgui/mpcgui.cpp (+77/-51) src/mpcgui/mpcgui.h (+4/-4) src/mplayerprocess.cpp (+31/-9) src/mplayerprocess.h (+3/-1) src/mplayerversion.cpp (+1/-1) src/mplayerversion.h (+1/-1) src/mplayerwindow.cpp (+142/-82) src/mplayerwindow.h (+28/-14) src/multilineinputdialog.cpp (+1/-1) src/multilineinputdialog.h (+1/-1) src/myaction.cpp (+5/-1) src/myaction.h (+3/-1) src/myactiongroup.cpp (+1/-1) src/myactiongroup.h (+1/-1) src/myapplication.cpp (+157/-1) src/myapplication.h (+17/-1) src/mycombobox.cpp (+32/-1) src/mycombobox.h (+2/-1) src/mylineedit.cpp (+1/-1) src/mylineedit.h (+1/-1) src/myprocess.cpp (+5/-4) src/myprocess.h (+1/-1) src/myslider.cpp (+1/-1) src/myslider.h (+1/-1) src/mytablewidget.cpp (+1/-1) src/mytablewidget.h (+1/-1) src/old/floatingwidget.cpp (+171/-0) src/old/floatingwidget.h (+95/-0) src/old/videoequalizer.cpp (+140/-0) src/old/videoequalizer.h (+65/-0) src/paths.cpp (+7/-1) src/paths.h (+5/-1) src/playlist.cpp (+24/-6) src/playlist.h (+5/-3) src/playlistdock.cpp (+1/-1) src/playlistdock.h (+1/-1) src/prefadvanced.cpp (+26/-1) src/prefadvanced.h (+6/-1) src/prefadvanced.ui (+17/-9) src/prefassociations.cpp (+1/-1) src/prefassociations.h (+1/-1) src/prefdrives.cpp (+47/-3) src/prefdrives.h (+6/-1) src/prefdrives.ui (+181/-137) src/preferences.cpp (+84/-19) src/preferences.h (+29/-7) src/preferencesdialog.cpp (+1/-1) src/preferencesdialog.h (+1/-1) src/prefgeneral.cpp (+36/-7) src/prefgeneral.h (+7/-4) src/prefgeneral.ui (+459/-519) src/prefinput.cpp (+20/-12) src/prefinput.h (+3/-3) src/prefinput.ui (+307/-422) src/prefinterface.cpp (+30/-35) src/prefinterface.h (+1/-6) src/prefinterface.ui (+52/-11) src/prefperformance.cpp (+1/-1) src/prefperformance.h (+1/-1) src/prefperformance.ui (+178/-231) src/prefplaylist.cpp (+22/-11) src/prefplaylist.h (+3/-3) src/prefplaylist.ui (+100/-66) src/prefsubtitles.cpp (+37/-1) src/prefsubtitles.h (+2/-1) src/prefsubtitles.ui (+395/-521) src/preftv.cpp (+1/-1) src/preftv.h (+1/-1) src/prefupdates.cpp (+1/-1) src/prefupdates.h (+1/-1) src/prefupdates.ui (+2/-2) src/prefwidget.cpp (+1/-1) src/prefwidget.h (+2/-2) src/qtsingleapplication/qtlocalpeer.cpp (+19/-16) 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/recents.cpp (+1/-1) src/recents.h (+1/-1) src/reminderdialog.cpp (+70/-0) src/reminderdialog.h (+46/-0) src/reminderdialog.ui (+185/-0) src/screensaver.cpp (+5/-3) src/screensaver.h (+3/-1) src/seekwidget.cpp (+2/-2) src/seekwidget.h (+1/-1) src/seekwidget.ui (+27/-25) src/selectcolorbutton.cpp (+1/-1) src/selectcolorbutton.h (+1/-1) src/sharedialog.cpp (+86/-0) src/sharedialog.h (+50/-0) src/sharedialog.ui (+160/-0) src/shortcutgetter.cpp (+1/-1) src/shortcutgetter.h (+1/-1) src/shortcuts/default.keys (+25/-20) src/shortcuts/euskara.keys (+241/-0) src/simplehttp.cpp (+0/-102) src/simplehttp.h (+0/-56) src/skingui/actiontools.cpp (+1/-1) src/skingui/actiontools.h (+1/-1) src/skingui/mediabarpanel.cpp (+13/-7) src/skingui/mediabarpanel.h (+1/-1) src/skingui/mediapanel.cpp (+1/-1) src/skingui/mediapanel.h (+2/-2) src/skingui/mybutton.cpp (+1/-1) src/skingui/mybutton.h (+1/-1) src/skingui/myicon.cpp (+1/-1) src/skingui/myicon.h (+1/-1) src/skingui/panelseeker.cpp (+20/-5) src/skingui/panelseeker.h (+4/-3) src/skingui/playcontrol.cpp (+5/-6) src/skingui/playcontrol.h (+1/-1) src/skingui/qpropertysetter.cpp (+1/-4) src/skingui/qpropertysetter.h (+1/-16) src/skingui/skingui.cpp (+97/-107) src/skingui/skingui.h (+8/-13) src/skingui/volumecontrolpanel.cpp (+1/-1) src/smplayer.cpp (+62/-3) src/smplayer.h (+8/-1) src/smplayer.pro (+61/-41) src/smplayer.rc (+3/-3) src/subtracks.cpp (+1/-1) src/subtracks.h (+1/-1) src/timedialog.cpp (+5/-5) src/timedialog.h (+1/-1) src/timeslider.cpp (+6/-5) src/timeslider.h (+2/-2) src/titletracks.cpp (+1/-1) src/titletracks.h (+1/-1) src/toolbareditor.cpp (+1/-1) src/toolbareditor.h (+1/-1) src/tracks.cpp (+1/-1) src/tracks.h (+1/-1) src/translations/.tx/config (+1/-1) src/translations/smplayer_ar.ts (+9291/-0) src/translations/smplayer_ar_SY.ts (+1868/-1670) src/translations/smplayer_bg.ts (+3715/-3549) src/translations/smplayer_ca.ts (+1772/-1559) src/translations/smplayer_cs.ts (+1755/-1547) src/translations/smplayer_da.ts (+1935/-1758) src/translations/smplayer_de.ts (+2577/-2544) src/translations/smplayer_el_GR.ts (+1831/-1577) src/translations/smplayer_en_GB.ts (+9288/-0) src/translations/smplayer_en_US.ts (+1766/-1559) src/translations/smplayer_es.ts (+1945/-1873) src/translations/smplayer_et.ts (+2503/-2393) src/translations/smplayer_eu.ts (+1783/-1576) src/translations/smplayer_fi.ts (+2082/-2023) src/translations/smplayer_fr.ts (+1811/-1627) src/translations/smplayer_gl.ts (+1774/-1586) src/translations/smplayer_he_IL.ts (+1784/-1577) src/translations/smplayer_hr.ts (+1774/-1567) src/translations/smplayer_hu.ts (+2375/-2316) src/translations/smplayer_id.ts (+9288/-0) src/translations/smplayer_it.ts (+2972/-2918) src/translations/smplayer_ja.ts (+1791/-1584) src/translations/smplayer_ka.ts (+1801/-1564) src/translations/smplayer_ko.ts (+3418/-3277) src/translations/smplayer_ku.ts (+2562/-2469) src/translations/smplayer_lt.ts (+1778/-1594) src/translations/smplayer_mk.ts (+1821/-1602) src/translations/smplayer_ms_MY.ts (+1806/-1618) src/translations/smplayer_nl.ts (+2419/-2360) src/translations/smplayer_nn_NO.ts (+9351/-0) src/translations/smplayer_pl.ts (+2112/-1905) src/translations/smplayer_pt.ts (+1812/-1605) src/translations/smplayer_pt_BR.ts (+1789/-1582) src/translations/smplayer_ro_RO.ts (+1813/-1602) src/translations/smplayer_ru_RU.ts (+1858/-1678) src/translations/smplayer_sk.ts (+1807/-1598) src/translations/smplayer_sl_SI.ts (+1798/-1601) src/translations/smplayer_sr.ts (+1794/-1586) src/translations/smplayer_sv.ts (+1814/-1573) src/translations/smplayer_th.ts (+2311/-2193) src/translations/smplayer_tr.ts (+2889/-2814) src/translations/smplayer_uk_UA.ts (+1834/-1627) src/translations/smplayer_uz.ts (+9302/-0) src/translations/smplayer_vi_VN.ts (+2204/-2122) src/translations/smplayer_zh_CN.ts (+1856/-1668) src/translations/smplayer_zh_TW.ts (+3016/-2891) src/translator.cpp (+1/-1) src/translator.h (+1/-1) src/tristatecombo.cpp (+1/-1) src/tristatecombo.h (+1/-1) src/tvlist.cpp (+1/-1) src/tvlist.h (+1/-1) src/tvsettings.cpp (+1/-1) src/tvsettings.h (+1/-1) src/updatechecker.cpp (+1/-1) src/updatechecker.h (+1/-1) src/urlhistory.cpp (+1/-1) src/urlhistory.h (+1/-1) src/vdpauproperties.cpp (+1/-1) src/vdpauproperties.h (+1/-1) src/version.cpp (+3/-3) src/version.h (+1/-1) src/videoequalizer.cpp (+70/-95) src/videoequalizer.h (+42/-33) src/videoequalizer.ui (+343/-0) src/videoequalizer2.cpp (+0/-115) src/videoequalizer2.h (+0/-74) src/videoequalizer2.ui (+0/-343) src/videopreview/main.cpp (+1/-1) src/videopreview/videopreview.cpp (+5/-5) src/videopreview/videopreview.h (+1/-1) src/videopreview/videopreview.pro (+5/-0) src/videopreview/videopreviewconfigdialog.cpp (+1/-1) src/videopreview/videopreviewconfigdialog.h (+1/-1) src/videopreview/videopreviewconfigdialog.ui (+93/-92) src/widgetactions.cpp (+1/-1) src/widgetactions.h (+1/-1) src/winfileassoc.cpp (+2/-2) src/winfileassoc.h (+1/-1) src/youtube/codedownloader.cpp (+1/-1) src/youtube/codedownloader.h (+1/-1) src/youtube/retrieveyoutubeurl.cpp (+323/-42) src/youtube/retrieveyoutubeurl.h (+20/-5) src/youtube/ytsig.cpp (+50/-30) src/youtube/ytsig.h (+8/-6) |
To merge this branch: | bzr merge lp://staging/~alivema4ever/ubuntu/trusty/smplayer/lp-1325330-fix |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jamie Strandboge | Disapprove | ||
Review via email: mp+228868@code.staging.launchpad.net |
Description of the change
Packaging latest stable version of smplayer for trusty.
Tested and built on pbuilder development successfully.
To post a comment you must log in.
Unmerged revisions
- 27. By Alif M. Ahmad
-
Packaging 14.3.0-1 for trusty (lp: #1325330)
- 26. By Mateusz Ĺukasik
-
* Add myself to uploaders.
* New upstream release. (Closes: #740769, #742685)
* debian/control:
- bump standards version to 3.9.5. (no changes needed)
- rename smplayer-translations to smplayer-l10n. (Closes: #698365)
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.