rev 14352 - in kde-extras/kmplayer/trunk/debian: . patches
Mark Purcell
msp at alioth.debian.org
Sat Apr 11 00:15:06 UTC 2009
Author: msp
Date: 2009-04-11 00:15:06 +0000 (Sat, 11 Apr 2009)
New Revision: 14352
Added:
kde-extras/kmplayer/trunk/debian/kmplayer.lintian
kde-extras/kmplayer/trunk/debian/not-installed
kde-extras/kmplayer/trunk/debian/patches/
kde-extras/kmplayer/trunk/debian/patches/series
Removed:
kde-extras/kmplayer/trunk/debian/kmplayer.install
kde-extras/kmplayer/trunk/debian/kmplayer.manpages
kde-extras/kmplayer/trunk/debian/patches/
kde-extras/kmplayer/trunk/debian/patches/series
Modified:
kde-extras/kmplayer/trunk/debian/changelog
kde-extras/kmplayer/trunk/debian/control
kde-extras/kmplayer/trunk/debian/copyright
kde-extras/kmplayer/trunk/debian/rules
Log:
Merged branches/experimental changes r10470:14351 to trunk
Modified: kde-extras/kmplayer/trunk/debian/changelog
===================================================================
--- kde-extras/kmplayer/trunk/debian/changelog 2009-04-10 20:27:55 UTC (rev 14351)
+++ kde-extras/kmplayer/trunk/debian/changelog 2009-04-11 00:15:06 UTC (rev 14352)
@@ -1,12 +1,38 @@
-kmplayer (1:0.10.0c-3) UNRELEASED; urgency=low
+kmplayer (1:0.11.0-4) UNRELEASED; urgency=low
* (NOT RELEASED YET)
* Add kxineplayer.1 to kmplayer.manpages
- * Add Vcs-Browser and Vcs-Svn fields.
* Allow debian/watch to handle upstream -rc
-- Mark Purcell <msp at debian.org> Thu, 22 Jan 2009 10:15:49 +1100
+kmplayer (1:0.11.0-3) experimental; urgency=low
+
+ * Add patch to fix kmplayer.desktop install path.
+
+ -- Fathi Boudra <fabo at debian.org> Fri, 16 Jan 2009 01:41:08 +0100
+
+kmplayer (1:0.11.0-2) experimental; urgency=low
+
+ * Remove shipped oxygen icons. kde-icons-oxygen ships a different version.
+
+ -- Fathi Boudra <fabo at debian.org> Thu, 15 Jan 2009 22:42:51 +0100
+
+kmplayer (1:0.11.0-1) experimental; urgency=low
+
+ [ Fathi Boudra ]
+ * Initial KDE 4 release.
+ * Update build dependencies.
+ * Bump Standards-Version to 3.8.0.
+ * Merge kmplayer-common and kmplayer-plugin in kmplayer package.
+ * Add konqueror to Suggests field.
+ * Update long description.
+
+ [ Mark Purcell ]
+ * Add Vcs-Browser and Vcs-Svn fields.
+
+ -- Fathi Boudra <fabo at debian.org> Tue, 13 Jan 2009 18:03:08 +0100
+
kmplayer (1:0.10.0c-2) unstable; urgency=low
[ Fathi Boudra ]
Modified: kde-extras/kmplayer/trunk/debian/control
===================================================================
--- kde-extras/kmplayer/trunk/debian/control 2009-04-10 20:27:55 UTC (rev 14351)
+++ kde-extras/kmplayer/trunk/debian/control 2009-04-11 00:15:06 UTC (rev 14352)
@@ -3,47 +3,27 @@
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 (>= 6), quilt, automake1.9, kdelibs4-dev,
- libcairo2-dev, libdbus-1-dev, libdbus-glib-1-dev, libdbus-qt-1-dev,
- libgstreamer-plugins-base0.10-dev, libgtk2.0-dev, libxine-dev, libxv-dev,
- docbook2x
-Standards-Version: 3.7.3
+Build-Depends: cdbs, debhelper (>= 6), cmake, quilt, kdelibs5-dev, libphonon-dev,
+ libcairo2-dev, libdbus-1-dev, libdbus-glib-1-dev, libgtk2.0-dev, libx11-dev, libxt-dev
+Standards-Version: 3.8.0
Homepage: http://kmplayer.kde.org
Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/kmplayer/?op=log
Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/kmplayer/trunk/
Package: kmplayer
Architecture: any
-Depends: ${shlibs:Depends}, kmplayer-common (= ${binary:Version}), libxine1-x
-Recommends: kmplayer-plugin (= ${binary:Version})
-Suggests: ffmpeg, vdr, xawtv, mplayer
+Depends: ${shlibs:Depends}, libxine1-x
+Suggests: ffmpeg, vdr, xawtv, konqueror, mplayer
+Conflicts: kmplayer-common, kmplayer-plugin
+Replaces: kmplayer-common, kmplayer-plugin
Description: media player for KDE
- KMPlayer is a simple frontend for MPlayer/Xine/ffmpeg/ffserver/VDR.
+ KMPlayer is a simple frontend for MPlayer/FFMpeg/Phonon.
.
Some features:
* play DVD/VCD movies (from file or url and from a video device)
* embed inside konqueror (movie is played inside konqueror)
- * backend players play from a pipe (read from stdin)
- * DCOP KMediaPlayer interface support
- * VDR viewer frontend (with *kxvplayer)
* embed inside khtml (movie playback inside a html page)
- * Movie recording using Xine
+ * Movie recording using mencoder (part of the mplayer package)
* No video during recording, but you can always open a new window and play it
- * Broadcasting, http streaming, using ffserver/ffmpeg
- * For TV sources, you need v4lctl (part of the xawtv)
-
-Package: kmplayer-common
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: common files for kmplayer
- Common files needed by KMPlayer standalone applications and khtml/konqueror
- plugin.
-
-Package: kmplayer-plugin
-Architecture: any
-Depends: ${shlibs:Depends}, kmplayer-common (= ${binary:Version}), konqueror
-Description: kmplayer plugin for khtml/konqueror
- This plugin enables audio/video playback inside konqueror, using Xine (with
- *kxineplayer) or GStreamer (with *kgstplayer), such as movie trailers, web
- tv or radio. It mimics QuickTime, MS Media Player and RealPlayer plugin
- browser plugins.
+ * Broadcasting, http streaming, using ffserver/ffmpeg
+ * For TV sources, you need v4lctl (part of the xawtv package)
Modified: kde-extras/kmplayer/trunk/debian/copyright
===================================================================
--- kde-extras/kmplayer/trunk/debian/copyright 2009-04-10 20:27:55 UTC (rev 14351)
+++ kde-extras/kmplayer/trunk/debian/copyright 2009-04-11 00:15:06 UTC (rev 14352)
@@ -7,7 +7,7 @@
Copyright:
- (C) 2002-2007 Koos Vriezen <koos.vriezen at gmail.com>
+ (C) 2002-2009 Koos Vriezen <koos.vriezen at gmail.com>
(C) 2003 Joonas Koivunen <rzei at mbnet.fi>
Copyright for moz-sdk (except npruntime.h):
Copied: kde-extras/kmplayer/trunk/debian/kmplayer.lintian (from rev 14351, kde-extras/kmplayer/branches/experimental/debian/kmplayer.lintian)
===================================================================
--- kde-extras/kmplayer/trunk/debian/kmplayer.lintian (rev 0)
+++ kde-extras/kmplayer/trunk/debian/kmplayer.lintian 2009-04-11 00:15:06 UTC (rev 14352)
@@ -0,0 +1,3 @@
+kmplayer: shlib-without-versioned-soname usr/lib/libkdeinit4_kmplayer.so libkdeinit4_kmplayer.so
+kmplayer: shlib-without-versioned-soname usr/lib/libkmplayercommon.so libkmplayercommon.so
+kmplayer: package-name-doesnt-match-sonames libkdeinit4-kmplayer libkmplayercommon
Copied: kde-extras/kmplayer/trunk/debian/not-installed (from rev 14351, kde-extras/kmplayer/branches/experimental/debian/not-installed)
===================================================================
--- kde-extras/kmplayer/trunk/debian/not-installed (rev 0)
+++ kde-extras/kmplayer/trunk/debian/not-installed 2009-04-11 00:15:06 UTC (rev 14352)
@@ -0,0 +1,7 @@
+usr/share/icons/oxygen/128x128/apps/kmplayer.png
+usr/share/icons/oxygen/16x16/apps/kmplayer.png
+usr/share/icons/oxygen/22x22/apps/kmplayer.png
+usr/share/icons/oxygen/32x32/apps/kmplayer.png
+usr/share/icons/oxygen/48x48/apps/kmplayer.png
+usr/share/icons/oxygen/64x64/apps/kmplayer.png
+usr/share/icons/oxygen/scalable/apps/kmplayer.svgz
Copied: kde-extras/kmplayer/trunk/debian/patches/series (from rev 14351, kde-extras/kmplayer/branches/experimental/debian/patches/series)
===================================================================
--- kde-extras/kmplayer/trunk/debian/patches/series (rev 0)
+++ kde-extras/kmplayer/trunk/debian/patches/series 2009-04-11 00:15:06 UTC (rev 14352)
@@ -0,0 +1 @@
+01_fix_kmplayer.desktop_path.diff
Modified: kde-extras/kmplayer/trunk/debian/rules
===================================================================
--- kde-extras/kmplayer/trunk/debian/rules 2009-04-10 20:27:55 UTC (rev 14351)
+++ kde-extras/kmplayer/trunk/debian/rules 2009-04-11 00:15:06 UTC (rev 14352)
@@ -1,38 +1,9 @@
#!/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/gnome-pkg-tools/1/rules/sf-get-source.mk
+include /usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-maintainer-mode
-DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
-DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp
+DEB_CMAKE_EXTRA_FLAGS += -DWITH_CAIRO:BOOL=ON -DWITH_NPP:BOOL=ON
-build/kmplayer::
- # Generate manpages from docbook.
- docbook2x-man debian/kmplayer.1.docbook
- docbook2x-man debian/kxvplayer.1.docbook
-
-build/kmplayer-common::
- docbook2x-man debian/kxineplayer.1.docbook
-
install/kmplayer::
- install -D -p -m644 debian/kmplayer.lintian-overrides \
- debian/kmplayer/usr/share/lintian/overrides/kmplayer
-
-install/kmplayer-common::
- install -D -p -m644 debian/kmplayer-common.lintian-overrides \
- debian/kmplayer-common/usr/share/lintian/overrides/kmplayer-common
-
-get-orig-source-dpatch:
- @@dh_testdir
- @@[ -d ../tarballs/. ]
- @@dpatch-get-origtargz ../tarballs
-
-clean::
- rm -f kmplayer.1
- rm -f kxvplayer.1
- rm -f kxineplayer.1
-
+ rm -rf $(DEB_DESTDIR)/usr/share/icons/oxygen/
More information about the pkg-kde-commits
mailing list