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

[Fathi Boudra]

Author: fabo
Date: 2010-03-06 06:56:59 +0000 (Sat, 06 Mar 2010)
New Revision: 17371

Modified:
   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:
pass K3B_BUILD_K3BSETUP to dh_auto_configure.
comment k3bsetup files in *.install files.


Modified: kde-extras/k3b/trunk/debian/k3b-data.install
===================================================================
--- kde-extras/k3b/trunk/debian/k3b-data.install	2010-03-06 06:40:26 UTC (rev 17370)
+++ kde-extras/k3b/trunk/debian/k3b-data.install	2010-03-06 06:56:59 UTC (rev 17371)
@@ -1,7 +1,7 @@
-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.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/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 +126,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-03-06 06:40:26 UTC (rev 17370)
+++ kde-extras/k3b/trunk/debian/k3b.install	2010-03-06 06:56:59 UTC (rev 17371)
@@ -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-03-06 06:40:26 UTC (rev 17370)
+++ kde-extras/k3b/trunk/debian/libk3b6.install	2010-03-06 06:56:59 UTC (rev 17371)
@@ -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/k3bsetup_worker
 usr/lib/libk3bdevice.so.*
 usr/lib/libk3blib.so.*

Modified: kde-extras/k3b/trunk/debian/rules
===================================================================
--- kde-extras/k3b/trunk/debian/rules	2010-03-06 06:40:26 UTC (rev 17370)
+++ kde-extras/k3b/trunk/debian/rules	2010-03-06 06:56:59 UTC (rev 17371)
@@ -1,9 +1,10 @@
 #!/usr/bin/make -f
 
-# K3bSetup uses KAuth with kdelibs 4.4.x
-DEB_CMAKE_CUSTOM_FLAGS += -DK3B_BUILD_K3BSETUP=OFF
-
 %:
 	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