[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.4.5-9-133-g20bd1b6

José Manuel Santamaría Lema santa-guest at alioth.debian.org
Sun Apr 24 11:24:01 UTC 2011


The following commit has been merged in the master branch:
commit 2eb43fff3e6f03ee29f68d057a0d3976b988aae2
Merge: f448323aa635ff6fc03c37ad16cfea25896252f5 aebe6d3c2e5099205bdfe0ba0c7116d8a6a5a43d
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Sun Apr 24 11:44:52 2011 +0200

    Merge branch 'kde4.4'
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/patches/series

 debian/changelog                                  |   16 +++-
 debian/patches/initialize_variables_crashfix.diff |  100 +++++++++++++++++++++
 debian/patches/series                             |    1 +
 3 files changed, 115 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index aad394f,cc31c4d..7248fed
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,162 -1,16 +1,174 @@@
 +kdebase-workspace (4:4.6.2-0r1) UNRELEASED; urgency=low
 +
 +  * New upstream release:
 +    - adds authorization support to the login manager configuration module
 +      (Closes: #523094)
 +    - fixes unresponsive Plasma desktop while editing device actions
 +      (Closes: #597635)
 +    - makes example host names in KDM configuration file more neutral
 +      (Closes: #439781)
 +    - removes Plasma zooming user interface. (Closes: #523524)
 +    - fixes broken web shortcuts in krunner (Closes: #529861)
 +    - adjusts strict geometry policies in kwin (Closes: #564800)
 +    - limits the number of power profiles shown at the same time
 +      (Closes: #577475)
 +    - fixes missing shutdown and restart functionality in gdm 2.21+
 +      (Closes: #581841)
 +    - fixes Plasma digital clock widget not using locale date format
 +      (Closes: #524055)
 +    - fixes long application startup delays in krunner (Closes: #597111)
 +    - fixes font defaults in kdmrc (Closes: #605714)
 +  * Update installed files.
 +  * Update symbol files.
 +  * Refresh patches.
 +  * Update lintian overrides.
 +
 +  [ 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
 +  * 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.6.
 +  * 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.
 +
 +  [ José Manuel Santamaría Lema ]
 +  * 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
++    - ftbfs_remove_notify.diff - applied upstream
 +  * Refreshed patches:
 +    - 30_plasma_netbook_fix_autostart.diff
 +  * TODO:
 +    - 31_kdm_vt_switching_on_kfreebsd.diff - should be refreshed/reworked
 +  * Rename libweather-ion4a as libweather-ion6 due to soname bump.
 +  * Remove plasma-scriptengine-qedje package.
-   * Add build dependencies:
-     - libqtwebkit-dev
 +  * Bump kde-sc-dev-latest build dependency to 4:4.6.2.
 +  * Bump S-V to 3.9.1; updated Breaks/Replaces/Conflicts.
 +  * Remove starting articles in short descriptions.
 +  * Fix mispelling in plasma-scriptengine-googlegadgets long description.
 +  * Add myself to Uploaders.
 +
 +  [ Pino Toscano]
 +  * Remove unused build dependencies:
 +    - libqedje-dev
 +    - libbluetooth-dev
 +    - libntrack-qt4-dev
 +  * Add build dependencies:
 +    - libdmtx-dev
 +  * Make kdebase-workspace-bin recommend upower on Linux archs,
 +    for power management.
 +  * Use wildcard architectures:
 +    - !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 -> linux-any
 +    - kfreebsd-i386 kfreebsd-amd64 -> kfreebsd-any
 +
 +  [ Modestas Vainius ]
 +  * Remove README.Debian introduced in 4.4.5-6, no longer applicable.
 +  * Drop 34_backport_krunner_crash_fix_threading.diff patch, it was stolen from
 +    upstream.
 +  * Replace /usr/share/common-licenses/BSD with verbatim license text.
 +  * Switch debian/rules engine to dhmk based qt-kde-team/2/*.
 +  * Disable testsuite.
 +  * Require debhelper 7.2.7~.
 +  * Remove executable permissions from klipper.desktop.
 +  * Override plasma-desktop: postinst-must-call-ldconfig usr/lib/libkickoff.so.
 +  * Enable DebianABIManager:
 +    - include DebianABIManager.cmake at the bottom of the main CMakeLists.txt
 +      (patch enable_debianabimanager.diff);
 +    - debian/control: managing all non-local unstable-BC libraries (all lib*
 +      packages but libplasmagenericshell4);
 +    - rename and modify install files of those packages that got ABI: 1;
 +    - remove lintian-overrides for those packages that got ABI: 1 - no longer
 +      needed;
 +    - rewrite symbol files of affected libraries:
 +      + set versions of all symbols to 4:4.6.1;
 +      + replace @Base with appropriate @ABI string;
 +      + restart symbol confirmation process at 4:4.6.1;
 +    - ABI-0 library packages:
 +      + libkdecorations4;
 +      + libkscreensaver5;
 +      + libksgrd4;
 +      + libksignalplotter4;
 +      + libkworkspace4;
 +      + liblsofui4;
 +      + libplasma-geolocation-interface4;
 +      + libprocessui4a;
 +      + libweather-ion6;
 +    - ABI-1 library packages:
 +      + libkwineffects1abi1;
 +      + libkephal4abi1;
 +      + libplasmaclock4abi1;
 +      + libprocesscore4abi1;
 +      + libsolidcontrol4abi1;
 +      + libsolidcontrolifaces4abi1;
 +      + libtaskmanager4abi1.
 +  * Add symbol file for libweather-ion6.
 +  * Strip sequence numbers from the debian/patches/*.
 +  * Drop kaboom support: remove depend and run_kaboom_when_starting_kde.diff
 +    patch.
 +  * Add kdebase-runtime-dbg (<< 4:4.5) to kdebase-workspace-dbg
 +    Replaces/Breaks due to moved oxygen style plugin.
 +  * Make plasma-desktop Break pre-4.6 plasma-widget-networkmanagement. Symbol
 +    clashes (from libsolidcontrol4) cause a crash.
 +  * Do not bother about shlibs anymore: remove -V from the generic
 +    dh_makeshlibs call.
 +  * Clean up Replaces/Breaks which predate squeeze and can be removed.
 +
 + -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 06 Apr 2011 20:47:32 +0300
 +
+ kdebase-workspace (4:4.4.5-9) unstable; urgency=high
+ 
+   [ José Manuel Santamaría Lema ]
+   * Add ftbfs_remove_notify.diff to avoid FTBFS with Qt 4.7 (Closes: #618073)
+   * Build depend on libqtwebkit-dev.
+ 
+   [ Modestas Vainius ]
+   * Add initialize_variables_crashfix.diff patch which initializes some
+     variables in order to avoid kded crash with dbus 1.4.8. (Closes: #623492)
+   * Urgency=high because #623492 makes KDE desktop unusable.
+ 
+  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 22 Apr 2011 16:05:31 +0300
+ 
  kdebase-workspace (4:4.4.5-8) unstable; urgency=high
  
    * Backport 33_backport_krunner_crash_fix_threading.diff patch from 4.5.0 to
diff --cc debian/patches/series
index b5822a2,9d4e03e..5ffad7e
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,16 -1,25 +1,17 @@@
 -02_kdm_double_servertimeout.diff
 -06_kdm_does_not_wreak_havoc.diff
 -07_kdmrc_defaults.diff
 -08_genkdmconf.diff
 -09_genkdm_make.diff
 -10_kdm_no_custom.diff
 -11_kdm_X_path.diff
 -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
 -22_kdm_xreset_hook_framework.diff
 -26_run_kaboom_when_starting_kde.diff
 -27_ld_exclude_libs_qtuitools.diff
 -28_backport_bug156475_dualhead_support.diff
 -29_backport_fix_krandr_support_in_startkde.diff
 -30_plasma_netbook_fix_autostart.diff
 -31_kdm_vt_switching_on_kfreebsd.diff
 -32_ksmserver_fadeeffect_use_sse2_free.diff
 -33_qguiplatformplugin_kde_NULL_check.diff
 -34_backport_krunner_crash_fix_threading.diff
 -97_fix_target_link_libraries.diff
 -99_solid_network_use_ntrack.diff
 -ftbfs_remove_notify.diff
 +kdm_does_not_wreak_havoc.diff
 +kdmrc_defaults.diff
 +genkdmconf.diff
 +genkdm_make.diff
 +kdm_no_custom.diff
 +kdm_X_path.diff
 +be_better_at_honouring_user_kdm_theming.diff
 +kdm_override_docs.diff
 +use_dejavu_as_default_font.diff
 +place_global_config_in_etc.diff
 +kdm_xreset_hook_framework.diff
 +plasma_netbook_fix_autostart.diff
 +ksmserver_fadeeffect_use_sse2_free.diff
 +qguiplatformplugin_kde_NULL_check.diff
 +fix_target_link_libraries.diff
 +enable_debianabimanager.diff
+ initialize_variables_crashfix.diff

-- 
KDE Base Workspace module packaging



More information about the pkg-kde-commits mailing list