← Back to branch summary

~ubuntu-branches/ubuntu/quantal/kde4libs/quantal

« back to all changes in this revision

Viewing changes to debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff

  • Committer: Package Import Robot
  • Author(s): Felix Geyer, Philip Muškovac, Jonathan Thomas, Felix Geyer
  • Date: 2011-05-29 17:19:55 UTC
  • mfrom: (1.14.5 upstream) (0.1.19 sid)
  • Revision ID: package-import@ubuntu.com-20110529171955-nodep1593tuwyu6k
Tags: 4:4.6.3-1ubuntu1
[ Philip Muškovac]
* Drop kubuntu_83_fix_solid_network_status.diff
* Update Vcs links as the branch is owned by kubuntu-packagers now

[ Jonathan Thomas ]
* Drop kubuntu_06_user_disk_mounting. We no longer compile the hal
  backend, so this patch is useless.

[ Felix Geyer ]
* Merge from Debian unstable, remaining changes:
  - no build-dep on libaspell-dev
  - no build-dep on libfam-dev
  - kdelibs5-data: don't install kspell_aspell.desktop and
    usr/lib/kde4/kspell_aspell.so
  - kdelibs5-dev: don't install preparetips
  - Pass -DKDESU_USE_SUDO_DEFAULT=true to configure
  - dh_fixperms: exclude /usr/lib/kde4/libexec/fileshareset
  - set export KUBUNTU_DESKTOP_POT=kdelibs
  - don't apply use_dejavu_as_default_font.diff
  - don't apply kconf_update_migrate_from_kde3_icon_theme.diff
    - kdelibs5-data.install: drop usr/share/kde4/apps/kconf_update/kdeui.upd
  - don't build depend on libglu1-mesa-dev, not needed due to
    kubuntu_no_direct_gl_usage.diff
  - Add kdelibs5-data.links: link from /usr/share/doc/kde4 to kde for
    backwards compatible with old docs location
  - Keep the kdelibs5 transitional package
  - kdelibs5-dev.install: install ksambasharedata.h
  - kdelibs5-plugins: recommend ttf-dejavu-core instead of ttf-dejavu to save
    CD space.
* Add Breaks in addition to Replaces for moving files between packages.
* Drop no longer needed Breaks and Replaces.
* Completely drop kubuntu_51_launchpad_integration.diff and
  kubuntu_68_remove_applet_confirmation.diff.
  + Also drop the launchpad and kubuntu icons.
* Remove sequence numbers from kubuntu patches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff
1
 
In the case of config files, we want a local sysadm dir added as well.
2
 
 
3
 
The priorities is as follows:
4
 
 
5
 
 - peoples homedir (.kde4)
6
 
 - for config files, /etc/kde4/
7
 
 - what's defined in KDEDIRS
8
 
 - the default install path.
9
 
 
10
 
With this patch, we can also install all config files into /usr/ as they just can get
11
 
overridden by adding new files to /etc/kde4 by the sysadm.
12
 
 
13
 
Index: kde4libs-4.5.95/kdecore/kernel/kstandarddirs.cpp
14
 
===================================================================
15
 
--- kde4libs-4.5.95.orig/kdecore/kernel/kstandarddirs.cpp       2011-01-04 23:50:41.000000000 -0500
16
 
+++ kde4libs-4.5.95/kdecore/kernel/kstandarddirs.cpp    2011-01-04 23:51:21.000000000 -0500
17
 
@@ -1174,6 +1174,10 @@
18
 
                         if ((local || testdir.exists()) && !candidates.contains(path))
19
 
                             candidates.append(path);
20
 
                     }
21
 
+                    // UGLY HACK - forward porting Chris CHeney's HACK - Rex Dieter
22
 
+                    if ( local && (!strcmp("config", type)))  // local is used as a "homedir marker"
23
 
+                       candidates.append(QLatin1String("/etc/kde4/"));
24
 
+                    //
25
 
                     local = false;
26
 
                 }
27
 
                else