rev 6425 - in kde-extras/kaffeine: tags tags/0.8.4-3/debian trunk/debian

[Fathi Boudra]

Author: fboudra-guest
Date: 2007-06-03 21:24:24 +0000 (Sun, 03 Jun 2007)
New Revision: 6425

Added:
   kde-extras/kaffeine/tags/0.8.4-3/
Removed:
   kde-extras/kaffeine/tags/0.8.4-3/debian/patches/
   kde-extras/kaffeine/trunk/debian/patches/
Modified:
   kde-extras/kaffeine/tags/0.8.4-3/debian/changelog
   kde-extras/kaffeine/tags/0.8.4-3/debian/control
   kde-extras/kaffeine/tags/0.8.4-3/debian/kaffeine.lintian-overrides
   kde-extras/kaffeine/tags/0.8.4-3/debian/rules
   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:
  * Add libxcb1-dev and chrpath build-dependency.
  * Add libxine1-ffmpeg and libxine1-kde recommends.


Copied: kde-extras/kaffeine/tags/0.8.4-3 (from rev 6424, kde-extras/kaffeine/trunk)

Modified: kde-extras/kaffeine/tags/0.8.4-3/debian/changelog
===================================================================
--- kde-extras/kaffeine/trunk/debian/changelog	2007-06-03 18:26:22 UTC (rev 6424)
+++ kde-extras/kaffeine/tags/0.8.4-3/debian/changelog	2007-06-03 21:24:24 UTC (rev 6425)
@@ -1,8 +1,9 @@
-kaffeine (0.8.4-3) UNRELEASED; urgency=low
+kaffeine (0.8.4-3) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Add libxcb1-dev and chrpath build-dependency.
+  * Add libxine1-ffmpeg and libxine1-kde recommends. (Closes: #427085)
 
- -- Mark Purcell <msp at debian.org>  Thu, 19 Apr 2007 06:16:33 +1000
+ -- Fathi Boudra <fboudra at free.fr>  Sun, 03 Jun 2007 22:10:26 +0200
 
 kaffeine (0.8.4-2) unstable; urgency=low
 

Modified: kde-extras/kaffeine/tags/0.8.4-3/debian/control
===================================================================
--- kde-extras/kaffeine/trunk/debian/control	2007-06-03 18:26:22 UTC (rev 6424)
+++ kde-extras/kaffeine/tags/0.8.4-3/debian/control	2007-06-03 21:24:24 UTC (rev 6425)
@@ -4,12 +4,14 @@
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Riku Voipio <riku.voipio at iki.fi>, Fathi Boudra <fboudra at free.fr>,
  Mark Purcell <msp at debian.org>
-Build-Depends: cdbs (>= 0.4.37), debhelper (>= 5), kdelibs4-dev, libcdparanoia0-dev, libxine-dev (>= 1.1.1-1), libxtst-dev, libogg-dev, autotools-dev, automake1.9, autoconf
+Build-Depends: cdbs, debhelper (>= 5), automake, chrpath, kdelibs4-dev,
+ libcdparanoia0-dev, libogg-dev, libxine-dev, libxcb1-dev, libxtst-dev
 Standards-Version: 3.7.2
 
 Package: kaffeine
 Architecture: any
 Depends: ${shlibs:Depends}, hdparm
+Recommends: libxine1-ffmpeg, libxine1-kde
 Conflicts: kaffeine-xine, kaffeine-gstreamer
 Replaces: kaffeine-xine, kaffeine-gstreamer
 Description: versatile media player for KDE

Modified: kde-extras/kaffeine/tags/0.8.4-3/debian/kaffeine.lintian-overrides
===================================================================
--- kde-extras/kaffeine/trunk/debian/kaffeine.lintian-overrides	2007-06-03 18:26:22 UTC (rev 6424)
+++ kde-extras/kaffeine/tags/0.8.4-3/debian/kaffeine.lintian-overrides	2007-06-03 21:24:24 UTC (rev 6425)
@@ -2,7 +2,7 @@
 # It isn't a library or a development package and no other packages uses
 # libkaffeinedvbplugin0, libkaffeineaudioencoder0 and libkaffeinepart.
 # kaffeine needs them and maybe a split can happen later.
-kaffeine: package-name-doesnt-match-sonames libkaffeinedvbplugin0 libkaffeineaudioencoder0 libkaffeinepart
+kaffeine: package-name-doesnt-match-sonames libkaffeinedvbplugin0 libkaffeinepart libkaffeineaudioencoder0
 kaffeine: non-dev-pkg-with-shlib-symlink usr/lib/libkaffeinedvbplugin.so.0.0.1 usr/lib/libkaffeinedvbplugin.so
 kaffeine: non-dev-pkg-with-shlib-symlink usr/lib/libkaffeineaudioencoder.so.0.0.1 usr/lib/libkaffeineaudioencoder.so
 kaffeine: shlib-missing-in-control-file libkaffeinepart.so for usr/lib/libkaffeinepart.so

Modified: kde-extras/kaffeine/tags/0.8.4-3/debian/rules
===================================================================
--- kde-extras/kaffeine/trunk/debian/rules	2007-06-03 18:26:22 UTC (rev 6424)
+++ kde-extras/kaffeine/tags/0.8.4-3/debian/rules	2007-06-03 21:24:24 UTC (rev 6425)
@@ -20,6 +20,15 @@
 	# Bogus, shouldn't be shipped..
 	rm -f debian/kaffeine/usr/share/doc/kde/HTML/en/doc/CMakeLists.txt
 
+binary-install/kaffeine::
+	# disable rpath flag not honored
+	chrpath -d debian/kaffeine/usr/bin/kaffeine
+	chrpath -d debian/kaffeine/usr/lib/libkaffeineaudioencoder.so.0.0.1
+	chrpath -d debian/kaffeine/usr/lib/libkaffeinedvbplugin.so.0.0.1
+	chrpath -d debian/kaffeine/usr/lib/libkaffeinepart.so
+	chrpath -d debian/kaffeine/usr/lib/kde3/libxinepart.so
+	chrpath -d debian/kaffeine/usr/lib/kde3/libkaffeineoggvorbis.so
+
 get-orig-source:
 	 @@dh_testdir
 	 @@[ -d ../tarballs/. ]

Modified: kde-extras/kaffeine/trunk/debian/changelog
===================================================================
--- kde-extras/kaffeine/trunk/debian/changelog	2007-06-03 18:26:22 UTC (rev 6424)
+++ kde-extras/kaffeine/trunk/debian/changelog	2007-06-03 21:24:24 UTC (rev 6425)
@@ -1,8 +1,9 @@
-kaffeine (0.8.4-3) UNRELEASED; urgency=low
+kaffeine (0.8.4-3) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Add libxcb1-dev and chrpath build-dependency.
+  * Add libxine1-ffmpeg and libxine1-kde recommends. (Closes: #427085)
 
- -- Mark Purcell <msp at debian.org>  Thu, 19 Apr 2007 06:16:33 +1000
+ -- Fathi Boudra <fboudra at free.fr>  Sun, 03 Jun 2007 22:10:26 +0200
 
 kaffeine (0.8.4-2) unstable; urgency=low
 

Modified: kde-extras/kaffeine/trunk/debian/control
===================================================================
--- kde-extras/kaffeine/trunk/debian/control	2007-06-03 18:26:22 UTC (rev 6424)
+++ kde-extras/kaffeine/trunk/debian/control	2007-06-03 21:24:24 UTC (rev 6425)
@@ -4,12 +4,14 @@
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Riku Voipio <riku.voipio at iki.fi>, Fathi Boudra <fboudra at free.fr>,
  Mark Purcell <msp at debian.org>
-Build-Depends: cdbs (>= 0.4.37), debhelper (>= 5), kdelibs4-dev, libcdparanoia0-dev, libxine-dev (>= 1.1.1-1), libxtst-dev, libogg-dev, autotools-dev, automake1.9, autoconf
+Build-Depends: cdbs, debhelper (>= 5), automake, chrpath, kdelibs4-dev,
+ libcdparanoia0-dev, libogg-dev, libxine-dev, libxcb1-dev, libxtst-dev
 Standards-Version: 3.7.2
 
 Package: kaffeine
 Architecture: any
 Depends: ${shlibs:Depends}, hdparm
+Recommends: libxine1-ffmpeg, libxine1-kde
 Conflicts: kaffeine-xine, kaffeine-gstreamer
 Replaces: kaffeine-xine, kaffeine-gstreamer
 Description: versatile media player for KDE

Modified: kde-extras/kaffeine/trunk/debian/kaffeine.lintian-overrides
===================================================================
--- kde-extras/kaffeine/trunk/debian/kaffeine.lintian-overrides	2007-06-03 18:26:22 UTC (rev 6424)
+++ kde-extras/kaffeine/trunk/debian/kaffeine.lintian-overrides	2007-06-03 21:24:24 UTC (rev 6425)
@@ -2,7 +2,7 @@
 # It isn't a library or a development package and no other packages uses
 # libkaffeinedvbplugin0, libkaffeineaudioencoder0 and libkaffeinepart.
 # kaffeine needs them and maybe a split can happen later.
-kaffeine: package-name-doesnt-match-sonames libkaffeinedvbplugin0 libkaffeineaudioencoder0 libkaffeinepart
+kaffeine: package-name-doesnt-match-sonames libkaffeinedvbplugin0 libkaffeinepart libkaffeineaudioencoder0
 kaffeine: non-dev-pkg-with-shlib-symlink usr/lib/libkaffeinedvbplugin.so.0.0.1 usr/lib/libkaffeinedvbplugin.so
 kaffeine: non-dev-pkg-with-shlib-symlink usr/lib/libkaffeineaudioencoder.so.0.0.1 usr/lib/libkaffeineaudioencoder.so
 kaffeine: shlib-missing-in-control-file libkaffeinepart.so for usr/lib/libkaffeinepart.so

Modified: kde-extras/kaffeine/trunk/debian/rules
===================================================================
--- kde-extras/kaffeine/trunk/debian/rules	2007-06-03 18:26:22 UTC (rev 6424)
+++ kde-extras/kaffeine/trunk/debian/rules	2007-06-03 21:24:24 UTC (rev 6425)
@@ -20,6 +20,15 @@
 	# Bogus, shouldn't be shipped..
 	rm -f debian/kaffeine/usr/share/doc/kde/HTML/en/doc/CMakeLists.txt
 
+binary-install/kaffeine::
+	# disable rpath flag not honored
+	chrpath -d debian/kaffeine/usr/bin/kaffeine
+	chrpath -d debian/kaffeine/usr/lib/libkaffeineaudioencoder.so.0.0.1
+	chrpath -d debian/kaffeine/usr/lib/libkaffeinedvbplugin.so.0.0.1
+	chrpath -d debian/kaffeine/usr/lib/libkaffeinepart.so
+	chrpath -d debian/kaffeine/usr/lib/kde3/libxinepart.so
+	chrpath -d debian/kaffeine/usr/lib/kde3/libkaffeineoggvorbis.so
+
 get-orig-source:
 	 @@dh_testdir
 	 @@[ -d ../tarballs/. ]