Merge lp:~mvo/webapps-applications/whitelist-webapps into lp:ubuntu/quantal/webapps-applications

[Michael Vogt]

This add support to skip the prompting.

[Alexandre Abreu (abreu-alexandre)]

review: Approve

Unmerged revisions

123. By Michael Vogt on 2012-10-01

add .pkla and aptdaemon cfg to allow passwordless installs of webapps

122. By Stéphane Graber on 2012-09-25

releasing version 2.4.6-0ubuntu3

121. By Michael Terry on 2012-09-25

* debian/patches/migration-script.patch,
  debian/unity-webapps-common.migrations:
  - Add patch from upstream to migrate existing users to have the same
    webapps in the launcher that default users get.

120. By Michael Terry on 2012-09-21

add source format

119. By Michael Terry on 2012-09-21

use arch: all

118. By Michael Terry on 2012-09-21

revert configure to tarball version

117. By Michael Terry on 2012-09-21

mark for quantal-proposed

116. By Michael Terry on 2012-09-20

Change source name to match upstream

115. By Michael Terry on 2012-09-20

* debian/patches/disable-tests.patch:
  - Make sure to disable tests during build, so that we don't need gjs

114. By Michael Terry on 2012-09-20

bump to 2.4.6

=== modified file 'configure'
--- configure	2012-10-04 00:05:53 +0000
+++ configure	2012-10-04 15:17:28 +0000
@@ -1,6 +1,10 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
+<<<<<<< TREE
 # Generated by GNU Autoconf 2.69 for webapps 2.4.7.
+=======
+# Generated by GNU Autoconf 2.69 for webapps 2.4.6.
+>>>>>>> MERGE-SOURCE
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +591,13 @@
 # Identity of this package.
 PACKAGE_NAME='webapps'
 PACKAGE_TARNAME='webapps'
+<<<<<<< TREE
 PACKAGE_VERSION='2.4.7'
 PACKAGE_STRING='webapps 2.4.7'
+=======
+PACKAGE_VERSION='2.4.6'
+PACKAGE_STRING='webapps 2.4.6'
+>>>>>>> MERGE-SOURCE
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1390,7 +1399,11 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
+<<<<<<< TREE
 \`configure' configures webapps 2.4.7 to adapt to many kinds of systems.
+=======
+\`configure' configures webapps 2.4.6 to adapt to many kinds of systems.
+>>>>>>> MERGE-SOURCE
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1460,7 +1473,11 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
+<<<<<<< TREE
      short | recursive ) echo "Configuration of webapps 2.4.7:";;
+=======
+     short | recursive ) echo "Configuration of webapps 2.4.6:";;
+>>>>>>> MERGE-SOURCE
    esac
   cat <<\_ACEOF
 
@@ -1585,7 +1602,11 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
+<<<<<<< TREE
 webapps configure 2.4.7
+=======
+webapps configure 2.4.6
+>>>>>>> MERGE-SOURCE
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1863,7 +1884,11 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
+<<<<<<< TREE
 It was created by webapps $as_me 2.4.7, which was
+=======
+It was created by webapps $as_me 2.4.6, which was
+>>>>>>> MERGE-SOURCE
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2685,7 +2710,11 @@
 
 # Define the identity of the package.
  PACKAGE='webapps'
+<<<<<<< TREE
  VERSION='2.4.7'
+=======
+ VERSION='2.4.6'
+>>>>>>> MERGE-SOURCE
 
 
 cat >>confdefs.h <<_ACEOF
@@ -15026,7 +15055,11 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
+<<<<<<< TREE
 This file was extended by webapps $as_me 2.4.7, which was
+=======
+This file was extended by webapps $as_me 2.4.6, which was
+>>>>>>> MERGE-SOURCE
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15083,7 +15116,11 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
+<<<<<<< TREE
 webapps config.status 2.4.7
+=======
+webapps config.status 2.4.6
+>>>>>>> MERGE-SOURCE
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

=== modified file 'configure.ac'
--- configure.ac	2012-10-04 00:05:53 +0000
+++ configure.ac	2012-10-04 15:17:28 +0000
@@ -1,4 +1,8 @@
+<<<<<<< TREE
 AC_INIT(webapps, 2.4.7)
+=======
+AC_INIT(webapps, 2.4.6)
+>>>>>>> MERGE-SOURCE
 
 AC_SUBST([PACKAGE_NAME], ["$PACKAGE_NAME"])
 AC_SUBST([PACKAGE_VERSION], ["$PACKAGE_VERSION"])

=== added file 'debian/aptdaemon-trust-webapps.cfg'
--- debian/aptdaemon-trust-webapps.cfg	1970-01-01 00:00:00 +0000
+++ debian/aptdaemon-trust-webapps.cfg	2012-10-04 15:17:28 +0000
@@ -0,0 +1,4 @@
+[webapps]
+origin = Ubuntu
+component = universe
+pkgnames = unity-webapps-.*

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-04 02:38:54 +0000
+++ debian/changelog	2012-10-04 15:17:28 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 webapps-applications (2.4.7-0ubuntu1) quantal; urgency=low
 
   * New upstream release.
@@ -50,6 +51,43 @@
     - Make sure to disable tests during build, so that we don't need gjs
 
  -- Michael Terry <[e-mail]>  Thu, 20 Sep 2012 14:20:57 -0400
+=======
+webapps-applications (2.4.6-0ubuntu4) UNRELEASED; urgency=low
+
+  * do not prompt when installing webapps
+
+ -- Michael Vogt <[e-mail]>  Mon, 01 Oct 2012 16:47:10 +0200
+
+webapps-applications (2.4.6-0ubuntu3) quantal; urgency=low
+
+  * Add an ugly check into install-default-webapps-in-launcher.py to detect
+    Edubuntu system and skip the migration code in that case.
+    It's an ugly but working trick to restore the behaviour promised when
+    the release team reviewed the FeatureFreezeException.
+    (LP: #1056274)
+
+ -- Stéphane Graber <[e-mail]>  Tue, 25 Sep 2012 11:58:17 -0400
+
+webapps-applications (2.4.6-0ubuntu2) quantal-proposed; urgency=low
+
+  * debian/patches/migration-script.patch,
+    debian/unity-webapps-common.migrations:
+    - Add patch from upstream to migrate existing users to have the same
+      webapps in the launcher that default users get.
+
+ -- Michael Terry <[e-mail]>  Fri, 21 Sep 2012 15:45:28 -0400
+
+webapps-applications (2.4.6-0ubuntu1) quantal-proposed; urgency=low
+
+  * New upstream release (initial Ubuntu package, LP: #1046840)
+  * Change source name to match upstream
+  * debian/control:
+    - Switch to Architecture: all
+  * debian/patches/disable-tests.patch:
+    - Make sure to disable tests during build, so that we don't need gjs
+
+ -- Michael Terry <[e-mail]>  Thu, 20 Sep 2012 14:20:57 -0400
+>>>>>>> MERGE-SOURCE
 
 unity-webapps (2.0-0quantal1) quantal; urgency=low
 

=== added file 'debian/com.canonical.unity.webapps.pkla'
--- debian/com.canonical.unity.webapps.pkla	1970-01-01 00:00:00 +0000
+++ debian/com.canonical.unity.webapps.pkla	2012-10-04 15:17:28 +0000
@@ -0,0 +1,4 @@
+[Whitelisted installs]
+Identity=unix-group:admin;unix-group:sudo
+Action=org.debian.apt.install-packages.high-trust-repo
+ResultActive=yes

=== modified file 'debian/control'
--- debian/control	2012-09-26 18:16:53 +0000
+++ debian/control	2012-10-04 15:17:28 +0000
@@ -18,9 +18,15 @@
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/webapps-applications/ubuntu
 
 Package: unity-webapps-common
+<<<<<<< TREE
 Architecture: all
 Depends: ${misc:Depends},
          unity-webapps-service (>= 2.3.8-0ubuntu3),
+=======
+Architecture: all
+Depends: ${misc:Depends},
+         unity-webapps-service (>= 2.3.4),
+>>>>>>> MERGE-SOURCE
          xdg-utils
 Suggests: xul-ext-unity (>= 0.3.1) | unity-chromium-extension
 Breaks: unity-webapps

=== added directory 'debian/patches'
=== renamed directory 'debian/patches' => 'debian/patches.moved'
=== added file 'debian/patches/disable-tests.patch'
--- debian/patches/disable-tests.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/disable-tests.patch	2012-10-04 15:17:28 +0000
@@ -0,0 +1,12 @@
+Index: webapps-applications/tests/Makefile.am
+===================================================================
+--- webapps-applications.orig/tests/Makefile.am	2012-09-20 11:23:18.725429000 -0400
++++ webapps-applications/tests/Makefile.am	2012-09-20 15:04:02.795102336 -0400
+@@ -30,5 +30,7 @@
+     YandexNews.js\
+     YouTube.js
+ 
++if ENABLE_TESTS
+ check:
+ 	find . -maxdepth 1 -name "*.js" | xargs -L 1 $(top_srcdir)/scripts/style_checker.js $(top_srcdir)/scripts/third_party/jslint.js
++endif

=== added file 'debian/patches/dont-add-launchers-on-edubuntu'
--- debian/patches/dont-add-launchers-on-edubuntu	1970-01-01 00:00:00 +0000
+++ debian/patches/dont-add-launchers-on-edubuntu	2012-10-04 15:17:28 +0000
@@ -0,0 +1,20 @@
+--- webapps-applications-2.4.6.orig/scripts/install-default-webapps-in-launcher.py
++++ webapps-applications-2.4.6/scripts/install-default-webapps-in-launcher.py
+@@ -1,5 +1,6 @@
+ #!/usr/bin/python
+ from gi.repository import Gio
++import os
+ 
+ PREINSTALLED_LAUNCHER_DESKTOP_FILES = ["application://ubuntu-amazon-default.desktop", "application://UbuntuOneMusiconeubuntucom.desktop"]
+ 
+@@ -7,6 +8,10 @@ UNITY_LAUNCHER_SETTINGS = "com.canonical
+ UNITY_LAUNCHER_FAVORITE_KEY = "favorites"
+ 
+ def install_default_webapps_in_launcher():
++    # Workaround for the script triggering on systems where it shouldn't.
++    if os.path.exists("/usr/share/glib-2.0/schemas/95_edubuntu-artwork.gschema.override"):
++        return
++
+     new_desktop_files = PREINSTALLED_LAUNCHER_DESKTOP_FILES
+ 
+     if len(new_desktop_files) != 0:

=== added file 'debian/patches/migration-script.patch'
--- debian/patches/migration-script.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/migration-script.patch	2012-10-04 15:17:28 +0000
@@ -0,0 +1,46 @@
+=== modified file 'scripts/Makefile.am'
+Index: webapps-applications/scripts/Makefile.am
+===================================================================
+--- webapps-applications.orig/scripts/Makefile.am	2012-09-21 16:44:22.384214216 -0400
++++ webapps-applications/scripts/Makefile.am	2012-09-21 16:45:58.516215233 -0400
+@@ -1,4 +1,5 @@
+ EXTRA_DIST = \
++	install-default-webapps-in-launcher.py\
+ 	style_checker.js\
+ 	icon_uris_checker.sh\
+ 	po2json.py\
+Index: webapps-applications/scripts/install-default-webapps-in-launcher.py
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ webapps-applications/scripts/install-default-webapps-in-launcher.py	2012-09-21 18:02:35.204263884 -0400
+@@ -0,0 +1,30 @@
++#!/usr/bin/python
++from gi.repository import Gio
++
++PREINSTALLED_LAUNCHER_DESKTOP_FILES = ["application://ubuntu-amazon-default.desktop", "application://UbuntuOneMusiconeubuntucom.desktop"]
++
++UNITY_LAUNCHER_SETTINGS = "com.canonical.Unity.Launcher"
++UNITY_LAUNCHER_FAVORITE_KEY = "favorites"
++
++def install_default_webapps_in_launcher():
++    new_desktop_files = PREINSTALLED_LAUNCHER_DESKTOP_FILES
++
++    if len(new_desktop_files) != 0:
++        try:
++            settings = Gio.Settings.new (UNITY_LAUNCHER_SETTINGS)
++            if not settings.is_writable(UNITY_LAUNCHER_FAVORITE_KEY):
++                print "Unity Webapps migration process (preinstallation): 'favorites' key not writable"
++                return
++            favorites = settings.get_strv(UNITY_LAUNCHER_FAVORITE_KEY)
++
++            # only append the desktop icons that are not already present in the favorites list if any
++            favorites.extend(list (set(new_desktop_files).difference(favorites)))
++
++            settings.set_strv(UNITY_LAUNCHER_FAVORITE_KEY, favorites)
++            settings.sync()
++        except:
++            pass
++
++if __name__ == "__main__":
++    install_default_webapps_in_launcher()
++

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2012-10-04 15:17:28 +0000
@@ -0,0 +1,3 @@
+disable-tests.patch
+migration-script.patch
+dont-add-launchers-on-edubuntu

=== added directory 'debian/source'
=== renamed directory 'debian/source' => 'debian/source.moved'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2012-10-04 15:17:28 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)

=== added file 'debian/unity-webapps-common.install'
--- debian/unity-webapps-common.install	1970-01-01 00:00:00 +0000
+++ debian/unity-webapps-common.install	2012-10-04 15:17:28 +0000
@@ -0,0 +1,2 @@
+debian/*.pkla var/lib/polkit-1/localauthority/10-vendor.d/
+debian/aptdaemon-*.cfg etc/aptdaemon/high-trust-repository-whitelist.d
\ No newline at end of file

=== added file 'debian/unity-webapps-common.migrations'
--- debian/unity-webapps-common.migrations	1970-01-01 00:00:00 +0000
+++ debian/unity-webapps-common.migrations	2012-10-04 15:17:28 +0000
@@ -0,0 +1,1 @@
+scripts/install-default-webapps-in-launcher.py

=== renamed file 'debian/unity-webapps-common.migrations' => 'debian/unity-webapps-common.migrations.moved'