rev 14606 - kde-extras/kmplayer/trunk/debian

[Fathi Boudra]

Author: fabo
Date: 2009-05-12 13:58:09 +0000 (Tue, 12 May 2009)
New Revision: 14606

Removed:
   kde-extras/kmplayer/trunk/debian/README.Debian
   kde-extras/kmplayer/trunk/debian/kmplayer-common.install
   kde-extras/kmplayer/trunk/debian/kmplayer-common.lintian-overrides
   kde-extras/kmplayer/trunk/debian/kmplayer-common.manpages
   kde-extras/kmplayer/trunk/debian/kmplayer-common.postinst
   kde-extras/kmplayer/trunk/debian/kmplayer-plugin.install
   kde-extras/kmplayer/trunk/debian/patches/
Modified:
   kde-extras/kmplayer/trunk/debian/changelog
   kde-extras/kmplayer/trunk/debian/compat
   kde-extras/kmplayer/trunk/debian/control
   kde-extras/kmplayer/trunk/debian/kmplayer.lintian-overrides
   kde-extras/kmplayer/trunk/debian/kmplayer.postinst
   kde-extras/kmplayer/trunk/debian/rules
Log:
Upload kmplayer 0.11.1 to Sid
  * Remove patch to fix kmplayer.desktop install path. Commited upstream.
  * Bump compat to 7.
  * Update debian/control:
    - Cleanup build dependencies.
    - Bump debhelper to 7.
    - Bump Standards-Version from 3.8.0 to 3.8.1 (no changes needed).
    - Add dbus-x11 dependency (Closes: #514108).
  * Update debian/rules: cleanup.


Modified: kde-extras/kmplayer/trunk/debian/changelog
===================================================================
--- kde-extras/kmplayer/trunk/debian/changelog	2009-05-12 10:27:06 UTC (rev 14605)
+++ kde-extras/kmplayer/trunk/debian/changelog	2009-05-12 13:58:09 UTC (rev 14606)
@@ -1,6 +1,14 @@
 kmplayer (1:0.11.1-1) unstable; urgency=low
 
   * New upstream release.
+  * Remove patch to fix kmplayer.desktop install path. Commited upstream.
+  * Bump compat to 7.
+  * Update debian/control:
+    - Cleanup build dependencies.
+    - Bump debhelper to 7.
+    - Bump Standards-Version from 3.8.0 to 3.8.1 (no changes needed).
+    - Add dbus-x11 dependency (Closes: #514108).
+  * Update debian/rules: cleanup.
 
  -- Fathi Boudra <fabo at debian.org>  Tue, 12 May 2009 12:26:53 +0200
 

Modified: kde-extras/kmplayer/trunk/debian/compat
===================================================================
--- kde-extras/kmplayer/trunk/debian/compat	2009-05-12 10:27:06 UTC (rev 14605)
+++ kde-extras/kmplayer/trunk/debian/compat	2009-05-12 13:58:09 UTC (rev 14606)
@@ -1 +1 @@
-6
+7

Modified: kde-extras/kmplayer/trunk/debian/control
===================================================================
--- kde-extras/kmplayer/trunk/debian/control	2009-05-12 10:27:06 UTC (rev 14605)
+++ kde-extras/kmplayer/trunk/debian/control	2009-05-12 13:58:09 UTC (rev 14606)
@@ -3,16 +3,18 @@
 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), pkg-kde-tools, 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
+Build-Depends: cdbs, debhelper (>= 7), cmake, pkg-kde-tools, kdelibs5-dev,
+ libcairo2-dev, libdbus-1-dev, libdbus-glib-1-dev, libgtk2.0-dev,
+ libx11-dev, libxt-dev
+Standards-Version: 3.8.1
 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}, ${misc:Depends}, libxine1-x
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ dbus-x11, libxine1-x
 Suggests: ffmpeg, vdr, xawtv, konqueror, mplayer
 Conflicts: kmplayer-common, kmplayer-plugin
 Replaces: kmplayer-common, kmplayer-plugin

Modified: kde-extras/kmplayer/trunk/debian/kmplayer.lintian-overrides
===================================================================
--- kde-extras/kmplayer/trunk/debian/kmplayer.lintian-overrides	2009-05-12 10:27:06 UTC (rev 14605)
+++ kde-extras/kmplayer/trunk/debian/kmplayer.lintian-overrides	2009-05-12 13:58:09 UTC (rev 14606)
@@ -1,3 +1,4 @@
-kmplayer: binary-without-manpage kxvplayer
-kmplayer: no-shlibs-control-file usr/lib/libkdeinit_kmplayer.so
-kmplayer: package-name-doesnt-match-sonames libkdeinit-kmplayer
+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
+

Modified: kde-extras/kmplayer/trunk/debian/kmplayer.postinst
===================================================================
--- kde-extras/kmplayer/trunk/debian/kmplayer.postinst	2009-05-12 10:27:06 UTC (rev 14605)
+++ kde-extras/kmplayer/trunk/debian/kmplayer.postinst	2009-05-12 13:58:09 UTC (rev 14606)
@@ -43,5 +43,3 @@
 #DEBHELPER#
 
 exit 0
-
-

Modified: kde-extras/kmplayer/trunk/debian/rules
===================================================================
--- kde-extras/kmplayer/trunk/debian/rules	2009-05-12 10:27:06 UTC (rev 14605)
+++ kde-extras/kmplayer/trunk/debian/rules	2009-05-12 13:58:09 UTC (rev 14606)
@@ -1,9 +1,9 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk 
-include /usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk 
+include /usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CMAKE_EXTRA_FLAGS += -DWITH_CAIRO:BOOL=ON -DWITH_NPP:BOOL=ON
-
 install/kmplayer::
 	rm -rf $(DEB_DESTDIR)/usr/share/icons/oxygen/
+	chmod +x $(DEB_DESTDIR)/usr/share/kde4/apps/kmplayer/find-media.sh