rev 10976 - in kde-extras/k3b/trunk/debian: . patches

[Francois Marier]

Author: francois
Date: 2008-06-12 00:13:28 +0000 (Thu, 12 Jun 2008)
New Revision: 10976

Removed:
   kde-extras/k3b/trunk/debian/KUBUNTU-DEBIAN-DIFFERENCES
Modified:
   kde-extras/k3b/trunk/debian/control
   kde-extras/k3b/trunk/debian/k3b.install
   kde-extras/k3b/trunk/debian/libk3b3.install
   kde-extras/k3b/trunk/debian/patches/111_advice_kubuntu_restricted_extras.diff
Log:
Sync with Ubuntu, bump Standards-Version


Deleted: kde-extras/k3b/trunk/debian/KUBUNTU-DEBIAN-DIFFERENCES

Modified: kde-extras/k3b/trunk/debian/control
===================================================================
--- kde-extras/k3b/trunk/debian/control	2008-06-11 21:23:44 UTC (rev 10975)
+++ kde-extras/k3b/trunk/debian/control	2008-06-12 00:13:28 UTC (rev 10976)
@@ -4,7 +4,7 @@
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Francois Marier <francois at debian.org>, Fathi Boudra <fabo at debian.org>
 Build-Depends: debhelper (>= 6), cdbs, kdelibs4-dev (>= 3.5.0), libflac++-dev (>= 1.1.2), flac, libdbus-qt-1-dev, libhal-dev (>= 0.5.5.1), libhal-storage-dev (>= 0.5.5.1), libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmusicbrainz4-dev (>= 2.1.1-4.1), libmad0-dev, chrpath, libavformat-dev, libavcodec-dev, libdvdread-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Homepage: http://www.k3b.org
 Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/k3b/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/k3b/trunk/
@@ -68,7 +68,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}
 Conflicts: libk3b2-mp3
-Replaces: libk3b2-mp3
+Replaces: libk3b2-mp3, libk3b2-extracodecs
 Description: The KDE cd burning application library - extra decoders
  K3b is a GUI frontend to the cd recording programs cdrdao and cdrecord.
  Its aim is to provide a very user friendly interface to all the tasks

Modified: kde-extras/k3b/trunk/debian/k3b.install
===================================================================
--- kde-extras/k3b/trunk/debian/k3b.install	2008-06-11 21:23:44 UTC (rev 10975)
+++ kde-extras/k3b/trunk/debian/k3b.install	2008-06-12 00:13:28 UTC (rev 10976)
@@ -1,3 +1,5 @@
 debian/tmp/usr/bin/*
 debian/tmp/usr/share/applications/*
 debian/k3b.xpm usr/share/pixmaps/
+debian/tmp/usr/lib/kde3/kfile_k3b.so
+debian/tmp/usr/lib/kde3/kfile_k3b.la

Modified: kde-extras/k3b/trunk/debian/libk3b3.install
===================================================================
--- kde-extras/k3b/trunk/debian/libk3b3.install	2008-06-11 21:23:44 UTC (rev 10975)
+++ kde-extras/k3b/trunk/debian/libk3b3.install	2008-06-12 00:13:28 UTC (rev 10976)
@@ -25,3 +25,5 @@
 debian/tmp/usr/lib/kde3/libk3baudiometainforenamerplugin.la
 debian/tmp/usr/lib/kde3/kio_videodvd.so
 debian/tmp/usr/lib/kde3/kio_videodvd.la
+debian/tmp/usr/lib/kde3/libk3bffmpegdecoder.so
+debian/tmp/usr/lib/kde3/libk3bffmpegdecoder.la

Modified: kde-extras/k3b/trunk/debian/patches/111_advice_kubuntu_restricted_extras.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/111_advice_kubuntu_restricted_extras.diff	2008-06-11 21:23:44 UTC (rev 10975)
+++ kde-extras/k3b/trunk/debian/patches/111_advice_kubuntu_restricted_extras.diff	2008-06-12 00:13:28 UTC (rev 10976)
@@ -8,7 +8,7 @@
 -					      "due to the missing libmad). Some distributions allow installation of Mp3 support "
 -					      "via an online update tool (i.e. SuSE's YOU)."),
 +					      "due to the missing libmad). To get Mp3 support, please install libk3b3-extracodecs"
-+					      "."),
++					      "(or kubuntu-restricted-extras on Kubuntu)."),
  					 false ) );
    }