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

Fathi Boudra fabo at alioth.debian.org
Mon Aug 10 16:57:11 UTC 2009 

Author: fabo
Date: 2009-08-10 16:57:10 +0000 (Mon, 10 Aug 2009)
New Revision: 15610

Removed:
   kde-extras/k3b/trunk/debian/k3b.postinst
Modified:
   kde-extras/k3b/trunk/debian/changelog
   kde-extras/k3b/trunk/debian/compat
   kde-extras/k3b/trunk/debian/control
   kde-extras/k3b/trunk/debian/copyright
   kde-extras/k3b/trunk/debian/k3b-data.install
   kde-extras/k3b/trunk/debian/k3b.install
   kde-extras/k3b/trunk/debian/libk3b-dev.install
   kde-extras/k3b/trunk/debian/libk3b6-extracodecs.install
   kde-extras/k3b/trunk/debian/libk3b6.install
   kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff
   kde-extras/k3b/trunk/debian/patches/102_rename_dvd+rw-tools.diff
   kde-extras/k3b/trunk/debian/patches/104_dont_require_suid_cdrecord_or_cdrdao.diff
   kde-extras/k3b/trunk/debian/patches/107_iso_cue_mimetypes.diff
   kde-extras/k3b/trunk/debian/patches/109_disable_firstrun.diff
   kde-extras/k3b/trunk/debian/patches/110_disable_no_problems_found_popup.diff
   kde-extras/k3b/trunk/debian/patches/111_advice_debian_libk3b3-extracodes.diff
   kde-extras/k3b/trunk/debian/patches/112_dont_require_mp3.diff
   kde-extras/k3b/trunk/debian/rules
Log:
Merge my k3b changes to avoid duplicated work (blaming myself):

  * Bump debian/compat to 7.
  * Update debian/control:
    - Move k3b to section utils.
    - Cleanup build dependencies.
    - Cleanup k3b dependencies.
  * Update debian/copyright.
  * Convert debian/rules to dh usage.
  * Remove debian/k3b.postinst file.
  * Install kio_videodvd in libk3b6-extracodecs package.
  * Move k3b.desktop file from k3b-data package to k3b package.



Modified: kde-extras/k3b/trunk/debian/changelog
===================================================================
--- kde-extras/k3b/trunk/debian/changelog	2009-08-10 16:08:45 UTC (rev 15609)
+++ kde-extras/k3b/trunk/debian/changelog	2009-08-10 16:57:10 UTC (rev 15610)
@@ -1,22 +1,32 @@
-k3b (1.66.0~alpha2-1) UNRELEASED; urgency=low
+k3b (1.66.0~alpha2-1) experimental; urgency=low
 
-  targeted for experimental.
+  * New upstream release (KDE 4 version).
 
-  * New upstream release.
+  [ Fathi Boudra ]
+  * Bump debian/compat to 7.
+  * Update debian/control:
+    - Move k3b to section utils.
+    - Cleanup build dependencies.
+    - Cleanup k3b dependencies.
+  * Update debian/copyright.
+  * Convert debian/rules to dh usage.
+  * Remove debian/k3b.postinst file.
+  * Install kio_videodvd in libk3b6-extracodecs package.
+  * Move k3b.desktop file from k3b-data package to k3b package.
 
   [ Francois Marier ]
-  * Removing myself from Uploaders field
+  * Removing myself from Uploaders field.
 
   [ Didier Raboud ]
-  * Modify watchfile to handle alphas. 
-  * Standards to 3.8.2, no changes needed.
-  * Change libs name from libk3b3 to libk3b6.
-  * Update Build-Depends to new requirements.
-    - Add libvorbis-dev, libsndfile1-dev, libsamplerate0-dev, libpolkit-qt-dev,
-      libpolkit-grant-dev, libpolkit-dbus-dev, libpolkit-dev, libkcddb-dev
-    - Remove chrpath.
-  * Drop Conflicts/Replaces for versions lower than Lenny's.
-  * Use quilt
+  * Update debian/watch: handle alphas.
+  * Update debian/control:
+    - Bump Standards-Version to 3.8.2 (no changes needed).
+    - Update libraries package name from libk3b3 to libk3b6,
+      to reflect bump soname.
+    - Update build dependencies: add libvorbis-dev, libsndfile1-dev,
+      libsamplerate0-dev, libpolkit-qt-dev, libkcddb-dev and quilt;
+      remove chrpath.
+    - Drop Conflicts/Replaces for versions lower than Lenny's.
 
  -- Fathi Boudra <fabo at debian.org>  Wed, 22 Apr 2009 13:25:36 +0200
 
@@ -1248,4 +1258,3 @@
   * Thanks to Karolina Lindqvist for manpages
 
  -- Jean-Michel Kelbert <kelbert at debian.org>  Wed, 19 Feb 2003 23:53:45 -0500
-

Modified: kde-extras/k3b/trunk/debian/compat
===================================================================
--- kde-extras/k3b/trunk/debian/compat	2009-08-10 16:08:45 UTC (rev 15609)
+++ kde-extras/k3b/trunk/debian/compat	2009-08-10 16:57:10 UTC (rev 15610)
@@ -1 +1 @@
-6
+7

Modified: kde-extras/k3b/trunk/debian/control
===================================================================
--- kde-extras/k3b/trunk/debian/control	2009-08-10 16:08:45 UTC (rev 15609)
+++ kde-extras/k3b/trunk/debian/control	2009-08-10 16:57:10 UTC (rev 15610)
@@ -1,9 +1,13 @@
 Source: k3b
-Section: kde
+Section: utils
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fabo at debian.org>
-Build-Depends: debhelper (>= 6), cdbs, kdelibs5-dev, 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, libavformat-dev, libavcodec-dev, libdvdread-dev, libvorbis-dev, libsndfile1-dev, libsamplerate0-dev, libpolkit-qt-dev, libpolkit-grant-dev, libpolkit-dbus-dev, libpolkit-dev, libkcddb-dev, quilt
+Build-Depends: debhelper (>= 7.3), cmake, quilt, pkg-kde-tools (>= 0.4.11),
+ kdelibs5-dev (>= 4:4.3.0), libavformat-dev, libdvdread-dev, libflac++-dev,
+ libflac-dev, libkcddb-dev, libmad0-dev, libmpcdec-dev, libmusicbrainz4-dev,
+ libpolkit-qt-dev, libsamplerate0-dev, libsndfile1-dev, libtag1-dev,
+ libvorbis-dev
 Standards-Version: 3.8.2
 Homepage: http://www.k3b.org
 Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/k3b/trunk/
@@ -11,9 +15,12 @@
 
 Package: k3b
 Architecture: any
-Depends: ${shlibs:Depends}, wodim | cdrskin, cdparanoia (>= 3a9.8), genisoimage, kdelibs-data (>= 4:3.1.4-2), cdrdao (>= 1.1.7-5), k3b-data (= ${source:Version}), libk3b6 (= ${binary:Version})
-Recommends: vcdimager (>= 0.7), dvd+rw-tools, kdebase-kio-plugins, kcontrol, libk3b6-extracodecs
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ k3b-data (= ${source:Version}), libk3b6 (= ${binary:Version}),
+ wodim | cdrskin, cdparanoia, cdrdao, genisoimage
+Recommends: libk3b6-extracodecs, dvd+rw-tools, vcdimager
 Suggests: k3b-i18n, normalize-audio, toolame, sox, movixmaker-2
+Replaces: k3b-data (<< 1.66.0~alpha2-1)
 Description: A sophisticated KDE CD burning application 
  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
@@ -29,6 +36,7 @@
 
 Package: k3b-data
 Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: A sophisticated KDE CD burning application - data files
  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
@@ -39,7 +47,8 @@
 Package: libk3b-dev
 Section: libdevel
 Architecture: any
-Depends: libk3b6 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ libk3b6 (= ${binary:Version})
 Description: The KDE cd burning application library - development files
  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
@@ -50,7 +59,7 @@
 Package: libk3b6
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: The KDE cd burning application library - runtime files
  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
@@ -61,7 +70,7 @@
 Package: libk3b6-extracodecs
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 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/copyright
===================================================================
--- kde-extras/k3b/trunk/debian/copyright	2009-08-10 16:08:45 UTC (rev 15609)
+++ kde-extras/k3b/trunk/debian/copyright	2009-08-10 16:57:10 UTC (rev 15610)
@@ -1,30 +1,45 @@
-This package was debianized by Jean-Michel Kelbert <kelbert at debian.org> on
-Wed, 19 Feb 2003 23:53:45 -0500.
+This package was debianized by:
 
-It was downloaded from http://www.k3b.org/
+    Jean-Michel Kelbert <kelbert at debian.org> on Wed, 19 Feb 2003 23:53:45 -0500.
 
+It was downloaded from:
+
+    http://www.k3b.org
+
 Upstream Authors:
 
-   Sebastian Trueg <trueg at k3b.org>
-   Thomas Froescher <tfroescher at k3b.org>
-   Christian Kvasny <chris at k3b.org>
-   Klaus-Dieter Krannich <kd at k3b.org>
+    Sebastian Trueg <trueg at k3b.org>
+    Thomas Froescher <tfroescher at k3b.org>
+    Christian Kvasny <chris at k3b.org>
+    Klaus-Dieter Krannich <kd at k3b.org>
 
-Copyright: (C) 2001-2008 Sebastian Trueg
+Copyright:
 
-   This package is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 dated June, 1991.
+    Copyright (C) 2001-2008 Sebastian Trueg
 
-   This package is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+License:
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  
-   02110-1301, USA
+    This package is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License version 2 as
+    published by the Free Software Foundation.
 
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-2'.
+    This package is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+
+The Debian packaging is:
+
+    Copyright (C) 2008-2009 Fathi Boudra <fabo at debian.org>
+    Copyright (C) 2005-2008 Francois Marier <francois at debian.org>
+    Copyright (C) 2003-2005 Jean-Michel Kelbert <kelbert at debian.org>
+
+and is licensed under the GPL version 2, 
+see `/usr/share/common-licenses/GPL-2'.

Modified: kde-extras/k3b/trunk/debian/k3b-data.install
===================================================================
--- kde-extras/k3b/trunk/debian/k3b-data.install	2009-08-10 16:08:45 UTC (rev 15609)
+++ kde-extras/k3b/trunk/debian/k3b-data.install	2009-08-10 16:57:10 UTC (rev 15610)
@@ -1,2 +1,212 @@
-/etc/dbus-1/system.d/org.k3b.setup.conf
-/usr/share/*
+etc/dbus-1/system.d/org.k3b.setup.conf
+usr/share/PolicyKit/policy/org.k3b.setup.policy
+usr/share/dbus-1/interfaces/org.k3b.setup.xml
+usr/share/dbus-1/system-services/org.k3b.setup.service
+usr/share/icons/hicolor/128x128/apps/k3b.png
+usr/share/icons/hicolor/16x16/apps/k3b.png
+usr/share/icons/hicolor/22x22/apps/k3b.png
+usr/share/icons/hicolor/32x32/apps/k3b.png
+usr/share/icons/hicolor/48x48/apps/k3b.png
+usr/share/icons/hicolor/64x64/apps/k3b.png
+usr/share/kde4/apps/k3b/cdi/cdi_imag.rtf
+usr/share/kde4/apps/k3b/cdi/cdi_text.fnt
+usr/share/kde4/apps/k3b/cdi/cdi_vcd.app
+usr/share/kde4/apps/k3b/cdi/cdi_vcd.cfg
+usr/share/kde4/apps/k3b/cdi/icdia.htm
+usr/share/kde4/apps/k3b/cdi/vcd_on_cdi_41.pdf
+usr/share/kde4/apps/k3b/extra/k3bphotosvcd.mpg
+usr/share/kde4/apps/k3b/extra/k3bphotovcd.mpg
+usr/share/kde4/apps/k3b/icons/crystalsvg/16x16/actions/greenled.png
+usr/share/kde4/apps/k3b/icons/crystalsvg/16x16/actions/redled.png
+usr/share/kde4/apps/k3b/icons/crystalsvg/16x16/actions/yellowinfo.png
+usr/share/kde4/apps/k3b/icons/crystalsvg/16x16/actions/yellowled.png
+usr/share/kde4/apps/k3b/icons/hicolor/16x16/actions/audiocd.png
+usr/share/kde4/apps/k3b/icons/hicolor/16x16/actions/burn_cdimage.png
+usr/share/kde4/apps/k3b/icons/hicolor/16x16/actions/burn_dvdimage.png
+usr/share/kde4/apps/k3b/icons/hicolor/16x16/actions/cdburn.png
+usr/share/kde4/apps/k3b/icons/hicolor/16x16/actions/cdcopy.png
+usr/share/kde4/apps/k3b/icons/hicolor/16x16/actions/cddarip.png
+usr/share/kde4/apps/k3b/icons/hicolor/16x16/actions/datacd.png
+usr/share/kde4/apps/k3b/icons/hicolor/16x16/actions/datadvd.png
+usr/share/kde4/apps/k3b/icons/hicolor/16x16/actions/dvdcopy.png
+usr/share/kde4/apps/k3b/icons/hicolor/16x16/actions/emovix.png
+usr/share/kde4/apps/k3b/icons/hicolor/16x16/actions/erasecd.png
+usr/share/kde4/apps/k3b/icons/hicolor/16x16/actions/formatdvd.png
+usr/share/kde4/apps/k3b/icons/hicolor/16x16/actions/mixedcd.png
+usr/share/kde4/apps/k3b/icons/hicolor/16x16/actions/mp3cd.png
+usr/share/kde4/apps/k3b/icons/hicolor/16x16/actions/musicbrainz.png
+usr/share/kde4/apps/k3b/icons/hicolor/16x16/actions/videocd.png
+usr/share/kde4/apps/k3b/icons/hicolor/16x16/actions/videodvd.png
+usr/share/kde4/apps/k3b/icons/hicolor/22x22/actions/audiocd.png
+usr/share/kde4/apps/k3b/icons/hicolor/22x22/actions/burn_cdimage.png
+usr/share/kde4/apps/k3b/icons/hicolor/22x22/actions/burn_dvdimage.png
+usr/share/kde4/apps/k3b/icons/hicolor/22x22/actions/cdburn.png
+usr/share/kde4/apps/k3b/icons/hicolor/22x22/actions/cdcopy.png
+usr/share/kde4/apps/k3b/icons/hicolor/22x22/actions/cddarip.png
+usr/share/kde4/apps/k3b/icons/hicolor/22x22/actions/datacd.png
+usr/share/kde4/apps/k3b/icons/hicolor/22x22/actions/datadvd.png
+usr/share/kde4/apps/k3b/icons/hicolor/22x22/actions/dvdcopy.png
+usr/share/kde4/apps/k3b/icons/hicolor/22x22/actions/emovix.png
+usr/share/kde4/apps/k3b/icons/hicolor/22x22/actions/erasecd.png
+usr/share/kde4/apps/k3b/icons/hicolor/22x22/actions/formatdvd.png
+usr/share/kde4/apps/k3b/icons/hicolor/22x22/actions/mixedcd.png
+usr/share/kde4/apps/k3b/icons/hicolor/22x22/actions/mp3cd.png
+usr/share/kde4/apps/k3b/icons/hicolor/22x22/actions/videocd.png
+usr/share/kde4/apps/k3b/icons/hicolor/22x22/actions/videodvd.png
+usr/share/kde4/apps/k3b/icons/hicolor/32x32/actions/audiocd.png
+usr/share/kde4/apps/k3b/icons/hicolor/32x32/actions/burn_cdimage.png
+usr/share/kde4/apps/k3b/icons/hicolor/32x32/actions/burn_dvdimage.png
+usr/share/kde4/apps/k3b/icons/hicolor/32x32/actions/cdburn.png
+usr/share/kde4/apps/k3b/icons/hicolor/32x32/actions/cdcopy.png
+usr/share/kde4/apps/k3b/icons/hicolor/32x32/actions/cddarip.png
+usr/share/kde4/apps/k3b/icons/hicolor/32x32/actions/datacd.png
+usr/share/kde4/apps/k3b/icons/hicolor/32x32/actions/datadvd.png
+usr/share/kde4/apps/k3b/icons/hicolor/32x32/actions/dvdcopy.png
+usr/share/kde4/apps/k3b/icons/hicolor/32x32/actions/emovix.png
+usr/share/kde4/apps/k3b/icons/hicolor/32x32/actions/erasecd.png
+usr/share/kde4/apps/k3b/icons/hicolor/32x32/actions/formatdvd.png
+usr/share/kde4/apps/k3b/icons/hicolor/32x32/actions/mixedcd.png
+usr/share/kde4/apps/k3b/icons/hicolor/32x32/actions/mp3cd.png
+usr/share/kde4/apps/k3b/icons/hicolor/32x32/actions/videocd.png
+usr/share/kde4/apps/k3b/icons/hicolor/32x32/actions/videodvd.png
+usr/share/kde4/apps/k3b/icons/hicolor/48x48/actions/audiocd.png
+usr/share/kde4/apps/k3b/icons/hicolor/48x48/actions/burn_cdimage.png
+usr/share/kde4/apps/k3b/icons/hicolor/48x48/actions/burn_dvdimage.png
+usr/share/kde4/apps/k3b/icons/hicolor/48x48/actions/cdburn.png
+usr/share/kde4/apps/k3b/icons/hicolor/48x48/actions/cdcopy.png
+usr/share/kde4/apps/k3b/icons/hicolor/48x48/actions/cddarip.png
+usr/share/kde4/apps/k3b/icons/hicolor/48x48/actions/datacd.png
+usr/share/kde4/apps/k3b/icons/hicolor/48x48/actions/datadvd.png
+usr/share/kde4/apps/k3b/icons/hicolor/48x48/actions/dvdcopy.png
+usr/share/kde4/apps/k3b/icons/hicolor/48x48/actions/emovix.png
+usr/share/kde4/apps/k3b/icons/hicolor/48x48/actions/erasecd.png
+usr/share/kde4/apps/k3b/icons/hicolor/48x48/actions/formatdvd.png
+usr/share/kde4/apps/k3b/icons/hicolor/48x48/actions/mixedcd.png
+usr/share/kde4/apps/k3b/icons/hicolor/48x48/actions/mp3cd.png
+usr/share/kde4/apps/k3b/icons/hicolor/48x48/actions/videocd.png
+usr/share/kde4/apps/k3b/icons/hicolor/48x48/actions/videodvd.png
+usr/share/kde4/apps/k3b/icons/hicolor/64x64/actions/musicbrainz.png
+usr/share/kde4/apps/k3b/icons/hicolor/scalable/actions/audiocd.svgz
+usr/share/kde4/apps/k3b/icons/hicolor/scalable/actions/burn_cdimage.svgz
+usr/share/kde4/apps/k3b/icons/hicolor/scalable/actions/burn_dvdimage.svgz
+usr/share/kde4/apps/k3b/icons/hicolor/scalable/actions/cdburn.svgz
+usr/share/kde4/apps/k3b/icons/hicolor/scalable/actions/cdcopy.svgz
+usr/share/kde4/apps/k3b/icons/hicolor/scalable/actions/cddarip.svgz
+usr/share/kde4/apps/k3b/icons/hicolor/scalable/actions/datacd.svgz
+usr/share/kde4/apps/k3b/icons/hicolor/scalable/actions/datadvd.svgz
+usr/share/kde4/apps/k3b/icons/hicolor/scalable/actions/dvdcopy.svgz
+usr/share/kde4/apps/k3b/icons/hicolor/scalable/actions/emovix.svgz
+usr/share/kde4/apps/k3b/icons/hicolor/scalable/actions/erasecd.svgz
+usr/share/kde4/apps/k3b/icons/hicolor/scalable/actions/formatdvd.svgz
+usr/share/kde4/apps/k3b/icons/hicolor/scalable/actions/mixedcd.svgz
+usr/share/kde4/apps/k3b/icons/hicolor/scalable/actions/mp3cd.svgz
+usr/share/kde4/apps/k3b/icons/hicolor/scalable/actions/videocd.svgz
+usr/share/kde4/apps/k3b/icons/hicolor/scalable/actions/videodvd.svgz
+usr/share/kde4/apps/k3b/k3b.notifyrc
+usr/share/kde4/apps/k3b/k3bdeviceui.rc
+usr/share/kde4/apps/k3b/k3bui.rc
+usr/share/kde4/apps/k3b/pics/73lab/dialog_left.png
+usr/share/kde4/apps/k3b/pics/73lab/dialog_right.png
+usr/share/kde4/apps/k3b/pics/73lab/k3b.theme
+usr/share/kde4/apps/k3b/pics/73lab/media_audio.png
+usr/share/kde4/apps/k3b/pics/73lab/media_data.png
+usr/share/kde4/apps/k3b/pics/73lab/media_empty.png
+usr/share/kde4/apps/k3b/pics/73lab/media_left.png
+usr/share/kde4/apps/k3b/pics/73lab/media_mixed.png
+usr/share/kde4/apps/k3b/pics/73lab/media_none.png
+usr/share/kde4/apps/k3b/pics/73lab/media_video.png
+usr/share/kde4/apps/k3b/pics/73lab/probing.png
+usr/share/kde4/apps/k3b/pics/73lab/progress_fail.png
+usr/share/kde4/apps/k3b/pics/73lab/progress_right.png
+usr/share/kde4/apps/k3b/pics/73lab/progress_success.png
+usr/share/kde4/apps/k3b/pics/73lab/progress_working.png
+usr/share/kde4/apps/k3b/pics/73lab/project_left.png
+usr/share/kde4/apps/k3b/pics/73lab/project_right.png
+usr/share/kde4/apps/k3b/pics/73lab/splash.png
+usr/share/kde4/apps/k3b/pics/73lab/welcome_bg.png
+usr/share/kde4/apps/k3b/pics/RobsTheme/dialog_left.png
+usr/share/kde4/apps/k3b/pics/RobsTheme/dialog_right.png
+usr/share/kde4/apps/k3b/pics/RobsTheme/k3b.theme
+usr/share/kde4/apps/k3b/pics/RobsTheme/media_audio.png
+usr/share/kde4/apps/k3b/pics/RobsTheme/media_data.png
+usr/share/kde4/apps/k3b/pics/RobsTheme/media_empty.png
+usr/share/kde4/apps/k3b/pics/RobsTheme/media_left.png
+usr/share/kde4/apps/k3b/pics/RobsTheme/media_mixed.png
+usr/share/kde4/apps/k3b/pics/RobsTheme/media_none.png
+usr/share/kde4/apps/k3b/pics/RobsTheme/media_video.png
+usr/share/kde4/apps/k3b/pics/RobsTheme/progress_fail.png
+usr/share/kde4/apps/k3b/pics/RobsTheme/progress_right.png
+usr/share/kde4/apps/k3b/pics/RobsTheme/progress_success.png
+usr/share/kde4/apps/k3b/pics/RobsTheme/progress_working.png
+usr/share/kde4/apps/k3b/pics/RobsTheme/project_left.png
+usr/share/kde4/apps/k3b/pics/RobsTheme/project_right.png
+usr/share/kde4/apps/k3b/pics/RobsTheme/splash.png
+usr/share/kde4/apps/k3b/pics/RobsTheme/welcome_bg.png
+usr/share/kde4/apps/k3b/pics/crystal/dialog_left.png
+usr/share/kde4/apps/k3b/pics/crystal/dialog_right.png
+usr/share/kde4/apps/k3b/pics/crystal/k3b.theme
+usr/share/kde4/apps/k3b/pics/crystal/media_audio.png
+usr/share/kde4/apps/k3b/pics/crystal/media_data.png
+usr/share/kde4/apps/k3b/pics/crystal/media_empty.png
+usr/share/kde4/apps/k3b/pics/crystal/media_left.png
+usr/share/kde4/apps/k3b/pics/crystal/media_mixed.png
+usr/share/kde4/apps/k3b/pics/crystal/media_none.png
+usr/share/kde4/apps/k3b/pics/crystal/media_video.png
+usr/share/kde4/apps/k3b/pics/crystal/probing.png
+usr/share/kde4/apps/k3b/pics/crystal/progress_fail.png
+usr/share/kde4/apps/k3b/pics/crystal/progress_right.png
+usr/share/kde4/apps/k3b/pics/crystal/progress_success.png
+usr/share/kde4/apps/k3b/pics/crystal/progress_working.png
+usr/share/kde4/apps/k3b/pics/crystal/project_left.png
+usr/share/kde4/apps/k3b/pics/crystal/project_right.png
+usr/share/kde4/apps/k3b/pics/crystal/splash.png
+usr/share/kde4/apps/k3b/pics/crystal/welcome_bg.png
+usr/share/kde4/apps/k3b/pics/quant/dialog_left.png
+usr/share/kde4/apps/k3b/pics/quant/dialog_right.png
+usr/share/kde4/apps/k3b/pics/quant/k3b.theme
+usr/share/kde4/apps/k3b/pics/quant/media_audio.png
+usr/share/kde4/apps/k3b/pics/quant/media_data.png
+usr/share/kde4/apps/k3b/pics/quant/media_empty.png
+usr/share/kde4/apps/k3b/pics/quant/media_left.png
+usr/share/kde4/apps/k3b/pics/quant/media_mixed.png
+usr/share/kde4/apps/k3b/pics/quant/media_none.png
+usr/share/kde4/apps/k3b/pics/quant/media_video.png
+usr/share/kde4/apps/k3b/pics/quant/progress_fail.png
+usr/share/kde4/apps/k3b/pics/quant/progress_right.png
+usr/share/kde4/apps/k3b/pics/quant/progress_success.png
+usr/share/kde4/apps/k3b/pics/quant/progress_working.png
+usr/share/kde4/apps/k3b/pics/quant/project_left.png
+usr/share/kde4/apps/k3b/pics/quant/project_right.png
+usr/share/kde4/apps/k3b/pics/quant/splash.png
+usr/share/kde4/apps/k3b/pics/quant/welcome_bg.png
+usr/share/kde4/apps/k3b/tips
+usr/share/kde4/apps/konqsidebartng/virtual_folders/services/videodvd.desktop
+usr/share/kde4/apps/solid/actions/k3b_audiocd_rip.desktop
+usr/share/kde4/apps/solid/actions/k3b_copy_disc.desktop
+usr/share/kde4/apps/solid/actions/k3b_create_audio_cd_from_blank_medium.desktop
+usr/share/kde4/apps/solid/actions/k3b_create_data_project_from_blank_medium.desktop
+usr/share/kde4/apps/solid/actions/k3b_videodvd_rip.desktop
+usr/share/kde4/services/ServiceMenus/k3b_create_audio_cd.desktop
+usr/share/kde4/services/ServiceMenus/k3b_create_data_project.desktop
+usr/share/kde4/services/ServiceMenus/k3b_create_video_cd.desktop
+usr/share/kde4/services/ServiceMenus/k3b_write_bin_image.desktop
+usr/share/kde4/services/ServiceMenus/k3b_write_iso_image.desktop
+usr/share/kde4/services/k3baudiometainforenamerplugin.desktop
+usr/share/kde4/services/k3baudioprojectcddbplugin.desktop
+usr/share/kde4/services/k3bexternalencoder.desktop
+usr/share/kde4/services/k3bffmpegdecoder.desktop
+usr/share/kde4/services/k3bflacdecoder.desktop
+usr/share/kde4/services/k3blibsndfiledecoder.desktop
+usr/share/kde4/services/k3bmaddecoder.desktop
+usr/share/kde4/services/k3bmpcdecoder.desktop
+usr/share/kde4/services/k3boggvorbisdecoder.desktop
+usr/share/kde4/services/k3boggvorbisencoder.desktop
+usr/share/kde4/services/k3bsetup.desktop
+usr/share/kde4/services/k3bsoxencoder.desktop
+usr/share/kde4/services/k3bwavedecoder.desktop
+usr/share/kde4/services/kcm_k3bexternalencoder.desktop
+usr/share/kde4/services/kcm_k3boggvorbisencoder.desktop
+usr/share/kde4/services/videodvd.protocol
+usr/share/sounds/k3b_error1.wav
+usr/share/sounds/k3b_success1.wav
+usr/share/sounds/k3b_wait_media1.wav

Modified: kde-extras/k3b/trunk/debian/k3b.install
===================================================================
--- kde-extras/k3b/trunk/debian/k3b.install	2009-08-10 16:08:45 UTC (rev 15609)
+++ kde-extras/k3b/trunk/debian/k3b.install	2009-08-10 16:57:10 UTC (rev 15610)
@@ -1,2 +1,4 @@
-/usr/bin/*
-../k3b.xpm /usr/share/pixmaps/
+debian/k3b.xpm /usr/share/pixmaps
+usr/bin/k3b
+usr/bin/k3bsetup
+usr/share/applications/kde4/k3b.desktop

Modified: kde-extras/k3b/trunk/debian/libk3b-dev.install
===================================================================
--- kde-extras/k3b/trunk/debian/libk3b-dev.install	2009-08-10 16:08:45 UTC (rev 15609)
+++ kde-extras/k3b/trunk/debian/libk3b-dev.install	2009-08-10 16:57:10 UTC (rev 15610)
@@ -1,2 +1,3 @@
-/usr/include/*
-/usr/lib/*.so
+usr/include/k3b*.h
+usr/lib/libk3b.so
+usr/lib/libk3bdevice.so

Modified: kde-extras/k3b/trunk/debian/libk3b6-extracodecs.install
===================================================================
--- kde-extras/k3b/trunk/debian/libk3b6-extracodecs.install	2009-08-10 16:08:45 UTC (rev 15609)
+++ kde-extras/k3b/trunk/debian/libk3b6-extracodecs.install	2009-08-10 16:57:10 UTC (rev 15610)
@@ -1,2 +1,3 @@
-/usr/lib/kde4/k3bmaddecoder.so
-/usr/lib/kde4/k3bffmpegdecoder.so
+usr/lib/kde4/k3bffmpegdecoder.so
+usr/lib/kde4/k3bmaddecoder.so
+usr/lib/kde4/kio_videodvd.so

Modified: kde-extras/k3b/trunk/debian/libk3b6.install
===================================================================
--- kde-extras/k3b/trunk/debian/libk3b6.install	2009-08-10 16:08:45 UTC (rev 15609)
+++ kde-extras/k3b/trunk/debian/libk3b6.install	2009-08-10 16:57:10 UTC (rev 15610)
@@ -1,16 +1,16 @@
-/usr/lib/kde4/k3baudiometainforenamerplugin.so
-/usr/lib/kde4/k3bmpcdecoder.so
-/usr/lib/kde4/k3bflacdecoder.so
-/usr/lib/kde4/k3baudioprojectcddbplugin.so
-/usr/lib/kde4/k3blibsndfiledecoder.so
-/usr/lib/kde4/k3boggvorbisdecoder.so
-/usr/lib/kde4/k3boggvorbisencoder.so
-/usr/lib/kde4/kcm_k3boggvorbisencoder.so
-/usr/lib/kde4/k3bexternalencoder.so
-/usr/lib/kde4/k3bsoxencoder.so
-/usr/lib/kde4/k3bwavedecoder.so
-/usr/lib/kde4/kcm_k3bexternalencoder.so
-/usr/lib/kde4/kcm_k3bsetup.so
-/usr/lib/kde4/kio_videodvd.so
-/usr/lib/kde4/libexec/k3bsetup_worker
-/usr/lib/*.so.*
+usr/lib/kde4/k3baudiometainforenamerplugin.so
+usr/lib/kde4/k3baudioprojectcddbplugin.so
+usr/lib/kde4/k3bexternalencoder.so
+usr/lib/kde4/k3bflacdecoder.so
+usr/lib/kde4/k3blibsndfiledecoder.so
+usr/lib/kde4/k3bmpcdecoder.so
+usr/lib/kde4/k3boggvorbisdecoder.so
+usr/lib/kde4/k3boggvorbisencoder.so
+usr/lib/kde4/k3bsoxencoder.so
+usr/lib/kde4/k3bwavedecoder.so
+usr/lib/kde4/kcm_k3bexternalencoder.so
+usr/lib/kde4/kcm_k3boggvorbisencoder.so
+usr/lib/kde4/kcm_k3bsetup.so
+usr/lib/kde4/libexec/k3bsetup_worker
+usr/lib/libk3b.so.*
+usr/lib/libk3bdevice.so.*

Modified: kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff	2009-08-10 16:08:45 UTC (rev 15609)
+++ kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff	2009-08-10 16:57:10 UTC (rev 15610)
@@ -3,11 +3,9 @@
 Reviewed-by: Didier Raboud <didier at raboud.com>
 Last-Update: 2009-08-09
 
-Index: k3b-1.66.0/libk3b/core/k3bdefaultexternalprograms.cpp
-===================================================================
---- k3b-1.66.0.orig/libk3b/core/k3bdefaultexternalprograms.cpp	2009-08-09 14:34:11.000000000 +0200
-+++ k3b-1.66.0/libk3b/core/k3bdefaultexternalprograms.cpp	2009-08-09 15:47:13.000000000 +0200
-@@ -388,7 +388,7 @@
+--- a/libk3b/core/k3bdefaultexternalprograms.cpp
++++ b/libk3b/core/k3bdefaultexternalprograms.cpp
+@@ -388,7 +388,7 @@ K3b::VcdbuilderProgram::VcdbuilderProgra
  
  
  K3b::NormalizeProgram::NormalizeProgram()
@@ -16,11 +14,9 @@
  {
  }
  
-Index: k3b-1.66.0/libk3b/projects/audiocd/k3baudionormalizejob.cpp
-===================================================================
---- k3b-1.66.0.orig/libk3b/projects/audiocd/k3baudionormalizejob.cpp	2009-08-09 14:34:11.000000000 +0200
-+++ k3b-1.66.0/libk3b/projects/audiocd/k3baudionormalizejob.cpp	2009-08-09 14:34:13.000000000 +0200
-@@ -50,10 +50,10 @@
+--- a/libk3b/projects/audiocd/k3baudionormalizejob.cpp
++++ b/libk3b/projects/audiocd/k3baudionormalizejob.cpp
+@@ -50,10 +50,10 @@ void K3b::AudioNormalizeJob::start()
      connect( m_process, SIGNAL(stderrLine(const QString&)), this, SLOT(slotStdLine(const QString&)) );
      connect( m_process, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(slotProcessExited(int, QProcess::ExitStatus)) );
  
@@ -33,7 +29,7 @@
          jobFinished(false);
          return;
      }
-@@ -80,8 +80,8 @@
+@@ -80,8 +80,8 @@ void K3b::AudioNormalizeJob::start()
      if( !m_process->start( KProcess::OnlyStderrChannel ) ) {
          // something went wrong when starting the program
          // it "should" be the executable
@@ -44,7 +40,7 @@
          jobFinished(false);
      }
  }
-@@ -104,7 +104,7 @@
+@@ -104,7 +104,7 @@ void K3b::AudioNormalizeJob::slotStdLine
  
      //  emit newSubTask( i18n("Normalizing track %1 of %2 (%3)",t,tt,m_files.at(t-1)) );
  
@@ -53,7 +49,7 @@
  
      // wenn "% done" drin:
      //    wenn ein --% drin ist, so beginnt ein neuer track
-@@ -183,7 +183,7 @@
+@@ -183,7 +183,7 @@ void K3b::AudioNormalizeJob::slotProcess
              break;
          default:
              if( !m_canceled ) {
@@ -62,11 +58,9 @@
                                    K3b::Job::MessageError );
                  emit infoMessage( i18n("Please send me an email with the last output."), K3b::Job::MessageError );
                  emit infoMessage( i18n("Error while normalizing tracks."), MessageError );
-Index: k3b-1.66.0/src/projects/k3baudioburndialog.cpp
-===================================================================
---- k3b-1.66.0.orig/src/projects/k3baudioburndialog.cpp	2009-08-09 14:34:11.000000000 +0200
-+++ k3b-1.66.0/src/projects/k3baudioburndialog.cpp	2009-08-09 14:34:13.000000000 +0200
-@@ -283,11 +283,11 @@
+--- a/src/projects/k3baudioburndialog.cpp
++++ b/src/projects/k3baudioburndialog.cpp
+@@ -283,11 +283,11 @@ void K3b::AudioBurnDialog::slotNormalize
  {
      if( on ) {
          // we are not able to normalize in on-the-fly mode
@@ -82,11 +76,9 @@
              m_checkNormalize->setChecked( false );
          }
          else if( !m_checkCacheImage->isChecked() && !m_checkOnlyCreateImage->isChecked() ) {
-Index: k3b-1.66.0/src/projects/k3bmixedburndialog.cpp
-===================================================================
---- k3b-1.66.0.orig/src/projects/k3bmixedburndialog.cpp	2009-08-09 14:37:31.000000000 +0200
-+++ k3b-1.66.0/src/projects/k3bmixedburndialog.cpp	2009-08-09 14:39:37.000000000 +0200
-@@ -290,10 +290,10 @@
+--- a/src/projects/k3bmixedburndialog.cpp
++++ b/src/projects/k3bmixedburndialog.cpp
+@@ -290,10 +290,10 @@ void K3b::MixedBurnDialog::slotNormalize
      if( on ) {
          // we are not able to normalize in on-the-fly mode
          if( !k3bcore->externalBinManager()->foundBin( "normalize" ) ) {

Modified: kde-extras/k3b/trunk/debian/patches/102_rename_dvd+rw-tools.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/102_rename_dvd+rw-tools.diff	2009-08-10 16:08:45 UTC (rev 15609)
+++ kde-extras/k3b/trunk/debian/patches/102_rename_dvd+rw-tools.diff	2009-08-10 16:57:10 UTC (rev 15610)
@@ -1,8 +1,6 @@
-Index: k3b-1.66.0/libk3b/core/k3bdefaultexternalprograms.cpp
-===================================================================
---- k3b-1.66.0.orig/libk3b/core/k3bdefaultexternalprograms.cpp	2009-08-09 14:25:42.000000000 +0200
-+++ k3b-1.66.0/libk3b/core/k3bdefaultexternalprograms.cpp	2009-08-09 14:26:11.000000000 +0200
-@@ -431,7 +431,7 @@
+--- a/libk3b/core/k3bdefaultexternalprograms.cpp
++++ b/libk3b/core/k3bdefaultexternalprograms.cpp
+@@ -431,7 +431,7 @@ K3b::Version K3b::DvdformatProgram::pars
  {
      // different locales make searching for the +- char difficult
      // so we simply ignore it.

Modified: kde-extras/k3b/trunk/debian/patches/104_dont_require_suid_cdrecord_or_cdrdao.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/104_dont_require_suid_cdrecord_or_cdrdao.diff	2009-08-10 16:08:45 UTC (rev 15609)
+++ kde-extras/k3b/trunk/debian/patches/104_dont_require_suid_cdrecord_or_cdrdao.diff	2009-08-10 16:57:10 UTC (rev 15610)
@@ -1,8 +1,6 @@
-Index: k3b-1.66.0/src/k3bsystemproblemdialog.cpp
-===================================================================
---- k3b-1.66.0.orig/src/k3bsystemproblemdialog.cpp	2009-08-09 14:30:29.000000000 +0200
-+++ k3b-1.66.0/src/k3bsystemproblemdialog.cpp	2009-08-09 14:31:43.000000000 +0200
-@@ -206,6 +206,7 @@
+--- a/src/k3bsystemproblemdialog.cpp
++++ b/src/k3bsystemproblemdialog.cpp
+@@ -206,6 +206,7 @@ void K3b::SystemProblemDialog::checkSyst
                                                     false ) );
              }
  
@@ -10,7 +8,7 @@
  #ifdef Q_OS_LINUX
  
              //
-@@ -241,6 +242,7 @@
+@@ -241,6 +242,7 @@ void K3b::SystemProblemDialog::checkSyst
                                                     true ) );
  #endif // CDRECORD_SUID_ROOT_CHECK
  #endif
@@ -18,7 +16,7 @@
          }
  
          if( !k3bcore->externalBinManager()->foundBin( "cdrdao" ) ) {
-@@ -250,6 +252,7 @@
+@@ -250,6 +252,7 @@ void K3b::SystemProblemDialog::checkSyst
                                                 i18n("Install the cdrdao package."),
                                                 false ) );
          }
@@ -26,7 +24,7 @@
          else {
  #ifdef Q_OS_LINUX
  #ifdef CDRECORD_SUID_ROOT_CHECK
-@@ -264,6 +267,7 @@
+@@ -264,6 +267,7 @@ void K3b::SystemProblemDialog::checkSyst
  #endif // CDRECORD_SUID_ROOT_CHECK
  #endif
          }

Modified: kde-extras/k3b/trunk/debian/patches/107_iso_cue_mimetypes.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/107_iso_cue_mimetypes.diff	2009-08-10 16:08:45 UTC (rev 15609)
+++ kde-extras/k3b/trunk/debian/patches/107_iso_cue_mimetypes.diff	2009-08-10 16:57:10 UTC (rev 15610)
@@ -1,8 +1,6 @@
-Index: k3b-1.66.0/src/k3b.desktop
-===================================================================
---- k3b-1.66.0.orig/src/k3b.desktop	2009-08-09 14:42:40.000000000 +0200
-+++ k3b-1.66.0/src/k3b.desktop	2009-08-09 14:43:10.000000000 +0200
-@@ -94,8 +94,8 @@
+--- a/src/k3b.desktop
++++ b/src/k3b.desktop
+@@ -94,8 +94,8 @@ Name[hi]=के3बी
  Name[hne]=के3बी
  Name[ne]=केथ्रीबी
  Name[x-test]=xxK3bxx

Modified: kde-extras/k3b/trunk/debian/patches/109_disable_firstrun.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/109_disable_firstrun.diff	2009-08-10 16:08:45 UTC (rev 15609)
+++ kde-extras/k3b/trunk/debian/patches/109_disable_firstrun.diff	2009-08-10 16:57:10 UTC (rev 15610)
@@ -1,8 +1,6 @@
-Index: k3b-1.66.0/src/k3bapplication.cpp
-===================================================================
---- k3b-1.66.0.orig/src/k3bapplication.cpp	2009-08-09 14:45:30.000000000 +0200
-+++ k3b-1.66.0/src/k3bapplication.cpp	2009-08-09 14:45:40.000000000 +0200
-@@ -137,7 +137,7 @@
+--- a/src/k3bapplication.cpp
++++ b/src/k3bapplication.cpp
+@@ -137,7 +137,7 @@ void K3b::Application::init()
  
          emit initializationDone();
  

Modified: kde-extras/k3b/trunk/debian/patches/110_disable_no_problems_found_popup.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/110_disable_no_problems_found_popup.diff	2009-08-10 16:08:45 UTC (rev 15609)
+++ kde-extras/k3b/trunk/debian/patches/110_disable_no_problems_found_popup.diff	2009-08-10 16:57:10 UTC (rev 15610)
@@ -1,8 +1,6 @@
-Index: k3b-1.66.0/src/k3bsystemproblemdialog.cpp
-===================================================================
---- k3b-1.66.0.orig/src/k3bsystemproblemdialog.cpp	2009-08-09 14:46:42.000000000 +0200
-+++ k3b-1.66.0/src/k3bsystemproblemdialog.cpp	2009-08-09 14:47:10.000000000 +0200
-@@ -589,7 +589,7 @@
+--- a/src/k3bsystemproblemdialog.cpp
++++ b/src/k3bsystemproblemdialog.cpp
+@@ -589,7 +589,7 @@ void K3b::SystemProblemDialog::checkSyst
      if( problems.isEmpty() ) {
          kDebug() << "          - none - ";
          if( level == AlwaysNotify ) {

Modified: kde-extras/k3b/trunk/debian/patches/111_advice_debian_libk3b3-extracodes.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/111_advice_debian_libk3b3-extracodes.diff	2009-08-10 16:08:45 UTC (rev 15609)
+++ kde-extras/k3b/trunk/debian/patches/111_advice_debian_libk3b3-extracodes.diff	2009-08-10 16:57:10 UTC (rev 15610)
@@ -1,8 +1,6 @@
-Index: k3b-1.66.0/src/k3bsystemproblemdialog.cpp
-===================================================================
---- k3b-1.66.0.orig/src/k3bsystemproblemdialog.cpp	2009-08-09 17:01:11.000000000 +0200
-+++ k3b-1.66.0/src/k3bsystemproblemdialog.cpp	2009-08-09 17:46:06.000000000 +0200
-@@ -520,8 +520,7 @@
+--- a/src/k3bsystemproblemdialog.cpp
++++ b/src/k3bsystemproblemdialog.cpp
+@@ -520,8 +520,7 @@ void K3b::SystemProblemDialog::checkSyst
                                                  "include Mp3 support for legal reasons."),
                                             i18n("To enable Mp3 support, please install the MAD Mp3 decoding library as well as the "
                                                  "K3b MAD Mp3 decoder plugin (the latter may already be installed but not functional "

Modified: kde-extras/k3b/trunk/debian/patches/112_dont_require_mp3.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/112_dont_require_mp3.diff	2009-08-10 16:08:45 UTC (rev 15609)
+++ kde-extras/k3b/trunk/debian/patches/112_dont_require_mp3.diff	2009-08-10 16:57:10 UTC (rev 15610)
@@ -1,8 +1,6 @@
-Index: k3b-1.66.0/src/k3bsystemproblemdialog.cpp
-===================================================================
---- k3b-1.66.0.orig/src/k3bsystemproblemdialog.cpp	2009-08-09 14:52:01.000000000 +0200
-+++ k3b-1.66.0/src/k3bsystemproblemdialog.cpp	2009-08-09 14:52:52.000000000 +0200
-@@ -503,6 +503,7 @@
+--- a/src/k3bsystemproblemdialog.cpp
++++ b/src/k3bsystemproblemdialog.cpp
+@@ -503,6 +503,7 @@ void K3b::SystemProblemDialog::checkSyst
      // Way too many users are complaining about K3b not being able to decode mp3 files. So just warn them about
      // the legal restrictions with many distros
      //
@@ -10,8 +8,8 @@
      QList<K3b::Plugin*> plugins = k3bcore->pluginManager()->plugins( "AudioDecoder" );
      bool haveMp3Decoder = false;
      for( QList<K3b::Plugin*>::const_iterator it = plugins.constBegin();
-@@ -523,6 +524,7 @@
-                                                 "due to the missing libmad). To get Mp3 support, please install the package libk3b3-extracodecs."),
+@@ -523,6 +524,7 @@ void K3b::SystemProblemDialog::checkSyst
+                                                 "due to the missing libmad). To get Mp3 support, please install the package libk3b6-extracodecs."),
                                             false ) );
      }
 +*/

Modified: kde-extras/k3b/trunk/debian/rules
===================================================================
--- kde-extras/k3b/trunk/debian/rules	2009-08-10 16:08:45 UTC (rev 15609)
+++ kde-extras/k3b/trunk/debian/rules	2009-08-10 16:57:10 UTC (rev 15610)
@@ -1,11 +1,10 @@
 #!/usr/bin/make -f
 
-include /usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/pkg-kde-tools/makefiles/1/debhelper/kde.mk
 
-DEB_DH_INSTALL_SOURCEDIR := debian/tmp
+#DEB_CMAKE_CUSTOM_FLAGS += -DK3B_BUILD_K3BSETUP=OFF
 
-DEB_CONFIGURE_EXTRA_FLAGS = --with-k3bsetup=no
+%:
+	dh --with quilt --list-missing $@
 
-DEB_INSTALL_MANPAGES_k3b = debian/k3b.1
+.PHONY: override_dh_auto_test

More information about the pkg-kde-commits mailing list