[SCM] KDE Base Workspace module packaging branch, kde4.5, updated. debian/4.4.5-3-23-g89a639d

Modestas Vainius modax at alioth.debian.org
Tue Aug 10 09:37:43 UTC 2010 

The following commit has been merged in the kde4.5 branch:
commit 89a639d90496021f4d31a52dc23036789958c15f
Merge: e840fd99bdd1e2f308bf34b649b55f709a8c4d66 9425686698d3f95fb7f50a3138e82c2df67c6ef3
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Tue Aug 10 12:37:28 2010 +0300

    Merge branch 'master' into kde4.5
    
    Conflicts:
    	debian/control

 debian/changelog                                |   12 +++++++++++
 debian/control                                  |    4 +-
 debian/patches/99_solid_network_use_ntrack.diff |   24 ++++++++++++----------
 3 files changed, 27 insertions(+), 13 deletions(-)

diff --cc debian/changelog
index 551f362,f6b851a..f170858
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,54 -1,15 +1,66 @@@
 +kdebase-workspace (4:4.5.0-0r1) UNRELEASED; urgency=low
 +
 +  * New upstream release:
 +    - no more dirt in kdmrc. (Closes: #439781)
 +
 +  [ George Kiagiadakis ]
 +  * Change my email address in uploaders.
 +  * Refresh patches.
 +  * Drop patch 01_plasma_netbook_no_autostart.diff. Fixed upstream.
 +  * Update installed files.
 +  * Add replaces:
 +    - kdebase-workspace-data replaces kdebase-runtime-data
 +      << 4:4.5.0 due to the moved themerc files.
 +    - kdebase-workspace-bin replaces kdebase-runtime << 4:4.5.0
 +      due to the moved oxygen style plugin.
 +    - kdebase-workspace-bin replaces kdebase-data << 4:4.5.0
 +      due to the moved desktoppath.desktop file.
 +  * Move some misplaced files from kdebase-workspace-bin and
 +    kdebase-workspace-data to plasma-desktop and add the necessary replaces.
 +  * Move the kinfocenter package from kdebase here, and as a consequence:
 +    - Add the required build dependency on libpci-dev.
 +    - Recommend it from kdebase-workspace.
 +    - Make kdebase-workspace-dbg replace kdebase-dbg << 4:4.5.0.
 +  * Adjust build dependencies:
 +    - Add new build dependencies:
 +      - libpng-dev
 +      - libjpeg62-dev
 +      - zlib1g-dev
 +      - libdbusmenu-qt-dev
 +      - libqalculate-dev
 +    - Remove unused build dependencies:
 +      - libxine-dev
 +      - libxklavier-dev
 +      - libsmbclient-dev
 +      - libxcb1-dev
 +    - Bump version of kdelibs5-dev and kdepimlibs5-dev to 4:4.5.
 +  * Update symbol files.
 +  * Rename the following library packages due to binary incompatible changes:
 +    - libkephal4 -> libkephal4a
 +    - libplasmaclock4a -> libplasmaclock4b
 +    - libprocesscore4a -> libprocesscore4b
 +    - libsolidcontrol4 -> libsolidcontrol4a
 +    - libsolidcontrolifaces4 -> libsolidcontrolifaces4a
 +    - libtaskmanager4a -> libtaskmanager4b
 +  * Move the freespacenotifier package from src:freespacenotifier here.
 +  * Adjust the kdm postinst and postrm scripts to create and remove (on purge)
 +    a "kdm" user, which is now used by default as the user to run the greeter.
 +    As a consequence, add dependency on adduser on the kdm package.
 +
 + -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 31 Jul 2010 16:41:50 +0300
 +
+ kdebase-workspace (4:4.4.5-3) unstable; urgency=low
+ 
+   [ Sune Vuorela ]
+   * Don't use ntrack on !linux. It doesn't work/exist there, and fix
+     patch to actually work in all cases.
+ 
+   [ Pino Toscano ]
+   * Fix a typo in description of libksgrd4, which slipped in my previous
+     changes. (Closes: #592278)
+ 
+  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 02 Aug 2010 23:23:41 +0200
+ 
  kdebase-workspace (4:4.4.5-2) unstable; urgency=low
  
    [ Sune Vuorela ]
diff --cc debian/control
index fd2a7b8,663e3bf..b013b73
--- a/debian/control
+++ b/debian/control
@@@ -2,37 -2,28 +2,37 @@@ Source: kdebase-workspac
  Section: kde
  Priority: optional
  Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 -Uploaders: Sune Vuorela <sune at debian.org>, Fathi Boudra <fabo at debian.org>, Armin Berres <armin+debian at space-based.de>, Modestas Vainius <modax at debian.org>, George Kiagiadakis <gkiagiad at csd.uoc.gr>
 +Uploaders: Sune Vuorela <sune at debian.org>, Fathi Boudra <fabo at debian.org>, Armin Berres <armin+debian at space-based.de>,
 + Modestas Vainius <modax at debian.org>, George Kiagiadakis <kiagiadakis.george at gmail.com>
  Build-Depends: kde-sc-dev-latest (>= 4:4.4.5),
 - cdbs (>= 0.4.51), cmake, debhelper (>= 7), pkg-kde-tools (>= 0.9),
 - dpkg-dev (>= 1.15.5), kdelibs5-dev (>= 4:4.4), kdepimlibs5-dev (>= 4:4.4),
 - libakonadi-dev (>= 1.1.95), shared-desktop-ontologies,
 - libboost-dev, python-support (>= 0.6), python-dev,
 - libbluetooth-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
 - libck-connector-dev, libdbus-1-dev,
 + cdbs (>= 0.4.51), cmake, debhelper (>= 7), pkg-kde-tools (>= 0.9), dpkg-dev (>= 1.15.5),
 + kdelibs5-dev (>= 4:4.5), kdepimlibs5-dev (>= 4:4.5),
 + libstrigiqtdbusclient-dev (>= 0.6.3), libstreamanalyzer-dev (>= 0.6.3),
 + libqimageblitz-dev (>= 1:0.0.4-2),
 + zlib1g-dev,
 + libdbusmenu-qt-dev,
 + libfontconfig-dev,
 + libggadget-1.0-dev (>= 0.11.2), libggadget-qt-1.0-dev (>= 0.11.2),
 + libqedje-dev (>= 0.4.0),
 + libglu1-mesa-dev, libqt4-opengl-dev,
 + python-support (>= 0.6), python-dev,
 + shared-desktop-ontologies,
 + libpam0g-dev,
   libnm-util-dev (>= 0.7) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
   network-manager-dev (>= 0.7.0) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
 - libpam0g-dev, libqimageblitz-dev (>= 1:0.0.4-2), 
 - libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], 
 + libbluetooth-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
 + libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
 + libusb-dev, libpci-dev,
 + libakonadi-dev (>= 1.1.95), libboost-dev,
 + libgps-dev (>= 2.90),
 + libck-connector-dev, libdbus-1-dev,
   libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
   libdevstat-dev [kfreebsd-i386 kfreebsd-amd64],
 - libstrigiqtdbusclient-dev (>= 0.6.3), libstreamanalyzer-dev (>= 0.6.3), libusb-dev, libxkbfile-dev,
 - libxcomposite-dev, libxdamage-dev, libxfixes-dev, libxklavier-dev,
 - libxrandr-dev, libxrender-dev, libxi-dev,
 - libsmbclient-dev, libxcb1-dev, libxine-dev, libfontconfig-dev, libglu1-mesa-dev,
 - libsm-dev, libxcursor-dev, libxft-dev, libxtst-dev, libqt4-opengl-dev, libxinerama-dev,
 - libxss-dev, libqedje-dev (>= 0.4.0), libggadget-1.0-dev (>= 0.11.2), libggadget-qt-1.0-dev (>= 0.11.2),
 - libgps-dev (>= 2.90),
 + libxkbfile-dev, libxrandr-dev, libxrender-dev, libxcomposite-dev, libxdamage-dev,
 + libxfixes-dev, libxft-dev, libxtst-dev, libxss-dev, libsm-dev, libxinerama-dev, libxi-dev,
 + libpng-dev, libjpeg62-dev, libxcursor-dev
 + libqalculate-dev,
-  libntrack-qt4-dev
+  libntrack-qt4-dev [linux-any]
  Standards-Version: 3.8.4
  Homepage: http://www.kde.org/
  Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/kdebase-workspace.git

-- 
KDE Base Workspace module packaging

More information about the pkg-kde-commits mailing list