rev 9106 - in branches/kde4/packages: decibel/debian extragear-plasma/debian kdeadmin/debian kdeartwork/debian kdebase/debian kdebase-runtime/debian kdebase-workspace/debian kdeedu/debian kdegames/debian kdegraphics/debian kdelibs/debian kdemultimedia/debian kdenetwork/debian kdepimlibs/debian kdesdk/debian kdetoys/debian kdeutils/debian soprano/debian

Matthew Rosewarne mukidohime-guest at alioth.debian.org
Wed Jan 23 07:29:22 UTC 2008


Author: mukidohime-guest
Date: 2008-01-23 07:29:22 +0000 (Wed, 23 Jan 2008)
New Revision: 9106

Modified:
   branches/kde4/packages/decibel/debian/changelog
   branches/kde4/packages/decibel/debian/control
   branches/kde4/packages/extragear-plasma/debian/changelog
   branches/kde4/packages/extragear-plasma/debian/control
   branches/kde4/packages/kdeadmin/debian/changelog
   branches/kde4/packages/kdeadmin/debian/control
   branches/kde4/packages/kdeartwork/debian/changelog
   branches/kde4/packages/kdeartwork/debian/control
   branches/kde4/packages/kdebase-runtime/debian/changelog
   branches/kde4/packages/kdebase-runtime/debian/control
   branches/kde4/packages/kdebase-workspace/debian/changelog
   branches/kde4/packages/kdebase-workspace/debian/control
   branches/kde4/packages/kdebase/debian/changelog
   branches/kde4/packages/kdebase/debian/control
   branches/kde4/packages/kdebase/debian/kdebase-dev.install
   branches/kde4/packages/kdebase/debian/libkonq5-dev.install
   branches/kde4/packages/kdeedu/debian/changelog
   branches/kde4/packages/kdeedu/debian/control
   branches/kde4/packages/kdeedu/debian/libmarble-dev.install
   branches/kde4/packages/kdeedu/debian/marble.install
   branches/kde4/packages/kdegames/debian/changelog
   branches/kde4/packages/kdegames/debian/control
   branches/kde4/packages/kdegraphics/debian/changelog
   branches/kde4/packages/kdegraphics/debian/control
   branches/kde4/packages/kdelibs/debian/changelog
   branches/kde4/packages/kdelibs/debian/control
   branches/kde4/packages/kdemultimedia/debian/changelog
   branches/kde4/packages/kdemultimedia/debian/control
   branches/kde4/packages/kdenetwork/debian/changelog
   branches/kde4/packages/kdenetwork/debian/control
   branches/kde4/packages/kdepimlibs/debian/changelog
   branches/kde4/packages/kdepimlibs/debian/control
   branches/kde4/packages/kdesdk/debian/changelog
   branches/kde4/packages/kdesdk/debian/control
   branches/kde4/packages/kdetoys/debian/changelog
   branches/kde4/packages/kdetoys/debian/control
   branches/kde4/packages/kdeutils/debian/changelog
   branches/kde4/packages/kdeutils/debian/control
   branches/kde4/packages/soprano/debian/changelog
   branches/kde4/packages/soprano/debian/control
Log:
+ general
    * line-wrap
    * UNRELEASED for changelogs
    * normalize module metapackage depends version to >=source
    * most -dev packages are arch-indep
    * add suggests for *-dbg

+ versions
    * stricter depends version for extragear-plasma*, kscreensaver-xsavers*, & libplasma-dev
    * remove version from kcoloredit conflict, there is no kcoloredit 4
    * bump kdelibs depends version for soprano to 2.0.0
    * fix kdenetwork-dev use of substvar depends version for kdebase-dev
    * fix libsoprano-dev depends version for libsoprano4

+ dependency changes
     * change kdebase-runtime-dbg depends from kdelibs5-dbg to kdepimlibs-dbg
     * change okular-dev depends from libqt4-dev to kdelibs5-dev
     * specific depends for kdebase-dev & kdebase-workspace-dev, not whole modules
     * remove shared-mime-info depends from kdelibs5-dev, since kdelibs5 already has it
     * add depends kate & poxml to kdesdk-dev
     * kpackage suggests rpm instead of recommends
     * remove recommends kdm from kdebase

+ I like to move it, move it
    * change kdegames-*-data section from games to kde
    * move libkonq.so from kdebase-dev to libkonq5-dev
    * move libmarble_part.so from libmarble-dev to marble


Modified: branches/kde4/packages/decibel/debian/changelog
===================================================================
--- branches/kde4/packages/decibel/debian/changelog	2008-01-22 22:03:03 UTC (rev 9105)
+++ branches/kde4/packages/decibel/debian/changelog	2008-01-23 07:29:22 UTC (rev 9106)
@@ -1,3 +1,9 @@
+decibel (0.5.0+svn737972-3) UNRELEASED; urgency=low
+
+  * Change libdecibel-dev to Architecture: all.
+
+ -- Matthew Rosewarne <mrosewarne at inoutbox.com>  Tue, 22 Jan 2008 21:44:30 -0500
+
 decibel (0.5.0+svn737972-2) experimental; urgency=low
 
   * Add depends on libqttapioca-dev and  libqttelepathy-dev for

Modified: branches/kde4/packages/decibel/debian/control
===================================================================
--- branches/kde4/packages/decibel/debian/control	2008-01-22 22:03:03 UTC (rev 9105)
+++ branches/kde4/packages/decibel/debian/control	2008-01-23 07:29:22 UTC (rev 9106)
@@ -8,8 +8,8 @@
 
 Package: libdecibel-dev
 Section: libdevel
-Architecture: any
-Depends: libdecibel0.6.0 (= ${binary:Version}), libqttapioca-dev, libqttelepathy-dev
+Architecture: all
+Depends: libdecibel0.6.0 (= ${source:Version}), libqttapioca-dev, libqttelepathy-dev
 Description: header files for Decibel communication framework
  Decibel is a realtime communications framework, integrating services like CTI 
  (Computer Telephone Integration), VoIP (Voice over IP), text based chat 

Modified: branches/kde4/packages/extragear-plasma/debian/changelog
===================================================================
--- branches/kde4/packages/extragear-plasma/debian/changelog	2008-01-22 22:03:03 UTC (rev 9105)
+++ branches/kde4/packages/extragear-plasma/debian/changelog	2008-01-23 07:29:22 UTC (rev 9106)
@@ -1,8 +1,9 @@
-extragear-plasma (4:4.0.0-2) experimental; urgency=low
+extragear-plasma (4:4.0.0-2) UNRELEASED; urgency=low
 
   * Tweak descriptions.
+  * Tighten dependency versions.
 
- -- Matthew Rosewarne <mrosewarne at inoutbox.com>  Sun, 13 Jan 2008 23:01:19 -0500
+ -- Matthew Rosewarne <mrosewarne at inoutbox.com>  Tue, 22 Jan 2008 20:09:54 -0500
 
 extragear-plasma (4:4.0.0-1) experimental; urgency=low
 

Modified: branches/kde4/packages/extragear-plasma/debian/control
===================================================================
--- branches/kde4/packages/extragear-plasma/debian/control	2008-01-22 22:03:03 UTC (rev 9105)
+++ branches/kde4/packages/extragear-plasma/debian/control	2008-01-23 07:29:22 UTC (rev 9106)
@@ -10,7 +10,7 @@
 Package: extragear-plasma
 Architecture: any
 Section: utils
-Depends: ${shlibs:Depends}, extragear-plasma-data (>= ${source:Version})
+Depends: ${shlibs:Depends}, extragear-plasma-data (= ${source:Version})
 Replaces: kdebase-workspace-bin (<< 4:4.0.0)
 Description: extras for the KDE 4 Plasma desktop and panel
  This package provides additional Plasma data engines and widgets found in the
@@ -38,7 +38,7 @@
 
 Package: extragear-plasma-l10n
 Architecture: all
-Depends: extragear-plasma (>= ${source:Version})
+Depends: extragear-plasma (= ${source:Version})
 Section: utils
 Description: localization files for extragear-plasma
  This package contains the localization files for extragear-plasma.

Modified: branches/kde4/packages/kdeadmin/debian/changelog
===================================================================
--- branches/kde4/packages/kdeadmin/debian/changelog	2008-01-22 22:03:03 UTC (rev 9105)
+++ branches/kde4/packages/kdeadmin/debian/changelog	2008-01-23 07:29:22 UTC (rev 9106)
@@ -1,10 +1,13 @@
-kdeadmin (4:4.0.0-2) experimental; urgency=low
+kdeadmin (4:4.0.0-2) UNRELEASED; urgency=low
 
   +++ Changes by Matthew Rosewarne:
 
   * Tweak package descriptions.
   * Add Depends: smartpm-core to kpackage (Closes: #??????).
   * Change kdeadmin-dbg Depends from kdelibs-dbg to kdebase-runtime-dbg.
+  * Lower rpm Recommends to Suggests.
+  * Use source:Version for kdeadmin metapackage.
+  * Add Suggests: kdeadmin to kdeadmin-dbg.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 13 Jan 2008 23:40:35 -0500
 

Modified: branches/kde4/packages/kdeadmin/debian/control
===================================================================
--- branches/kde4/packages/kdeadmin/debian/control	2008-01-22 22:03:03 UTC (rev 9105)
+++ branches/kde4/packages/kdeadmin/debian/control	2008-01-23 07:29:22 UTC (rev 9106)
@@ -11,8 +11,8 @@
 Package: kdeadmin
 Section: kde
 Architecture: all
-Depends: kcron (>= ${binary:Version}), knetworkconf (>= ${binary:Version}),
- kpackage (>= ${binary:Version}), kuser (>= ${binary:Version})
+Depends: kcron (>= ${source:Version}), knetworkconf (>= ${source:Version}),
+ kpackage (>= ${source:Version}), kuser (>= ${source:Version})
 Description: System administration tools from the official KDE 4 release
  KDE is produced by an international technology team that creates free and open
  source software for desktop and portable computing. Among KDE's products are a
@@ -49,8 +49,7 @@
 Section: admin
 Architecture: any
 Depends: ${shlibs:Depends}, smartpm-core
-Recommends: rpm
-Suggests: khelpcenter
+Suggests: khelpcenter, rpm
 Description: Package management tool for KDE 4
  KPackage is a frontend to the SMART package manager, supporting Debian, RPM,
  and other package formats.  It can be used to search for, examine, install,
@@ -72,6 +71,7 @@
 Section: libdevel
 Architecture: any
 Depends: kdebase-runtime-dbg
+Suggests: kdeadmin (= ${source:Version})
 Priority: extra
 Description: Debugging symbols for kdeadmin
  This package contains the debugging symbols associated with kdeadmin.

Modified: branches/kde4/packages/kdeartwork/debian/changelog
===================================================================
--- branches/kde4/packages/kdeartwork/debian/changelog	2008-01-22 22:03:03 UTC (rev 9105)
+++ branches/kde4/packages/kdeartwork/debian/changelog	2008-01-23 07:29:22 UTC (rev 9106)
@@ -1,12 +1,15 @@
-kdeartwork (4:4.0.0-2) experimental; urgency=low
+kdeartwork (4:4.0.0-2) UNRELEASED; urgency=low
 
+  +++ Changes by Matthew Rosewarne:
+
   * Tweak package descriptions.
   * Change KDE 4 dependency version to 4:4.0.0-1.
   * Replace kscreensaver dependency on kdebase-bin with kdebase-workspace-bin.
   * Make dependencies binNMU-friendly.
   * Remove Enhances: kopete from kdeartwork-emoticons.
+  * Tighten kscreensaver-xsavers dependency version.
 
- -- Matthew Rosewarne <mrosewarne at inoutbox.com>  Mon, 14 Jan 2008 01:23:51 -0500
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 14 Jan 2008 01:23:51 -0500
 
 kdeartwork (4:4.0.0-1) experimental; urgency=low
 

Modified: branches/kde4/packages/kdeartwork/debian/control
===================================================================
--- branches/kde4/packages/kdeartwork/debian/control	2008-01-22 22:03:03 UTC (rev 9105)
+++ branches/kde4/packages/kdeartwork/debian/control	2008-01-23 07:29:22 UTC (rev 9106)
@@ -10,8 +10,13 @@
 
 Package: kdeartwork
 Architecture: all
-Depends: kdeartwork-misc (>= ${source:Version}), kdeartwork-emoticons (>= ${source:Version}),  kdeartwork-style (>= ${binary:Version}), kdeartwork-theme-icon (>= ${source:Version}), kdeartwork-theme-window (>= ${binary:Version}), kdewallpapers (>= ${source:Version}), kscreensaver (>= ${binary:Version})
-Description: themes, styles and more from the official KDE 4 release
+Depends: kdeartwork-misc (>= ${source:Version}),
+ kdeartwork-emoticons (>= ${source:Version}),
+ kdeartwork-style (>= ${source:Version}),
+ kdeartwork-theme-icon (>= ${source:Version}),
+ kdeartwork-theme-window (>= ${source:Version}),
+ kdewallpapers (>= ${source:Version}), kscreensaver (>= ${source:Version})
+Description: Themes, styles and other artwork from the official KDE 4 release
  KDE is produced by an international technology team that creates free and open
  source software for desktop and portable computing. Among KDE's products are a
  modern desktop system for Linux and UNIX platforms, comprehensive office
@@ -102,7 +107,7 @@
 Section: kde
 Depends: ${shlibs:Depends}, kdebase-workspace-bin, xscreensaver
 Recommends: kwin, kscreensaver (= ${binary:Version}), xscreensaver-gl
-Suggests: kscreensaver-xsavers-webcollage
+Suggests: kscreensaver-xsavers-webcollage (= ${source:Version})
 Description: XScreenSaver support for KDE 4
  This package allows KDE 4 to use the XScreenSaver collection of screensavers.
  .
@@ -114,7 +119,7 @@
 Package: kscreensaver-xsavers-webcollage
 Architecture: all
 Section: kde
-Depends: kscreensaver-xsavers, miscfiles, netpbm
+Depends: kscreensaver-xsavers (= ${source:Version}), miscfiles, netpbm
 Description: WebCollage screensaver support for KDE 4
  This package allows KDE 4 to use the WebCollage screensaver, which downloads
  random pictures from the internet to create a collage.

Modified: branches/kde4/packages/kdebase/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase/debian/changelog	2008-01-22 22:03:03 UTC (rev 9105)
+++ branches/kde4/packages/kdebase/debian/changelog	2008-01-23 07:29:22 UTC (rev 9106)
@@ -11,9 +11,15 @@
   * Change KDE 4 dependency version to 4:4.0.0-1.
   * Remove unnecessary Replaces.
   * Make dependencies binNMU-friendly.
+  * Change kdebase-dev and libkonq5-dev to Architecture: all.
+  * More specific dependencies for kdebase-dev.
+  * Move libkonq.so from kdebase-dev to libkonq5-dev.
+  * Use source:Version for kdebase metapackage.
+  * Remove Recommends: kdm from kdebase.
   * Add Recommends: konqueror-nsplugins to konqueror.
   * Remove Recommends: xine-ui from kappfinder.
   * Change kdebase-dbg Depends to kdebase-runtime-dbg.
+  * Add Suggests: kdebase to kdebase-dbg.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 13 Jan 2008 23:14:15 +0100
 

Modified: branches/kde4/packages/kdebase/debian/control
===================================================================
--- branches/kde4/packages/kdebase/debian/control	2008-01-22 22:03:03 UTC (rev 9105)
+++ branches/kde4/packages/kdebase/debian/control	2008-01-23 07:29:22 UTC (rev 9106)
@@ -11,12 +11,11 @@
 Package: kdebase
 Section: kde
 Architecture: all
-Depends: dolphin (>= ${binary:Version}), kappfinder (>= ${binary:Version}),
- kdebase-bin (>= ${binary:Version}), kdepasswd (>= ${binary:Version}),
- kfind (>= ${binary:Version}), konqueror-nsplugins (>= ${binary:Version}),
- konqueror (>= ${binary:Version}), konsole (>= ${binary:Version}),
- kwrite (>= ${binary:Version}), libkonq5 (>= ${binary:Version})
-Recommends: kdm (>= ${binary:Version})
+Depends: dolphin (>= ${source:Version}), kappfinder (>= ${source:Version}),
+ kdebase-bin (>= ${source:Version}), kdepasswd (>= ${source:Version}),
+ kfind (>= ${source:Version}), konqueror-nsplugins (>= ${source:Version}),
+ konqueror (>= ${source:Version}), konsole (>= ${source:Version}),
+ kwrite (>= ${source:Version}), libkonq5 (>= ${source:Version})
 Description: Base applications from the official KDE release
  KDE is produced by an international technology team that creates free and open
  source software for desktop and portable computing. Among KDE's products are a
@@ -78,9 +77,11 @@
 
 Package: kdebase-dev
 Section: kde
-Architecture: any
-Depends: ${shlibs:Depends}, kdebase (= ${source:Version}), kdepimlibs5-dev (>= 4:4.0.0-1),
- libqimageblitz-dev, libsmbclient-dev, libusb-dev, libxkbfile-dev
+Architecture: all
+Depends: ${shlibs:Depends}, dolphin (= ${source:Version}),
+ konqueror (= ${source:Version}), libkonq5-dev (= ${source:Version}),
+ kdepimlibs5-dev (>= 4:4.0.0-1), libqimageblitz-dev, libsmbclient-dev,
+ libusb-dev, libxkbfile-dev
 Description: Development files for the KDE 4 base module
  This package contains headers and other development files needed to build
  software that uses the KDE 4 base module.
@@ -196,7 +197,7 @@
 
 Package: libkonq5-dev
 Section: libdevel
-Architecture: any
+Architecture: all
 Depends: libkonq5 (= ${binary:Version}), kdelibs5-dev (>= 4:4.0.0-1)
 Description: Development files for the Konqueror libraries
  This package contains headers and other development files needed to build
@@ -209,6 +210,7 @@
 Architecture: any
 Priority: extra
 Depends: kdebase-runtime-dbg
+Suggests: kdebase (= ${source:Version})
 Description: debugging symbols for kdebase
  This package contains the debugging symbols associated with kdebase.
  They will automatically be used by gdb for debugging kdebase-related

Modified: branches/kde4/packages/kdebase/debian/kdebase-dev.install
===================================================================
--- branches/kde4/packages/kdebase/debian/kdebase-dev.install	2008-01-22 22:03:03 UTC (rev 9105)
+++ branches/kde4/packages/kdebase/debian/kdebase-dev.install	2008-01-23 07:29:22 UTC (rev 9106)
@@ -1,4 +1,3 @@
 usr/lib/libdolphinprivate.so
 usr/lib/libkonqsidebarplugin.so
-usr/lib/libkonq.so
 usr/lib/libkonquerorprivate.so

Modified: branches/kde4/packages/kdebase/debian/libkonq5-dev.install
===================================================================
--- branches/kde4/packages/kdebase/debian/libkonq5-dev.install	2008-01-22 22:03:03 UTC (rev 9105)
+++ branches/kde4/packages/kdebase/debian/libkonq5-dev.install	2008-01-23 07:29:22 UTC (rev 9106)
@@ -8,3 +8,4 @@
 usr/include/konq_operations.h
 usr/include/konq_popupmenu.h
 usr/include/libkonq_export.h
+usr/lib/libkonq.so

Modified: branches/kde4/packages/kdebase-runtime/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/changelog	2008-01-22 22:03:03 UTC (rev 9105)
+++ branches/kde4/packages/kdebase-runtime/debian/changelog	2008-01-23 07:29:22 UTC (rev 9106)
@@ -1,3 +1,11 @@
+kdebase-runtime (4:4.0.0-3) UNRELEASED; urgency=low
+
+  +++ Changes by Matthew Rosewarne:
+
+  * Changed kdebase-runtime-dbg Depends: kdelibs5-dbg to kdepimlibs-dbg.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 22 Jan 2008 20:07:02 -0500
+
 kdebase-runtime (4:4.0.0-2) unstable; urgency=low
 
   +++ Changes by Armin Berres:

Modified: branches/kde4/packages/kdebase-runtime/debian/control
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/control	2008-01-22 22:03:03 UTC (rev 9105)
+++ branches/kde4/packages/kdebase-runtime/debian/control	2008-01-23 07:29:22 UTC (rev 9106)
@@ -17,7 +17,8 @@
 Architecture: any
 Replaces: kdebase-bin (<< 4:4.0.0-1)
 Depends: ${shlibs:Depends}, kdebase-runtime-bin-kde4 (= ${binary:Version}),
- kdebase-runtime-data (>= ${source:Version}), kde-icons-oxygen (>= ${source:Version})
+ kdebase-runtime-data (>= ${source:Version}),
+ kde-icons-oxygen (>= ${source:Version})
 Description: Runtime components from the official KDE 4 release
  KDE is produced by an international technology team that creates free and open
  source software for desktop and portable computing. Among KDE's products are a
@@ -94,7 +95,7 @@
 Section: devel
 Architecture: any
 Priority: extra
-Depends: kdebase-runtime (= ${binary:Version}), kdelibs5-dbg
+Depends: kdebase-runtime (= ${binary:Version}), kdepimlibs-dbg
 Description: Debugging symbols for KDE 4 base runtime module
  This package contains the debugging symbols associated with kdebase-runtime.
  They will automatically be used by gdb for debugging kdebase-runtime related

Modified: branches/kde4/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/changelog	2008-01-22 22:03:03 UTC (rev 9105)
+++ branches/kde4/packages/kdebase-workspace/debian/changelog	2008-01-23 07:29:22 UTC (rev 9106)
@@ -16,8 +16,13 @@
   * Add README.Debian for kwin about compositing support.
   * Tweak package descriptions.
   * Change KDE 4 dependency version to 4:4.0.0-1.
+  * Change kdebase-workspace-dev to Architecture: all.
+  * More specific dependencies for kdebase-workspace-dev.
   * Remove unnecessary Replaces.
+  * Use source:Version for kdebase-workspace metapackage.
   * Change kdebase-workspace-dbg Depends to kdebase-runtime-dbg.
+  * Add Suggests: kdebase-workspace to kdebase-workspace-dbg.
+  * Tighten libplasma-dev dependency version.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 14 Jan 2008 17:08:06 -0500
 

Modified: branches/kde4/packages/kdebase-workspace/debian/control
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/control	2008-01-22 22:03:03 UTC (rev 9105)
+++ branches/kde4/packages/kdebase-workspace/debian/control	2008-01-23 07:29:22 UTC (rev 9106)
@@ -15,10 +15,10 @@
 Package: kdebase-workspace
 Section: kde
 Architecture: all
-Depends:  kdebase-workspace-bin (>= ${binary:Version}),
- klipper (>= ${binary:Version}), ksysguard (>= ${binary:Version}),
- kwin (>= ${binary:Version}), systemsettings (>= ${binary:Version})
-Recommends: kdm (>= ${binary:Version})
+Depends:  kdebase-workspace-bin (>= ${source:Version}),
+ klipper (>= ${source:Version}), ksysguard (>= ${source:Version}),
+ kwin (>= ${source:Version}), systemsettings (>= ${source:Version})
+Recommends: kdm (>= ${source:Version})
 Description: Base components from the official KDE 4 release
  KDE is produced by an international technology team that creates free and open
  source software for desktop and portable computing. Among KDE's products are a
@@ -58,14 +58,16 @@
 
 Package: kdebase-workspace-dev
 Section: kde
-Architecture: any
-Depends: ${shlibs:Depends}, kdebase-workspace (= ${source:Version}),
+Architecture: all
+Depends: ${shlibs:Depends}, kdebase-workspace-bin (= ${source:Version}),
+ kdm (= ${source:Version}), ksysguard (= ${source:Version}),
+ kwin (= ${source:Version}), libplasma-dev (= ${source:Version}),
  kdepimlibs5-dev (>= 4:4.0.0-1), libbluetooth-dev, libcaptury-dev,
  libdbus-1-dev, libphonon-dev, libnm-util-dev, libpam0g-dev, libqimageblitz-dev,
  libraw1394-dev, libsensors-dev, libstrigiqtdbusclient-dev (>= 0.5.7-2),
  libusb-dev, libxkbfile-dev, libxcomposite-dev, libxdamage-dev, libxfixes-dev,
  libxklavier11-dev, libxrandr-dev, libxrender-dev, libxxf86misc-dev,
- network-manager-dev, libplasma-dev
+ network-manager-dev
 Description: Development files for the KDE 4 base module
  This package contains headers and other development files needed to build
  software that uses the KDE 4 base workspace module.
@@ -148,6 +150,7 @@
 Architecture: any
 Priority: extra
 Depends: kdebase-runtime-dbg
+Suggests: kdebase-workspace (= ${source:Version})
 Description: Debugging symbols for kdebase-workspace
  This package contains the debugging symbols associated with kdebase-workspace.
  They will automatically be used by gdb for debugging kdebase-workspace-related
@@ -166,7 +169,7 @@
 Section: libdevel
 Architecture: all
 Priority: optional
-Depends: libplasma1 (>= ${binary:Version}), kdelibs5-dev (>= 4:4.0.0-1)
+Depends: libplasma1 (= ${source:Version}), kdelibs5-dev (>= 4:4.0.0-1)
 Description: Development files for the KDE 4 Plasma desktop
  This package contains headers and other development files needed to build
  software that uses the KDE 4 Plasma library.

Modified: branches/kde4/packages/kdeedu/debian/changelog
===================================================================
--- branches/kde4/packages/kdeedu/debian/changelog	2008-01-22 22:03:03 UTC (rev 9105)
+++ branches/kde4/packages/kdeedu/debian/changelog	2008-01-23 07:29:22 UTC (rev 9106)
@@ -1,11 +1,15 @@
-kdeedu (4:4.0.0-2) experimental; urgency=low
+kdeedu (4:4.0.0-2) UNRELEASED; urgency=low
 
   +++ Changes by Matthew Rosewarne:
 
   * Tweak package descriptions.
   * Change KDE 4 dependency version to 4:4.0.0-1.
   * Remove unnecessary version from libkiten1 conflict.
+  * Change libkiten-dev and libmarble-dev to Architecture: all.
+  * Use source:Version for kdebase metapackage.
   * Change kdeedu-dbg Depends from kdelibs-dbg to kdebase-runtime-dbg.
+  * Add Suggests: kdeedu to kdeedu-dbg.
+  * libmarble_part.so should not be in libmarble-dev, move it to marble.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 15 Jan 2008 02:21:08 -0500
 

Modified: branches/kde4/packages/kdeedu/debian/control
===================================================================
--- branches/kde4/packages/kdeedu/debian/control	2008-01-22 22:03:03 UTC (rev 9105)
+++ branches/kde4/packages/kdeedu/debian/control	2008-01-23 07:29:22 UTC (rev 9106)
@@ -12,7 +12,16 @@
 
 Package: kdeedu
 Architecture: all
-Depends: blinken (>= ${binary:Version}), indi (>= ${binary:Version}), kalgebra (>= ${binary:Version}), kalzium (>= ${binary:Version}), kanagram (>= ${binary:Version}), kbruch (>= ${binary:Version}), kgeography (>= ${binary:Version}), khangman (>= ${binary:Version}), kig (>= ${binary:Version}), kiten (>= ${binary:Version}), klettres (>= ${binary:Version}), kmplot (>= ${binary:Version}), kpercentage (>= ${binary:Version}), kstars (>= ${binary:Version}), ktouch (>= ${binary:Version}), kturtle (>= ${binary:Version}), kwordquiz (>= ${binary:Version}), marble (>= ${binary:Version}), parley (>= ${binary:Version})
+Depends: blinken (>= ${source:Version}), indi (>= ${source:Version}),
+ kalgebra (>= ${source:Version}), kalzium (>= ${source:Version}),
+ kanagram (>= ${source:Version}), kbruch (>= ${source:Version}),
+ kgeography (>= ${source:Version}), khangman (>= ${source:Version}),
+ kig (>= ${source:Version}), kiten (>= ${source:Version}),
+ klettres (>= ${source:Version}), kmplot (>= ${source:Version}),
+ kpercentage (>= ${source:Version}), kstars (>= ${source:Version}),
+ ktouch (>= ${source:Version}), kturtle (>= ${source:Version}),
+ kwordquiz (>= ${source:Version}), marble (>= ${source:Version}),
+ parley (>= ${source:Version})
 Description: Educational applications from the official KDE 4 release
  KDE is produced by an international technology team that creates free and open
  source software for desktop and portable computing. Among KDE's products are a
@@ -26,9 +35,10 @@
 
 Package: kdeedu-dbg
 Architecture: any
+Section: libdevel
 Priority: extra
 Depends: kdebase-runtime-dbg
-Section: libdevel
+Suggests: kdeedu (= ${source:Version})
 Description: Debugging symbols for kdeedu
  This package contains the debugging symbols associated with kdeedu.
  They will automatically be used by gdb for debugging kdeedu-related issues.
@@ -302,7 +312,7 @@
 Package: libkdeedu-dev
 Architecture: all
 Section: libdevel
-Depends: libkdeedu4 (>= ${binary:Version}), kdelibs5-dev (>= 4:4.0.0-1)
+Depends: libkdeedu4 (= ${source:Version}), kdelibs5-dev (>= 4:4.0.0-1)
 Description: Development files for the KDE 4 educational libraries
  This package contains headers and other related files needed to build KDE 4
  applications that use the KDE 4 educational libraries.
@@ -325,9 +335,9 @@
  This package is part of the KDE 4 education module.
 
 Package: libkiten-dev
-Architecture: any
+Architecture: all
 Section: libdevel
-Depends: libkiten4 (= ${binary:Version}), kdelibs5-dev (>= 4:4.0.0-1)
+Depends: libkiten4 (= ${source:Version}), kdelibs5-dev (>= 4:4.0.0-1)
 Description: Development files for the Kiten libraries
  This package contains headers and other related files needed to build KDE 4
  applications that use the Kiten libraries.
@@ -379,9 +389,9 @@
  This package is part of the KDE 4 education module.
 
 Package: libmarble-dev
-Architecture: any
+Architecture: all
 Section: libdevel
-Depends: libmarble4 (= ${binary:Version}), kdelibs5-dev (>= 4:4.0.0-1)
+Depends: libmarble4 (= ${source:Version}), kdelibs5-dev (>= 4:4.0.0-1)
 Description: Development files for the Marble globe widget
  This package contains headers and other related files needed to build
  applications that use the Marble globe widget.

Modified: branches/kde4/packages/kdeedu/debian/libmarble-dev.install
===================================================================
--- branches/kde4/packages/kdeedu/debian/libmarble-dev.install	2008-01-22 22:03:03 UTC (rev 9105)
+++ branches/kde4/packages/kdeedu/debian/libmarble-dev.install	2008-01-23 07:29:22 UTC (rev 9106)
@@ -1,3 +1,2 @@
 usr/include/marble/
-usr/lib/kde4/libmarble_part.so
 usr/lib/libmarblewidget.so

Modified: branches/kde4/packages/kdeedu/debian/marble.install
===================================================================
--- branches/kde4/packages/kdeedu/debian/marble.install	2008-01-22 22:03:03 UTC (rev 9105)
+++ branches/kde4/packages/kdeedu/debian/marble.install	2008-01-23 07:29:22 UTC (rev 9106)
@@ -1 +1,2 @@
 usr/bin/marble
+usr/lib/kde4/libmarble_part.so

Modified: branches/kde4/packages/kdegames/debian/changelog
===================================================================
--- branches/kde4/packages/kdegames/debian/changelog	2008-01-22 22:03:03 UTC (rev 9105)
+++ branches/kde4/packages/kdegames/debian/changelog	2008-01-23 07:29:22 UTC (rev 9106)
@@ -1,12 +1,18 @@
-kdegames (4:4.0.0-2) experimental; urgency=low
+kdegames (4:4.0.0-2) UNRELEASED; urgency=low
 
+  +++ Changes by Matthew Rosewarne:
+
   * Removed kdegames-doc-html package.
+  * Move kdegames-card-data and kdegames-mahjongg-data to Section: kde.
   * Tweak package descriptions.
   * Make dependencies binNMU-friendly.
+  * Use source:Version for kdegames metapackage.
+  * Change libkdegames-dev to Architecture: all.
   * Fix erroneous kdebase dependency version from kpat.
   * Add Depends: kdebase-runtime-dbg to kdegames-dbg.
+  * Add Suggests: kdegames to kdegames-dbg.
 
- -- Matthew Rosewarne <mrosewarne at inoutbox.com>  Tue, 15 Jan 2008 02:20:39 -0500
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 15 Jan 2008 02:20:39 -0500
 
 kdegames (4:4.0.0-1) experimental; urgency=low
 

Modified: branches/kde4/packages/kdegames/debian/control
===================================================================
--- branches/kde4/packages/kdegames/debian/control	2008-01-22 22:03:03 UTC (rev 9105)
+++ branches/kde4/packages/kdegames/debian/control	2008-01-23 07:29:22 UTC (rev 9106)
@@ -11,9 +11,19 @@
 Package: kdegames
 Architecture: all
 Section: kde
-Depends: bovo (>= ${binary:Version}), katomic (>= ${binary:Version}), kbattleship (>= ${binary:Version}), kblackbox (>= ${binary:Version}), kbounce (>= ${binary:Version}), kgoldrunner (>= ${binary:Version}), kiriki (>= ${binary:Version}), kjumpingcube (>= ${binary:Version}), klines (>= ${binary:Version}), kmahjongg (>= ${binary:Version}), kmines (>= ${binary:Version}), knetwalk (>= ${binary:Version}), kolf (>= ${binary:Version}), konquest (>= ${binary:Version}), kpat (>= ${binary:Version}), kreversi (>= ${binary:Version}), ksame (>= ${binary:Version}), kshisen (>= ${binary:Version}), kspaceduel (>= ${binary:Version}), ksudoku (>= ${binary:Version}), ksquares (>= ${binary:Version}), ktuberling (>= ${binary:Version}), kfourinline (>= ${binary:Version}), lskat (>= ${binary:Version})
-Suggests: kdegames-doc-html (>= ${source:Version})
-Description: games from the official KDE 4 release
+Depends: bovo (>= ${source:Version}), katomic (>= ${source:Version}),
+ kbattleship (>= ${source:Version}), kblackbox (>= ${source:Version}),
+ kbounce (>= ${source:Version}), kgoldrunner (>= ${source:Version}),
+ kiriki (>= ${source:Version}), kjumpingcube (>= ${source:Version}),
+ klines (>= ${source:Version}), kmahjongg (>= ${source:Version}),
+ kmines (>= ${source:Version}), knetwalk (>= ${source:Version}),
+ kolf (>= ${source:Version}), konquest (>= ${source:Version}),
+ kpat (>= ${source:Version}), kreversi (>= ${source:Version}),
+ ksame (>= ${source:Version}), kshisen (>= ${source:Version}),
+ kspaceduel (>= ${source:Version}), ksudoku (>= ${source:Version}),
+ ksquares (>= ${source:Version}), ktuberling (>= ${source:Version}),
+ kfourinline (>= ${source:Version}), lskat (>= ${source:Version})
+Description: Games from the official KDE 4 release
  KDE is produced by an international technology team that creates free and open
  source software for desktop and portable computing. Among KDE's products are a
  modern desktop system for Linux and UNIX platforms, comprehensive office
@@ -40,15 +50,16 @@
 Priority: extra
 Section: kde
 Depends: kdebase-runtime-dbg
+Suggests: kdegames (= ${source:Version})
 Description: Debugging symbols for kdegames
  This package contains the debugging symbols associated with kdegames.
  They will automatically be used by gdb for debugging kdegames-related
  issues.
 
 Package: libkdegames-dev
-Architecture: any
+Architecture: all
 Section: libdevel
-Depends: kdelibs5-dev (>= 4:4.0.0-1), libkdegames4 (= ${binary:Version})
+Depends: kdelibs5-dev (>= 4:4.0.0-1), libkdegames4 (= ${source:Version})
 Description: Development files for the KDE 4 games libraries
  This package contains headers and other related files needed to build KDE 4
  applications that use the KDE 4 games libraries.
@@ -57,7 +68,7 @@
 
 Package: kdegames-card-data
 Architecture: all
-Section: games
+Section: kde
 Description: Card decks for KDE 4 games
  This package contains a collection of playing card themes for KDE 4 card games.
  .
@@ -65,7 +76,7 @@
 
 Package: kdegames-mahjongg-data
 Architecture: all
-Section: games
+Section: kde
 Description: Tilesets and backgrounds for Mahjongg games
  This package contains a collection of tilesets and backgrounds for KMahjongg
  and KShisen.

Modified: branches/kde4/packages/kdegraphics/debian/changelog
===================================================================
--- branches/kde4/packages/kdegraphics/debian/changelog	2008-01-22 22:03:03 UTC (rev 9105)
+++ branches/kde4/packages/kdegraphics/debian/changelog	2008-01-23 07:29:22 UTC (rev 9106)
@@ -1,8 +1,13 @@
-kdegraphics (4:4.0.0-3) experimental; urgency=low
+kdegraphics (4:4.0.0-3) UNRELEASED; urgency=low
 
   +++ Changes by Matthew Rosewarne:
 
+  * Use source:Version for kdegraphics metapackage.
+  * Change okular-dev Depends from libqt4-dev to kdelibs5-dev.
+  * Change okular-dev to Architecture: all.
   * Change kdegraphics-dbg Depends from kdebase-dbg to kdebase-runtime-dbg.
+  * Add Suggests: kdegraphics to kdegraphics-dbg.
+  * Remove unnecessary version from kcoloredit Conflicts/Replaces.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 20 Jan 2008 19:13:18 -0500
 

Modified: branches/kde4/packages/kdegraphics/debian/control
===================================================================
--- branches/kde4/packages/kdegraphics/debian/control	2008-01-22 22:03:03 UTC (rev 9105)
+++ branches/kde4/packages/kdegraphics/debian/control	2008-01-23 07:29:22 UTC (rev 9106)
@@ -12,13 +12,13 @@
 
 Package: kdegraphics
 Architecture: all
-Depends: gwenview (>= ${binary:Version}), kamera (>= ${binary:Version}),
- kcolorchooser (>= ${binary:Version}), kgamma (>= ${binary:Version}),
- kolourpaint4 (>= ${binary:Version}), kruler (>= ${binary:Version}),
- kscan (>= ${binary:Version}), ksnapshot (>= ${binary:Version}),
- okular (>= ${binary:Version})
-Recommends: kdegraphics-strigi-plugins (>= ${binary:Version}),
- okular-extra-backends (>= ${binary:Version})
+Depends: gwenview (>= ${source:Version}), kamera (>= ${source:Version}),
+ kcolorchooser (>= ${source:Version}), kgamma (>= ${source:Version}),
+ kolourpaint4 (>= ${source:Version}), kruler (>= ${source:Version}),
+ kscan (>= ${source:Version}), ksnapshot (>= ${source:Version}),
+ okular (>= ${source:Version})
+Recommends: kdegraphics-strigi-plugins (>= ${source:Version}),
+ okular-extra-backends (>= ${source:Version})
 Description: Graphics applications from the official KDE 4 release
  KDE is produced by an international technology team that creates free and open
  source software for desktop and portable computing. Among KDE's products are a
@@ -35,6 +35,7 @@
 Architecture: any
 Priority: extra
 Depends: kdebase-runtime-dbg
+Suggests: kdegraphics (= ${source:Version})
 Description: Debugging symbols for kdegraphics
  This package contains the debugging symbols associated with kdegraphics.
  They will automatically be used by gdb for debugging kdegraphics-related
@@ -78,8 +79,8 @@
 Section: graphics
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: kcoloredit (<< 4:4.0.0-1)
-Conflicts: kcoloredit (<< 4:4.0.0-1)
+Replaces: kcoloredit
+Conflicts: kcoloredit
 Description: Color chooser and palette editor for KDE 4
  KColorChooser is a color palette tool, used to mix colors and create custom
  color palettes.  Using the dropper, it can obtain the color of any pixel on
@@ -173,8 +174,8 @@
  This package is part of the KDE 4 graphics module.
 
 Package: okular-dev
-Architecture: any
-Depends: libokularcore1 (= ${binary:Version}), libqt4-dev
+Architecture: all
+Depends: libokularcore1 (= ${source:Version}), kdelibs5-dev (>= 4:4.0.0-1)
 Description: Development files for the okular libraries
  This package contains headers and other related files needed to build document
  format backends for okular.

Modified: branches/kde4/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdelibs/debian/changelog	2008-01-22 22:03:03 UTC (rev 9105)
+++ branches/kde4/packages/kdelibs/debian/changelog	2008-01-23 07:29:22 UTC (rev 9106)
@@ -16,6 +16,14 @@
 
   * Update to debhelper 6.
 
+  +++ Changes by Matthew Rosewarne:
+
+  * Change libphonon-dev to Architecture: all.
+  * Make dependencies binNMU-friendly.
+  * Bump Soprano minimum version to 2.0.0.
+  * Remove redundant Depends: shared-mime-info from kdelibs5-dev.
+  * Add Suggests: kdelibs5-doc to kdelibs5-dev.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 19 Jan 2008 14:05:04 +0100
 
 kde4libs (4:4.0.0-2) unstable; urgency=low

Modified: branches/kde4/packages/kdelibs/debian/control
===================================================================
--- branches/kde4/packages/kdelibs/debian/control	2008-01-22 22:03:03 UTC (rev 9105)
+++ branches/kde4/packages/kdelibs/debian/control	2008-01-23 07:29:22 UTC (rev 9106)
@@ -7,13 +7,23 @@
  libcupsys2-dev, libdbus-1-dev, libqt4-dev,
  libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libkeyutils-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libsoprano-dev (>= 1.99~rc2-1), libstreamanalyzer-dev (>= 0.5.7),
+ libsoprano-dev (>= 2.0.0-1), libstreamanalyzer-dev (>= 0.5.7),
  libxml2-dev, libxml2-utils,  libxslt1-dev, libxtst-dev, libungif4-dev,
  libavahi-common-dev, libaspell-dev, libbz2-dev, libenchant-dev, libfam-dev,
  libjasper-dev, libopenexr-dev, libpcre3-dev, libtiff4-dev, hspell, xsltproc
 Standards-Version: 3.7.3
 Homepage: http://www.kde.org/
 
+Package: kdelibs5
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, kdelibs5-data (>= ${source:Version}),
+ kdelibs-bin(>= ${binary:Version}), shared-mime-info, xauth
+Description: core libraries for all KDE 4 applications
+ This package contains shared libraries needed to run KDE 4 applications.
+ .
+ This package is part of the KDE 4 libraries module.
+
 Package: kdelibs5-data
 Section: libs
 Architecture: all
@@ -24,26 +34,16 @@
  .
  This package is part of the KDE 4 libraries module.
 
-
-Package: kdelibs5
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, kdelibs5-data (>= ${binary:Version}),
- kdelibs-bin(>= ${binary:Version}), shared-mime-info, xauth
-Description: core libraries for all KDE 4 applications
- This package contains shared libraries needed to run KDE 4 applications.
- .
- This package is part of the KDE 4 libraries module.
-
 Package: kdelibs5-dev
 Section: libdevel
 Architecture: any
-Depends: ${shlibs:Depends}, kdelibs5 (= ${binary:Version}), shared-mime-info,
- libasound2-dev, libcupsys2-dev, libdbus-1-dev, libkeyutils-dev, libqt4-dev,
- libsoprano-dev (>= 1.99~rc2-1), libstreamanalyzer-dev (>= 0.5.7),
+Depends: ${shlibs:Depends}, kdelibs5 (= ${binary:Version}), libasound2-dev,
+ libcupsys2-dev, libdbus-1-dev, libkeyutils-dev, libqt4-dev,
+ libsoprano-dev (>= 2.0.0-1), libstreamanalyzer-dev (>= 0.5.7),
  libxml2-dev, libxml2-utils, libxslt1-dev, libxtst-dev, libungif4-dev,
  libavahi-common-dev, libaspell-dev, libbz2-dev, libenchant-dev, libfam-dev,
  libjasper-dev, libopenexr-dev, libpcre3-dev, libtiff4-dev, hspell, xsltproc
+Suggests: kdelibs5-doc (= ${source:Version})
 Conflicts: kdelibs4-dev
 Description: development files for the KDE 4 core libraries
  This package contains headers and other files needed to build KDE 4
@@ -84,8 +84,8 @@
 
 Package: libphonon-dev
 Section: libdevel
-Architecture: any
-Depends: libphonon4 (= ${binary:Version})
+Architecture: all
+Depends: libphonon4 (= ${source:Version})
 Replaces: kdelibs5-dev (<< 4:3.98.0~svn755919-1)
 Description: cross-platform multimedia framework (development)
  Phonon is a cross-platform multimedia framework that enables the use of audio

Modified: branches/kde4/packages/kdemultimedia/debian/changelog
===================================================================
--- branches/kde4/packages/kdemultimedia/debian/changelog	2008-01-22 22:03:03 UTC (rev 9105)
+++ branches/kde4/packages/kdemultimedia/debian/changelog	2008-01-23 07:29:22 UTC (rev 9106)
@@ -1,3 +1,14 @@
+kdemultimedia (4:4.0.0-2) UNRELEASED; urgency=low
+
+  +++ Changes by Matthew Rosewarne:
+
+  * Use source:Version for kdemultimedia metapackage.
+  * Change kdemultimedia-dbg Depends from kdelibs-dbg to kdebase-runtime-dbg.
+  * Change kdemultimedia-dev to Architecture: all.
+  * Add Suggests: kdemultimedia to kdemultimedia-dbg.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 22 Jan 2008 21:32:06 -0500
+
 kdemultimedia (4:4.0.0-1) experimental; urgency=low
 
   * New upstream release.
@@ -11,7 +22,6 @@
   +++ Changes by Matthew Rosewarne:
 
   * Add Homepage: to control.
-  * Change kdemultimedia-dbg Depends from kdelibs-dbg to kdebase-runtime-dbg.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 10 Jan 2008 13:08:51 +0100
 

Modified: branches/kde4/packages/kdemultimedia/debian/control
===================================================================
--- branches/kde4/packages/kdemultimedia/debian/control	2008-01-22 22:03:03 UTC (rev 9105)
+++ branches/kde4/packages/kdemultimedia/debian/control	2008-01-23 07:29:22 UTC (rev 9106)
@@ -14,9 +14,9 @@
 Package: kdemultimedia
 Section: kde
 Architecture: all
-Depends: kdemultimedia-kio-plugins (>= ${binary:Version}),
- juk (>= ${binary:Version}), kmix (>= ${binary:Version}),
- kscd (>= ${binary:Version})
+Depends: kdemultimedia-kio-plugins (>= ${source:Version}),
+ juk (>= ${source:Version}), kmix (>= ${source:Version}),
+ kscd (>= ${source:Version})
 Description: multimedia apps from the official KDE release 
  KDE (the K Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -33,6 +33,7 @@
 Architecture: any
 Priority: extra
 Depends: kdebase-runtime-dbg
+Suggests: kdemultimedia (= ${source:Version})
 Description: debugging symbols for kdemultimedia
  This package contains the debugging symbols associated with kdemultimedia.
  They will automatically be used by gdb for debugging kdemultimedia-related
@@ -41,10 +42,10 @@
 
 Package: kdemultimedia-dev
 Section: devel
-Architecture: any
+Architecture: all
 Depends: kdelibs5-dev (>=4:4.0.0-1), kdebase-workspace-dev (>=4:4.0.0-1),
- kdemultimedia-kio-plugins (= ${binary:Version}),
- libkcddb4 (= ${binary:Version})
+ kdemultimedia-kio-plugins (= ${source:Version}),
+ libkcddb4 (= ${source:Version})
 Description: development files for the KDE multimedia module
  Development files and headers for the KDE multimedia module.
  .

Modified: branches/kde4/packages/kdenetwork/debian/changelog
===================================================================
--- branches/kde4/packages/kdenetwork/debian/changelog	2008-01-22 22:03:03 UTC (rev 9105)
+++ branches/kde4/packages/kdenetwork/debian/changelog	2008-01-23 07:29:22 UTC (rev 9106)
@@ -1,10 +1,14 @@
-kdenetwork (4:4.0.0-2) experimental; urgency=low
+kdenetwork (4:4.0.0-2) UNRELEASED; urgency=low
 
   +++ Changes by Matthew Rosewarne:
 
   * Add Suggests: kdeartwork-emoticons to kopete
+  * Use source:Version for kdenetwork metapackage.
+  * Change kdenetwork-dev to Architecture: all.
+  * Fix kdenetwork-dev dependency version for kdebase-dev.
   * Change kdenetwork-dbg Depends from kdebase-dbg to kdebase-runtime-dbg.
-  * Add Recommends: kdebase-workspace-dbg to kdenetwork-dbg for libplasma.
+  * Add Recommends: kdebase-workspace-dbg to kdenetwork-dbg.
+  * Add Suggests: kdenetwork to kdenetwork-dbg.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 14 Jan 2008 04:00:29 -0500
 

Modified: branches/kde4/packages/kdenetwork/debian/control
===================================================================
--- branches/kde4/packages/kdenetwork/debian/control	2008-01-22 22:03:03 UTC (rev 9105)
+++ branches/kde4/packages/kdenetwork/debian/control	2008-01-23 07:29:22 UTC (rev 9106)
@@ -2,7 +2,7 @@
 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>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Armin Berres <trigger+debian at space-based.de>, Modestas Vainius <modestas at vainius.eu>
+Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Armin Berres <trigger+debian at space-based.de>, Modestas Vainius <modestas at vainius.eu>, Matthew Rosewarne <mrosewarne at inoutbox.com>
 Build-Depends: cdbs, debhelper (>= 5), cmake, quilt, kdepimlibs5-dev (>=4:4.0.0-1), 
  libphonon-dev (>=4:4.0.0-1), libxdamage-dev, libxss-dev, libslp-dev, libiw-dev, libidn11-dev, 
  libvncserver-dev (>=0.9.3), libqca2-dev, libplasma-dev,
@@ -13,8 +13,10 @@
 Package: kdenetwork
 Section: kde
 Architecture: all
-Depends: kget (>= ${binary:Version}), knewsticker (>= ${binary:Version}), kopete (>= ${binary:Version}), kppp (>= ${binary:Version}), krdc (>= ${binary:Version}), krfb (>= ${binary:Version})
-Recommends: kdenetwork-filesharing (>= ${binary:Version})
+Depends: kget (>= ${source:Version}), knewsticker (>= ${source:Version}),
+ kopete (>= ${source:Version}), kppp (>= ${source:Version}),
+ krdc (>= ${source:Version}), krfb (>= ${source:Version})
+Recommends: kdenetwork-filesharing (>= ${source:Version})
 Description: network-related apps from the official KDE 4 release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -38,8 +40,8 @@
 
 Package: kdenetwork-dev
 Section: devel
-Architecture: any
-Depends: kopete (= ${binary:Version}), kdebase-dev (>= ${binary:Version})
+Architecture: all
+Depends: kopete (= ${source:Version}), kdebase-dev (>= 4:4.0.0-1)
 Description: development files for the KDE 4 network module
  This is the development package which contains the headers for the KDE RSS
  library as well as the Kopete chat client, as well as miscellaneous
@@ -150,6 +152,7 @@
 Priority: extra
 Depends: kdebase-runtime-dbg
 Recommends: kdebase-workspace-dbg
+Suggests: kdenetwork (= ${source:Version})
 Description: debugging symbols for kdenetwork
  This package contains the debugging symbols associated with kdenetwork.
  They will automatically be used by gdb for debugging kdenetwork-related

Modified: branches/kde4/packages/kdepimlibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdepimlibs/debian/changelog	2008-01-22 22:03:03 UTC (rev 9105)
+++ branches/kde4/packages/kdepimlibs/debian/changelog	2008-01-23 07:29:22 UTC (rev 9106)
@@ -1,10 +1,16 @@
 kdepimlibs (4:4.0.0-5) UNRELEASED; urgency=low
 
+  +++ Changes by Armin Berres:
+
   * Make kdepimlibs5 depend on the source and not the binary version of
     kdepimlibs-data.
 
- -- Armin Berres <trigger+debian at space-based.de>  Tue, 22 Jan 2008 23:02:08 +0100
+  +++ Changes by Matthew Rosewarne:
 
+  * Change kdepimlib5-dev to Architecture: all.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 22 Jan 2008 23:02:08 +0100
+
 kdepimlibs (4:4.0.0-4) unstable; urgency=low
 
   * Add Vcs-Browser and Vcs-Svn fields.

Modified: branches/kde4/packages/kdepimlibs/debian/control
===================================================================
--- branches/kde4/packages/kdepimlibs/debian/control	2008-01-22 22:03:03 UTC (rev 9105)
+++ branches/kde4/packages/kdepimlibs/debian/control	2008-01-23 07:29:22 UTC (rev 9106)
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Armin Berres <trigger+debian at space-based.de>
+Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Armin Berres <trigger+debian at space-based.de>, Matthew Rosewarne <mrosewarne at inoutbox.com>
 Build-Depends: cdbs, debhelper (>= 6), quilt, cmake, kdelibs5-dev (>= 4:4.0.0-1),
  libboost-dev, libgpgme11-dev, libldap2-dev, libsasl2-dev
 Standards-Version: 3.7.3
@@ -30,8 +30,8 @@
 
 Package: kdepimlibs5-dev
 Section: libdevel
-Architecture: any
-Depends: kdepimlibs5 (= ${binary:Version}), kdelibs5-dev (>= 4:4.0.0-1),
+Architecture: all
+Depends: kdepimlibs5 (= ${source:Version}), kdelibs5-dev (>= 4:4.0.0-1),
  libboost-dev, libgpgme11-dev, libldap2-dev, libsasl2-dev
 Conflicts: libkleopatra1-dev
 Description: development files for the KDE PIM 4 core libraries

Modified: branches/kde4/packages/kdesdk/debian/changelog
===================================================================
--- branches/kde4/packages/kdesdk/debian/changelog	2008-01-22 22:03:03 UTC (rev 9105)
+++ branches/kde4/packages/kdesdk/debian/changelog	2008-01-23 07:29:22 UTC (rev 9106)
@@ -7,7 +7,11 @@
 
   +++ Changes by Matthew Rosewarne:
 
+  * Use source:Version for kdesdk metapackage.
+  * Change kdesdk-dev to Architecture: all.
+  * Add dependencies on kate and poxml to kdesdk-dev.
   * Change kdesdk-dbg Depends from kdelibs-dbg to kdebase-runtime-dbg.
+  * Add Suggests: kdesdk to kdesdk-dbg.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 17 Jan 2008 10:26:00 +0100
 

Modified: branches/kde4/packages/kdesdk/debian/control
===================================================================
--- branches/kde4/packages/kdesdk/debian/control	2008-01-22 22:03:03 UTC (rev 9105)
+++ branches/kde4/packages/kdesdk/debian/control	2008-01-23 07:29:22 UTC (rev 9106)
@@ -4,15 +4,21 @@
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Build-Depends: cdbs, debhelper (>= 5), cmake, quilt, kdepimlibs5-dev (>=4:4.0.0-1),
  libphonon-dev (>=4:4.0.0-1), libsvn-dev
-Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Fathi Boudra <fabo at debian.org>, Sune Vuorela <debian at pusling.com>, Armin Berres <trigger+debian at space-based.de>
+Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Fathi Boudra <fabo at debian.org>, Sune Vuorela <debian at pusling.com>, Armin Berres <trigger+debian at space-based.de>, Matthew Rosewarne <mrosewarne at inoutbox.com>
 Standards-Version: 3.7.3
 Homepage: http://www.kde.org
 
 Package: kdesdk
 Architecture: all
 Section: kde
-Depends: cervisia (>= ${binary:Version}), kapptemplate (>= ${binary:Version}), kate (>= ${binary:Version}), kbugbuster (>= ${binary:Version}), kcachegrind (>= ${binary:Version}), kdesdk-kio-plugins (>= ${binary:Version}), kdesdk-misc (>= ${binary:Version}), kdesdk-scripts (>= ${binary:Version}), kdesdk-strigi-plugins (>= ${binary:Version}), kompare (>= ${binary:Version}), kuiviewer (>= ${binary:Version}), poxml (>= ${binary:Version}), umbrello (>= ${binary:Version})
-Suggests: kcachegrind-converters
+Depends: cervisia (>= ${source:Version}), kapptemplate (>= ${source:Version}),
+ kate (>= ${source:Version}), kbugbuster (>= ${source:Version}),
+ kcachegrind (>= ${source:Version}), kdesdk-kio-plugins (>= ${source:Version}),
+ kdesdk-misc (>= ${source:Version}), kdesdk-scripts (>= ${source:Version}),
+ kdesdk-strigi-plugins (>= ${source:Version}), kompare (>= ${source:Version}),
+ kuiviewer (>= ${source:Version}), poxml (>= ${source:Version}),
+ umbrello (>= ${source:Version})
+Suggests: kcachegrind-converters (>= ${source:Version})
 Description: Software Development Kit from the official KDE 4 release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -130,9 +136,9 @@
 
 
 Package: kdesdk-dev
-Architecture: any
+Architecture: all
 Section: libdevel
-Depends: libsvn-dev
+Depends: kate (= ${source:Version}), poxml (= ${source:Version}), libsvn-dev
 Description: development files for the KDE 4 sdk module
  This package contains development files needed to build software based on
  the kdesdk module.
@@ -282,6 +288,7 @@
 Architecture: any
 Priority: extra
 Depends: kdebase-runtime-dbg
+Suggests: kdesdk (= ${source:Version})
 Description: debugging symbols for kdesdk
  This package contains the debugging symbols associated with kdesdk.
  They will automatically be used by gdb for debugging kdesdk-related issues.

Modified: branches/kde4/packages/kdetoys/debian/changelog
===================================================================
--- branches/kde4/packages/kdetoys/debian/changelog	2008-01-22 22:03:03 UTC (rev 9105)
+++ branches/kde4/packages/kdetoys/debian/changelog	2008-01-23 07:29:22 UTC (rev 9106)
@@ -1,3 +1,12 @@
+kdetoys (4:4.0.0-2) UNRELEASED; urgency=low
+
+  +++ Changes by Matthew Rosewarne:
+
+  * Change kdeadmin-dbg Depends from kdelibs-dbg to kdebase-runtime-dbg.
+  * Add Suggests: kdetoys to kdetoys-dbg.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 23 Jan 2008 01:17:38 -0500
+
 kdetoys (4:4.0.0-1) experimental; urgency=low
 
   * New upstream release.
@@ -5,7 +14,6 @@
   +++ Changes by Matthew Rosewarne:
 
   * Add Homepage: to control.
-  * Change kdeadmin-dbg Depends from kdelibs-dbg to kdebase-runtime-dbg.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 05 Jan 2008 15:43:44 +0100
 

Modified: branches/kde4/packages/kdetoys/debian/control
===================================================================
--- branches/kde4/packages/kdetoys/debian/control	2008-01-22 22:03:03 UTC (rev 9105)
+++ branches/kde4/packages/kdetoys/debian/control	2008-01-23 07:29:22 UTC (rev 9106)
@@ -2,7 +2,7 @@
 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>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Armin Berres <trigger+debian at space-based.de>
+Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Armin Berres <trigger+debian at space-based.de>, Matthew Rosewarne <mrosewarne at inoutbox.com>
 Build-Depends: cdbs, debhelper (>= 5), cmake, quilt, kdelibs5-dev (>=4:4.0.0-1),
  libphonon-dev (>=4:4.0.0-1)
 Standards-Version: 3.7.3
@@ -11,7 +11,8 @@
 Package: kdetoys
 Architecture: all
 Section: kde
-Depends: amor (>= ${source:Version}), kteatime (>= ${source:Version}), kworldclock (>= ${source:Version})
+Depends: amor (>= ${source:Version}), kteatime (>= ${source:Version}),
+ kworldclock (>= ${source:Version})
 Description: toys from the official KDE 4 release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -76,6 +77,7 @@
 Section: libdevel
 Architecture: any
 Depends: kdebase-runtime-dbg
+Suggests: kdetoys (= ${source:Version})
 Priority: extra
 Description: debugging symbols for kdetoys
  This package contains the debugging symbols associated with kdetoys.

Modified: branches/kde4/packages/kdeutils/debian/changelog
===================================================================
--- branches/kde4/packages/kdeutils/debian/changelog	2008-01-22 22:03:03 UTC (rev 9105)
+++ branches/kde4/packages/kdeutils/debian/changelog	2008-01-23 07:29:22 UTC (rev 9106)
@@ -1,3 +1,13 @@
+kdeutils (4:4.0.0-2) UNRELEASED; urgency=low
+
+  +++ Changes by Matthew Rosewarne:
+
+  * Use source:Version for kdeutils metapackage.
+  * Change kdeutils-dev to Architecture: all.
+  * Add Suggests: kdeutils to kdeutils-dbg.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 22 Jan 2008 21:36:22 -0500
+
 kdeutils (4:4.0.0-1) experimental; urgency=low
 
   * New uptream release.

Modified: branches/kde4/packages/kdeutils/debian/control
===================================================================
--- branches/kde4/packages/kdeutils/debian/control	2008-01-22 22:03:03 UTC (rev 9105)
+++ branches/kde4/packages/kdeutils/debian/control	2008-01-23 07:29:22 UTC (rev 9106)
@@ -10,13 +10,13 @@
 
 Package: kdeutils
 Architecture: all
-Depends: ark (>= ${binary:Version}), kcalc (>= ${binary:Version}),
- kcharselect (>= ${binary:Version}), kdessh (>= ${binary:Version}),
- kdf (>= ${binary:Version}), kfloppy (>= ${binary:Version}),
- kgpg (>= ${binary:Version}), kjots (>= ${binary:Version}), 
- kmilo (>= ${binary:Version}), ktimer (>= ${binary:Version}),
- kwalletmanager (>= ${binary:Version}), kwikdisk (>= ${binary:Version}),
- superkaramba (>= ${binary:Version}), sweeper (>= ${binary:Version})
+Depends: ark (>= ${source:Version}), kcalc (>= ${source:Version}),
+ kcharselect (>= ${source:Version}), kdessh (>= ${source:Version}),
+ kdf (>= ${source:Version}), kfloppy (>= ${source:Version}),
+ kgpg (>= ${source:Version}), kjots (>= ${source:Version}), 
+ kmilo (>= ${source:Version}), ktimer (>= ${source:Version}),
+ kwalletmanager (>= ${source:Version}), kwikdisk (>= ${source:Version}),
+ superkaramba (>= ${source:Version}), sweeper (>= ${source:Version})
 Description: general purpose utilities from the official KDE 4 release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -32,6 +32,7 @@
 Architecture: any
 Priority: extra
 Depends: kdebase-runtime-dbg
+Suggests: kdeutils (= ${source:Version})
 Description: debugging symbols for kdeutils
  This package contains the debugging symbols associated with kdeutils.
  They will automatically be used by gdb for debugging kdeutils-related issues.
@@ -39,8 +40,8 @@
 
 Package: kdeutils-dev
 Section: utils
-Architecture: any
-Depends: ark (>= ${binary:Version}), kmilo (>= ${binary:Version}), superkaramba (>= ${binary:Version})
+Architecture: all
+Depends: ark (= ${source:Version}), kmilo (= ${source:Version}), superkaramba (= ${source:Version})
 Description: development files for the KDE 4 utilities module
  This package contains development files needed to compile kdeutils
  applications.

Modified: branches/kde4/packages/soprano/debian/changelog
===================================================================
--- branches/kde4/packages/soprano/debian/changelog	2008-01-22 22:03:03 UTC (rev 9105)
+++ branches/kde4/packages/soprano/debian/changelog	2008-01-23 07:29:22 UTC (rev 9106)
@@ -1,3 +1,11 @@
+soprano (2.0.0-3) unstable; urgency=low
+
+  +++ Changes by Matthew Rosewarne:
+
+  * Fix version for libsoprano-dev dependency on libsoprano4.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 23 Jan 2008 01:22:43 -0500
+
 soprano (2.0.0-2) unstable; urgency=low
 
   * Need to be builded against Qt4 from unstable.

Modified: branches/kde4/packages/soprano/debian/control
===================================================================
--- branches/kde4/packages/soprano/debian/control	2008-01-22 22:03:03 UTC (rev 9105)
+++ branches/kde4/packages/soprano/debian/control	2008-01-23 07:29:22 UTC (rev 9106)
@@ -28,8 +28,7 @@
 Package: libsoprano-dev
 Section: libdevel
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libsoprano4 (>= ${source:Version}),
- libsoprano4 (<< ${source:Version}.1~)
+Depends: ${shlibs:Depends}, ${misc:Depends}, libsoprano4 (= ${binary:Version})
 Description: Development files for soprano, a Qt4 interface for RDF storage
  Soprano (formally known as QRDF) is a library which provides a nice Qt4
  interface to RDF storage solutions. It has a modular structure which allows 




More information about the pkg-kde-commits mailing list