Merge lp:~townsend/unity8-desktop-session/add-stable-overlay into lp:unity8-desktop-session/xenial

[Christopher Townsend]

Add stable-overlay PPA when installing the package. Updated Standards-Version to 3.9.6 (no changes required).

[Jean-Baptiste Lallement (jibel)]

Wouldn't it be better to use add-apt-repository to add/remove the ppa and also maybe add a way to purge packages installed from the ppa with ppa-purge?

[Christopher Townsend (townsend)]

@jibel,

I considered that, but after talking with some others, it is good form to be able to install this (and any Debian package) on a machine without network access. Using the methods you describe, we would absolutely need network access during package install and package purge.

[Stephen M. Webb (bregma)]

good to go

review: Approve

[Stephen M. Webb (bregma)]

Changes acceptable.

review: Approve

[lp:~townsend/unity8-desktop-session/add-stable-overlay]

85. By Christopher Townsend on 2016-06-10

Address issues based on RAOF's feedback.

[Christopher Townsend (townsend)]

Rejecting this as the Technical Board rejected this for an SRU.

Unmerged revisions

85. By Christopher Townsend on 2016-06-10

Address issues based on RAOF's feedback.

84. By Christopher Townsend on 2016-06-09

Add debconf interactions for asking the user if they indeed want to enable the Stable Overlay PPA.

83. By Christopher Townsend on 2016-06-06

Add stable-overlay PPA when installing the package.

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2014-09-29 20:46:52 +0000
+++ data/Makefile.am	2016-06-10 18:29:08 +0000
@@ -21,7 +21,7 @@
 lightdm_sessiondir = ${lightdmdir}/sessions
 
 dist_pkgdata_DATA = \
-	sensors.txt
+	sensors.txt stable-overlay-ppa.key
 
 dist_icon_DATA = \
 	custom_unity8-mir_badge.png

=== added file 'data/stable-overlay-ppa.key'
--- data/stable-overlay-ppa.key	1970-01-01 00:00:00 +0000
+++ data/stable-overlay-ppa.key	2016-06-10 18:29:08 +0000
@@ -0,0 +1,14 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: SKS 1.1.5
+Comment: Hostname: keyserver.ubuntu.com
+
+mI0EUs00cgEEAJJqaPue5gzQiLB1krT9slYbqVW/bSBpW9+qX8gFI44IVM/Bo3yh9BPAs1RA
+zja96N0FS6SNlew4JYfk7MBT2sFDGpm3bTKt9Go7muO0JkvKv0vYgrrwqORlWK3SfsYa6Eps
+CdVzZPAKvGzc8I0XywVgcJhM5okx+3J2naBaSp9NABEBAAG0K0xhdW5jaHBhZCBQUEEgZm9y
+IENJIFRyYWluIFBQQSBTZXJ2aWNlIFRlYW2IuAQTAQIAIgUCUs00cgIbAwYLCQgHAwIGFQgC
+CQoLBBYCAwECHgECF4AACgkQhVBBKOzxIEy62gP/T2h98ongV+RXekM1DpgTNoH0PBHrZVj4
+zfrvrYKZOaxRmJ6TWtzG8tFIuB4gPjaFeenJBhCFaZ9UncFQemS9jztQ/pA049L1N7Tijd8/
+BKD7gc7tM07+Fq+Q6DT7VuUFiVlfZUwWYzk5UXEk6ctluoIRpnRWUHmh6NssuAgd1Nk=
+=yfBz
+-----END PGP PUBLIC KEY BLOCK-----
+

=== added file 'debian/config'
--- debian/config	1970-01-01 00:00:00 +0000
+++ debian/config	2016-06-10 18:29:08 +0000
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+. /usr/share/debconf/confmodule
+
+db_input critical unity8-desktop-session-mir/add-stable-overlay || true
+db_go

=== modified file 'debian/control'
--- debian/control	2015-06-09 12:42:50 +0000
+++ debian/control	2016-06-10 18:29:08 +0000
@@ -4,12 +4,14 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: debhelper (>= 9),
                dh-autoreconf
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 
 Package: unity8-desktop-session-mir
 Architecture: all
 Conflicts: ubuntu-desktop-mir
-Depends: qtubuntu-desktop,
+Depends: apt,
+         debconf,
+         qtubuntu-desktop,
          qtmir-desktop,
          unity-system-compositor,
          unity8,

=== added directory 'debian/po'
=== added file 'debian/po/POTFILES.in'
--- debian/po/POTFILES.in	1970-01-01 00:00:00 +0000
+++ debian/po/POTFILES.in	2016-06-10 18:29:08 +0000
@@ -0,0 +1,1 @@
+[type: gettext/rfc822deb] templates

=== added file 'debian/po/templates.pot'
--- debian/po/templates.pot	1970-01-01 00:00:00 +0000
+++ debian/po/templates.pot	2016-06-10 18:29:08 +0000
@@ -0,0 +1,49 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the unity8-desktop-session package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: unity8-desktop-session\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2016-06-08 16:31-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid "Would you like to install the Stable Overlay PPA?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"The Stable Overlay PPA enables installing the latest packages for the Unity8 "
+"Desktop Session."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"Selecting this option will enable the Stable Overlay PPA. You will need to "
+"run 'apt-get update' and 'apt-get dist-upgrade' to upgrade to the packages "
+"in the Stable Overlay PPA."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"If you don not select this option, use 'dpkg-reconfigure unity8-desktop-"
+"session-mir' to add it later."
+msgstr ""

=== added file 'debian/postinst'
--- debian/postinst	1970-01-01 00:00:00 +0000
+++ debian/postinst	2016-06-10 18:29:08 +0000
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+stable_overlay_file="/etc/apt/sources.list.d/stable-overlay-xenial.list"
+stable_overlay_ppa="http://ppa.launchpad.net/ci-train-ppa-service/stable-phone-overlay/ubuntu"
+
+if ! grep -q $stable_overlay_ppa /etc/apt/sources.list /etc/apt/sources.list.d/* ; then
+    db_get unity8-desktop-session-mir/add-stable-overlay
+
+    if [ "$RET" = "true" ] ; then
+        if [ ! -e $stable_overlay_ppa ] ; then
+            echo "deb $stable_overlay_ppa xenial main" > $stable_overlay_file
+            echo "deb-src $stable_overlay_ppa xenial main" >> $stable_overlay_file
+
+            apt-key add /usr/share/unity8-desktop-session/stable-overlay-ppa.key > /dev/null
+        else
+            echo "$stable_overlay_ppa already exists."
+            echo "You will need to enable the Stable Overlay PPA manually."
+        fi
+    fi
+fi
+
+#DEBHELPER#
+
+exit 0

=== added file 'debian/postrm'
--- debian/postrm	1970-01-01 00:00:00 +0000
+++ debian/postrm	2016-06-10 18:29:08 +0000
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+stable_overlay_file="/etc/apt/sources.list.d/stable-overlay-xenial.list"
+stable_overlay_file_md5sum="126bc5ee1cb71607257ea431dd587f2f"
+stable_overlay_public_key="ECF1204C"
+
+if [ "$1" = "purge" ] ; then
+    if [ -e $stable_overlay_file ] ; then
+        current_md5sum=`md5sum $stable_overlay_file | awk '{print $1}'`
+
+        if [ "$current_md5sum" = "$stable_overlay_file_md5sum" ] ; then
+            echo "Removing Xenial Stable Overlay PPA..."
+
+            rm $stable_overlay_file
+
+            apt-key remove $stable_overlay_public_key
+        fi
+    fi
+
+    db_fset unity8-desktop-session-mir/add-stable-overlay seen false
+fi
+
+#DEBHELPER#
+
+exit 0

=== added file 'debian/templates'
--- debian/templates	1970-01-01 00:00:00 +0000
+++ debian/templates	2016-06-10 18:29:08 +0000
@@ -0,0 +1,13 @@
+Template: unity8-desktop-session-mir/add-stable-overlay
+Type: boolean
+Default: true
+_Description: Would you like to install the Stable Overlay PPA?
+ The Stable Overlay PPA enables installing the latest packages for the
+ Unity8 Desktop Session.
+ .
+ Selecting this option will enable the Stable Overlay PPA. You will need
+ to run 'apt-get update' and 'apt-get dist-upgrade' to upgrade to the
+ packages in the Stable Overlay PPA.
+ .
+ If you don not select this option, use 'dpkg-reconfigure
+ unity8-desktop-session-mir' to add it later.