rev 3425 - kde-extras/kaffeine/trunk/debian

[Fathi Boudra]

Author: fboudra-guest
Date: 2006-03-29 22:55:08 +0000 (Wed, 29 Mar 2006)
New Revision: 3425

Modified:
   kde-extras/kaffeine/trunk/debian/changelog
   kde-extras/kaffeine/trunk/debian/control
   kde-extras/kaffeine/trunk/debian/kaffeine.lintian-overrides
   kde-extras/kaffeine/trunk/debian/rules
Log:
 need to use DEB_DESTDIR, fix upgrading issue

Modified: kde-extras/kaffeine/trunk/debian/changelog
===================================================================
--- kde-extras/kaffeine/trunk/debian/changelog	2006-03-29 22:05:41 UTC (rev 3424)
+++ kde-extras/kaffeine/trunk/debian/changelog	2006-03-29 22:55:08 UTC (rev 3425)
@@ -4,7 +4,7 @@
   * Clean up control
   * Added libcdparanoia0-dev to Build-Depends
   * Disabled gstreamer support
-  * Merged kaffeine-xine and kaffeine-gstreamer in kaffeine package
+  * Merged kaffeine-xine 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 22:05:41 UTC (rev 3424)
+++ kde-extras/kaffeine/trunk/debian/control	2006-03-29 22:55:08 UTC (rev 3425)
@@ -9,6 +9,8 @@
 Package: kaffeine
 Architecture: any
 Depends: ${shlibs:Depends}
+Conflicts: kaffeine-xine, kaffeine-gstreamer
+Replaces: kaffeine (<< 0.8.0), kaffeine-xine, kaffeine-gstreamer
 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

Modified: kde-extras/kaffeine/trunk/debian/kaffeine.lintian-overrides
===================================================================
--- kde-extras/kaffeine/trunk/debian/kaffeine.lintian-overrides	2006-03-29 22:05:41 UTC (rev 3424)
+++ kde-extras/kaffeine/trunk/debian/kaffeine.lintian-overrides	2006-03-29 22:55:08 UTC (rev 3425)
@@ -1,3 +1,4 @@
+kaffeine: manpage-has-errors-from-man usr/share/man/man1/kaffeine.1.gz 17: warning: can't find numbered character 195
 # 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.
@@ -2 +3,3 @@
 kaffeine: package-name-doesnt-match-sonames libkmediapart0 libkaffeineaudioencoder0
+kaffeine: non-dev-pkg-with-shlib-symlink usr/lib/libkmediapart.so.0.0.1 usr/lib/libkmediapart.so
+kaffeine: non-dev-pkg-with-shlib-symlink usr/lib/libkaffeineaudioencoder.so.0.0.1 usr/lib/libkaffeineaudioencoder.so

Modified: kde-extras/kaffeine/trunk/debian/rules
===================================================================
--- kde-extras/kaffeine/trunk/debian/rules	2006-03-29 22:05:41 UTC (rev 3424)
+++ kde-extras/kaffeine/trunk/debian/rules	2006-03-29 22:55:08 UTC (rev 3425)
@@ -2,9 +2,9 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/kde.mk
-#include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS := --without-gstreamer --without-lame
+DEB_DESTDIR = $(CURDIR)/debian/kaffeine/
 DEB_INSTALL_MANPAGES_kaffeine := debian/kaffeine.1
 
 install/kaffeine::