rev 15642 - kde-extras/kaffeine/trunk/debian
Fathi Boudra
fabo at alioth.debian.org
Wed Aug 12 09:55:53 UTC 2009
Author: fabo
Date: 2009-08-12 09:55:53 +0000 (Wed, 12 Aug 2009)
New Revision: 15642
Added:
kde-extras/kaffeine/trunk/debian/kaffeine.install
Modified:
kde-extras/kaffeine/trunk/debian/changelog
kde-extras/kaffeine/trunk/debian/compat
kde-extras/kaffeine/trunk/debian/control
kde-extras/kaffeine/trunk/debian/copyright
kde-extras/kaffeine/trunk/debian/kaffeine.docs
kde-extras/kaffeine/trunk/debian/rules
Log:
Prepare kaffeine 1.0 pre 2 for experimental.
Modified: kde-extras/kaffeine/trunk/debian/changelog
===================================================================
--- kde-extras/kaffeine/trunk/debian/changelog 2009-08-12 08:43:00 UTC (rev 15641)
+++ kde-extras/kaffeine/trunk/debian/changelog 2009-08-12 09:55:53 UTC (rev 15642)
@@ -1,17 +1,20 @@
-kaffeine (1.0~pre1-1) UNRELEASED; urgency=low
+kaffeine (1.0~pre2-1) experimental; urgency=low
- targeted for experimental.
+ * New upstream release (KDE 4 version).
+ * Bump debian/compat to 7.
+ * Update debian/control:
+ - Move kaffeine to section video.
+ - Cleanup build depencies for the KDE 4 version.
+ - Update Homepage field.
+ - Cleanup dependencies for the KDE 4 version.
+ - Update description.
+ * Rewrite debian/copyright file (KDE 4 version).
+ * Cleanup debian/kaffeine.docs file.
+ * Add debian/kaffeine.install file.
+ * Convert debian/rules to dh usage.
- * New upstream release. KDE 4 version.
+ -- Fathi Boudra <fabo at debian.org> Wed, 12 Aug 2009 02:23:50 +0200
- [ Mark Purcell ]
- * Update debian/kaffeine.1 - fixes hyphen-used-as-minus-sign
- * Clean package from svn - fixes lintian:patch-system-but-direct-
- changes-in-diff
- * Refresh kaffeine.lintian-overrides - fixes unused-override
-
- -- Fathi Boudra <fabo at debian.org> Sun, 26 Apr 2009 23:09:53 +0200
-
kaffeine (0.8.7-1) unstable; urgency=low
* New upstream release.
@@ -268,7 +271,7 @@
* Updated package description.
* Added 12_gstreamer_service_menu.diff, based on Kubuntu's patch
kubuntu_02_gstreamer_service_menu.diff to change name, icon and MIME types
- of the GStreamer part.
+ of the GStreamer part.
* Added 13_xine_service_menu.diff to change name of the xine part.
* Added kubuntu_03_gstreamer_stop.diff from Kubuntu to not attempt to play
the logo file when the stop button is pressed.
@@ -383,7 +386,7 @@
* Diverted user settings to '~/.kde/share/apps/kaffeine'. Closes: #261245
* Removed logo.avi - if this is a big problem, we can talk.
- * Now build-depends on libxine-dev >= 1-rc5-1. Closes: #268819
+ * Now build-depends on libxine-dev >= 1-rc5-1. Closes: #268819
-- Zack Cerza <zcerza at coe.neu.edu> Tue, 7 Sep 2004 23:11:30 -0400
@@ -431,4 +434,3 @@
* Put the SuperKaramba theme in /usr/share/superkaramba/themes/kaffeine_bw/
-- Zack Cerza <zcerza at coe.neu.edu> Mon, 05 Apr 2004 22:41:00 -0500
-
Modified: kde-extras/kaffeine/trunk/debian/compat
===================================================================
--- kde-extras/kaffeine/trunk/debian/compat 2009-08-12 08:43:00 UTC (rev 15641)
+++ kde-extras/kaffeine/trunk/debian/compat 2009-08-12 09:55:53 UTC (rev 15642)
@@ -1 +1 @@
-5
+7
Modified: kde-extras/kaffeine/trunk/debian/control
===================================================================
--- kde-extras/kaffeine/trunk/debian/control 2009-08-12 08:43:00 UTC (rev 15641)
+++ kde-extras/kaffeine/trunk/debian/control 2009-08-12 09:55:53 UTC (rev 15642)
@@ -1,24 +1,22 @@
Source: kaffeine
-Section: kde
+Section: video
Priority: optional
Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
Uploaders: Fathi Boudra <fabo at debian.org>, Mark Purcell <msp at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), quilt, automake1.9, kdelibs4-dev,
- libcdparanoia0-dev, libogg-dev, libxine-dev (>= 1.1.9), libxcb1-dev,
- libxtst-dev
-Standards-Version: 3.8.0
-Homepage: http://kaffeine.sourceforge.net
+Build-Depends: debhelper (>= 7.3), cmake, pkg-kde-tools (>= 0.4.11),
+ kdelibs5-dev (>= 4:4.3.0)
+Standards-Version: 3.8.2
+Homepage: http://kaffeine.kde.org
Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/kaffeine/trunk
Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/kaffeine/trunk
Package: kaffeine
Architecture: any
-Depends: ${shlibs:Depends}, libxine1-ffmpeg, libxine1-x, hdparm [linux-any]
-Conflicts: kaffeine-xine, kaffeine-gstreamer
-Replaces: kaffeine-xine, kaffeine-gstreamer
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ phonon-backend-xine, libxine1-ffmpeg, libxine1-x
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
+ Kaffeine is a media player for KDE. While It supports multiple Phonon
+ backends, its default backend is Xine, giving Kaffeine a wide variety of
supported media types and letting Kaffeine access CDs, DVDs, and
network streams easily.
.
@@ -26,10 +24,10 @@
autoloading of subtitles files for use while playing video.
Package: kaffeine-dbg
-Section: devel
+Section: debug
Architecture: any
Priority: extra
-Depends: kaffeine (= ${binary:Version}), kdelibs-dbg
+Depends: ${misc:Depends}, kaffeine (= ${binary:Version}), kdelibs5-dbg
Description: debugging symbols for kaffeine
This package contains the debugging symbols associated with kaffeine.
They will automatically be used by gdb for debugging kaffeine-related
Modified: kde-extras/kaffeine/trunk/debian/copyright
===================================================================
--- kde-extras/kaffeine/trunk/debian/copyright 2009-08-12 08:43:00 UTC (rev 15641)
+++ kde-extras/kaffeine/trunk/debian/copyright 2009-08-12 09:55:53 UTC (rev 15642)
@@ -1,141 +1,94 @@
-This package was debianized by Zack Cerza <zcerza at coe.neu.edu> on
-Sun, 28 Mar 2004 22:55:09 -0500.
+This package was debianized by:
-It was downloaded from http://kaffeine.sourceforge.net
+ Fathi Boudra <fabo at debian.org> on Wed, 12 Aug 2009 02:23:50 +0200
-Upstream authors:
- Christophe Thommeret <hftom at free.fr>
- Christoph Pfister <christophpfister at gmail.com>
- Jurgen Kofler <kaffeine at gmx.net>
+It was downloaded from:
-Copyright for kmultitabbar:
- © 2001-2003 Joseph Wenninger <jowenn at kde.org>
+ http://kaffeine.kde.org
-Copyright for kaffeine_export copied from kat:
- © 2005 Laurent Montel <montel at kde.org>
+Upstream Author:
-Copyright for ts2pes copied from mjpegtools for
-the Siemens Fujitsu DVB PCI card:
- © 2000-2001 Marcus Metzler <mocm at metzlerbros.de>
+ Christoph Pfister <christophpfister at gmail.com>
-Copyright for ts2rtp copied from dvbstream:
- © 2001-2002 Dave Chapman <dave at dchapman.org>
+Copyright:
-Copyright for cddb code:
- © 2000 Michael Matz <matz at kde.org>
+ Copyright (C) 2007-2009 Christoph Pfister <christophpfister at gmail.com>
-Copyright for playlistitem and subtitle file import code:
- © 2004-2005 Giorgos Gousios <gousiosg at cs.man.ac.uk>
+Copyright for include/dmx.h file:
-Copyright for position slider:
- © 2004-2005 Giorgos Gousios <gousiosg at cs.man.ac.uk>
- © 2004-2005 Jürgen Kofler <kaffeine at gmx.net>
- © 2004-2005 Miguel Freitas <miguel at cetuc.puc-rio.br>
+ Copyright (C) 2000 Marcus Metzler <marcus at convergence.de>
+ & Ralph Metzler <ralph at convergence.de>
+ for convergence integrated media GmbH
-Copyriht for xine postprocessing filters wrapper:
- © 2003-2005 Jürgen Kofler <kaffeine at gmx.net>
- © 2003-2005 Miguel Freitas <miguel at cetuc.puc-rio.br>
+Copyright for include/frontend.h file:
-Copyright for googlefetcher code:
- © 2004 Nathan Toone <nathan at toonetown.com>
- © 2006 Christophe Thommeret <hftom at free.fr>
+ Copyright (C) 2000 Marcus Metzler <marcus at convergence.de>
+ Ralph Metzler <ralph at convergence.de>
+ Holger Waechtler <holger at convergence.de>
+ Andre Draszik <ad at convergence.de>
+ for convergence integrated media GmbH
-Copyright for xine post plugin handling:
- © 2004-2005 Miguel Freitas <miguel at cetuc.puc-rio.br>
+Copyright for icons/* files:
-Copyright for ca_zap:
- © 2004-2005 Manu Abraham <manu at kromtek.com>
- © 2006 Andrew de Quincey <adq_dvb at lidskialf.net>
+ Copyright (C) 2007 The Oxygen Team
-Copyright for libdvbfe:
- © 2005 Manu Abraham <manu at kromtek.com>
- © 2005 Andrew de Quincey <adq_dvb at lidskialf.net>
- © 2005 Kenneth Aafloy <kenneth at linuxtv.org>
+Kaffeine is licensed under GPL-2 or any later version:
-Copyright for libdvbca:
- © 2006 Andrew de Quincey <adq_dvb at lidskialf.net>
+ 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.
-Copyright for libdvbdemux:
- © 2005 Andrew de Quincey <adq_dvb at lidskialf.net>
+ 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.
-Copyright for libdvbnet:
- © 2005 Andrew de Quincey <adq_dvb at lidskialf.net>
+ 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
-Copyright for libdvben50221:
- © 2004-2005 Manu Abraham <manu at kromtek.com>
- © 2006 Andrew de Quincey <adq_dvb at lidskialf.net>
+On Debian systems, the complete text of the GNU General
+Public License version 2 can be found in:
+ `/usr/share/common-licenses/GPL-2'
+ `/usr/share/common-licenses/GPL-3'
-Copyright for en50221 encoder:
- © 2004-2005 Manu Abraham <manu at kromtek.com>
- © 2005 Julian Scheel <julian at jusst.de>
- © 2006 Andrew de Quincey <adq_dvb at lidskialf.net>
+Kaffeine include files are licensed under LGPL-2.1 or any later version:
-Copyright for libdvbmisc:
- © 2005 Manu Abraham <manu at kromtek.com>
-
-Copyright for crc32 calculation routines:
- © 2005 by Andrew de Quincey <adq_dvb at lidskialf.net>
-
-Copyright for libucsi (section and descriptor parser):
- © 2005 Kenneth Aafloy <kenneth at linuxtv.org>
- © 2005 Andrew de Quincey <adq_dvb at lidskialf.net>
- © 2005 Patrick Boettcher <pb at linuxtv.org>
-
-Copyright for logo animation licensed under LGPL:
- © Dieter Zander
-
-Copyright for all coffee bean icons licensed under LGPL:
- © 2003-2004 Jürgen Kofler <kaffeine at gmx.net>
-
-Copyright for record icons, taken from nuvola icon set licensed under LGPL:
- © by David Vignoni
-
-Copyright for dvbcam:
- © 2006 by Christoph Pfister <christophpfister at gmail.com>
-
-dvbcam code is based on ca_zap licensed under LGPL:
-
- This library is free software; you can redistribute it and/or
+ This package is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
- This library is distributed in the hope that it will be useful,
+ 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
- Lesser General Public License for more details.
+ 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 Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ 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 Lesser General
-Public License can be found in `/usr/share/common-licenses/LGPL'.
+Public License version 2.1 or any later version can be found in:
+ `/usr/share/common-licenses/LGPL-2.1'
+ `/usr/share/common-licenses/LGPL-3'
-Kaffeine is licensed under GPL-2:
+Kaffeine icons are licensed under Creative Common Attribution-ShareAlike 3.0
+or LGPL2+:
- 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.
+ All icons are copied & hacked from oxygen
+ Creative Common Attribution-ShareAlike 3.0 or LGPL2+ (+ clarification)
- 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.
+On Debian systems, the complete text of the GNU Lesser General
+Public License version 2 or any later version can be found in:
+ `/usr/share/common-licenses/LGPL-2'
+ `/usr/share/common-licenses/LGPL-2.1'
+ `/usr/share/common-licenses/LGPL-3'
- 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
+The Debian packaging is:
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-2'.
+ Copyright (C) 2009 Fathi Boudra <fabo at debian.org>
-The documentations provided with kaffeine is distributed under
-the GNU Free Documentation License (FDL). They are considered free with
-regards to the Debian Free Software Guidelines (DFSG) because they don't
-contain any unmodifiable parts (invariant sections).
-
-On Debian systems, the complete text of the GNU Free Documentation
-License can be found in `/usr/share/common-licenses/GFDL'.
-
+and is licensed under the GPL version 2 or any later version,
+see above.
Modified: kde-extras/kaffeine/trunk/debian/kaffeine.docs
===================================================================
--- kde-extras/kaffeine/trunk/debian/kaffeine.docs 2009-08-12 08:43:00 UTC (rev 15641)
+++ kde-extras/kaffeine/trunk/debian/kaffeine.docs 2009-08-12 09:55:53 UTC (rev 15642)
@@ -1,7 +1 @@
-README
TODO
-kaffeine/BUGS
-kaffeine/CREDITS
-kaffeine/README.atsc
-kaffeine/README.dvb
-kaffeine/README.gstreamer
Added: kde-extras/kaffeine/trunk/debian/kaffeine.install
===================================================================
--- kde-extras/kaffeine/trunk/debian/kaffeine.install (rev 0)
+++ kde-extras/kaffeine/trunk/debian/kaffeine.install 2009-08-12 09:55:53 UTC (rev 15642)
@@ -0,0 +1,54 @@
+debian/kaffeine.xpm /usr/share/pixmaps
+usr/bin/kaffeine
+usr/lib/kde4/kaffeinedvb.so
+usr/share/applications/kde4/kaffeine.desktop
+usr/share/icons/oxygen/16x16/actions/audio-radio-encrypted.png
+usr/share/icons/oxygen/16x16/actions/video-television-encrypted.png
+usr/share/icons/oxygen/22x22/actions/audio-radio-encrypted.png
+usr/share/icons/oxygen/22x22/actions/video-television-encrypted.png
+usr/share/icons/oxygen/32x32/actions/audio-radio-encrypted.png
+usr/share/icons/oxygen/32x32/actions/video-television-encrypted.png
+usr/share/icons/oxygen/48x48/actions/audio-radio-encrypted.png
+usr/share/icons/oxygen/48x48/actions/video-television-encrypted.png
+usr/share/kde4/apps/kaffeine/scanfile.dvb
+usr/share/kde4/apps/solid/actions/kaffeine_play_audiocd.desktop
+usr/share/kde4/apps/solid/actions/kaffeine_play_dvd.desktop
+usr/share/kde4/apps/solid/actions/kaffeine_play_videocd.desktop
+usr/share/locale/cs/LC_MESSAGES/kaffeine.mo
+usr/share/locale/da/LC_MESSAGES/kaffeine.mo
+usr/share/locale/de/LC_MESSAGES/kaffeine.mo
+usr/share/locale/el/LC_MESSAGES/kaffeine.mo
+usr/share/locale/en_GB/LC_MESSAGES/kaffeine.mo
+usr/share/locale/es/LC_MESSAGES/kaffeine.mo
+usr/share/locale/et/LC_MESSAGES/kaffeine.mo
+usr/share/locale/fi/LC_MESSAGES/kaffeine.mo
+usr/share/locale/fr/LC_MESSAGES/kaffeine.mo
+usr/share/locale/ga/LC_MESSAGES/kaffeine.mo
+usr/share/locale/gl/LC_MESSAGES/kaffeine.mo
+usr/share/locale/hu/LC_MESSAGES/kaffeine.mo
+usr/share/locale/it/LC_MESSAGES/kaffeine.mo
+usr/share/locale/ja/LC_MESSAGES/kaffeine.mo
+usr/share/locale/km/LC_MESSAGES/kaffeine.mo
+usr/share/locale/ko/LC_MESSAGES/kaffeine.mo
+usr/share/locale/ku/LC_MESSAGES/kaffeine.mo
+usr/share/locale/lt/LC_MESSAGES/kaffeine.mo
+usr/share/locale/mai/LC_MESSAGES/kaffeine.mo
+usr/share/locale/nb/LC_MESSAGES/kaffeine.mo
+usr/share/locale/nds/LC_MESSAGES/kaffeine.mo
+usr/share/locale/nl/LC_MESSAGES/kaffeine.mo
+usr/share/locale/nn/LC_MESSAGES/kaffeine.mo
+usr/share/locale/pa/LC_MESSAGES/kaffeine.mo
+usr/share/locale/pl/LC_MESSAGES/kaffeine.mo
+usr/share/locale/pt/LC_MESSAGES/kaffeine.mo
+usr/share/locale/pt_BR/LC_MESSAGES/kaffeine.mo
+usr/share/locale/ro/LC_MESSAGES/kaffeine.mo
+usr/share/locale/ru/LC_MESSAGES/kaffeine.mo
+usr/share/locale/se/LC_MESSAGES/kaffeine.mo
+usr/share/locale/sk/LC_MESSAGES/kaffeine.mo
+usr/share/locale/sv/LC_MESSAGES/kaffeine.mo
+usr/share/locale/th/LC_MESSAGES/kaffeine.mo
+usr/share/locale/tr/LC_MESSAGES/kaffeine.mo
+usr/share/locale/uk/LC_MESSAGES/kaffeine.mo
+usr/share/locale/x-test/LC_MESSAGES/kaffeine.mo
+usr/share/locale/zh_CN/LC_MESSAGES/kaffeine.mo
+usr/share/locale/zh_TW/LC_MESSAGES/kaffeine.mo
Modified: kde-extras/kaffeine/trunk/debian/rules
===================================================================
--- kde-extras/kaffeine/trunk/debian/rules 2009-08-12 08:43:00 UTC (rev 15641)
+++ kde-extras/kaffeine/trunk/debian/rules 2009-08-12 09:55:53 UTC (rev 15642)
@@ -1,35 +1,8 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/kde.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/pkg-kde-tools/makefiles/1/debhelper/kde.mk
-DEB_CONFIGURE_EXTRA_FLAGS := --without-gstreamer --without-lame
-DEB_CONFIGURE_SCRIPT_ENV += \
- CFLAGS="-g -Wall $(DEB_OPT_FLAG) -fasynchronous-unwind-tables" \
- LDFLAGS="-Wl,--as-needed" \
- CPPFLAGS="-g -Wall $(DEB_OPT_FLAG) -fasynchronous-unwind-tables" \
- CXXFLAGS="-g -Wall $(DEB_OPT_FLAG) -fasynchronous-unwind-tables"
-DEB_DESTDIR := $(CURDIR)/debian/kaffeine/
-DEB_INSTALL_MANPAGES_kaffeine := debian/kaffeine.1
+%:
+ dh --with --dbg-package=kaffeine-dbg $@
-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
- install -D -p -m0755 debian/install-css.sh debian/kaffeine/usr/share/doc/kaffeine/install-css.sh
- install -D -p -m0644 debian/kaffeine-iso.desktop debian/kaffeine/usr/share/applications/kde/kaffeine-iso.desktop
-
- # file shipped by kdelibs
- rm -f debian/kaffeine/usr/share/mimelnk/application/x-mplayer2.desktop
- # Bogus, shouldn't be shipped..
- rm -f debian/kaffeine/usr/share/doc/kde/HTML/en/doc/CMakeLists.txt
-
-clean::
- find po -type f -name '*.gmo' | xargs rm -f
-
-get-orig-source-dpatch:
- @@dh_testdir
- @@[ -d ../tarballs/. ]
- @@dpatch-get-origtargz ../tarballs
-
+.PHONY: override_dh_auto_test
More information about the pkg-kde-commits
mailing list