~ubuntu-branches/debian/wheezy/kde-workspace/wheezy

« back to all changes in this revision

Viewing changes to debian/patches/kdm_no_custom.diff

  • Committer: Package Import Robot
  • Author(s): Debian Qt/KDE Maintainers, José Manuel Santamaría Lema, Sune Vuorela, Pino Toscano
  • Date: 2011-12-03 10:44:18 UTC
  • Revision ID: package-import@ubuntu.com-20111203104418-574y0gk3lqobev98
Tags: 4:4.7.2-1
* New upstream release.

[ José Manuel Santamaría Lema ]
* Bump kde-sc-dev-latest build dependency to 4:4.7.2.
* Bump kdelibs5-dev build dependency to 4:4.7.
* Bump kdepimlibs5-dev build dependency to 4:4.7.
* Change the source package name from kdebase-workspace to kde-workspace in
  order to match upstream naming.
* Rename the following binary packages to match upstream namimg:
  - kdebase-workspace -> kde-workspace
  - kdebase-workspace-bin -> kde-workspace-bin
  - kdebase-workspace-data -> kde-workspace-data
  - kdebase-workspace-dev -> kde-workspace-dev
  - kdebase-workspace-kgreet-plugins -> kde-workspace-kgreet-plugins
* Manage the kdebase-runtime -> kde-runtime renaming:
  - Exclude kde-runtime instead of kdebase-runtime from dh_shlibdeps results.
  - kde-workspace-dbg depends on kde-runtime-dbg instead of
    kdebase-runtime-dbg.
* Add the following dummy packages (which depend on kde-workspace-*):
  - kdebase-workspace
  - kdebase-workspace-bin
  - kdebase-workspace-dev
  - kdebase-workspace-dbg
* Update Vcs-* fields.
* Update patches:
  - Import plasma_desktop_shell_drop_kactivities.diff from Ubuntu.
  - Remove backport_kwin_multihead_improvements.diff, applied usptream.
  - Remove ksmserver_fadeeffect_use_sse2_free.diff, applied upstream.
  - Remove kwin_avoid_deep_vector_copies.diff, applied upstream.
  - Remove upstream_gpsd-api-has-changed-and-for-GPSD_API_MAJOR_VERSION.patch,
    applied upstream.
  - Refreshed various patches to make them apply without offsets.
* Update build dependencies:
  - Add libgles2-mesa-dev.
  - Add libprison-dev.
  - Replace libpng-dev build depend with libpng12-dev to avoid accidental
    builds against libpng packages in experimental.
* Update installed files.
* Ship Oxygen style in a separate package: kde-style-oxygen. (Closes: #624520)
* Ship kmenuedit in a separate package.
* Bump sonames due to binary incompatible changes:
  - libkwineffects1abi1 -> libkwineffects1abi2
  - libplasmaclock4abi1 -> libplasmaclock4abi2
  - libsolidcontrol4abi1 -> libsolidcontrol4abi2
  - libsolidcontrolifaces4abi1 -> libsolidcontrolifaces4abi2
  - libtaskmanager4abi1 -> libtaskmanager4abi2
* kdebase-workspace-data Breaks/Replaces kde-icons-mono (<< 4:4.6.80).
* Add relationships because of the new, split kde-wallpapers source package:
  - plasma-desktop, plasma-netbook and kdm depend on kde-wallpapers-default.
  - kde-workspace-data recommends kde-wallpapers.
  - kdm suggests kde-wallpapers. 
* Update lintian overrides.

[ Sune Vuorela ]
* Remove libdmtx-dev, not used directly (but thru libprison)

[ Pino Toscano ]
* kdm: recommend kde-workspace instead of kdebase. (Closes: #646787)
* plasma-scriptengine-ruby: depend on ruby-plasma instead of libplasma-ruby.

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
--- a/kdm/kfrontend/kgreeter.cpp
 
2
+++ b/kdm/kfrontend/kgreeter.cpp
 
3
@@ -451,7 +451,6 @@ void
 
4
 KGreeter::putSession(const QString &type, const QString &name, bool hid, const char *exe)
 
5
 {
 
6
     int prio = exe ? (!strcmp(exe, "default") ? 0 :
 
7
-                      !strcmp(exe, "custom") ? 1 :
 
8
                       !strcmp(exe, "failsafe") ? 3 : 2) : 2;
 
9
     for (int i = 0; i < sessionTypes.size(); i++)
 
10
         if (sessionTypes[i].type == type) {
 
11
@@ -480,7 +479,6 @@ KGreeter::insertSessions()
 
12
                             dsk.readEntry("Exec").toLatin1());
 
13
             }
 
14
     putSession("default", i18nc("@item:inlistbox session type", "Default"), false, "default");
 
15
-    putSession("custom", i18nc("@item:inlistbox session type", "Custom"), false, "custom");
 
16
     putSession("failsafe", i18nc("@item:inlistbox session type", "Failsafe"), false, "failsafe");
 
17
     qSort(sessionTypes);
 
18
     for (int i = 0; i < sessionTypes.size() && !sessionTypes[i].hid; i++) {