[pkg-kde-commits] rev 2755 - trunk/packages/kdebase/debian

Adeodato Simó adeodato at costa.debian.org
Fri Jan 6 15:16:24 UTC 2006


Author: adeodato
Date: 2006-01-06 15:16:22 +0000 (Fri, 06 Jan 2006)
New Revision: 2755

Modified:
   trunk/packages/kdebase/debian/changelog
   trunk/packages/kdebase/debian/control
   trunk/packages/kdebase/debian/kcontrol.install
   trunk/packages/kdebase/debian/rules
Log:
Use the new --with-usbids configure option to use the usb.ids file
provided by usbutils instead of the one included in the source. Make
kcontrol depend on usbutils for this, and do not ship usb.ids anymore.


Modified: trunk/packages/kdebase/debian/changelog
===================================================================
--- trunk/packages/kdebase/debian/changelog	2006-01-06 15:10:44 UTC (rev 2754)
+++ trunk/packages/kdebase/debian/changelog	2006-01-06 15:16:22 UTC (rev 2755)
@@ -9,6 +9,10 @@
 
   * KDE_3_5_BRANCH update (up to r494868).
 
+  * Use the new --with-usbids configure option to use the usb.ids file
+    provided by usbutils instead of the one included in the source. Make
+    kcontrol depend on usbutils for this, and do not ship usb.ids anymore.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Date
 
 kdebase (4:3.5.0-2) experimental; urgency=low

Modified: trunk/packages/kdebase/debian/control
===================================================================
--- trunk/packages/kdebase/debian/control	2006-01-06 15:10:44 UTC (rev 2754)
+++ trunk/packages/kdebase/debian/control	2006-01-06 15:16:22 UTC (rev 2755)
@@ -70,7 +70,7 @@
 Package: kcontrol
 Section: kde
 Architecture: any
-Depends: ${shlibs:Depends}, kdebase-data (>> ${KDE-Version3}), kdebase-data (<< ${KDE-Version2}.90)
+Depends: ${shlibs:Depends}, kdebase-data (>> ${KDE-Version3}), kdebase-data (<< ${KDE-Version2}.90), usbutils
 Recommends: udev | hotplug
 Suggests: khelpcenter
 Conflicts: kdebase-libs (<< 4:3.0.0)

Modified: trunk/packages/kdebase/debian/kcontrol.install
===================================================================
--- trunk/packages/kdebase/debian/kcontrol.install	2006-01-06 15:10:44 UTC (rev 2754)
+++ trunk/packages/kdebase/debian/kcontrol.install	2006-01-06 15:16:22 UTC (rev 2755)
@@ -227,7 +227,6 @@
 debian/tmp/usr/share/apps/kcmkeys/win4.kksrc
 debian/tmp/usr/share/apps/kcmkeys/wm3.kksrc
 debian/tmp/usr/share/apps/kcmlocale/pics/background.png
-debian/tmp/usr/share/apps/kcmusb/usb.ids
 debian/tmp/usr/share/apps/kcmview1394/oui.db
 debian/tmp/usr/share/apps/kconf_update/convertShortcuts.pl
 debian/tmp/usr/share/apps/kconf_update/kaccel.upd

Modified: trunk/packages/kdebase/debian/rules
===================================================================
--- trunk/packages/kdebase/debian/rules	2006-01-06 15:10:44 UTC (rev 2754)
+++ trunk/packages/kdebase/debian/rules	2006-01-06 15:16:22 UTC (rev 2755)
@@ -9,7 +9,7 @@
 
 DEB_CONFIGURE_EXTRA_FLAGS := --with-shadow --without-java --with-pam=kde \
 	--with-kcp-pam=kcheckpass --with-kdm-pam=kdm --with-kss-pam=kscreensaver \
-	--with-extra-includes=/usr/include/sasl
+	--with-extra-includes=/usr/include/sasl --with-usbids=/usr/share/misc/usb.ids
 
 DEB_FIXPERMS_EXCLUDE := usr/bin/kdesud
 




More information about the pkg-kde-commits mailing list