rev 17855 - kde-extras/k3b/trunk/debian

[Michael Meskes]

Author: meskes
Date: 2010-05-07 12:23:39 +0000 (Fri, 07 May 2010)
New Revision: 17855

Modified:
   kde-extras/k3b/trunk/debian/changelog
   kde-extras/k3b/trunk/debian/control
   kde-extras/k3b/trunk/debian/k3b-data.install
   kde-extras/k3b/trunk/debian/k3b.install
   kde-extras/k3b/trunk/debian/libk3b6.install
   kde-extras/k3b/trunk/debian/rules
Log:
Re-enabled k3bsetup.


Modified: kde-extras/k3b/trunk/debian/changelog
===================================================================
--- kde-extras/k3b/trunk/debian/changelog	2010-05-07 11:54:30 UTC (rev 17854)
+++ kde-extras/k3b/trunk/debian/changelog	2010-05-07 12:23:39 UTC (rev 17855)
@@ -1,6 +1,7 @@
 k3b (1.91.0~rc2-1) unstable; urgency=low
 
   * New upstream version.
+  * Re-enabled k3bsetup.
 
  -- Michael Meskes <meskes at debian.org>  Fri, 07 May 2010 13:18:50 +0200
 

Modified: kde-extras/k3b/trunk/debian/control
===================================================================
--- kde-extras/k3b/trunk/debian/control	2010-05-07 11:54:30 UTC (rev 17854)
+++ kde-extras/k3b/trunk/debian/control	2010-05-07 12:23:39 UTC (rev 17855)
@@ -4,7 +4,7 @@
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fabo at debian.org>, Michael Meskes <meskes at debian.org>
 Build-Depends: debhelper (>= 7.4.15), cmake, pkg-kde-tools (>= 0.6.5),
- kdelibs5-dev (>= 4:4.3.4), libavformat-dev, libdvdread-dev, libflac++-dev,
+ kdelibs5-dev (>= 4:4.4.3), libavformat-dev, libdvdread-dev, libflac++-dev,
  libflac-dev, libkcddb-dev, libmad0-dev, libmpcdec-dev, libmusicbrainz4-dev,
  libsamplerate0-dev, libsndfile1-dev, libtag1-dev,
  libvorbis-dev, libcam-dev [kfreebsd-i386 kfreebsd-amd64]

Modified: kde-extras/k3b/trunk/debian/k3b-data.install
===================================================================
--- kde-extras/k3b/trunk/debian/k3b-data.install	2010-05-07 11:54:30 UTC (rev 17854)
+++ kde-extras/k3b/trunk/debian/k3b-data.install	2010-05-07 12:23:39 UTC (rev 17855)
@@ -1,7 +1,6 @@
-#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
+etc/dbus-1/system.d/org.kde.kcontrol.k3bsetup.conf
+usr/share/dbus-1/system-services/org.kde.kcontrol.k3bsetup.service
+usr/share/polkit-1/actions/org.kde.kcontrol.k3bsetup.policy
 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
@@ -126,7 +125,7 @@
 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/k3bsetup.desktop
 usr/share/kde4/services/k3bsoxencoder.desktop
 usr/share/kde4/services/k3bwavedecoder.desktop
 usr/share/kde4/services/kcm_k3bexternalencoder.desktop

Modified: kde-extras/k3b/trunk/debian/k3b.install
===================================================================
--- kde-extras/k3b/trunk/debian/k3b.install	2010-05-07 11:54:30 UTC (rev 17854)
+++ kde-extras/k3b/trunk/debian/k3b.install	2010-05-07 12:23:39 UTC (rev 17855)
@@ -1,4 +1,4 @@
 debian/k3b.xpm /usr/share/pixmaps
 usr/bin/k3b
-#usr/bin/k3bsetup
+usr/bin/k3bsetup
 usr/share/applications/kde4/k3b.desktop

Modified: kde-extras/k3b/trunk/debian/libk3b6.install
===================================================================
--- kde-extras/k3b/trunk/debian/libk3b6.install	2010-05-07 11:54:30 UTC (rev 17854)
+++ kde-extras/k3b/trunk/debian/libk3b6.install	2010-05-07 12:23:39 UTC (rev 17855)
@@ -10,8 +10,8 @@
 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/kcm_k3bsetup.so
 usr/lib/kde4/kcm_k3bsoxencoder.so
-#usr/lib/kde4/libexec/k3bsetup_worker
+usr/lib/kde4/libexec/k3bsetuphelper
 usr/lib/libk3bdevice.so.*
 usr/lib/libk3blib.so.*

Modified: kde-extras/k3b/trunk/debian/rules
===================================================================
--- kde-extras/k3b/trunk/debian/rules	2010-05-07 11:54:30 UTC (rev 17854)
+++ kde-extras/k3b/trunk/debian/rules	2010-05-07 12:23:39 UTC (rev 17855)
@@ -3,8 +3,4 @@
 %:
 	dh --parallel --list-missing --dbg-package=k3b-dbg --with kde $@
 
-override_dh_auto_configure:
-	# K3bSetup uses KAuth with kdelibs 4.4.x
-	dh_auto_configure --buildsystem=kde -- -DK3B_BUILD_K3BSETUP=OFF
-
 .PHONY: override_dh_auto_test