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

[Didier Roche]

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…

[Gerry Boland (gerboland)]

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

review: Approve

[Unity Merger (unity-merger)]

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.

=== 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 @@
 # GSettings schemas
 pkg_check_modules(GLIB REQUIRED glib-2.0)
 set (UNITY_2D_SCHEMAS "com.canonical.Unity2d.gschema.xml")
-set (UNITY_2D_GCONF_CONVERT "unity-2d.convert")
 set (GSETTINGS_DIR "${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas/")
 set (UNITY_2D_SCHEMA_FILE "${GSETTINGS_DIR}${UNITY_2D_SCHEMAS}")
-set (GCONF_CONVERT_DIR "${CMAKE_INSTALL_PREFIX}/share/GConf/gsettings")
 execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} gio-2.0 --variable glib_compile_schemas  OUTPUT_VARIABLE GLIB_COMPILE_SCHEMAS OUTPUT_STRIP_TRAILING_WHITESPACE)
 
 # Run the schemas validator and error if it fails
@@ -74,9 +72,6 @@
 
 configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h @ONLY)
 
-# Install GConf to GSettings conversion file
-install (FILES ${UNITY_2D_DATA_DIR}/${UNITY_2D_GCONF_CONVERT} DESTINATION ${GCONF_CONVERT_DIR})
-
 include_directories(
     ${CMAKE_BINARY_DIR}
     ${QT_INCLUDE_DIR}

=== 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 @@
-[com.canonical.Unity2d.Launcher]
-super-key-enable = /desktop/unity-2d/launcher/super_key_enable
-hide-mode = /desktop/unity-2d/launcher/hide_mode
-

=== 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 @@
   * debian/unity-2d.gconf-defaults:
     - removed: not used anymore and causing regression with hide-mode=2
       by default, converted to the gsettings key (LP: #942772)
+  * debian/unity-2d.preinst:
+    - removed, was a natty -> oneiric transition
+  * debian/control, debian/unity-2d-common.install:
+    - create unity-2d-common and make some packages depending on it
+    - move some files from unity-2d package to unity-2d-common
+      (gsettings and apport hook) to have packaging shipping their schema
+      (LP: #925457)
+  * debian/unity-2d-common.install.in:
+    - no more gconf -> gsettings migration shipped
+  * debian/unity-2d.postinst, prerm, trigger:
+    - moved to unity-2d-common new package, to ensure even people uninstalling
+      unity-2d got the right metacity configuration in the session
+    - update the trigger to the correct directory
+  * debian/control:
+    - bump to latest Standards-Version
+    - fix some too long description
+    - put the transitional packages in the oldlibs/extra section
 
  -- Didier Roche <[e-mail]>  Wed, 07 Mar 2012 18:43:46 +0100
 

=== 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 @@
                libnux-2.0-dev (>= 2.4),
                libxi-dev,
                libxtst-dev,
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Vcs-Bzr: https://code.launchpad.net/~unity-2d-team/unity-2d/trunk
 
 Package: unity-2d
@@ -42,13 +42,14 @@
  offer a session called Unity 2D in your login manager.
  .
  Unity 2D is designed to run smoothly without any graphics acceleration.
+ .
+ This metapackage will install all required unity-2d components.
 
 Package: libunity-2d-private0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         unity-common,
 Description: Unity 2D shared library
  This library is used to host common code used by several Unity 2D components
  It is only used internally, there is no use case for it outside of the unity-2d
@@ -73,6 +74,8 @@
 
 Package: unity-2d-launcher
 Architecture: all
+Section: oldlibs
+Priority: extra
 Depends: ${misc:Depends},
          unity-2d-shell,
 Description: Transitional package for unity-2d-launcher
@@ -83,6 +86,7 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
+         unity-2d-common (= ${source:Version}),
          libunity-2d-private0 (= ${binary:Version}),
 Provides: indicator-renderer
 Recommends: indicator-application,
@@ -98,6 +102,8 @@
 
 Package: unity-2d-places
 Architecture: all
+Section: oldlibs
+Priority: extra
 Depends: ${misc:Depends},
          unity-2d-shell,
 Description: Transitional package for unity-2d-places
@@ -108,6 +114,7 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
+         unity-2d-common (= ${source:Version}),
          libunity-2d-private0 (= ${binary:Version}),
          libqt4-svg
 Description: Unity 2D Spread
@@ -120,6 +127,7 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
+         unity-2d-common (= ${source:Version}),
          unity-asset-pool,
          libunity-2d-private0 (= ${binary:Version}),
          libqt4-svg,
@@ -137,14 +145,23 @@
  * Dash: an overlay over the desktop to provide quick access to
          various categories of applications.
  * Launcher: displays in a panel at the left of the screen a list of running
-             and favorite applications as well as highlighting their notifications.
+             and favorite applications as well as highlighting their
+             notifications.
+
+Package: unity-2d-common
+Architecture: all
+Depends: ${misc:Depends},
+Replaces: unity-2d (<< 5.6.0-0ubuntu2)
+Description: Common files for Unity 2D Shell
+ This is part of Unity 2D and contains the common files needed by multiple
+ components of it.
 
 Package: unity-2d-dbg
 Architecture: any
 Section: debug
 Priority: extra
 Depends:
-    unity-2d (= ${binary:Version}),
+    unity-2d (= ${source:Version}),
     ${misc:Depends}
 Description: Debugging symbols for unity-2d
  The Unity 2D interface installs a fully usable 2D session and provides the 

=== 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 @@
 debian/20_ubuntu-2d-gconf-default @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/gconf/ubuntu-2d/default
 @DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/locale/*/LC_MESSAGES/unity-2d.mo
 @DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/glib-2.0/schemas/com.canonical.Unity2d.gschema.xml
-@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/GConf/gsettings

=== 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 @@
-interest @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/gconf/unity-2d/default
-interest @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/gconf/unity-2d/mandatory
+interest @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/gconf/ubuntu-2d/default
+interest @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/gconf/ubuntu-2d/mandatory

=== 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 @@
-#!/bin/sh
-set -e
-
-case "$1" in
-  install|upgrade)
-    if dpkg --compare-versions "$2" le "3.8.6-0ubuntu1"; then
-        if [ -d /var/lib/gconf/unity-2d.mandatory ]; then
-          mv /var/lib/gconf/unity-2d.mandatory /var/lib/gconf/ubuntu-2d.mandatory || true
-          mv /var/lib/gconf/unity-2d.default /var/lib/gconf/ubuntu-2d.default || true
-        fi
-    fi
-  ;;
-esac
-
-#DEBHELPER#
-