[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.4.5-5-40-g33cdd46

Modestas Vainius modax at alioth.debian.org
Sun Nov 28 17:00:46 UTC 2010


The following commit has been merged in the master branch:
commit 33cdd465743df79b24644e32739f8a2692f48fa5
Merge: 437be6e5e5499d1d094c2554d30db8a23af29449 0ce6a4cedab427fbed0f0ee4493861c91c22ad6c
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Nov 28 19:00:29 2010 +0200

    Merge branch 'squeeze'
    
    Conflicts:
    	debian/control

 debian/changelog                                   |   16 ++
 debian/control                                     |    3 +-
 .../patches/31_kdm_vt_switching_on_kfreebsd.diff   |  273 ++++++++++++++++++++
 .../32_ksmserver_fadeeffect_use_sse2_free.diff     |   20 ++
 .../33_qguiplatformplugin_kde_NULL_check.diff      |   19 ++
 debian/patches/series                              |    3 +
 6 files changed, 333 insertions(+), 1 deletions(-)

diff --cc debian/changelog
index 456b1c0,45391d9..6f2b5a9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,67 -1,19 +1,83 @@@
 +kdebase-workspace (4:4.5.1-0r2) UNRELEASED; urgency=low
 +
 +  * New upstream release:
 +    - no more dirt in kdmrc. (Closes: #439781)
 +
 +  [ George Kiagiadakis ]
 +  * Change my email address in uploaders.
 +  * Refresh patches.
 +    - Re-work patch 11_kdm_X_path.diff.
 +    - Re-work patch 21_kdm_doesnt_use_kstandarddirs.diff (and rename it to
 +      21_place_global_config_in_etc.diff) to also patch the new kdm kcm kauth
 +      helper and the kcm_clock helper and provide a method to catch future
 +      wrong uses of the KDE_CONFDIR macro with regards to the debian policy.
 +  * Drop patches for bugs that are fixed upstream:
 +    - 01_plasma_netbook_no_autostart.diff
 +    - 27_ld_exclude_libs_qtuitools.diff
 +  * 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.
 +  * Add dependency to iso-codes in kdebase-workspace-bin, since it is
 +    a runtime dependency for kcm_keyboard.
 +  * Fix the kdm init script to use any overrides set in /etc/default/kdm.d/.
 +  * Add code in kdebase-workspace-bin.postinst to move the misplaced kcmclockrc
 +    configuration file from /usr/share to /etc.
 +  * Update lintian overrides.
 +
 + -- 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-5) unstable; urgency=medium
+ 
+   [ Modestas Vainius ]
+   * Add patch 31_kdm_vt_switching_on_kfreebsd.diff which implements VT
+     switching and status detection support for KDM on kFreeBSD. This should
+     fix an issue with KDM hijacking VT2 on bootup. (Closes: #586540)
+   * Fix ksmserver crash on logout. It's 100% reproducible on kfreebsd-amd64.
+   * Make kdebase-workspace-bin Replace and Break kdesktop. (Closes: #605135)
+   * Set urgency=medium due to multiple RC bug fixes.
+ 
+   [ Didier Raboud ]
+   * Fix a segfault in qguiplatformplugin_kde, thanks to David Alan Gilbert
+     (patch 33_qguiplatformplugin_kde_NULL_check.diff). (Closes: #603480)
+ 
+  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 28 Nov 2010 13:09:18 +0200
+ 
  kdebase-workspace (4:4.4.5-4) unstable; urgency=low
  
    [ Frederik Schwarzer ]
diff --cc debian/control
index f6dccc9,24f14e3..b4cc34c
--- a/debian/control
+++ b/debian/control
@@@ -94,8 -83,8 +94,9 @@@ Suggests: x11-xkb-util
  Conflicts: kcontrol, libplasma1, libplasma2, libkfontinst4, ksplash
  Replaces: kdebase-bin (<< 4:4.0.0-1), kcontrol, kmenuedit, ktip, libplasma2,
   kde-window-manager (<< 4:4.1.80), kdebase-workspace-data (<< 4:4.1.82),
 - kdebase-workspace-libs4+5, libkfontinst4, ksplash, kdesktop
 + kdebase-workspace-libs4+5, libkfontinst4, ksplash, kdebase-runtime (<< 4:4.5.0),
-  kdebase-data (<< 4:4.5.0)
++ kdebase-data (<< 4:4.5.0), kdesktop
+ Breaks: kdesktop
  Description: core binaries for the KDE Plasma Workspace
   This package contains miscellaneous programs needed for a basic desktop
   installation. Among other standard KDE Workspace components, the package

-- 
KDE Base Workspace module packaging



More information about the pkg-kde-commits mailing list