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

Modestas Vainius modax at alioth.debian.org
Sun Jan 2 10:16:26 UTC 2011 

The following commit has been merged in the master branch:
commit 4302ed6b704f66e641bf7d9e45bc359fa8df7a1a
Merge: fbcbd34f0ff307599000cff22db0f9416594e76e e60e4efb0609de3c7b92f5b050686437cc1c4f13
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Jan 2 12:10:40 2011 +0200

    Merge branch 'squeeze'
    
    Conflicts:
    	debian/kdebase-workspace-bin.install
    	debian/kdebase-workspace-bin.install.linux

 debian/README.Debian                       |   32 ++++++++++++++++++++++++++++
 debian/changelog                           |   13 +++++++++++
 debian/kdebase-workspace-bin.install       |    1 +
 debian/kdebase-workspace-bin.install.linux |    1 -
 debian/rules                               |    3 ++
 5 files changed, 49 insertions(+), 1 deletions(-)

diff --cc debian/changelog
index 075487d,9b9a5eb..a615091
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,95 -1,16 +1,108 @@@
 +kdebase-workspace (4:4.5.90-0r1) 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.
 +
 +  [ José Manuel Santamaría Lema ]
 +  * Refreshed patches:
 +    - 06_kdm_does_not_wreak_havoc.diff
 +    - 07_kdmrc_defaults.diff
 +    - 08_genkdmconf.diff
 +    - 09_genkdm_make.diff
 +    - 10_kdm_no_custom.diff
 +    - 12_be_better_at_honouring_user_kdm_theming.diff
 +    - 21_place_global_config_in_etc.diff
 +    - 33_qguiplatformplugin_kde_NULL_check.diff
 +    - 97_fix_target_link_libraries.diff
 +  * Dropped patches:
 +    - 02_kdm_double_servertimeout.diff - applied upstream
 +    - 28_backport_bug156475_dualhead_support.diff - applied upstream
 +    - 29_backport_fix_krandr_support_in_startkde.diff - applied upstream
 +    - 99_solid_network_use_ntrack.diff - applied upstream
 +  * TODO:
 +    - 30_plasma_netbook_fix_autostart.diff - check if the issue still exists
 +    - 31_kdm_vt_switching_on_kfreebsd.diff - should be refreshed/reworked
 +  * Update installed files.
 +  * Rename libweather-ion4a as libweather-ion6.
 +  * Remove plasma-scriptengine-qedje package.
 +
 +  [ Pino Toscano]
 +  * Remove unused build dependencies:
 +    - libqedje-dev
 +    - libbluetooth-dev
 +
 + -- 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-6) unstable; urgency=medium
+ 
+   [ Pino Toscano ]
+   * Move the solid servicetypes from kdebase-workspace-bin.install.linux to
+     kdebase-workspace-bin.install. (Closes: #608541)
+ 
+   [ Modestas Vainius ]
+   * Document a workaround for the "dark taskbar" bug in README.Debian. The real
+     fix is in KDE SC 4.5 or later. However, regardless, I think this change
+     closes: #564941.
+ 
+  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 02 Jan 2011 01:48:18 +0200
+ 
  kdebase-workspace (4:4.4.5-5) unstable; urgency=medium
  
    [ Modestas Vainius ]
diff --cc debian/kdebase-workspace-bin.install
index 89b9bfa,9d04d90..c48f72c
--- a/debian/kdebase-workspace-bin.install
+++ b/debian/kdebase-workspace-bin.install
@@@ -227,12 -182,10 +227,13 @@@ usr/share/kde4/services/solidbackends/s
  usr/share/kde4/services/standard_actions.desktop
  usr/share/kde4/services/workspaceoptions.desktop
  usr/share/kde4/services/xinerama.desktop
 +usr/share/kde4/servicetypes/plasma_shareprovider.desktop
 +usr/share/kde4/servicetypes/powerdevilaction.desktop
  usr/share/kde4/servicetypes/screensaver.desktop
  usr/share/kde4/servicetypes/solid-device-type.desktop
 -usr/share/kde4/servicetypes/solidbluetoothmanager.desktop
 +usr/share/kde4/servicetypes/solidmodemmanager.desktop
+ usr/share/kde4/servicetypes/solidnetworkmanager.desktop
 -usr/share/kde4/servicetypes/solidpowermanager.desktop
  usr/share/kde4/servicetypes/solidremotecontrolmanager.desktop
  usr/share/man/man1/plasmaengineexplorer.1
 +usr/share/man/man1/plasmapkg.1
 +usr/share/man/man1/plasmoidviewer.1
diff --cc debian/kdebase-workspace-bin.install.linux
index f2ecb06,9c07a8b..bbafe12
--- a/debian/kdebase-workspace-bin.install.linux
+++ b/debian/kdebase-workspace-bin.install.linux
@@@ -1,8 -1,13 +1,7 @@@
 -usr/bin/solid-bluetooth
  usr/bin/solid-network
 -usr/bin/solid-powermanagement
  usr/lib/kde4/kcm_joystick.so
 -usr/lib/kde4/kded_networkstatus.so
 -usr/lib/kde4/solid_bluez.so
 -usr/lib/kde4/solid_hal_power.so
 +usr/lib/kde4/solid_modemmanager04.so
  usr/lib/kde4/solid_networkmanager07.so
  usr/share/kde4/services/joystick.desktop
 -usr/share/kde4/services/kded/networkstatus.desktop
 -usr/share/kde4/services/solidbackends/solid_bluez.desktop
 -usr/share/kde4/services/solidbackends/solid_hal_power.desktop
 +usr/share/kde4/services/solidbackends/solid_modemmanager04.desktop
  usr/share/kde4/services/solidbackends/solid_networkmanager07.desktop
- usr/share/kde4/servicetypes/solidnetworkmanager.desktop

-- 
KDE Base Workspace module packaging

More information about the pkg-kde-commits mailing list