Merge lp:~unity-2d-team/unity-2d/natty-release into lp:unity-2d/3.0

[Oliver Grawert]

merge of unity-2d-default-settings as new unity-2d toplevel package

[Florian Boucault (fboucault)]

xdg directory and files underneath seem useless now.

review: Needs Fixing

[Florian Boucault (fboucault)]

Can we move gconf/ under debian/ ? It does not seem that these files are useful without debian/20_unity-2d-gconf-default debian/20_unity-2d-gconf-mandatory and the postinst scripts.

[Florian Boucault (fboucault)]

Everything else looks great.

[lp:~unity-2d-team/unity-2d/natty-release]

387. By Oliver Grawert on 2011-01-26

drop xdg stuff, not needed anymore

388. By Oliver Grawert on 2011-01-26

switch reloading of gconfd-2 to use pkill

389. By Oliver Grawert on 2011-01-26

move gconf to debian/gconf, update package description for unity-2d

390. By Oliver Grawert on 2011-01-26

fix typos in package descriptions LP: #703170

[Florian Boucault (fboucault)]

Great fixes!

review: Approve

[lp:~unity-2d-team/unity-2d/natty-release]

391. By Oliver Grawert on 2011-01-26

releasing version 3.2-0ubuntu2

=== added file 'debian/20_unity-2d-gconf-default'
--- debian/20_unity-2d-gconf-default	1970-01-01 00:00:00 +0000
+++ debian/20_unity-2d-gconf-default	2011-01-26 17:30:52 +0000
@@ -0,0 +1,31 @@
+/apps/gnome-power-manager/lock/use_screensaver_settings true
+/apps/gnome-power-manager/general/use_time_for_policy false
+/desktop/unity/launcher/favorites/favorites_list [app-firefox.desktop,app-empathy.desktop,app-evolution.desktop,app-cheese.desktop,app-rhythmbox.desktop,app-ubuntu-software-center.desktop,app-nautilus.desktop]
+/desktop/unity/launcher/favorites/app-firefox.desktop/type application
+/desktop/unity/launcher/favorites/app-firefox.desktop/desktop_file /usr/share/applications/firefox.desktop
+/desktop/unity/launcher/favorites/app-firefox.desktop/priority 2.0
+/desktop/unity/launcher/favorites/app-empathy.desktop/type application
+/desktop/unity/launcher/favorites/app-empathy.desktop/desktop_file /usr/share/applications/empathy.desktop
+/desktop/unity/launcher/favorites/app-empathy.desktop/priority 3.0
+/desktop/unity/launcher/favorites/app-evolution.desktop/type application
+/desktop/unity/launcher/favorites/app-evolution.desktop/desktop_file /usr/share/une/applications/evolution.desktop
+/desktop/unity/launcher/favorites/app-evolution.desktop/priority 4.0
+/desktop/unity/launcher/favorites/app-cheese.desktop/type application
+/desktop/unity/launcher/favorites/app-cheese.desktop/desktop_file /usr/share/applications/cheese.desktop
+/desktop/unity/launcher/favorites/app-cheese.desktop/priority 5.0
+/desktop/unity/launcher/favorites/app-rhythmbox.desktop/type application
+/desktop/unity/launcher/favorites/app-rhythmbox.desktop/desktop_file /usr/share/applications/rhythmbox.desktop
+/desktop/unity/launcher/favorites/app-rhythmbox.desktop/priority 6.0
+/desktop/unity/launcher/favorites/app-ubuntu-software-center.desktop/type application
+/desktop/unity/launcher/favorites/app-ubuntu-software-center.desktop/desktop_file /usr/share/applications/ubuntu-software-center.desktop
+/desktop/unity/launcher/favorites/app-ubuntu-software-center.desktop/priority 7.0
+/desktop/unity/launcher/favorites/app-nautilus.desktop/type application
+/desktop/unity/launcher/favorites/app-nautilus.desktop/desktop_file /usr/share/applications/nautilus.desktop
+/desktop/unity/launcher/favorites/app-nautilus.desktop/priority 8.0
+/desktop/gnome/applications/window_manager/default /usr/bin/metacity
+/desktop/gnome/applications/window_manager/current /usr/bin/metacity
+/apps/metacity/general/show_maximized_titlebars false
+/apps/metacity/general/theme Ambiance
+/desktop/gnome/interface/gtk_theme Ambiance
+/desktop/gnome/interface/icon_theme ubuntu-mono-dark
+/desktop/gnome/peripherals/mouse/cursor_theme DMZ-White

=== added file 'debian/20_unity-2d-gconf-mandatory'
--- debian/20_unity-2d-gconf-mandatory	1970-01-01 00:00:00 +0000
+++ debian/20_unity-2d-gconf-mandatory	2011-01-26 17:30:52 +0000
@@ -0,0 +1,2 @@
+/apps/nautilus/preferences/show_desktop false
+/apps/nautilus/preferences/exit_with_last_window false

=== modified file 'debian/changelog'
--- debian/changelog	2011-01-21 12:11:31 +0000
+++ debian/changelog	2011-01-26 17:30:52 +0000
@@ -1,3 +1,17 @@
+unity-2d (3.2-0ubuntu2) natty; urgency=low
+
+  * merge unity-2d-default-settings package as new unity-2d toplevel 
+    package.
+  * fix various typos in package descriptions (LP: #703170)
+
+ -- Oliver Grawert <[e-mail]>  Wed, 26 Jan 2011 18:27:04 +0100
+
+unity-2d (3.2-0ubuntu1) natty; urgency=low
+
+  * switch to proper upstream versioning, we are actually at 3.2 not 1.0
+
+ -- Oliver Grawert <[e-mail]>  Fri, 21 Jan 2011 14:39:01 +0100
+
 unity-2d (0.1-0ubuntu4) natty; urgency=low
 
   * add Vcs-Bzr location to debian/control

=== modified file 'debian/control'
--- debian/control	2011-01-21 12:07:31 +0000
+++ debian/control	2011-01-26 17:30:52 +0000
@@ -11,6 +11,33 @@
 Standards-Version: 3.9.1
 Vcs-Bzr: http://bazaar.launchpad.net/~unity-2d-team/unity-2d/natty-release
 
+Package: unity-2d
+Architecture: all
+Depends: ${misc:Depends},
+ unity-2d-launcher, unity-2d-panel, unity-2d-places, unity-2d-spread,
+ metacity ( >= 2.30.3-0ubuntu3 ), gnome-session-bin
+Recommends: indicator-application, indicator-appmenu, indicator-datetime, 
+ indicator-me, indicator-messages, indicator-session, indicator-sound, 
+ gnome-settings-daemon, nautilus, policykit-1-gnome, gnome-power-manager, 
+ gtk2-engines-pixbuf
+Provides: unity-2d-default-settings
+Conflicts: unity-2d-default-settings (<= 0.4)
+Replaces:  unity-2d-default-settings (<= 0.4)
+Description: Unity interface for non-accelerated graphics cards
+ The Unity 2D interface installs a fully usable 2D session and provides the 
+ common configuration files and defaults. Installing this package will 
+ offer a session called Unity 2D in your login manager.
+ .
+ Unity 2D is designed to run smoothly without any graphics acceleration.
+
+Package: unity-2d-default-settings
+Architecture: all
+Depends: unity-2d
+Description: Transitional package for upgrades to the new unity-2d package
+ This is a transitional package to properly handle upgrading from natty
+ pre-release installations of unity-2d and also for handling upgrades of 
+ maverick installs from the unity-2d team PPA.
+
 Package: unity-2d-launcher
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, unity-asset-pool
@@ -25,7 +52,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Unity 2D Panel
  The Unity 2D panel displays a top panel containing the application menu and
- various indicators. It part of Unity 2D and can not run  as a standalone
+ various indicators. It is part of Unity 2D and can not run  as a standalone
  application outside of the Unity 2D environment.
 
 Package: libuqpanel0
@@ -53,7 +80,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, unity-2d-launcher
 Description: Unity 2D Places
  The Unity 2D places overlay over the desktop to provide quick access to
- various categories of applications. It part of Unity 2D and can not run
+ various categories of applications. It is part of Unity 2D and can not run
  as a standalone application outside of the Unity 2D environment.
 
 Package: unity-2d-spread
@@ -62,6 +89,6 @@
 Description: Unity 2D Spread
  The Unity 2D spread allows you to display a quick thumbnailed view of open
  windows so you can quickly and effectively choose which one you want to 
- switch to. It part of Unity 2D and can not run  as a standalone application
+ switch to. It is part of Unity 2D and can not run  as a standalone application
  outside of the Unity 2D environment.
 

=== added directory 'debian/gconf'
=== added file 'debian/gconf/unity-2d.default.path'
--- debian/gconf/unity-2d.default.path	1970-01-01 00:00:00 +0000
+++ debian/gconf/unity-2d.default.path	2011-01-26 17:30:52 +0000
@@ -0,0 +1,3 @@
+# Additional mandatory path for unity-2d experience
+xml:readonly:/var/lib/gconf/unity-2d.default
+

=== added file 'debian/gconf/unity-2d.mandatory.path'
--- debian/gconf/unity-2d.mandatory.path	1970-01-01 00:00:00 +0000
+++ debian/gconf/unity-2d.mandatory.path	2011-01-26 17:30:52 +0000
@@ -0,0 +1,3 @@
+# Additional mandatory path for unity-2d experience
+xml:readonly:/var/lib/gconf/unity-2d.mandatory
+

=== added file 'debian/unity-2d.install'
--- debian/unity-2d.install	1970-01-01 00:00:00 +0000
+++ debian/unity-2d.install	2011-01-26 17:30:52 +0000
@@ -0,0 +1,6 @@
+debian/unity-2d.py /usr/share/apport/general-hooks
+debian/gconf/* /usr/share/gconf
+session/unity-2d.desktop /usr/share/xsessions
+session/2d-ubuntu.session /usr/share/gnome-session/sessions
+debian/20_unity-2d-gconf-mandatory /usr/share/gconf/unity-2d/mandatory
+debian/20_unity-2d-gconf-default /usr/share/gconf/unity-2d/default

=== added file 'debian/unity-2d.postinst'
--- debian/unity-2d.postinst	1970-01-01 00:00:00 +0000
+++ debian/unity-2d.postinst	2011-01-26 17:30:52 +0000
@@ -0,0 +1,47 @@
+#!/bin/sh
+set -e
+
+signal_daemons()
+{
+    # Tell all running daemons to reload their databases
+    pkill -HUP -x gconfd-2 >/dev/null 2>&1 || true
+}
+
+case "$1" in
+  configure|upgrade)
+    if [ -x /usr/lib/gdm/gdm-set-default-session ] ; then
+        /usr/lib/gdm/gdm-set-default-session --keep-old unity-2d || true
+    fi
+    if which update-gconf-defaults >/dev/null 2>&1 ; then
+        mkdir -p /var/lib/gconf/unity-2d.mandatory
+        mkdir -p /var/lib/gconf/unity-2d.default
+    fi
+  ;;
+  triggered)
+    for trigger in $2; do
+      case $trigger in
+        /usr/share/gconf/unity-2d/mandatory)
+          update-gconf-defaults --source /usr/share/gconf/unity-2d/mandatory \
+          --destination /var/lib/gconf/unity-2d.mandatory --no-signal
+        ;;
+        /usr/share/gconf/unity-2d/default)
+          update-gconf-defaults --source /usr/share/gconf/unity-2d/default \
+          --destination /var/lib/gconf/unity-2d.default --no-signal
+        ;;
+      esac
+    done
+    signal_daemons
+    exit 0
+  ;;
+esac
+
+#DEBHELPER#
+
+# Upon installation/upgrade, regenerate all databases, because in this case 
+# there will be no trigger run
+update-gconf-defaults --source /usr/share/gconf/unity-2d/mandatory \
+                      --destination /var/lib/gconf/unity-2d.mandatory --no-signal
+update-gconf-defaults --source /usr/share/gconf/unity-2d/default \
+                      --destination /var/lib/gconf/unity-2d.default --no-signal
+signal_daemons
+

=== added file 'debian/unity-2d.postrm'
--- debian/unity-2d.postrm	1970-01-01 00:00:00 +0000
+++ debian/unity-2d.postrm	2011-01-26 17:30:52 +0000
@@ -0,0 +1,24 @@
+#!/bin/sh
+set -e
+
+case "$1" in
+  remove|purge)
+    if which update-gconf-defaults >/dev/null 2>&1 && [ -d /usr/share/gconf/mandatory/unity-2d ]; then
+        update-gconf-defaults --source /usr/share/gconf/unity-2d/mandatory \
+        --destination /var/lib/gconf/unity-2d.mandatory
+        update-gconf-defaults --source /usr/share/gconf/unity-2d/default \
+        --destination /var/lib/gconf/unity-2d.default
+    fi
+    if [ -d /var/lib/gconf/unity-2d.mandatory ]; then
+        rm -rf /var/lib/gconf/unity-2d.mandatory
+    fi
+    if [ -d /var/lib/gconf/unity-2d.default ]; then
+        rm -rf /var/lib/gconf/unity-2d.default
+    fi
+    if [ -x /usr/lib/gdm/gdm-set-default-session ] ; then
+        /usr/lib/gdm/gdm-set-default-session --remove unity-2d || true
+    fi
+    ;;
+esac
+
+#DEBHELPER#

=== added file 'debian/unity-2d.py'
--- debian/unity-2d.py	1970-01-01 00:00:00 +0000
+++ debian/unity-2d.py	2011-01-26 17:30:52 +0000
@@ -0,0 +1,2 @@
+def add_info(report):
+    report['Tags'] = report.get('Tags', '') + ' unity-2d'

=== added file 'debian/unity-2d.triggers'
--- debian/unity-2d.triggers	1970-01-01 00:00:00 +0000
+++ debian/unity-2d.triggers	2011-01-26 17:30:52 +0000
@@ -0,0 +1,2 @@
+interest /usr/share/gconf/unity-2d/defaults
+interest /usr/share/gconf/unity-2d/mandatory

=== added directory 'session'
=== added file 'session/2d-ubuntu.session'
--- session/2d-ubuntu.session	1970-01-01 00:00:00 +0000
+++ session/2d-ubuntu.session	2011-01-26 17:30:52 +0000
@@ -0,0 +1,8 @@
+[GNOME Session]
+Name=Unity 2D
+Required=windowmanager;panel;filemanager;
+Required-windowmanager=metacity
+Required-panel=unity-2d-panel
+Required-filemanager=nautilus
+DefaultApps=gnome-settings-daemon;unity-2d-launcher;
+FallbackSession=classic-gnome

=== added file 'session/unity-2d.desktop'
--- session/unity-2d.desktop	1970-01-01 00:00:00 +0000
+++ session/unity-2d.desktop	2011-01-26 17:30:52 +0000
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Unity 2D 
+Comment=This session logs you into Unity 2D
+Exec=gnome-session --session=2d-ubuntu
+TryExec=gnome-session
+Icon=
+Type=Application
+X-Ubuntu-Gettext-Domain=unity-2d