diff -u qdvdauthor-1.0.0~rc3/debian/changelog qdvdauthor-1.0.0~rc3/debian/changelog --- qdvdauthor-1.0.0~rc3/debian/changelog +++ qdvdauthor-1.0.0~rc3/debian/changelog @@ -1,3 +1,20 @@ +qdvdauthor (1:1.0.0~rc3-0.0ubuntu1) hardy; urgency=low + + * Merged new upstream release from debian-multimedia.org (LP: #164815), remaining Ubuntu changes: + - debian/rules, debian/qdvdauthor.desktop, debian/qdvdauthor.install: install .desktop file + icons + - debian/qslideshow.1, debian/qdvdauthor.1, debian/manpages, debian/qplayer.1: Added manpages. + - debian/rules: Build with --qt-dir=/usr/share/qt3 --with-qt-lib=qt-mt --with-xine-support. + - debian/control: + - Added homepage field to debian/control. + - Add netpbm, sox, lame, vorbis-tools, videotrans as Dependencies, + - debian/patches/00list: don't apply -01_configure.dpatch because: + - The QTDIR issue is now avoiced by passing the --qt-dir parameter to configure. + - The make lines are edited out, so qplayer and qslideshow are not built.  (The Ubuntu version builds them.) + - debian/source.lintian-overrides: add lintian overrides for source-contains-CVS-dir + * debian/control: drop -dbg package, we have -dbgsym packages now. + + -- Matvey Kozhev Mon, 26 Nov 2007 15:11:26 +0600 + qdvdauthor (1:1.0.0~rc3-0.0) unstable; urgency=low * New upstream release. @@ -10,6 +27,17 @@ -- Christian Marillat Sun, 07 Oct 2007 19:28:27 +0200 +qdvdauthor (1.0.0~rc1-0ubuntu1) gutsy; urgency=low + + * New upstream release. (LP: #105406, LP: #137987) + * Merge in changes from Matvey Kozhev + * Fix various packaging deficiencies + * Wrote manpages for binaries + * Complemented copyright information + * Added dbg package for debugging crashes + + -- Aleksander Adamowski Thu, 6 Sep 2007 00:31:31 +0200 + qdvdauthor (1.0.0-0.0) unstable; urgency=low * New upstream release. diff -u qdvdauthor-1.0.0~rc3/debian/rules qdvdauthor-1.0.0~rc3/debian/rules --- qdvdauthor-1.0.0~rc3/debian/rules +++ qdvdauthor-1.0.0~rc3/debian/rules @@ -29,7 +29,7 @@ build-stamp: patch-stamp dh_testdir - ./configure --prefix=/usr --build-qslideshow --build-qplayer + ./configure --prefix=/usr --qt-dir=/usr/share/qt3 --with-qt-lib=qt-mt --with-xine-support --build-qslideshow --build-qplayer touch build-stamp @@ -63,8 +63,8 @@ cp bin/q* debian/qdvdauthor/usr/bin - cp qdvdauthor.desktop debian/qdvdauthor/usr/share/applications cp qdvdauthor.png debian/qdvdauthor/usr/share/pixmaps + dh_install # Build architecture-independent files here. binary-indep: build install reverted: --- qdvdauthor-1.0.0~rc3/debian/patches/00list +++ qdvdauthor-1.0.0~rc3.orig/debian/patches/00list @@ -1 +0,0 @@ -01_configure.dpatch diff -u qdvdauthor-1.0.0~rc3/debian/control qdvdauthor-1.0.0~rc3/debian/control --- qdvdauthor-1.0.0~rc3/debian/control +++ qdvdauthor-1.0.0~rc3/debian/control @@ -1,15 +1,18 @@ Source: qdvdauthor Section: graphics Priority: optional -Maintainer: Christian Marillat +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Christian Marillat Bugs: mailto:marillat@debian.org Standards-Version: 3.7.2 +Homepage: http://qdvdauthor.sourceforge.net Build-Depends: debhelper (>= 5), libmagick++9-dev | libmagick++-dev, libqt3-mt-dev, libxine-dev, dpatch Package: qdvdauthor Architecture: any -Depends: ${shlibs:Depends}, dvdauthor (>= 0.6.10), dvd-slideshow, mjpegtools (>= 1.8.0) +Depends: ${shlibs:Depends}, dvdauthor (>= 0.6.10), dvd-slideshow, mjpegtools (>= 1.8.0), + netpbm, sox, lame, vorbis-tools, videotrans Description: GUI frontend for dvdauthor and other related tools The goal is to provide an easy-to-use, yet powerful and complete interface to generate DVD menus, slideshows, and videos to burn on a DVD. only in patch2: unchanged: --- qdvdauthor-1.0.0~rc3.orig/debian/qslideshow.1 +++ qdvdauthor-1.0.0~rc3/debian/qslideshow.1 @@ -0,0 +1,38 @@ +.\" +.\" Template for man pages by Jan Schaumann +.\" +.TH qslideshow 1 "18 July 2007" Linux "qslideshow Manpage" +.SH NAME +qslideshow \- a utility for generating image slideshows + +.SH SYNOPSIS +.B qslideshow + +.SH DESCRIPTION +\fBqslideshow\fR is a small GUI application for creating slideshows of images +with background sound and transition effects. + +It is typically used internally by \fIqdvdauthor\fR. + +.SH USAGE +.B qslideshow + +.SH OPTIONS +.TP +No options are accepted. + +.SH VERSION +1.0.0-rc1 + +.SH BUGS +\fBqslideshow\fR tends to crash sometimes. + +.SH "SEE ALSO" +.BR qdvdauthor (1) + +.SH AUTHOR +Varol Okan + +This man-page was written by Aleksander Adamowski as part of "The Missing +Man Pages Project". Please see \fIhttp://www.netmeister.org/misc/m2p2/index.html\fR +for details. only in patch2: unchanged: --- qdvdauthor-1.0.0~rc3.orig/debian/qdvdauthor.1 +++ qdvdauthor-1.0.0~rc3/debian/qdvdauthor.1 @@ -0,0 +1,70 @@ +.\" +.\" Template for man pages by Jan Schaumann +.\" +.TH qdvdauthor 1 "18 July 2007" Linux "QDVDAuthor Manpage" +.SH NAME +qdvdauthor \- a complete DVDAuthoring solution for Linux + +.SH SYNOPSIS +.B qdvdauthor +[\fIOPTION\fR...] + +.SH DESCRIPTION +The goal of 'Q' DVD-Author is to provide a complete DVDAuthoring solution +for Linux with the emphasis of ease of use and a complete set +of functionality. + +\fBqdvdauthor\fR is the main binary that launches the GUI editor. + +.SH USAGE +.B qdvdauthor [\-k ] [\-d ] [\-s ] +[\-p ] [\-o ] [\-a] + +.SH OPTIONS +.TP +.B \-k +import a kino smil file. +.TP +.B \-d +import a dvdauthor.xml file. +.TP +.B \-s +import spumux.xml file(s). +.TP +.B \-p +open a 'Q' DVD-Author project file. +.TP +.B \-o +export the generated 'Q' DVD-Author project file. +.TP +.B \-a +This option creates a menu structure automatically from the input provided. +.TP +.B \-x +Execute the program without Dialog boxes. This way you can run it in batch mode. + +.TP +Note: \-a and \-x are not yet implemented. + +.SH REQUIRES +\fIdvdauthor\fR utility is needed to do authoring jobs. + +.SH FILES +\fI~/.qdvdauthor/qdvdauthor.ini\fR initialization file, contains user configuration + + +.SH VERSION +1.0.0-rc1 + +.SH BUGS +\fBqdvdauthor\fR tends to crash on certain editing operations + +.SH "SEE ALSO" +.BR dvdauthor (1) + +.SH AUTHOR +Varol Okan + +This man-page was written by Aleksander Adamowski as part of "The Missing +Man Pages Project". Please see \fIhttp://www.netmeister.org/misc/m2p2/index.html\fR +for details. only in patch2: unchanged: --- qdvdauthor-1.0.0~rc3.orig/debian/manpages +++ qdvdauthor-1.0.0~rc3/debian/manpages @@ -0,0 +1,3 @@ +debian/qdvdauthor.1 +debian/qplayer.1 +debian/qslideshow.1 only in patch2: unchanged: --- qdvdauthor-1.0.0~rc3.orig/debian/qplayer.1 +++ qdvdauthor-1.0.0~rc3/debian/qplayer.1 @@ -0,0 +1,40 @@ +.\" +.\" Template for man pages by Jan Schaumann +.\" +.TH qplayer 1 "18 July 2007" Linux "qplayer Manpage" +.SH NAME +qplayer \- a player based on Xine libraries + +.SH SYNOPSIS +.B qplayer + +.SH DESCRIPTION +\fBqplayer\fR is a small GUI application fostering the xine libraries. +It was neccesary to have a working interface to movie files for the +'Q' DVD-Author application and thus a small sub-project +was created called QPlayer. + +It is typically used internally by \fIqdvdauthor\fR. + +.SH USAGE +.B qplayer [clips to load] + +.SH OPTIONS +.TP +No options are accepted other from files to open. + +.SH VERSION +1.0.0-rc1 + +.SH BUGS +\fBqplayer\fR tends to crash sometimes. + +.SH "SEE ALSO" +.BR qdvdauthor (1) + +.SH AUTHOR +Varol Okan + +This man-page was written by Aleksander Adamowski as part of "The Missing +Man Pages Project". Please see \fIhttp://www.netmeister.org/misc/m2p2/index.html\fR +for details. only in patch2: unchanged: --- qdvdauthor-1.0.0~rc3.orig/debian/qdvdauthor.install +++ qdvdauthor-1.0.0~rc3/debian/qdvdauthor.install @@ -0,0 +1,2 @@ +debian/qdvdauthor.desktop usr/share/applications +qdvdauthor.png usr/share/icons/hicolor/48x48/apps only in patch2: unchanged: --- qdvdauthor-1.0.0~rc3.orig/debian/source.lintian-overrides +++ qdvdauthor-1.0.0~rc3/debian/source.lintian-overrides @@ -0,0 +1,2 @@ +# Upstream version was tar-ed with CVS directories: +qdvdauthor source: source-contains-CVS-dir only in patch2: unchanged: --- qdvdauthor-1.0.0~rc3.orig/debian/qdvdauthor.desktop +++ qdvdauthor-1.0.0~rc3/debian/qdvdauthor.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=QDVDAuthor +Comment=DVD Author GUI +Icon=qdvdauthor +Exec=qdvdauthor +Terminal=false +Type=Application +Encoding=UTF-8 +X-Desktop-File-Install-Version=0.3 +Categories=Qt;AudioVideo;