Merge lp:~bregma/unity8-desktop-session/lp-1376715 into lp:unity8-desktop-session

[Stephen M. Webb]

renamed package to remove the redundant '-mir' in the name

Renamed package to remove the redundant '-mir' in the name.

[Christopher Townsend (townsend)]

The actual session name that shows up in the LightDM greeter needs to just be 'Unity 8' or something similar.

[Stephen M. Webb (bregma)]

Seems this will break launching Unity 8 on the desktop, need a change to /usr/share/upstart/session/unity8.conf to restore order.

[Stephen M. Webb (bregma)]

See also https://code.launchpad.net/~bregma/unity8/lp-1376715/+merge/296960

[Christopher Townsend (townsend)]

Yep, everything that has "mir" in the name is now just Unity8.

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2014-08-07 19:55:21 +0000
+++ configure.ac	2016-06-09 15:55:33 +0000
@@ -1,7 +1,7 @@
 # This file is part of Unity8-session-x11, a desktop session configration
 # package.
 #
-# Copyright 2013-2014 Canonical Ltd.
+# Copyright 2013-2016 Canonical Ltd.
 # 
 # Unity8-session-x11 is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published by
@@ -17,7 +17,7 @@
 
 AC_PREREQ([2.60])
 AC_INIT([Unity8 Session],
-        [1.0.12],
+        [1.0.13],
         [[e-mail]],
         [unity8-desktop-session])
 AM_INIT_AUTOMAKE([1.13 foreign dist-xz])

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2014-09-29 20:46:52 +0000
+++ data/Makefile.am	2016-06-09 15:55:33 +0000
@@ -1,7 +1,7 @@
 # This file is part of Unity8-session, a desktop session configration
 # package.
 #
-# Copyright 2013-2014 Canonical Ltd.
+# Copyright 2013-2016 Canonical Ltd.
 # 
 # unity8-desktop-session is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3, as published by
@@ -24,17 +24,17 @@
 	sensors.txt
 
 dist_icon_DATA = \
-	custom_unity8-mir_badge.png
+	custom_unity8_badge.png
 
 dist_lightdm_conf_DATA = \
 	55-unity8.conf
 
 dist_lightdm_session_DATA = \
-	unity8-mir.desktop
+	unity8.desktop
 
 dist_bin_SCRIPTS = \
 	lightdm-unity8-session
 
 EXTRA_DIST = \
-	unity8-mir.desktop.in
+	unity8.desktop.in
 

=== renamed file 'data/custom_unity8-mir_badge.png' => 'data/custom_unity8_badge.png'
=== renamed file 'data/unity8-mir.desktop' => 'data/unity8.desktop'
--- data/unity8-mir.desktop	2014-08-07 19:19:20 +0000
+++ data/unity8.desktop	2016-06-09 15:55:33 +0000
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=Unity8-Mir
+Name=Unity8
 Exec=lightdm-unity8-session
 Type=Application
 X-LightDM-Session-Type=mir

=== modified file 'debian/changelog'
--- debian/changelog	2016-06-01 12:40:56 +0000
+++ debian/changelog	2016-06-09 15:55:33 +0000
@@ -1,3 +1,9 @@
+unity8-desktop-session (1.0.13-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Removed the now-redundant -mir for package and asset names.
+
+ -- Stephen M. Webb <[e-mail]>  Thu, 11 Feb 2016 09:43:06 -0500
+
 unity8-desktop-session (1.0.12+16.10.20160601-0ubuntu1) yakkety; urgency=medium
 
   [ Ted Gould ]

=== modified file 'debian/control'
--- debian/control	2016-06-01 12:40:19 +0000
+++ debian/control	2016-06-09 15:55:33 +0000
@@ -2,21 +2,22 @@
 Section: misc
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
-Build-Depends: debhelper (>= 9),
-               dh-autoreconf
+Build-Depends: debhelper (>= 9), dh-autoreconf
 Standards-Version: 3.9.5
 
-Package: unity8-desktop-session-mir
+Package: unity8-desktop-session
 Architecture: all
 Conflicts: ubuntu-desktop-mir
+Replaces: unity8-desktop-session-mir (<< 1.0.13)
+Breaks: unity8-desktop-session-mir (<< 1.0.13)
 Depends: packagekit,
          packagekit-plugin-click,
+         policykit-unity8,
+         qtmir-desktop,
          qtubuntu-desktop,
-         qtmir-desktop,
+         ubuntu-app-launch,
          unity-system-compositor,
          unity8,
-         policykit-unity8,
-         ubuntu-app-launch,
          url-dispatcher,
          mir-graphics-drivers-desktop,
          ${misc:Depends}
@@ -32,3 +33,9 @@
  .
  This package is provided for evaluation and demonstration purposes only.
 
+Package: unity8-desktop-session-mir
+Depends: unity8-desktop-session (>= 1.0.13), ${misc:Depends}
+Architecture: all
+Priority: extra
+Description: transitional dummy package
+ This is a transitional dummy package.  It can safely be removed.

=== modified file 'debian/copyright'
--- debian/copyright	2013-11-26 20:58:46 +0000
+++ debian/copyright	2016-06-09 15:55:33 +0000
@@ -1,9 +1,9 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
-Upstream-Name: unity8-session-x11
+Upstream-Name: unity8-desktop-session
 Upstream-Contact: Stephen M. Webb <[e-mail]>
 
 Files: *
-Copyright: 2013 Canonical Ltd.
+Copyright: 2013-2016 Canonical Ltd.
 License: GPL-3
  This program is free software: you can redistribute it and/or modify it
  under the terms of the GNU General Public License version 3, as published

=== added file 'debian/unity8-desktop-session.install'
--- debian/unity8-desktop-session.install	1970-01-01 00:00:00 +0000
+++ debian/unity8-desktop-session.install	2016-06-09 15:55:33 +0000
@@ -0,0 +1,5 @@
+usr/bin/lightdm-unity8-session
+usr/share/lightdm/lightdm.conf.d/55-unity8.conf
+usr/share/lightdm/sessions/unity8.desktop
+usr/share/unity-greeter/custom_unity8_badge.png
+usr/share/unity8-desktop-session/sensors.txt

=== renamed file 'debian/unity8-desktop-session-mir.maintscript' => 'debian/unity8-desktop-session.maintscript'