rev 3360 - in kde-extras/kaffeine/trunk/debian: . man
Fathi Boudra
fboudra-guest at costa.debian.org
Mon Mar 27 12:32:07 UTC 2006
Author: fboudra-guest
Date: 2006-03-27 12:32:06 +0000 (Mon, 27 Mar 2006)
New Revision: 3360
Added:
kde-extras/kaffeine/trunk/debian/docs
kde-extras/kaffeine/trunk/debian/kaffeine.lintian-overrides
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/copyright
kde-extras/kaffeine/trunk/debian/kaffeine.install
kde-extras/kaffeine/trunk/debian/man/kaffeine.1
kde-extras/kaffeine/trunk/debian/rules
kde-extras/kaffeine/trunk/debian/watch
Log:
kaffeine cleanup, build-able, patches disabled
Modified: kde-extras/kaffeine/trunk/debian/README.Debian
===================================================================
--- kde-extras/kaffeine/trunk/debian/README.Debian 2006-03-27 12:29:08 UTC (rev 3359)
+++ kde-extras/kaffeine/trunk/debian/README.Debian 2006-03-27 12:32:06 UTC (rev 3360)
@@ -1,12 +1,20 @@
+kaffeine for Debian
+-------------------
+
+lame mp3 encoding is disabled on kaffeine for Debian.
+
Known bugs
----------
-Issue: Kaffeine, using the Xine engine, will hang and use 100% of the CPU in the background instead of quitting.
+
+Issue: Kaffeine, using the Xine engine, will hang and use 100% of the CPU in
+ the background instead of quitting.
Workaround: Use the GStreamer engine.
Building -dbg packages for debugging
------------------------------------
-To build packages with debug information, you can follow a procedure like this one:
+To build packages with debug information, you can follow a procedure like this
+one:
mkdir /tmp/kaffeine_dbg
cd /tmp/kaffeine_dbg
@@ -17,3 +25,4 @@
dpkg-buildpackage -rfakeroot -us -uc
dpkg -i ../kaffeine*.deb
+ -- 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-27 12:29:08 UTC (rev 3359)
+++ kde-extras/kaffeine/trunk/debian/changelog 2006-03-27 12:32:06 UTC (rev 3360)
@@ -1,3 +1,9 @@
+kaffeine (0.8-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Fathi Boudra <fboudra at free.fr> Mon, 27 Mar 2006 09:44:19 +0200
+
kaffeine (0.7.1-1.3) unstable; urgency=low
* NMU with maintainer's approval. All changes come straight from a patch
Modified: kde-extras/kaffeine/trunk/debian/control
===================================================================
--- kde-extras/kaffeine/trunk/debian/control 2006-03-27 12:29:08 UTC (rev 3359)
+++ kde-extras/kaffeine/trunk/debian/control 2006-03-27 12:32:06 UTC (rev 3360)
@@ -1,15 +1,15 @@
Source: kaffeine
Section: kde
Priority: optional
-Maintainer: Zack Cerza <zcerza at coe.neu.edu>
-Uploaders: Riku Voipio <riku.voipio at iki.fi>, Zack Cerza <zcerza at coe.neu.edu>
-Build-Depends: debhelper (>= 4.2.0), cdbs, automake1.8, autoconf, libqt3-compat-headers, kdelibs4-dev (>= 4:3.2.3-2), libxine-dev (>= 1-rc5-1), linux-kernel-headers, libgstreamer-plugins0.8-dev, g++-3.4 [arm m68k hppa]
-Standards-Version: 3.6.1.1
+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
+Standards-Version: 3.6.2
Package: kaffeine
Architecture: any
Depends: ${shlibs:Depends}, kaffeine-xine | kaffeine-gstreamer
-Description: versatile media player for KDE 3
+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
supported media types and letting Kaffeine access CDs, DVDs, and
@@ -18,7 +18,6 @@
Kaffeine can keep track of multiple playlists simultaneously, and supports
autoloading of subtitles files for use while playing video.
.
- Authors: Jürgen Kofler and Christophe Thommeret
Homepage: http://kaffeine.sourceforge.net
Package: kaffeine-gstreamer
@@ -32,7 +31,6 @@
.
This package provides the GStreamer playing engine for Kaffeine.
.
- Authors: Jürgen Kofler and Christophe Thommeret
Homepage: http://kaffeine.sourceforge.net
Package: kaffeine-xine
@@ -46,5 +44,4 @@
.
This package provides the Xine playing engine for Kaffeine.
.
- Authors: Jürgen Kofler and Christophe Thommeret
Homepage: http://kaffeine.sourceforge.net
Modified: kde-extras/kaffeine/trunk/debian/copyright
===================================================================
--- kde-extras/kaffeine/trunk/debian/copyright 2006-03-27 12:29:08 UTC (rev 3359)
+++ kde-extras/kaffeine/trunk/debian/copyright 2006-03-27 12:32:06 UTC (rev 3360)
@@ -3,23 +3,50 @@
It was downloaded from http://kaffeine.sourceforge.net
-Upstream Authors: Jürgen Kofler and Christophe Thommeret
+Copyright Holders:
+ (C) 2006 Christophe Thommeret <hftom at free.fr>
+ (C) 2004-2005 by Jurgen Kofler <kaffeine at gmx.net>
-This software is copyright (c) the Kaffeine Project, the xine project,
-Giorgos Gousios, Miguel Freitas, and Dave Chapman.
+Copyright for kmultitabbar:
+ (C) 2001-2003 by Joseph Wenninger <jowenn at kde.org>
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+Copyright for kaffeine_export copied from kat:
+ (C) 2005 Laurent Montel <montel at kde.org>
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+Copyright for ts2pes copied from mjpegtools for the Siemens Fujitsu DVB PCI card:
+ (C) 2000-2001 Marcus Metzler <mocm at metzlerbros.de>
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+Copyright for ts2rtp copied from dvbstream:
+ (C) 2001-2002 Dave Chapman <dave at dchapman.org>
+Copyright for cddb code:
+ (C) 2000 Michael Matz <matz at kde.org>
-On Debian systems, the complete text of the GNU General Public License can be found in the file `/usr/share/common-licenses/GPL'.
+Copyright for playlistitem and subtitle file import code:
+ (C) 2004-2005 Giorgos Gousios <gousiosg at cs.man.ac.uk>
+
+Copyright for googlefetcher code:
+ (C) 2004 Nathan Toone <nathan at toonetown.com>
+
+Copyright for xine post plugin handling:
+ (C) 2004-2005 Miguel Freitas <miguel at cetuc.puc-rio.br>
+
+License:
+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
+
Added: kde-extras/kaffeine/trunk/debian/docs
===================================================================
--- kde-extras/kaffeine/trunk/debian/docs 2006-03-27 12:29:08 UTC (rev 3359)
+++ kde-extras/kaffeine/trunk/debian/docs 2006-03-27 12:32:06 UTC (rev 3360)
@@ -0,0 +1,2 @@
+README
+TODO
Modified: kde-extras/kaffeine/trunk/debian/kaffeine.install
===================================================================
--- kde-extras/kaffeine/trunk/debian/kaffeine.install 2006-03-27 12:29:08 UTC (rev 3359)
+++ kde-extras/kaffeine/trunk/debian/kaffeine.install 2006-03-27 12:32:06 UTC (rev 3360)
@@ -1,10 +1,13 @@
-debian/tmp/usr/bin
-debian/tmp/usr/lib/*.la
-debian/tmp/usr/lib/*.so.*
+debian/tmp/usr/bin/kaffeine
+debian/tmp/usr/lib/kde3/libkaffeineoggvorbis.la
+debian/tmp/usr/lib/kde3/libkaffeineoggvorbis.so
+debian/tmp/usr/lib/libk*.la
+debian/tmp/usr/lib/libk*.so.*
+debian/tmp/usr/share/applications/kde/kaffeine.desktop
+debian/tmp/usr/share/apps/
debian/tmp/usr/share/doc/
-debian/tmp/usr/share/man/
-debian/tmp/usr/share/apps/
debian/tmp/usr/share/icons/
-debian/tmp/usr/share/applications/
debian/tmp/usr/share/locale/
debian/tmp/usr/share/mimelnk/
+debian/tmp/usr/share/services/kaffeineoggvorbis.desktop
+debian/tmp/usr/share/servicetypes/kaffeineaudioencoder.desktop
Added: kde-extras/kaffeine/trunk/debian/kaffeine.lintian-overrides
===================================================================
--- kde-extras/kaffeine/trunk/debian/kaffeine.lintian-overrides 2006-03-27 12:29:08 UTC (rev 3359)
+++ kde-extras/kaffeine/trunk/debian/kaffeine.lintian-overrides 2006-03-27 12:32:06 UTC (rev 3360)
@@ -0,0 +1,4 @@
+# It isn't a library or a development package and no other packages uses
+# libkmediapart and libkaffeineaudioencoder. kaffeine needs them and maybe
+# a split can happen later.
+kaffeine: package-name-doesnt-match-sonames libkmediapart0 libkaffeineaudioencoder0
Modified: kde-extras/kaffeine/trunk/debian/man/kaffeine.1
===================================================================
--- kde-extras/kaffeine/trunk/debian/man/kaffeine.1 2006-03-27 12:29:08 UTC (rev 3359)
+++ kde-extras/kaffeine/trunk/debian/man/kaffeine.1 2006-03-27 12:32:06 UTC (rev 3360)
@@ -1,8 +1,8 @@
.\" This file was generated by kdemangen.pl
-.TH KAFFEINE 1 "Apr 2005" "K Desktop Environment" "A media player for KDE 3"
+.TH KAFFEINE 1 "Apr 2005" "K Desktop Environment" "A media player for KDE"
.SH NAME
kaffeine
-- A media player for KDE 3 that can use multiple backends for playback.
+- A media player for KDE that can use multiple backends for playback.
.SH SYNOPSIS
kaffeine [Qt-options] [KDE-options] [options] [file]
.SH DESCRIPTION
@@ -183,6 +183,5 @@
.nf
Jürgen Kofler <kaffeine at gmx.net>
.br
-Christophe Thommeret <hftom at wanadoo.fr>
+Christophe Thommeret <hftom at free.fr>
.br
-
Modified: kde-extras/kaffeine/trunk/debian/rules
===================================================================
--- kde-extras/kaffeine/trunk/debian/rules 2006-03-27 12:29:08 UTC (rev 3359)
+++ kde-extras/kaffeine/trunk/debian/rules 2006-03-27 12:32:06 UTC (rev 3360)
@@ -1,28 +1,12 @@
#!/usr/bin/make -f
-GCC4_ICES_HERE := arm m68k hppa
-DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
-
-ifneq (,$(filter $(DEB_HOST_ARCH_CPU),$(GCC4_ICES_HERE)))
- export CC=gcc-3.4
- export CPP=cpp-3.4
- export CXX=g++-3.4
-endif
-
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-# For some reason this is broken, at least for me.
-#include /usr/share/cdbs/1/class/kde.mk
-include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/class/kde.mk
+#include /usr/share/cdbs/1/rules/simple-patchsys.mk
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-rpath
+DEB_INSTALL_MANPAGES_kaffeine := debian/man/kaffeine.1
-DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/tmp/
-DEB_COMPRESS_EXCLUDE := .docbook
+install/kaffeine::
+ install -D -p -m0644 debian/kaffeine.xpm debian/kaffeine/usr/share/pixmaps/kaffeine.xpm
+ install -D -p -m0644 debian/kaffeine.lintian-overrides debian/kaffeine/usr/share/lintian/overrides/kaffeine
-binary-post-install/kaffeine::
- mkdir debian/kaffeine/usr/share/pixmaps
- cp debian/kaffeine.xpm debian/kaffeine/usr/share/pixmaps/
- mkdir debian/kaffeine/usr/share/doc/kde
- mv debian/kaffeine/usr/share/doc/HTML debian/kaffeine/usr/share/doc/kde
-
Modified: kde-extras/kaffeine/trunk/debian/watch
===================================================================
--- kde-extras/kaffeine/trunk/debian/watch 2006-03-27 12:29:08 UTC (rev 3359)
+++ kde-extras/kaffeine/trunk/debian/watch 2006-03-27 12:32:06 UTC (rev 3360)
@@ -1,2 +1,2 @@
-version=2
-http://heanet.dl.sourceforge.net/sourceforge/kaffeine/kaffeine-([^m].*)\.tar\.bz2 debian uupdate
+version=3
+http://sf.net/kaffeine/kaffeine-([^m].*)\.tar\.bz2 debian uupdate
More information about the pkg-kde-commits
mailing list