Unity

Merge lp:~didrocks/unity/fix-unity-distro-rollback into lp:unity

  1. fix-unity-distro-rollback
  2. Merge into trunk
Proposed by Didier Roche-Tolomelli
Status: Merged
Approved by: Gord Allott
Approved revision: no longer in the source branch.
Merged at revision: 1543
Proposed branch: lp:~didrocks/unity/fix-unity-distro-rollback
Merge into: lp:unity
Diff against target: 36 lines (+17/-7)
1 file modified
tools/unity.cmake (+17/-7)
To merge this branch: bzr merge lp:~didrocks/unity/fix-unity-distro-rollback
Reviewer Review Type Date Requested Status
Unity Team Pending
Review via email: mp+74986@code.launchpad.net

Description of the change

update unity --distro to latest installed files (LP: #847799)

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tools/unity.cmake'
2--- tools/unity.cmake 2011-09-05 08:39:17 +0000
3+++ tools/unity.cmake 2011-09-12 13:03:11 +0000
4@@ -31,15 +31,25 @@
5 home_dir = os.path.expanduser("~%s" % os.getenv("SUDO_USER"))
6 supported_prefix = "/usr/local"
7
8-well_known_local_path = ("%s/share/unity" % supported_prefix,
9- "%s/share/ccsm/icons/*/*/*/*unity*" % supported_prefix,
10- "%s/share/locale/*/LC_MESSAGES/*unity*" % supported_prefix,
11+well_known_local_path = ("%s/share/locale/*/LC_MESSAGES/*unity*" % supported_prefix,
12+ "%s/share/man/man1/*unity*" % supported_prefix,
13+ "%s/lib/*unity*" % supported_prefix,
14+ "%s/share/dbus-1/services/*Unity*" % supported_prefix,
15+ "%s/bin/*unity*" % supported_prefix,
16+ "%s/include/Unity*" % supported_prefix;
17+ "%s/lib/pkgconfig/unity*" % supported_prefix,
18+ "%s/.compiz-1/*/*gtkloader*" % home_dir,
19+ "%s/.config/compiz-1/gsettings/schemas/*gtkloader*" % home_dir,
20+ "%s/.gconf/schemas/*gtkloader*" % home_dir,
21+ "%s/.compiz-1/*/*networkarearegion*" % home_dir,
22+ "%s/.config/compiz-1/gsettings/schemas/*networkarearegion*" % home_dir,
23+ "%s/.gconf/schemas/*networkarearegion*" % home_dir,
24 "%s/.compiz-1/*/*unity*" % home_dir,
25+ "%s/.config/compiz-1/gsettings/schemas/*unity*" % home_dir,
26 "%s/.gconf/schemas/*unity*" % home_dir,
27- "%s/lib/*unity*" % supported_prefix,
28- "%s/share/dbus-1/services/*Unity*" % supported_prefix,
29- "%s/bin/*unity*" % supported_prefix,
30- "%s/share/man/man1/*unity*" % supported_prefix,
31+ "%s/share/ccsm/icons/*/*/*/*unity*" % supported_prefix,
32+ "%s/share/unity" % supported_prefix,
33+ "%s/.compiz-1/unity*" % home_dir,
34 "%s/lib/*nux*" % supported_prefix,
35 "%s/lib/pkgconfig/nux*" % supported_prefix,
36 "%s/include/Nux*" % supported_prefix