diff -u smplayer-0.5.20/debian/changelog smplayer-0.5.62/debian/changelog --- smplayer-0.5.20/debian/changelog +++ smplayer-0.5.62/debian/changelog @@ -1,3 +1,29 @@ +smplayer (0.5.62-0ubuntu1) hardy; urgency=low + + * New upstream release. (LP: #175051) + * debian/control: + - Replaced kdelibs4-dev with libqt4-dev, since the Qt3 version has + been discontinued and no longer builds. + - Moved homepage out of the description. + - Recommend smplayer-themes. + - Depend on mplayer | mplayer-nogui. (LP: #146783) + - Split translations into smplayer-translations (big /usr/share). + - Increased debhelper version to 5.0.51 (for dh_icons). + - Updated Standards-Version to 3.7.3. + * debian/rules: + - Cleaned up by removing dh_make comments. + - Build against Qt4. + - Do not ignore make clean errors. + - Added dh_install. + - Added dh_icons and dh_desktop. + - Moved manpage file name from debian/rules to debian/manpages. + * debian/smplayer.1: updated. + * debian/smplayer.desktop: removed encoding field. + * Added debian/menu (with XPM file). + * Added debian/watch. + + -- Matvey Kozhev Sun, 09 Dec 2007 14:43:05 +0600 + smplayer (0.5.20-0ubuntu1) gutsy; urgency=low * New upstream release diff -u smplayer-0.5.20/debian/rules smplayer-0.5.62/debian/rules --- smplayer-0.5.20/debian/rules +++ smplayer-0.5.62/debian/rules @@ -9,8 +9,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 - - CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -25,12 +23,7 @@ build-stamp: dh_testdir - # Add here commands to compile the package. - #Qt 3 - $(MAKE) PREFIX=/usr KDE_SUPPORT=1 KDE_INCLUDE_PATH=/usr/include/kde - # Qt 4 - #$(MAKE) prep - #$(MAKE) PREFIX=/usr QMAKE=qmake-qt4 + $(MAKE) PREFIX=/usr QMAKE=qmake-qt4 LRELEASE=lrelease-qt4 touch $@ clean: @@ -38,8 +31,7 @@ dh_testroot rm -f build-stamp configure-stamp - # Add here commands to clean up after the build process. - -$(MAKE) clean + [ ! -f src/Makefile ] || $(MAKE) distclean dh_clean @@ -49,21 +41,20 @@ dh_clean -k dh_installdirs - # Add here commands to install the package into debian/smplayer. - $(MAKE) PREFIX=/usr DESTDIR=$(CURDIR)/debian/smplayer install - rm -rf $(CURDIR)/debian/smplayer/usr/share/doc/packages + $(MAKE) PREFIX=/usr DESTDIR=$(CURDIR)/debian/tmp install + rm -rf $(CURDIR)/debian/tmp/usr/share/doc/packages + dh_install -# Build architecture-independent files here. binary-indep: build install -# We have nothing to do by default. -# Build architecture-dependent files here. binary-arch: build install dh_testdir dh_testroot dh_installchangelogs Changelog dh_installdocs - dh_installman debian/smplayer.1 + dh_installman + dh_icons + dh_desktop dh_strip dh_compress dh_fixperms diff -u smplayer-0.5.20/debian/control smplayer-0.5.62/debian/control --- smplayer-0.5.20/debian/control +++ smplayer-0.5.62/debian/control @@ -1,13 +1,17 @@ Source: smplayer Section: graphics Priority: optional -Maintainer: Cyril Breuil -Build-Depends: debhelper (>= 5), kdelibs4-dev -Standards-Version: 3.7.2 +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Cyril Breuil +Build-Depends: debhelper (>= 5.0.51), libqt4-dev +Standards-Version: 3.7.3 +Homepage: http://smplayer.sourceforge.net/linux/ Package: smplayer Architecture: any -Depends: ${shlibs:Depends}, mplayer +Depends: ${shlibs:Depends}, smplayer-translations (= ${source:Version}), + mplayer | mplayer-nogui +Recommends: smplayer-themes Description: complete front-end for MPlayer Qt Mplayer front-end, with basic features like playing videos, DVDs, and VCDs to more advanced features like support @@ -20,3 +24,15 @@ - . - Homepage: http://smplayer.sourceforge.net/linux/ +Package: smplayer-translations +Architecture: all +Depends: smplayer (>= ${source:Version}) +Description: complete front-end for MPlayer + Qt Mplayer front-end, with basic features like playing + videos, DVDs, and VCDs to more advanced features like support + for MPlayer filters and more. One of the most interesting features + of SMPlayer: it remembers the settings of all files you play. + So you start to watch a movie but you have to leave... don't + worry, when you open that movie again it will resume at the same + point you left it, and with the same settings: audio track, + subtitles, volume... + . + This package contains translation files. diff -u smplayer-0.5.20/debian/smplayer.1 smplayer-0.5.62/debian/smplayer.1 --- smplayer-0.5.20/debian/smplayer.1 +++ smplayer-0.5.62/debian/smplayer.1 @@ -2,52 +2,80 @@ -.TH QT: "1" "May 2007" "Qt: 3.3.7" "User Commands" +.TH smplayer "1" "December 2007" "smplayer" "" .SH NAME -Qt: \- mplayer front end +SMPlayer \- GUI frontend for MPlayer .SH SYNOPSIS .B smplayer -[\fIQt-options\fR] [\fIKDE-options\fR] [\fIfile\fR] +.I [\fI-mini\fR] [\fI-ini-path directory\fR] [\fI-send-action action_name\fR] +[\fI-actions action_list\fR] [\fI\-close\-at\-end\fR] [\fI\-no\-close\-at\-end\fR] [\fI\-fullscreen\fR] +[\fI\-no\-fullscreen\fR] [\fI\-add\-to\-playlist\fR] [\fI\-help|\-\-help|\-h|\-?\fR] [\fI[\-playlist] media\fR] +[\fI[\-playlist] media\fR]... .SH DESCRIPTION -Front\-end for mplayer -.SS "Generic options:" .TP -\fB\-\-help\fR -Show help about options +SMPlayer is a GUI media player based on Qt 4, using \fBmplayer\fR(1) as its backend. +.SH OPTIONS .TP -\fB\-\-help\-qt\fR -Show Qt specific options +.B \-mini +Open the mini GUI instead of the default one. .TP -\fB\-\-help\-kde\fR -Show KDE specific options +.B \-ini\-path +Specify the directory for the configuration file (smplayer.ini). .TP -\fB\-\-help\-all\fR -Show all options -.TP -\fB\-\-author\fR -Show author information -.TP -\fB\-v\fR, \fB\-\-version\fR -Show version information -.TP -\fB\-\-license\fR -Show license information -.TP -\fB\-\-\fR -End of options -.SS "Arguments:" -.TP -file -File to open -.PP -KDE: 3.5.6 -SMPlayer: 0.4.12 +.B \-send\-action +Try to make a connection to another running instance and send to it the +specified action. Example: \fB\-send\-action\fR pause The rest of options +(if any) will be ignored and the application will exit. It will return 0 +on success or \fB\-1\fR on failure. +.TP +.B \-actions action_list +A list of actions separated by spaces. The +actions will be executed just after loading the file (if +any) in the same order you entered. For checkable actions +you can pass true or false as parameter. Example: \fB\-actions\fR +"fullscreen compact true". Quotes are necessary in case you +pass more than one action. +.TP +.B \-close\-at\-end +Close the main window when the file/playlist +finishes. +.TP +.B \-no\-close\-at\-end +Do not close the main window when the file/playlist +finishes. +.TP +.B \-fullscreen +Play the video in fullscreen mode. +.TP +.B \-no\-fullscreen +Play the video in window mode. +.TP +.B \-help +Show the help message and then exit. +.TP +.B -add\-to\-playlist +If there is another instance running, the media will be +added to that instance's playlist. If there is no other +instance, this option will be ignored and the files will be +opened in a new instance. +.TP +.B media +Any kind of file that SMPlayer can open. It can be a local file, +a DVD (e.g. dvd://1), an Internet stream +(e.g. mms://....) or a local playlist in format m3u. If the +\fB\-playlist\fR option is used, that means that SMPlayer will +pass the \fB\-playlist\fR option to MPlayer, so MPlayer will +handle the playlist, not SMPlayer. .SH "SEE ALSO" -The full documentation for -.B Qt: -is maintained as a Texinfo manual. If the -.B info -and -.B Qt: -programs are properly installed at your site, the command -.IP -.B info Qt: -.PP -should give you access to the complete manual. +\fBmplayer\fR(1) +.SH AUTHOR +The author of SMPlayer is Ricardo Villalba . + +This manual page was written by Matvey Kozhev for the +Ubuntu project (but may be used by others). + +Permission is granted to copy, distribute and/or modify this document +under the terms of the GNU General Public License, Version 2 or any later +version published by the Free Software Foundation. On Debian systems, the +complete text of the GNU General Public License can be found in +\fB/usr/share/common-licenses/GPL\fR. + +.SH BUGS +Please submit bugs to \fBhttp://sourceforge.net/projects/smplayer\fR. only in patch2: unchanged: --- smplayer-0.5.62.orig/debian/menu +++ smplayer-0.5.62/debian/menu @@ -0,0 +1,2 @@ +?package(smplayer): needs="X11" section="Applications/Video" \ + title="SMPlayer" longtitle="SMPlayer media player" icon="smplayer" command="smplayer" only in patch2: unchanged: --- smplayer-0.5.62.orig/debian/watch +++ smplayer-0.5.62/debian/watch @@ -0,0 +1,3 @@ +version=3 + +http://sf.net/smplayer/smplayer-([0.9].*)\.tar\.bz2 only in patch2: unchanged: --- smplayer-0.5.62.orig/debian/manpages +++ smplayer-0.5.62/debian/manpages @@ -0,0 +1 @@ +debian/smplayer.1 only in patch2: unchanged: --- smplayer-0.5.62.orig/debian/smplayer.xpm +++ smplayer-0.5.62/debian/smplayer.xpm @@ -0,0 +1,269 @@ +/* XPM */ +static char *smplayer[] = { +/* columns rows colors chars-per-pixel */ +"32 32 231 2", +" c #000000", +". c #010408", +"X c #0C0C0C", +"o c #111111", +"O c #1D1D1D", +"+ c #061229", +"@ c #091429", +"# c #061A38", +"$ c #081634", +"% c #091A3C", +"& c #141421", +"* c #232323", +"= c #26292A", +"- c #2A2A2A", +"; c #353535", +": c #3A3A3A", +"> c #0E2C4C", +", c #0D2450", +"< c #0E2758", +"1 c #0E3471", +"2 c #0F3D7A", +"3 c #333E41", +"4 c #3B3C43", +"5 c #285368", +"6 c #395E6A", +"7 c #7D4F39", +"8 c #444444", +"9 c #4B4B4B", +"0 c #544C4A", +"q c #525252", +"w c #5B5B5B", +"e c #444E63", +"r c #4F5F63", +"t c #636363", +"y c #61646B", +"u c #6A6A6B", +"i c #666F73", +"p c #6A6A74", +"a c #6A6F79", +"s c #64767B", +"d c #706D6C", +"f c #737374", +"g c #70707B", +"h c #7C7877", +"j c #7A7A7B", +"k c #153E8A", +"l c #16408F", +"z c #164294", +"x c #14479A", +"c c #154BA4", +"v c #184CA2", +"b c #1A51AA", +"n c #1454B4", +"m c #1456B8", +"M c #165BBC", +"N c #274A8F", +"B c #285C80", +"V c #28539E", +"C c #2962B8", +"Z c #3E68B0", +"A c #1661C5", +"S c #1A62C4", +"D c #1C67C9", +"F c #267AD2", +"G c #475A83", +"H c #5B5B92", +"J c #526DA3", +"K c #687C82", +"L c #727287", +"P c #7B7C82", +"I c #407ACD", +"U c #7979CA", +"Y c #2F83D6", +"T c #3883D5", +"R c #3B97DA", +"E c #3C98DE", +"W c #4EA4BF", +"Q c #798593", +"! c #6F8CBF", +"~ c #7686A6", +"^ c #7C8FB5", +"/ c #7B9CA4", +"( c #63A3B6", +") c #76A9B8", +"_ c #5380C5", +"` c #5887CD", +"' c #518BD6", +"] c #579BDE", +"[ c #5E9ADC", +"{ c #58B5D4", +"} c #5ABADA", +"| c #4FB6EA", +" . c #5CA8E2", +".. c #50B8EB", +"X. c #5FBAEB", +"o. c #648AC6", +"O. c #6888C0", +"+. c #6A97D7", +"@. c #6E98D4", +"#. c #689BDC", +"$. c #7899CE", +"%. c #7E9ED2", +"&. c #60AFE6", +"*. c #6BA8E2", +"=. c #7CA9E1", +"-. c #71B9E9", +";. c #7DB4E6", +":. c #69C4EE", +">. c #77C7E3", +",. c #7EC6EE", +"<. c #79CCF2", +"1. c #8E5328", +"2. c #AC5D3E", +"3. c #94765C", +"4. c #AA755C", +"5. c #DF6C3F", +"6. c #DA7E30", +"7. c #E57233", +"8. c #E57C3C", +"9. c #FC7E38", +"0. c #B8885A", +"q. c #A38A6C", +"w. c #D48333", +"e. c #E7983F", +"r. c #ED953C", +"t. c #F48A36", +"y. c #FD8B34", +"u. c #FC8838", +"i. c #D38549", +"p. c #EE9B42", +"a. c #F29549", +"s. c #F29846", +"d. c #838383", +"f. c #82848A", +"g. c #8B8B8C", +"h. c #829499", +"j. c #8F9094", +"k. c #8B929B", +"l. c #929293", +"z. c #959598", +"x. c #979898", +"c. c #9A9A9B", +"v. c #8B8BB6", +"b. c #8692A0", +"n. c #8793AA", +"m. c #8C97AA", +"M. c #8C99AB", +"N. c #8D9CB2", +"B. c #929DA9", +"V. c #9A9BA1", +"C. c #88B3BF", +"Z. c #93A1A6", +"A. c #9FA0A4", +"S. c #A2948C", +"D. c #A69D99", +"F. c #A3A3A4", +"G. c #A4A5AB", +"H. c #ABABAC", +"J. c #AAACB2", +"K. c #A4B7BC", +"L. c #AFB0B3", +"P. c #B2B3B3", +"I. c #B3B4BB", +"U. c #BBBBBB", +"Y. c #8989CA", +"T. c #829CC8", +"R. c #9696F6", +"E. c #89A1C7", +"W. c #81A6DA", +"Q. c #8CAED7", +"!. c #93ACC8", +"~. c #9DA8C0", +"^. c #9DB1D2", +"/. c #86B1E2", +"(. c #80B9E8", +"). c #8FBFEA", +"_. c #A2A2CC", +"`. c #A0B9DD", +"'. c #A8BADA", +"]. c #B7B8C0", +"[. c #B9BCC3", +"{. c #BCBCCC", +"}. c #B1BCD2", +"|. c #A8A8F5", +" X c #82C2EC", +".X c #88D3F4", +"XX c #92CBEF", +"oX c #9CC8E4", +"OX c #9CD0ED", +"+X c #98D8EF", +"@X c #96D9F4", +"#X c #BFC1C6", +"$X c #B8C6DC", +"%X c #A4DEF4", +"&X c #B0C3E2", +"*X c #BBCAE2", +"=X c #C9AE92", +"-X c #DAB389", +";X c #EBE5BC", +":X c #C2C2C2", +">X c #C3C4CB", +",X c #CBCBCB", +"./ 8 d.,Xl.: ; : h 4X6X6XP.x.P.iX4XH.P.iXiXiXlXlX", +"o w M.%.+.] .X.} r j Q :XU.F.U.6X6X6X6XpXpXaXP.8 ; ; t iX6XlXlX", +"t P.^ O.U F T E | { ; X : x.4X6XU.D.S.j aXaXpX9 ; ; ; ; :XiXlXlX", +"9 P.a J Z C S F R ..{ * * ; U.H.4.8.i.4XU.aX4X; ; : ; ; F.iXiXlX", +"lX; w e N v n A F R 5 6 ; * j 5.9.u.a.=Xh aXiXH.].J.f.: P.iXaXlX", +"lXo O ; @ k v m M > 5 :.( 3 w 2.u.y.s.e.4XpXgX2Xj.j g.G.iXiXlXlX", +"lXlX % k x # 2 Y X.<.) u 0 7.t.r.s.-X[.5Xl.y w u j 5XiXlXlX", +"lXlXlX $ + 1 m D ] -..XC.x.7 6.6.0.q.U.H.f t t w d A.iXlXlX", +"lXlXlXlX % z v m ' *. X@X/ 9 1.3.P H.4Xc.Y.U p t t f.[.lXlX", +"lXlXlXlXlX , z b ` #.;.XX%XK u t A.I.,X{.9X8Xv.u t j I.lXlX", +"lXlXlXlXlXlX . < V o.@.=.).oXi J.y J.3X,XrXdXjX7Xf t j A.lXlX", +"lXlXlXlXlXlXlX . G ! $.=.Q.h.Q [.f wXsX>XhXjXkXgXj t j V.lXlX", +"lXlXlXlXlXlXlXlX X y ~ E.E.k.!.k.>Xj wXhX,XjXkXkXgXQ u j V.lXlX", +"lXlXlXlXlXlXlXlXlX= w f n.k.^.^.Q ].u >XwX,XsXhXkXrXh t j V.lXlX", +"lXlXlXlXlXlXlXlXlXlX; w f.~.&X&XN.V.w J.[.,X3XtXuX_.d t j J. lX", +"lXlXlXlXlXlXlXlXlXlXlX: d.c.$X$X$XB.f g.G.,XG.|.R.L u t j {. lX", +"lXlXlXlXlXlXlXlXlXlXlXlX0 Q L.1XqX0XJ.j z.,XA.g p t w u c.H.& lX", +"lXlXlXlXlXlXlXlXlXlXlXlXlXw F.:XrXfXfXeXH.J.>Xf.t w t f >X4 H lX", +"lXlXlXlXlXlXlXlXlXlXlXlXlX* t P.6XgXjXkXc.f gXJ.j d f H.[.lXlXlX", +"lXlXlXlXlXlXlXlXlXlXlXlXlXlX- g.>XsXjXx.o X I.pXX[. lXlXlX", +"lXlXlXlXlXlXlXlXlXlXlXlXlXlXlX* q.0Xd.. lX 9 P j.t X lXlXlXlX", +"lXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlX; q . lXlXlXlXlXlXlXlXlXlXlXlXlX", +"lXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlX" +}; only in patch2: unchanged: --- smplayer-0.5.62.orig/debian/smplayer.install +++ smplayer-0.5.62/debian/smplayer.install @@ -0,0 +1,6 @@ +debian/smplayer.desktop usr/share/applications +debian/smplayer.xpm usr/share/pixmaps +debian/tmp/usr/bin/smplayer +debian/tmp/usr/share/icons +debian/tmp/usr/share/smplayer/shortcuts +debian/tmp/usr/share/smplayer/input.conf only in patch2: unchanged: --- smplayer-0.5.62.orig/debian/smplayer-translations.install +++ smplayer-0.5.62/debian/smplayer-translations.install @@ -0,0 +1 @@ +debian/tmp/usr/share/smplayer/translations only in patch2: unchanged: --- smplayer-0.5.62.orig/debian/smplayer.desktop +++ smplayer-0.5.62/debian/smplayer.desktop @@ -0,0 +1,17 @@ +[Desktop Entry] +Categories=Qt;AudioVideo;Player;Video; +Comment=A great MPlayer front-end +Comment[es]=A great MPlayer front-end +Comment[ja]=MPlayer フロントエンド +Comment[pl]=Świetna nakładka na Mplayer +Comment[ru_RU]=Мощный интерфейс для MPlayer +Exec=smplayer %f +GenericName=A great MPlayer front-end +GenericName[es]=A great MPlayer front-end +GenericName[ja]=MPlayer フロントエンド +GenericName[pl]=Świetna nakładka na Mplayer +GenericName[ru_RU]=Мощный интерфейс для MPlayer +Icon=smplayer +MimeType=audio/ac3;audio/mp4;audio/mpeg;audio/vnd.rn-realaudio;audio/vorbis;audio/x-adpcm;audio/x-matroska;audio/x-mp2;audio/x-mp3;audio/x-ms-wma;audio/x-vorbis;audio/x-wav;video/avi;video/mp4;video/mpeg;video/quicktime;video/vnd.rn-realvideo;video/x-matroska;video/x-ms-asf;video/x-msvideo;video/x-ms-wmv;video/x-ogm;video/x-theora +Name=SMPlayer +Type=Application