rev 11404 - in trunk/packages/kdebase/debian: . patches

[Ana Beatriz Guerrero López]

Author: ana
Date: 2008-07-09 00:18:46 +0000 (Wed, 09 Jul 2008)
New Revision: 11404

Modified:
   trunk/packages/kdebase/debian/changelog
   trunk/packages/kdebase/debian/control
   trunk/packages/kdebase/debian/control.in
   trunk/packages/kdebase/debian/patches/01_kdebase_branch_r829407.diff
Log:
udating mroe stuff
sync control*


Modified: trunk/packages/kdebase/debian/changelog
===================================================================
--- trunk/packages/kdebase/debian/changelog	2008-07-08 23:26:40 UTC (rev 11403)
+++ trunk/packages/kdebase/debian/changelog	2008-07-09 00:18:46 UTC (rev 11404)
@@ -17,9 +17,10 @@
   * Improve copyright notice.
   * Update section in doc-base files.
   * Fix bashism in startkde. Thanks lamby! (Closes: #480604)
-  * Add documentation from bug 482268.
+  * Add documentation from bug 482268. (patch 73_)
+  * Update build depent on xutils to xutils-dev.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 10 Mar 2008 17:02:38 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 09 Jul 2008 00:17:02 +0200
 
 kdebase (4:3.5.9.dfsg.1-2) unstable; urgency=medium
 

Modified: trunk/packages/kdebase/debian/control
===================================================================
--- trunk/packages/kdebase/debian/control	2008-07-08 23:26:40 UTC (rev 11403)
+++ trunk/packages/kdebase/debian/control	2008-07-09 00:18:46 UTC (rev 11404)
@@ -2,9 +2,9 @@
 Section: kde
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Armin Berres <trigger+debian at space-based.de>, Fathi Boudra <fabo at debian.org>, Modestas Vainius <modestas at vainius.eu>, Sune Vuorela <debian at pusling.com>
+Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Armin Berres <trigger+debian at space-based.de>, Fathi Boudra <fabo at debian.org>, Modestas Vainius <modestas at vainius.eu>, Pino Toscano <pino at kde.org>, Sune Vuorela <debian at pusling.com>
 Build-Depends: cdbs (>= 0.4.48), debhelper (>= 5.0.42), autotools-dev, gawk,
- gettext, sharutils, texinfo, xutils, kdelibs4-dev (>= 4:3.5.8-5),
+ gettext, sharutils, texinfo, xutils-dev, kdelibs4-dev (>= 4:3.5.8-5),
  libavahi-compat-libdnssd-dev (>= 0.4), libdbus-qt-1-dev (>= 0.60),
  libfontenc-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev,
  libsmbclient-dev, libusb-dev, libxcomposite-dev, libxdamage-dev,
@@ -123,10 +123,12 @@
 Replaces: kdebase-bin (<< 4:3.5.8.dfsg.1-2)
 Conflicts: kdebase-runtime-bin-kde4
 Description: core binaries for the KDE base module
- This package contains miscellaneous programs needed by other
- KDE applications, particularly those in the KDE base module. They can
- be provided by KDE3 or KDE4. This package provides the KDE3 versions.
+ This package contains miscellaneous programs needed at runtime by other KDE 3
+ applications.
  .
+ This package contains the KDE 3 version of the binaries included in the
+ 'kdebase-bin-kde4' package.
+ .
  This package is part of KDE, and a component of the KDE base module.
  See the 'kde' and 'kdebase' packages for more information.
 
@@ -188,7 +190,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, libsasl2-modules, psmisc, kdeeject, man-db (>= 2.5.1-1)
 Recommends: hal, pmount, kamera, kdemultimedia-kio-plugins
-Suggests: khelpcenter, mtools
+Suggests: khelpcenter, mtools, djvulibre-bin
 Conflicts: kdebase-libs (<< 4:3.0.0)
 Replaces: kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0), konqueror (<< 4:3.0.0)
 Description: core I/O slaves for KDE

Modified: trunk/packages/kdebase/debian/control.in
===================================================================
--- trunk/packages/kdebase/debian/control.in	2008-07-08 23:26:40 UTC (rev 11403)
+++ trunk/packages/kdebase/debian/control.in	2008-07-09 00:18:46 UTC (rev 11404)
@@ -4,7 +4,7 @@
 Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
 Build-Depends: cdbs (>= 0.4.48), debhelper (>= 5.0.42), autotools-dev, gawk,
- gettext, sharutils, texinfo, xutils, kdelibs4-dev (>= 4:3.5.8-5),
+ gettext, sharutils, texinfo, xutils-dev, kdelibs4-dev (>= 4:3.5.8-5),
  libavahi-compat-libdnssd-dev (>= 0.4), libdbus-qt-1-dev (>= 0.60),
  libfontenc-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev,
  libsmbclient-dev, libusb-dev, libxcomposite-dev, libxdamage-dev,

Modified: trunk/packages/kdebase/debian/patches/01_kdebase_branch_r829407.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/01_kdebase_branch_r829407.diff	2008-07-08 23:26:40 UTC (rev 11403)
+++ trunk/packages/kdebase/debian/patches/01_kdebase_branch_r829407.diff	2008-07-09 00:18:46 UTC (rev 11404)
@@ -36534,3 +36534,14 @@
  Comment[ven]=Tshisedzi tsho engedza phungudzo i sasaladzeaho
  Comment[vi]=Đầu dò vượt quá giới hạn chịu đựng
  Comment[wa]=Li sinteu a stî pus lon kel limite
+--- ksysguard/ksysguardd/Makefile.in	
++++ ksysguard/ksysguardd/Makefile.in
+@@ -64,7 +64,7 @@
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ ksysguardd_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(ksysguardd_LDFLAGS) $(LDFLAGS) -o $@
++	$(ksysguardd_LDFLAGS) $(LDFLAGS) $(LIBSENSORS) -o $@
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles