[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.4.5-4-39-g437be6e
Modestas Vainius
modax at alioth.debian.org
Fri Nov 26 22:59:34 UTC 2010
The following commit has been merged in the master branch:
commit 437be6e5e5499d1d094c2554d30db8a23af29449
Merge: 546c903bc2657dcca5264c55d30a04bc0bad6f80 be1388c300158e7079ddc27f1a90a8e1c8f1feb9
Author: Modestas Vainius <modestas at vainius.eu>
Date: Sat Nov 27 00:58:57 2010 +0200
Merge branch 'kde4.5'
Conflicts:
debian/patches/series
debian/changelog | 64 ++++++++++
debian/control | 110 ++++++++++++------
debian/freespacenotifier.install | 4 +
debian/kde-window-manager.install | 15 ++-
debian/kdebase-workspace-bin.install | 36 ++++---
debian/kdebase-workspace-bin.lintian-overrides | 2 +-
debian/kdebase-workspace-bin.postinst | 10 ++-
debian/kdebase-workspace-data.install | 121 +++++++-------------
debian/kdebase-workspace-dev.install | 16 +--
debian/kdm.init | 29 +++---
debian/kdm.install | 23 +++-
debian/kdm.postinst | 4 +
debian/kdm.postrm | 7 +
debian/kinfocenter.install | 38 ++++++
debian/kinfocenter.install.linux | 3 +
debian/ksysguard.install | 6 +
debian/libkdecorations4.install | 2 +-
debian/libkephal4.install | 2 -
debian/libkephal4.symbols | 117 -------------------
debian/libkephal4a.install | 2 +
debian/libkephal4a.lintian-overrides | 1 +
debian/libkephal4a.symbols | 41 +++++++
debian/libksgrd4.install | 2 +-
debian/libksignalplotter4.install | 2 +-
debian/libksignalplotter4.symbols | 74 ++++++++++++-
debian/libkwineffects1a.symbols | 14 ++-
debian/libkworkspace4.install | 2 +-
debian/libkworkspace4.symbols | 75 ++++++++++++-
debian/liblsofui4.install | 2 +-
debian/libplasma-geolocation-interface4.install | 2 +-
debian/libplasmaclock4a.install | 2 -
debian/libplasmaclock4a.lintian-overrides | 1 -
debian/libplasmaclock4b.install | 2 +
debian/libplasmaclock4b.lintian-overrides | 1 +
...smaclock4a.symbols => libplasmaclock4b.symbols} | 36 +++++--
debian/libplasmagenericshell4.install | 3 +-
debian/libprocesscore4a.install | 2 -
debian/libprocesscore4a.lintian-overrides | 1 -
debian/libprocesscore4b.install | 2 +
debian/libprocesscore4b.lintian-overrides | 1 +
...cesscore4a.symbols => libprocesscore4b.symbols} | 19 ++-
debian/libprocessui4a.install | 2 +-
debian/libsolidcontrol4.install | 2 -
debian/libsolidcontrol4a.install | 2 +
debian/libsolidcontrol4a.lintian-overrides | 1 +
...dcontrol4.symbols => libsolidcontrol4a.symbols} | 11 +-
debian/libsolidcontrolifaces4.install | 2 -
debian/libsolidcontrolifaces4a.install | 2 +
debian/libsolidcontrolifaces4a.lintian-overrides | 1 +
...es4.symbols => libsolidcontrolifaces4a.symbols} | 5 +-
debian/libtaskmanager4a.install | 2 -
debian/libtaskmanager4a.lintian-overrides | 1 -
debian/libtaskmanager4b.install | 2 +
debian/libtaskmanager4b.lintian-overrides | 1 +
...kmanager4a.symbols => libtaskmanager4b.symbols} | 16 ++-
debian/libweather-ion4a.install | 2 +-
debian/not-installed | 11 ++
debian/patches/06_kdm_does_not_wreak_havoc.diff | 24 ++--
debian/patches/07_kdmrc_defaults.diff | 12 +-
debian/patches/08_genkdmconf.diff | 68 ++++++------
debian/patches/09_genkdm_make.diff | 2 +-
debian/patches/10_kdm_no_custom.diff | 30 +++---
debian/patches/11_kdm_X_path.diff | 70 ++++--------
...12_be_better_at_honouring_user_kdm_theming.diff | 2 +-
debian/patches/20_use_dejavu_as_default_font.diff | 2 +-
.../patches/21_kdm_doesnt_use_kstandarddirs.diff | 93 ---------------
debian/patches/21_place_global_config_in_etc.diff | 122 ++++++++++++++++++++
debian/patches/22_kdm_xreset_hook_framework.diff | 2 +-
debian/patches/27_ld_exclude_libs_qtuitools.diff | 18 ---
debian/patches/97_fix_target_link_libraries.diff | 4 +-
debian/patches/99_solid_network_use_ntrack.diff | 17 +--
debian/patches/series | 3 +-
debian/plasma-dataengines-workspace.install | 5 +
debian/plasma-desktop.install | 19 +++
debian/plasma-netbook.install | 14 ++-
debian/plasma-scriptengine-python.install | 2 -
debian/plasma-widgets-workspace.install | 4 +-
debian/rules | 2 +-
debian/systemsettings.install | 32 +++---
debian/systemsettings.lintian-overrides | 2 +-
80 files changed, 905 insertions(+), 603 deletions(-)
diff --cc debian/changelog
index 77315cb,df4c95c..456b1c0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,27 -1,67 +1,91 @@@
+ 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-4) unstable; urgency=low
+
+ [ Frederik Schwarzer ]
+ * Add a patch that doubles the time KDM waits for X to start.
+ (Closes: #524751)
+
+ [ Modestas Vainius ]
+ * Backport oneliner patch which is likely to fix dual head support in plasma
+ (KDE bug #156475).
+ * Add back support for changing RandR settings on KDE startup (patch
+ 29_backport_fix_krandr_support_in_startkde.diff). (Closes: #596473)
+ * Fix kdm.postinst not to fail due to -e mode even if default display manager
+ cannot be found on the system. After all, this behaviour appears to be an
+ intention of the original code as well. (Closes: #585981)
+ * Deprecate 01_plasma_netbook_no_autostart.diff and add
+ 30_plasma_netbook_fix_autostart.diff patch to properly fix issues
+ with autostart of plasma-netbook. The fix is needed for kde-plasma-netbook
+ metapackage to be useful. (Closes: #584905)
+
+ [ Sune Vuorela ]
+ * Fix a bug in 99_solid_network_use_ntrack.diff patch.
+
+ -- Modestas Vainius <modax at debian.org> Wed, 20 Oct 2010 01:06:17 +0300
+
kdebase-workspace (4:4.4.5-3) unstable; urgency=low
[ Sune Vuorela ]
diff --cc debian/patches/series
index dc8f1aa,b37a32c..debe821
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -8,12 -7,8 +8,11 @@@
12_be_better_at_honouring_user_kdm_theming.diff
13_kdm_override_docs.diff
20_use_dejavu_as_default_font.diff
- 21_kdm_doesnt_use_kstandarddirs.diff
+ 21_place_global_config_in_etc.diff
22_kdm_xreset_hook_framework.diff
26_run_kaboom_when_starting_kde.diff
+28_backport_bug156475_dualhead_support.diff
+29_backport_fix_krandr_support_in_startkde.diff
+30_plasma_netbook_fix_autostart.diff
97_fix_target_link_libraries.diff
- 27_ld_exclude_libs_qtuitools.diff
99_solid_network_use_ntrack.diff
--
KDE Base Workspace module packaging
More information about the pkg-kde-commits
mailing list