unity-2d

Merge lp:~didrocks/unity-2d/common-and-package-cleaning into lp:unity-2d

  1. common-and-package-cleaning
  2. Merge into trunk
Proposed by Didier Roche-Tolomelli
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 972
Merged at revision: 974
Proposed branch: lp:~didrocks/unity-2d/common-and-package-cleaning
Merge into: lp:unity-2d
Diff against target: 199 lines (+40/-32)
7 files modified
CMakeLists.txt (+0/-5)
data/unity-2d.convert (+0/-4)
debian/changelog (+17/-0)
debian/control (+21/-4)
debian/unity-2d-common.install.in (+0/-1)
debian/unity-2d-common.triggers.in (+2/-2)
debian/unity-2d.preinst (+0/-16)
To merge this branch: bzr merge lp:~didrocks/unity-2d/common-and-package-cleaning
Reviewer Review Type Date Requested Status
Gerry Boland (community) Approve
Review via email: mp+96610@code.launchpad.net

Description of the change

Add an unity-2d-common package containing schemas and other files to fix
(LP: #925457).

Also, do a lot of packaging cleaning, some trigger fixes…

To post a comment you must log in.
Revision history for this message
Gerry Boland (gerboland) wrote :

Beautiful, tested on clean install and customised install, works perfectly.
Many thanks Didier!

review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity-2d/188/console reported an error when processing this lp:~didrocks/unity-2d/common-and-package-cleaning branch.
Not merging it.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2012-03-05 14:04:05 +0000
+++ CMakeLists.txt 2012-03-08 16:48:44 +0000
@@ -53,10 +53,8 @@
53# GSettings schemas53# GSettings schemas
54pkg_check_modules(GLIB REQUIRED glib-2.0)54pkg_check_modules(GLIB REQUIRED glib-2.0)
55set (UNITY_2D_SCHEMAS "com.canonical.Unity2d.gschema.xml")55set (UNITY_2D_SCHEMAS "com.canonical.Unity2d.gschema.xml")
56set (UNITY_2D_GCONF_CONVERT "unity-2d.convert")
57set (GSETTINGS_DIR "${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas/")56set (GSETTINGS_DIR "${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas/")
58set (UNITY_2D_SCHEMA_FILE "${GSETTINGS_DIR}${UNITY_2D_SCHEMAS}")57set (UNITY_2D_SCHEMA_FILE "${GSETTINGS_DIR}${UNITY_2D_SCHEMAS}")
59set (GCONF_CONVERT_DIR "${CMAKE_INSTALL_PREFIX}/share/GConf/gsettings")
60execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} gio-2.0 --variable glib_compile_schemas OUTPUT_VARIABLE GLIB_COMPILE_SCHEMAS OUTPUT_STRIP_TRAILING_WHITESPACE)58execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} gio-2.0 --variable glib_compile_schemas OUTPUT_VARIABLE GLIB_COMPILE_SCHEMAS OUTPUT_STRIP_TRAILING_WHITESPACE)
6159
62# Run the schemas validator and error if it fails60# Run the schemas validator and error if it fails
@@ -74,9 +72,6 @@
7472
75configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h @ONLY)73configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h @ONLY)
7674
77# Install GConf to GSettings conversion file
78install (FILES ${UNITY_2D_DATA_DIR}/${UNITY_2D_GCONF_CONVERT} DESTINATION ${GCONF_CONVERT_DIR})
79
80include_directories(75include_directories(
81 ${CMAKE_BINARY_DIR}76 ${CMAKE_BINARY_DIR}
82 ${QT_INCLUDE_DIR}77 ${QT_INCLUDE_DIR}
8378
=== removed file 'data/unity-2d.convert'
--- data/unity-2d.convert 2012-01-24 12:49:13 +0000
+++ data/unity-2d.convert 1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
1[com.canonical.Unity2d.Launcher]
2super-key-enable = /desktop/unity-2d/launcher/super_key_enable
3hide-mode = /desktop/unity-2d/launcher/hide_mode
4
50
=== modified file 'debian/changelog'
--- debian/changelog 2012-03-07 17:49:48 +0000
+++ debian/changelog 2012-03-08 16:48:44 +0000
@@ -3,6 +3,23 @@
3 * debian/unity-2d.gconf-defaults:3 * debian/unity-2d.gconf-defaults:
4 - removed: not used anymore and causing regression with hide-mode=24 - removed: not used anymore and causing regression with hide-mode=2
5 by default, converted to the gsettings key (LP: #942772)5 by default, converted to the gsettings key (LP: #942772)
6 * debian/unity-2d.preinst:
7 - removed, was a natty -> oneiric transition
8 * debian/control, debian/unity-2d-common.install:
9 - create unity-2d-common and make some packages depending on it
10 - move some files from unity-2d package to unity-2d-common
11 (gsettings and apport hook) to have packaging shipping their schema
12 (LP: #925457)
13 * debian/unity-2d-common.install.in:
14 - no more gconf -> gsettings migration shipped
15 * debian/unity-2d.postinst, prerm, trigger:
16 - moved to unity-2d-common new package, to ensure even people uninstalling
17 unity-2d got the right metacity configuration in the session
18 - update the trigger to the correct directory
19 * debian/control:
20 - bump to latest Standards-Version
21 - fix some too long description
22 - put the transitional packages in the oldlibs/extra section
623
7 -- Didier Roche <didrocks@ubuntu.com> Wed, 07 Mar 2012 18:43:46 +010024 -- Didier Roche <didrocks@ubuntu.com> Wed, 07 Mar 2012 18:43:46 +0100
825
926
=== modified file 'debian/control'
--- debian/control 2012-03-02 12:33:31 +0000
+++ debian/control 2012-03-08 16:48:44 +0000
@@ -26,7 +26,7 @@
26 libnux-2.0-dev (>= 2.4),26 libnux-2.0-dev (>= 2.4),
27 libxi-dev,27 libxi-dev,
28 libxtst-dev,28 libxtst-dev,
29Standards-Version: 3.9.229Standards-Version: 3.9.3
30Vcs-Bzr: https://code.launchpad.net/~unity-2d-team/unity-2d/trunk30Vcs-Bzr: https://code.launchpad.net/~unity-2d-team/unity-2d/trunk
3131
32Package: unity-2d32Package: unity-2d
@@ -42,13 +42,14 @@
42 offer a session called Unity 2D in your login manager.42 offer a session called Unity 2D in your login manager.
43 .43 .
44 Unity 2D is designed to run smoothly without any graphics acceleration.44 Unity 2D is designed to run smoothly without any graphics acceleration.
45 .
46 This metapackage will install all required unity-2d components.
4547
46Package: libunity-2d-private048Package: libunity-2d-private0
47Section: libs49Section: libs
48Architecture: any50Architecture: any
49Depends: ${shlibs:Depends},51Depends: ${shlibs:Depends},
50 ${misc:Depends},52 ${misc:Depends},
51 unity-common,
52Description: Unity 2D shared library53Description: Unity 2D shared library
53 This library is used to host common code used by several Unity 2D components54 This library is used to host common code used by several Unity 2D components
54 It is only used internally, there is no use case for it outside of the unity-2d55 It is only used internally, there is no use case for it outside of the unity-2d
@@ -73,6 +74,8 @@
7374
74Package: unity-2d-launcher75Package: unity-2d-launcher
75Architecture: all76Architecture: all
77Section: oldlibs
78Priority: extra
76Depends: ${misc:Depends},79Depends: ${misc:Depends},
77 unity-2d-shell,80 unity-2d-shell,
78Description: Transitional package for unity-2d-launcher81Description: Transitional package for unity-2d-launcher
@@ -83,6 +86,7 @@
83Architecture: any86Architecture: any
84Depends: ${shlibs:Depends},87Depends: ${shlibs:Depends},
85 ${misc:Depends},88 ${misc:Depends},
89 unity-2d-common (= ${source:Version}),
86 libunity-2d-private0 (= ${binary:Version}),90 libunity-2d-private0 (= ${binary:Version}),
87Provides: indicator-renderer91Provides: indicator-renderer
88Recommends: indicator-application,92Recommends: indicator-application,
@@ -98,6 +102,8 @@
98102
99Package: unity-2d-places103Package: unity-2d-places
100Architecture: all104Architecture: all
105Section: oldlibs
106Priority: extra
101Depends: ${misc:Depends},107Depends: ${misc:Depends},
102 unity-2d-shell,108 unity-2d-shell,
103Description: Transitional package for unity-2d-places109Description: Transitional package for unity-2d-places
@@ -108,6 +114,7 @@
108Architecture: any114Architecture: any
109Depends: ${shlibs:Depends},115Depends: ${shlibs:Depends},
110 ${misc:Depends},116 ${misc:Depends},
117 unity-2d-common (= ${source:Version}),
111 libunity-2d-private0 (= ${binary:Version}),118 libunity-2d-private0 (= ${binary:Version}),
112 libqt4-svg119 libqt4-svg
113Description: Unity 2D Spread120Description: Unity 2D Spread
@@ -120,6 +127,7 @@
120Architecture: any127Architecture: any
121Depends: ${shlibs:Depends},128Depends: ${shlibs:Depends},
122 ${misc:Depends},129 ${misc:Depends},
130 unity-2d-common (= ${source:Version}),
123 unity-asset-pool,131 unity-asset-pool,
124 libunity-2d-private0 (= ${binary:Version}),132 libunity-2d-private0 (= ${binary:Version}),
125 libqt4-svg,133 libqt4-svg,
@@ -137,14 +145,23 @@
137 * Dash: an overlay over the desktop to provide quick access to145 * Dash: an overlay over the desktop to provide quick access to
138 various categories of applications.146 various categories of applications.
139 * Launcher: displays in a panel at the left of the screen a list of running147 * Launcher: displays in a panel at the left of the screen a list of running
140 and favorite applications as well as highlighting their notifications.148 and favorite applications as well as highlighting their
149 notifications.
150
151Package: unity-2d-common
152Architecture: all
153Depends: ${misc:Depends},
154Replaces: unity-2d (<< 5.6.0-0ubuntu2)
155Description: Common files for Unity 2D Shell
156 This is part of Unity 2D and contains the common files needed by multiple
157 components of it.
141158
142Package: unity-2d-dbg159Package: unity-2d-dbg
143Architecture: any160Architecture: any
144Section: debug161Section: debug
145Priority: extra162Priority: extra
146Depends:163Depends:
147 unity-2d (= ${binary:Version}),164 unity-2d (= ${source:Version}),
148 ${misc:Depends}165 ${misc:Depends}
149Description: Debugging symbols for unity-2d166Description: Debugging symbols for unity-2d
150 The Unity 2D interface installs a fully usable 2D session and provides the 167 The Unity 2D interface installs a fully usable 2D session and provides the
151168
=== renamed file 'debian/unity-2d.install.in' => 'debian/unity-2d-common.install.in'
--- debian/unity-2d.install.in 2011-11-09 22:26:57 +0000
+++ debian/unity-2d-common.install.in 2012-03-08 16:48:44 +0000
@@ -4,4 +4,3 @@
4debian/20_ubuntu-2d-gconf-default @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/gconf/ubuntu-2d/default4debian/20_ubuntu-2d-gconf-default @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/gconf/ubuntu-2d/default
5@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/locale/*/LC_MESSAGES/unity-2d.mo5@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/locale/*/LC_MESSAGES/unity-2d.mo
6@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/glib-2.0/schemas/com.canonical.Unity2d.gschema.xml6@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/glib-2.0/schemas/com.canonical.Unity2d.gschema.xml
7@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/GConf/gsettings
87
=== renamed file 'debian/unity-2d.postinst.in' => 'debian/unity-2d-common.postinst.in'
=== renamed file 'debian/unity-2d.postrm.in' => 'debian/unity-2d-common.postrm.in'
=== renamed file 'debian/unity-2d.triggers.in' => 'debian/unity-2d-common.triggers.in'
--- debian/unity-2d.triggers.in 2011-11-09 22:54:40 +0000
+++ debian/unity-2d-common.triggers.in 2012-03-08 16:48:44 +0000
@@ -1,2 +1,2 @@
1interest @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/gconf/unity-2d/default1interest @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/gconf/ubuntu-2d/default
2interest @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/gconf/unity-2d/mandatory2interest @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/gconf/ubuntu-2d/mandatory
33
=== removed file 'debian/unity-2d.preinst'
--- debian/unity-2d.preinst 2011-05-26 11:13:11 +0000
+++ debian/unity-2d.preinst 1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
1#!/bin/sh
2set -e
3
4case "$1" in
5 install|upgrade)
6 if dpkg --compare-versions "$2" le "3.8.6-0ubuntu1"; then
7 if [ -d /var/lib/gconf/unity-2d.mandatory ]; then
8 mv /var/lib/gconf/unity-2d.mandatory /var/lib/gconf/ubuntu-2d.mandatory || true
9 mv /var/lib/gconf/unity-2d.default /var/lib/gconf/ubuntu-2d.default || true
10 fi
11 fi
12 ;;
13esac
14
15#DEBHELPER#
16

Subscribers

People subscribed via source and target branches