rev 3403 - kde-extras/kaffeine/trunk/debian
Fathi Boudra
fboudra-guest at costa.debian.org
Wed Mar 29 16:42:38 UTC 2006
Author: fboudra-guest
Date: 2006-03-29 16:42:37 +0000 (Wed, 29 Mar 2006)
New Revision: 3403
Added:
kde-extras/kaffeine/trunk/debian/kaffeine.1
Removed:
kde-extras/kaffeine/trunk/debian/kaffeine-gstreamer.install
kde-extras/kaffeine/trunk/debian/kaffeine-xine.install
kde-extras/kaffeine/trunk/debian/kaffeine.install
kde-extras/kaffeine/trunk/debian/man/
Modified:
kde-extras/kaffeine/trunk/debian/README.Debian
kde-extras/kaffeine/trunk/debian/changelog
kde-extras/kaffeine/trunk/debian/control
kde-extras/kaffeine/trunk/debian/rules
kde-extras/kaffeine/trunk/debian/watch
Log:
merge kaffeine-xine and kafffeine-gstreamer in kaffeine, disabled gstreamer part
Modified: kde-extras/kaffeine/trunk/debian/README.Debian
===================================================================
--- kde-extras/kaffeine/trunk/debian/README.Debian 2006-03-29 16:41:22 UTC (rev 3402)
+++ kde-extras/kaffeine/trunk/debian/README.Debian 2006-03-29 16:42:37 UTC (rev 3403)
@@ -1,7 +1,7 @@
kaffeine for Debian
-------------------
-The Gstreamer player-part is experimental
-The Lame Mp3 encoding plugin isn't compiled.
+The Gstreamer support is experimental and has been disabled.
+Due to patents problems, the Lame Mp3 encoding plugin isn't available.
-- Fathi Boudra <fboudra at free.fr>, Mon, 27 Mar 2006 09:44:19 +0200
Modified: kde-extras/kaffeine/trunk/debian/changelog
===================================================================
--- kde-extras/kaffeine/trunk/debian/changelog 2006-03-29 16:41:22 UTC (rev 3402)
+++ kde-extras/kaffeine/trunk/debian/changelog 2006-03-29 16:42:37 UTC (rev 3403)
@@ -1,6 +1,10 @@
kaffeine (0.8-1) unstable; urgency=low
* New upstream release
+ * Clean up control
+ * Added libcdparanoia0-dev to Build-Depends
+ * Disabled gstreamer support
+ * Merged kaffeine-xine and kaffeine-gstreamer in kaffeine package
-- Fathi Boudra <fboudra at free.fr> Mon, 27 Mar 2006 09:44:19 +0200
Modified: kde-extras/kaffeine/trunk/debian/control
===================================================================
--- kde-extras/kaffeine/trunk/debian/control 2006-03-29 16:41:22 UTC (rev 3402)
+++ kde-extras/kaffeine/trunk/debian/control 2006-03-29 16:42:37 UTC (rev 3403)
@@ -3,12 +3,12 @@
Priority: optional
Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
Uploaders: Riku Voipio <riku at debian.org>, Fathi Boudra <fboudra at free.fr>, Mark Purcell <msp at debian.org>
-Build-Depends: cdbs, debhelper (>= 5.0.0), kdelibs4-dev, libcdparanoia0-dev, libgstreamer-plugins0.8-dev, libqt3-compat-headers, libxine-dev
+Build-Depends: cdbs, debhelper (>= 5.0.0), kdelibs4-dev, libcdparanoia0-dev, libqt3-compat-headers, libxine-dev
Standards-Version: 3.6.2
Package: kaffeine
Architecture: any
-Depends: ${shlibs:Depends}, kaffeine-xine (= ${Source-Version}) | kaffeine-gstreamer (= ${Source-Version})
+Depends: ${shlibs:Depends}
Description: versatile media player for KDE
Kaffeine is a media player for KDE. While it supports multiple player
engines, its default engine is Xine, giving Kaffeine a wide variety of
@@ -20,32 +20,6 @@
.
Homepage: http://kaffeine.sourceforge.net
-Package: kaffeine-xine
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: Xine engine for kaffeine media player
- Kaffeine is a media player for KDE. While it supports multiple player
- engines, its default engine is Xine, giving Kaffeine a wide variety of
- supported media types and letting Kaffeine access CDs, DVDs, and
- network streams easily.
- .
- This package provides the Xine playing engine for Kaffeine.
- .
- Homepage: http://kaffeine.sourceforge.net
-
-Package: kaffeine-gstreamer
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: GStreamer engine for kaffeine media player
- Kaffeine is a media player for KDE. While it supports multiple player
- engines, its default engine is Xine, giving Kaffeine a wide variety of
- supported media types and letting Kaffeine access CDs, DVDs, and
- network streams easily.
- .
- This package provides the GStreamer playing engine for Kaffeine.
- .
- Homepage: http://kaffeine.sourceforge.net
-
Package: kaffeine-dbg
Section: devel
Architecture: any
Deleted: kde-extras/kaffeine/trunk/debian/kaffeine-gstreamer.install
Deleted: kde-extras/kaffeine/trunk/debian/kaffeine-xine.install
Added: kde-extras/kaffeine/trunk/debian/kaffeine.1
===================================================================
--- kde-extras/kaffeine/trunk/debian/kaffeine.1 2006-03-29 16:41:22 UTC (rev 3402)
+++ kde-extras/kaffeine/trunk/debian/kaffeine.1 2006-03-29 16:42:37 UTC (rev 3403)
@@ -0,0 +1,187 @@
+.\" This file was generated by kdemangen.pl
+.TH KAFFEINE 1 "Apr 2005" "K Desktop Environment" "A media player for KDE"
+.SH NAME
+kaffeine
+- A media player for KDE that can use multiple backends for playback.
+.SH SYNOPSIS
+kaffeine [Qt-options] [KDE-options] [options] [file]
+.SH DESCRIPTION
+Kaffeine is a media player for KDE. While it supports multiple player
+engines, its default engine is Xine, giving Kaffeine a wide variety of
+supported media types and letting Kaffeine access CDs, DVDs, and
+network streams easily.
+
+Kaffeine can keep track of multiple playlists simultaneously, and supports
+autoloading of subtitles files for use while playing video.
+
+Author: Jürgen Kofler
+Homepage: http://kaffeine.sourceforge.net
+
+
+.SH OPTIONS
+.SS
+.SS Arguments:
+.TP
+.B file
+File(s) to play. Can be a local file, a URL, a directory or 'DVD', 'VCD', 'AudioCD'.
+.SS Options:
+.TP
+.B -p, --play
+Start playing immediately
+.TP
+.B -f, --fullscreen
+Start in fullscreen mode
+.TP
+.B -a, --audiodriver <argument>
+Set audio driver [default]
+.TP
+.B -x, --videodriver <argument>
+Set video driver [default]
+.TP
+.B -d, --device <argument>
+Set Audio-CD/VCD/DVD device path. [default]
+.TP
+.B --verbose
+Output xine debug messages
+.TP
+.B -w, --wizard
+Run installation wizard
+.SS
+.SS Generic options:
+.TP
+.B --help
+Show help about options
+.TP
+.B --help-qt
+Show Qt specific options
+.TP
+.B --help-kde
+Show KDE specific options
+.TP
+.B --help-all
+Show all options
+.TP
+.B --author
+Show author information
+.TP
+.B -v, --version
+Show version information
+.TP
+.B --license
+Show license information
+.TP
+.B --
+End of options
+.SS
+.SS KDE options:
+.TP
+.B --caption <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B --icon <icon>
+Use 'icon' as the application icon
+.TP
+.B --miniicon <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B --config <filename>
+Use alternative configuration file
+.TP
+.B --dcopserver <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B --nocrashhandler
+Disable crash handler, to get core dumps
+.TP
+.B --waitforwm
+Waits for a WM_NET compatible windowmanager
+.TP
+.B --style <style>
+sets the application GUI style
+.TP
+.B --geometry <geometry>
+sets the client geometry of the main widget - see man X for the argument format
+.TP
+.B --nofork
+Don't run in the background.
+.SS
+.SS Qt options:
+.TP
+.B --display <displayname>
+Use the X-server display 'displayname'
+.TP
+.B --session <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B --cmap
+Causes the application to install a private color
+map on an 8-bit display
+.TP
+.B --ncols <count>
+Limits the number of colors allocated in the color
+cube on an 8-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B --nograb
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B --dograb
+running under a debugger can cause an implicit
+-nograb, use -dograb to override
+.TP
+.B --sync
+switches to synchronous mode for debugging
+.TP
+.B --fn, --font <fontname>
+defines the application font
+.TP
+.B --bg, --background <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B --fg, --foreground <color>
+sets the default foreground color
+.TP
+.B --btn, --button <color>
+sets the default button color
+.TP
+.B --name <name>
+sets the application name
+.TP
+.B --title <title>
+sets the application title (caption)
+.TP
+.B --visual TrueColor
+forces the application to use a TrueColor visual on
+an 8-bit display
+.TP
+.B --inputstyle <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B --im <XIM server>
+set XIM server
+.TP
+.B --noxim
+disable XIM
+.TP
+.B --reverse
+mirrors the whole layout of widgets
+.SS
+
+.SH SEE ALSO
+Full user documentation is available through the KDE Help Center. You can also enter the URL
+.BR help:/kaffeine/
+directly into konqueror or you can run
+.BR "`khelpcenter help:/kaffeine/'"
+from the command-line.
+.br
+.SH AUTHORS
+.nf
+Jürgen Kofler <kaffeine at gmx.net>
+.br
+Christophe Thommeret <hftom at free.fr>
+.br
Deleted: kde-extras/kaffeine/trunk/debian/kaffeine.install
Modified: kde-extras/kaffeine/trunk/debian/rules
===================================================================
--- kde-extras/kaffeine/trunk/debian/rules 2006-03-29 16:41:22 UTC (rev 3402)
+++ kde-extras/kaffeine/trunk/debian/rules 2006-03-29 16:42:37 UTC (rev 3403)
@@ -4,7 +4,8 @@
include /usr/share/cdbs/1/class/kde.mk
#include /usr/share/cdbs/1/rules/simple-patchsys.mk
-DEB_INSTALL_MANPAGES_kaffeine := debian/man/kaffeine.1
+DEB_CONFIGURE_EXTRA_FLAGS := --without-gstreamer --without-lame
+DEB_INSTALL_MANPAGES_kaffeine := debian/kaffeine.1
install/kaffeine::
install -D -p -m0644 debian/kaffeine.xpm debian/kaffeine/usr/share/pixmaps/kaffeine.xpm
Modified: kde-extras/kaffeine/trunk/debian/watch
===================================================================
--- kde-extras/kaffeine/trunk/debian/watch 2006-03-29 16:41:22 UTC (rev 3402)
+++ kde-extras/kaffeine/trunk/debian/watch 2006-03-29 16:42:37 UTC (rev 3403)
@@ -1,2 +1,2 @@
version=3
-http://sf.net/kaffeine/kaffeine-([^m].*)\.tar\.bz2 debian uupdate
+http://sourceforge.net/kaffeine/kaffeine-([^m].*)\.tar\.bz2 debian uupdate
More information about the pkg-kde-commits
mailing list