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

Proposed by Michael Vogt
Status: Needs review
Proposed branch: lp:~mvo/webapps-applications/whitelist-webapps
Merge into: lp:ubuntu/quantal/webapps-applications
Diff against target: 343 lines (+178/-0) (has conflicts)
13 files modified
configure (+37/-0)
configure.ac (+4/-0)
debian/aptdaemon-trust-webapps.cfg (+4/-0)
debian/changelog (+38/-0)
debian/com.canonical.unity.webapps.pkla (+4/-0)
debian/control (+6/-0)
debian/patches/disable-tests.patch (+12/-0)
debian/patches/dont-add-launchers-on-edubuntu (+20/-0)
debian/patches/migration-script.patch (+46/-0)
debian/patches/series (+3/-0)
debian/source/format (+1/-0)
debian/unity-webapps-common.install (+2/-0)
debian/unity-webapps-common.migrations (+1/-0)
Text conflict in configure
Text conflict in configure.ac
Text conflict in debian/changelog
Text conflict in debian/control
Conflict adding file debian/patches.  Moved existing file to debian/patches.moved.
Conflict adding file debian/source.  Moved existing file to debian/source.moved.
Conflict adding file debian/unity-webapps-common.migrations.  Moved existing file to debian/unity-webapps-common.migrations.moved.
To merge this branch: bzr merge lp:~mvo/webapps-applications/whitelist-webapps
Reviewer Review Type Date Requested Status
Alexandre Abreu Pending
Review via email: mp+128043@code.launchpad.net

This proposal supersedes a proposal from 2012-10-01.

Description of the change

This add support to skip the prompting.

To post a comment you must log in.
Revision history for this message
Alexandre Abreu (abreu-alexandre) : Posted in a previous version of this proposal
review: Approve

Unmerged revisions

123. By Michael Vogt

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

122. By St├ęphane Graber

releasing version 2.4.6-0ubuntu3

121. By Michael Terry

* 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

add source format

119. By Michael Terry

use arch: all

118. By Michael Terry

revert configure to tarball version

117. By Michael Terry

mark for quantal-proposed

116. By Michael Terry

Change source name to match upstream

115. By Michael Terry

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

114. By Michael Terry

bump to 2.4.6

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'configure'
--- configure 2012-10-04 00:05:53 +0000
+++ configure 2012-10-04 15:17:28 +0000
@@ -1,6 +1,10 @@
1#! /bin/sh1#! /bin/sh
2# Guess values for system-dependent variables and create Makefiles.2# Guess values for system-dependent variables and create Makefiles.
3<<<<<<< TREE
3# Generated by GNU Autoconf 2.69 for webapps 2.4.7.4# Generated by GNU Autoconf 2.69 for webapps 2.4.7.
5=======
6# Generated by GNU Autoconf 2.69 for webapps 2.4.6.
7>>>>>>> MERGE-SOURCE
4#8#
5#9#
6# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.10# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +591,13 @@
587# Identity of this package.591# Identity of this package.
588PACKAGE_NAME='webapps'592PACKAGE_NAME='webapps'
589PACKAGE_TARNAME='webapps'593PACKAGE_TARNAME='webapps'
594<<<<<<< TREE
590PACKAGE_VERSION='2.4.7'595PACKAGE_VERSION='2.4.7'
591PACKAGE_STRING='webapps 2.4.7'596PACKAGE_STRING='webapps 2.4.7'
597=======
598PACKAGE_VERSION='2.4.6'
599PACKAGE_STRING='webapps 2.4.6'
600>>>>>>> MERGE-SOURCE
592PACKAGE_BUGREPORT=''601PACKAGE_BUGREPORT=''
593PACKAGE_URL=''602PACKAGE_URL=''
594603
@@ -1390,7 +1399,11 @@
1390 # Omit some internal or obsolete options to make the list less imposing.1399 # Omit some internal or obsolete options to make the list less imposing.
1391 # This message is too long to be a string in the A/UX 3.1 sh.1400 # This message is too long to be a string in the A/UX 3.1 sh.
1392 cat <<_ACEOF1401 cat <<_ACEOF
1402<<<<<<< TREE
1393\`configure' configures webapps 2.4.7 to adapt to many kinds of systems.1403\`configure' configures webapps 2.4.7 to adapt to many kinds of systems.
1404=======
1405\`configure' configures webapps 2.4.6 to adapt to many kinds of systems.
1406>>>>>>> MERGE-SOURCE
13941407
1395Usage: $0 [OPTION]... [VAR=VALUE]...1408Usage: $0 [OPTION]... [VAR=VALUE]...
13961409
@@ -1460,7 +1473,11 @@
14601473
1461if test -n "$ac_init_help"; then1474if test -n "$ac_init_help"; then
1462 case $ac_init_help in1475 case $ac_init_help in
1476<<<<<<< TREE
1463 short | recursive ) echo "Configuration of webapps 2.4.7:";;1477 short | recursive ) echo "Configuration of webapps 2.4.7:";;
1478=======
1479 short | recursive ) echo "Configuration of webapps 2.4.6:";;
1480>>>>>>> MERGE-SOURCE
1464 esac1481 esac
1465 cat <<\_ACEOF1482 cat <<\_ACEOF
14661483
@@ -1585,7 +1602,11 @@
1585test -n "$ac_init_help" && exit $ac_status1602test -n "$ac_init_help" && exit $ac_status
1586if $ac_init_version; then1603if $ac_init_version; then
1587 cat <<\_ACEOF1604 cat <<\_ACEOF
1605<<<<<<< TREE
1588webapps configure 2.4.71606webapps configure 2.4.7
1607=======
1608webapps configure 2.4.6
1609>>>>>>> MERGE-SOURCE
1589generated by GNU Autoconf 2.691610generated by GNU Autoconf 2.69
15901611
1591Copyright (C) 2012 Free Software Foundation, Inc.1612Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1863,7 +1884,11 @@
1863This file contains any messages produced by compilers while1884This file contains any messages produced by compilers while
1864running configure, to aid debugging if configure makes a mistake.1885running configure, to aid debugging if configure makes a mistake.
18651886
1887<<<<<<< TREE
1866It was created by webapps $as_me 2.4.7, which was1888It was created by webapps $as_me 2.4.7, which was
1889=======
1890It was created by webapps $as_me 2.4.6, which was
1891>>>>>>> MERGE-SOURCE
1867generated by GNU Autoconf 2.69. Invocation command line was1892generated by GNU Autoconf 2.69. Invocation command line was
18681893
1869 $ $0 $@1894 $ $0 $@
@@ -2685,7 +2710,11 @@
26852710
2686# Define the identity of the package.2711# Define the identity of the package.
2687 PACKAGE='webapps'2712 PACKAGE='webapps'
2713<<<<<<< TREE
2688 VERSION='2.4.7'2714 VERSION='2.4.7'
2715=======
2716 VERSION='2.4.6'
2717>>>>>>> MERGE-SOURCE
26892718
26902719
2691cat >>confdefs.h <<_ACEOF2720cat >>confdefs.h <<_ACEOF
@@ -15026,7 +15055,11 @@
15026# report actual input values of CONFIG_FILES etc. instead of their15055# report actual input values of CONFIG_FILES etc. instead of their
15027# values after options handling.15056# values after options handling.
15028ac_log="15057ac_log="
15058<<<<<<< TREE
15029This file was extended by webapps $as_me 2.4.7, which was15059This file was extended by webapps $as_me 2.4.7, which was
15060=======
15061This file was extended by webapps $as_me 2.4.6, which was
15062>>>>>>> MERGE-SOURCE
15030generated by GNU Autoconf 2.69. Invocation command line was15063generated by GNU Autoconf 2.69. Invocation command line was
1503115064
15032 CONFIG_FILES = $CONFIG_FILES15065 CONFIG_FILES = $CONFIG_FILES
@@ -15083,7 +15116,11 @@
15083cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=115116cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
15084ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"15117ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
15085ac_cs_version="\\15118ac_cs_version="\\
15119<<<<<<< TREE
15086webapps config.status 2.4.715120webapps config.status 2.4.7
15121=======
15122webapps config.status 2.4.6
15123>>>>>>> MERGE-SOURCE
15087configured by $0, generated by GNU Autoconf 2.69,15124configured by $0, generated by GNU Autoconf 2.69,
15088 with options \\"\$ac_cs_config\\"15125 with options \\"\$ac_cs_config\\"
1508915126
1509015127
=== 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 @@
1<<<<<<< TREE
1AC_INIT(webapps, 2.4.7)2AC_INIT(webapps, 2.4.7)
3=======
4AC_INIT(webapps, 2.4.6)
5>>>>>>> MERGE-SOURCE
26
3AC_SUBST([PACKAGE_NAME], ["$PACKAGE_NAME"])7AC_SUBST([PACKAGE_NAME], ["$PACKAGE_NAME"])
4AC_SUBST([PACKAGE_VERSION], ["$PACKAGE_VERSION"])8AC_SUBST([PACKAGE_VERSION], ["$PACKAGE_VERSION"])
59
=== 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 @@
1[webapps]
2origin = Ubuntu
3component = universe
4pkgnames = unity-webapps-.*
05
=== 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 @@
1<<<<<<< TREE
1webapps-applications (2.4.7-0ubuntu1) quantal; urgency=low2webapps-applications (2.4.7-0ubuntu1) quantal; urgency=low
23
3 * New upstream release.4 * New upstream release.
@@ -50,6 +51,43 @@
50 - Make sure to disable tests during build, so that we don't need gjs51 - Make sure to disable tests during build, so that we don't need gjs
5152
52 -- Michael Terry <mterry@ubuntu.com> Thu, 20 Sep 2012 14:20:57 -040053 -- Michael Terry <mterry@ubuntu.com> Thu, 20 Sep 2012 14:20:57 -0400
54=======
55webapps-applications (2.4.6-0ubuntu4) UNRELEASED; urgency=low
56
57 * do not prompt when installing webapps
58
59 -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 01 Oct 2012 16:47:10 +0200
60
61webapps-applications (2.4.6-0ubuntu3) quantal; urgency=low
62
63 * Add an ugly check into install-default-webapps-in-launcher.py to detect
64 Edubuntu system and skip the migration code in that case.
65 It's an ugly but working trick to restore the behaviour promised when
66 the release team reviewed the FeatureFreezeException.
67 (LP: #1056274)
68
69 -- St├ęphane Graber <stgraber@ubuntu.com> Tue, 25 Sep 2012 11:58:17 -0400
70
71webapps-applications (2.4.6-0ubuntu2) quantal-proposed; urgency=low
72
73 * debian/patches/migration-script.patch,
74 debian/unity-webapps-common.migrations:
75 - Add patch from upstream to migrate existing users to have the same
76 webapps in the launcher that default users get.
77
78 -- Michael Terry <mterry@ubuntu.com> Fri, 21 Sep 2012 15:45:28 -0400
79
80webapps-applications (2.4.6-0ubuntu1) quantal-proposed; urgency=low
81
82 * New upstream release (initial Ubuntu package, LP: #1046840)
83 * Change source name to match upstream
84 * debian/control:
85 - Switch to Architecture: all
86 * debian/patches/disable-tests.patch:
87 - Make sure to disable tests during build, so that we don't need gjs
88
89 -- Michael Terry <mterry@ubuntu.com> Thu, 20 Sep 2012 14:20:57 -0400
90>>>>>>> MERGE-SOURCE
5391
54unity-webapps (2.0-0quantal1) quantal; urgency=low92unity-webapps (2.0-0quantal1) quantal; urgency=low
5593
5694
=== 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 @@
1[Whitelisted installs]
2Identity=unix-group:admin;unix-group:sudo
3Action=org.debian.apt.install-packages.high-trust-repo
4ResultActive=yes
05
=== 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 @@
18Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/webapps-applications/ubuntu18Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/webapps-applications/ubuntu
1919
20Package: unity-webapps-common20Package: unity-webapps-common
21<<<<<<< TREE
21Architecture: all22Architecture: all
22Depends: ${misc:Depends},23Depends: ${misc:Depends},
23 unity-webapps-service (>= 2.3.8-0ubuntu3),24 unity-webapps-service (>= 2.3.8-0ubuntu3),
25=======
26Architecture: all
27Depends: ${misc:Depends},
28 unity-webapps-service (>= 2.3.4),
29>>>>>>> MERGE-SOURCE
24 xdg-utils30 xdg-utils
25Suggests: xul-ext-unity (>= 0.3.1) | unity-chromium-extension31Suggests: xul-ext-unity (>= 0.3.1) | unity-chromium-extension
26Breaks: unity-webapps32Breaks: unity-webapps
2733
=== 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 @@
1Index: webapps-applications/tests/Makefile.am
2===================================================================
3--- webapps-applications.orig/tests/Makefile.am 2012-09-20 11:23:18.725429000 -0400
4+++ webapps-applications/tests/Makefile.am 2012-09-20 15:04:02.795102336 -0400
5@@ -30,5 +30,7 @@
6 YandexNews.js\
7 YouTube.js
8
9+if ENABLE_TESTS
10 check:
11 find . -maxdepth 1 -name "*.js" | xargs -L 1 $(top_srcdir)/scripts/style_checker.js $(top_srcdir)/scripts/third_party/jslint.js
12+endif
013
=== 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 @@
1--- webapps-applications-2.4.6.orig/scripts/install-default-webapps-in-launcher.py
2+++ webapps-applications-2.4.6/scripts/install-default-webapps-in-launcher.py
3@@ -1,5 +1,6 @@
4 #!/usr/bin/python
5 from gi.repository import Gio
6+import os
7
8 PREINSTALLED_LAUNCHER_DESKTOP_FILES = ["application://ubuntu-amazon-default.desktop", "application://UbuntuOneMusiconeubuntucom.desktop"]
9
10@@ -7,6 +8,10 @@ UNITY_LAUNCHER_SETTINGS = "com.canonical
11 UNITY_LAUNCHER_FAVORITE_KEY = "favorites"
12
13 def install_default_webapps_in_launcher():
14+ # Workaround for the script triggering on systems where it shouldn't.
15+ if os.path.exists("/usr/share/glib-2.0/schemas/95_edubuntu-artwork.gschema.override"):
16+ return
17+
18 new_desktop_files = PREINSTALLED_LAUNCHER_DESKTOP_FILES
19
20 if len(new_desktop_files) != 0:
021
=== 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 @@
1=== modified file 'scripts/Makefile.am'
2Index: webapps-applications/scripts/Makefile.am
3===================================================================
4--- webapps-applications.orig/scripts/Makefile.am 2012-09-21 16:44:22.384214216 -0400
5+++ webapps-applications/scripts/Makefile.am 2012-09-21 16:45:58.516215233 -0400
6@@ -1,4 +1,5 @@
7 EXTRA_DIST = \
8+ install-default-webapps-in-launcher.py\
9 style_checker.js\
10 icon_uris_checker.sh\
11 po2json.py\
12Index: webapps-applications/scripts/install-default-webapps-in-launcher.py
13===================================================================
14--- /dev/null 1970-01-01 00:00:00.000000000 +0000
15+++ webapps-applications/scripts/install-default-webapps-in-launcher.py 2012-09-21 18:02:35.204263884 -0400
16@@ -0,0 +1,30 @@
17+#!/usr/bin/python
18+from gi.repository import Gio
19+
20+PREINSTALLED_LAUNCHER_DESKTOP_FILES = ["application://ubuntu-amazon-default.desktop", "application://UbuntuOneMusiconeubuntucom.desktop"]
21+
22+UNITY_LAUNCHER_SETTINGS = "com.canonical.Unity.Launcher"
23+UNITY_LAUNCHER_FAVORITE_KEY = "favorites"
24+
25+def install_default_webapps_in_launcher():
26+ new_desktop_files = PREINSTALLED_LAUNCHER_DESKTOP_FILES
27+
28+ if len(new_desktop_files) != 0:
29+ try:
30+ settings = Gio.Settings.new (UNITY_LAUNCHER_SETTINGS)
31+ if not settings.is_writable(UNITY_LAUNCHER_FAVORITE_KEY):
32+ print "Unity Webapps migration process (preinstallation): 'favorites' key not writable"
33+ return
34+ favorites = settings.get_strv(UNITY_LAUNCHER_FAVORITE_KEY)
35+
36+ # only append the desktop icons that are not already present in the favorites list if any
37+ favorites.extend(list (set(new_desktop_files).difference(favorites)))
38+
39+ settings.set_strv(UNITY_LAUNCHER_FAVORITE_KEY, favorites)
40+ settings.sync()
41+ except:
42+ pass
43+
44+if __name__ == "__main__":
45+ install_default_webapps_in_launcher()
46+
047
=== 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 @@
1disable-tests.patch
2migration-script.patch
3dont-add-launchers-on-edubuntu
04
=== 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 @@
13.0 (quilt)
02
=== 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 @@
1debian/*.pkla var/lib/polkit-1/localauthority/10-vendor.d/
2debian/aptdaemon-*.cfg etc/aptdaemon/high-trust-repository-whitelist.d
0\ No newline at end of file3\ No newline at end of file
14
=== 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 @@
1scripts/install-default-webapps-in-launcher.py
02
=== renamed file 'debian/unity-webapps-common.migrations' => 'debian/unity-webapps-common.migrations.moved'

Subscribers

People subscribed via source and target branches

to all changes: