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
1=== modified file 'configure'
2--- configure 2012-10-04 00:05:53 +0000
3+++ configure 2012-10-04 15:17:28 +0000
4@@ -1,6 +1,10 @@
5 #! /bin/sh
6 # Guess values for system-dependent variables and create Makefiles.
7+<<<<<<< TREE
8 # Generated by GNU Autoconf 2.69 for webapps 2.4.7.
9+=======
10+# Generated by GNU Autoconf 2.69 for webapps 2.4.6.
11+>>>>>>> MERGE-SOURCE
12 #
13 #
14 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
15@@ -587,8 +591,13 @@
16 # Identity of this package.
17 PACKAGE_NAME='webapps'
18 PACKAGE_TARNAME='webapps'
19+<<<<<<< TREE
20 PACKAGE_VERSION='2.4.7'
21 PACKAGE_STRING='webapps 2.4.7'
22+=======
23+PACKAGE_VERSION='2.4.6'
24+PACKAGE_STRING='webapps 2.4.6'
25+>>>>>>> MERGE-SOURCE
26 PACKAGE_BUGREPORT=''
27 PACKAGE_URL=''
28
29@@ -1390,7 +1399,11 @@
30 # Omit some internal or obsolete options to make the list less imposing.
31 # This message is too long to be a string in the A/UX 3.1 sh.
32 cat <<_ACEOF
33+<<<<<<< TREE
34 \`configure' configures webapps 2.4.7 to adapt to many kinds of systems.
35+=======
36+\`configure' configures webapps 2.4.6 to adapt to many kinds of systems.
37+>>>>>>> MERGE-SOURCE
38
39 Usage: $0 [OPTION]... [VAR=VALUE]...
40
41@@ -1460,7 +1473,11 @@
42
43 if test -n "$ac_init_help"; then
44 case $ac_init_help in
45+<<<<<<< TREE
46 short | recursive ) echo "Configuration of webapps 2.4.7:";;
47+=======
48+ short | recursive ) echo "Configuration of webapps 2.4.6:";;
49+>>>>>>> MERGE-SOURCE
50 esac
51 cat <<\_ACEOF
52
53@@ -1585,7 +1602,11 @@
54 test -n "$ac_init_help" && exit $ac_status
55 if $ac_init_version; then
56 cat <<\_ACEOF
57+<<<<<<< TREE
58 webapps configure 2.4.7
59+=======
60+webapps configure 2.4.6
61+>>>>>>> MERGE-SOURCE
62 generated by GNU Autoconf 2.69
63
64 Copyright (C) 2012 Free Software Foundation, Inc.
65@@ -1863,7 +1884,11 @@
66 This file contains any messages produced by compilers while
67 running configure, to aid debugging if configure makes a mistake.
68
69+<<<<<<< TREE
70 It was created by webapps $as_me 2.4.7, which was
71+=======
72+It was created by webapps $as_me 2.4.6, which was
73+>>>>>>> MERGE-SOURCE
74 generated by GNU Autoconf 2.69. Invocation command line was
75
76 $ $0 $@
77@@ -2685,7 +2710,11 @@
78
79 # Define the identity of the package.
80 PACKAGE='webapps'
81+<<<<<<< TREE
82 VERSION='2.4.7'
83+=======
84+ VERSION='2.4.6'
85+>>>>>>> MERGE-SOURCE
86
87
88 cat >>confdefs.h <<_ACEOF
89@@ -15026,7 +15055,11 @@
90 # report actual input values of CONFIG_FILES etc. instead of their
91 # values after options handling.
92 ac_log="
93+<<<<<<< TREE
94 This file was extended by webapps $as_me 2.4.7, which was
95+=======
96+This file was extended by webapps $as_me 2.4.6, which was
97+>>>>>>> MERGE-SOURCE
98 generated by GNU Autoconf 2.69. Invocation command line was
99
100 CONFIG_FILES = $CONFIG_FILES
101@@ -15083,7 +15116,11 @@
102 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
103 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
104 ac_cs_version="\\
105+<<<<<<< TREE
106 webapps config.status 2.4.7
107+=======
108+webapps config.status 2.4.6
109+>>>>>>> MERGE-SOURCE
110 configured by $0, generated by GNU Autoconf 2.69,
111 with options \\"\$ac_cs_config\\"
112
113
114=== modified file 'configure.ac'
115--- configure.ac 2012-10-04 00:05:53 +0000
116+++ configure.ac 2012-10-04 15:17:28 +0000
117@@ -1,4 +1,8 @@
118+<<<<<<< TREE
119 AC_INIT(webapps, 2.4.7)
120+=======
121+AC_INIT(webapps, 2.4.6)
122+>>>>>>> MERGE-SOURCE
123
124 AC_SUBST([PACKAGE_NAME], ["$PACKAGE_NAME"])
125 AC_SUBST([PACKAGE_VERSION], ["$PACKAGE_VERSION"])
126
127=== added file 'debian/aptdaemon-trust-webapps.cfg'
128--- debian/aptdaemon-trust-webapps.cfg 1970-01-01 00:00:00 +0000
129+++ debian/aptdaemon-trust-webapps.cfg 2012-10-04 15:17:28 +0000
130@@ -0,0 +1,4 @@
131+[webapps]
132+origin = Ubuntu
133+component = universe
134+pkgnames = unity-webapps-.*
135
136=== modified file 'debian/changelog'
137--- debian/changelog 2012-10-04 02:38:54 +0000
138+++ debian/changelog 2012-10-04 15:17:28 +0000
139@@ -1,3 +1,4 @@
140+<<<<<<< TREE
141 webapps-applications (2.4.7-0ubuntu1) quantal; urgency=low
142
143 * New upstream release.
144@@ -50,6 +51,43 @@
145 - Make sure to disable tests during build, so that we don't need gjs
146
147 -- Michael Terry <mterry@ubuntu.com> Thu, 20 Sep 2012 14:20:57 -0400
148+=======
149+webapps-applications (2.4.6-0ubuntu4) UNRELEASED; urgency=low
150+
151+ * do not prompt when installing webapps
152+
153+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 01 Oct 2012 16:47:10 +0200
154+
155+webapps-applications (2.4.6-0ubuntu3) quantal; urgency=low
156+
157+ * Add an ugly check into install-default-webapps-in-launcher.py to detect
158+ Edubuntu system and skip the migration code in that case.
159+ It's an ugly but working trick to restore the behaviour promised when
160+ the release team reviewed the FeatureFreezeException.
161+ (LP: #1056274)
162+
163+ -- St├ęphane Graber <stgraber@ubuntu.com> Tue, 25 Sep 2012 11:58:17 -0400
164+
165+webapps-applications (2.4.6-0ubuntu2) quantal-proposed; urgency=low
166+
167+ * debian/patches/migration-script.patch,
168+ debian/unity-webapps-common.migrations:
169+ - Add patch from upstream to migrate existing users to have the same
170+ webapps in the launcher that default users get.
171+
172+ -- Michael Terry <mterry@ubuntu.com> Fri, 21 Sep 2012 15:45:28 -0400
173+
174+webapps-applications (2.4.6-0ubuntu1) quantal-proposed; urgency=low
175+
176+ * New upstream release (initial Ubuntu package, LP: #1046840)
177+ * Change source name to match upstream
178+ * debian/control:
179+ - Switch to Architecture: all
180+ * debian/patches/disable-tests.patch:
181+ - Make sure to disable tests during build, so that we don't need gjs
182+
183+ -- Michael Terry <mterry@ubuntu.com> Thu, 20 Sep 2012 14:20:57 -0400
184+>>>>>>> MERGE-SOURCE
185
186 unity-webapps (2.0-0quantal1) quantal; urgency=low
187
188
189=== added file 'debian/com.canonical.unity.webapps.pkla'
190--- debian/com.canonical.unity.webapps.pkla 1970-01-01 00:00:00 +0000
191+++ debian/com.canonical.unity.webapps.pkla 2012-10-04 15:17:28 +0000
192@@ -0,0 +1,4 @@
193+[Whitelisted installs]
194+Identity=unix-group:admin;unix-group:sudo
195+Action=org.debian.apt.install-packages.high-trust-repo
196+ResultActive=yes
197
198=== modified file 'debian/control'
199--- debian/control 2012-09-26 18:16:53 +0000
200+++ debian/control 2012-10-04 15:17:28 +0000
201@@ -18,9 +18,15 @@
202 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/webapps-applications/ubuntu
203
204 Package: unity-webapps-common
205+<<<<<<< TREE
206 Architecture: all
207 Depends: ${misc:Depends},
208 unity-webapps-service (>= 2.3.8-0ubuntu3),
209+=======
210+Architecture: all
211+Depends: ${misc:Depends},
212+ unity-webapps-service (>= 2.3.4),
213+>>>>>>> MERGE-SOURCE
214 xdg-utils
215 Suggests: xul-ext-unity (>= 0.3.1) | unity-chromium-extension
216 Breaks: unity-webapps
217
218=== added directory 'debian/patches'
219=== renamed directory 'debian/patches' => 'debian/patches.moved'
220=== added file 'debian/patches/disable-tests.patch'
221--- debian/patches/disable-tests.patch 1970-01-01 00:00:00 +0000
222+++ debian/patches/disable-tests.patch 2012-10-04 15:17:28 +0000
223@@ -0,0 +1,12 @@
224+Index: webapps-applications/tests/Makefile.am
225+===================================================================
226+--- webapps-applications.orig/tests/Makefile.am 2012-09-20 11:23:18.725429000 -0400
227++++ webapps-applications/tests/Makefile.am 2012-09-20 15:04:02.795102336 -0400
228+@@ -30,5 +30,7 @@
229+ YandexNews.js\
230+ YouTube.js
231+
232++if ENABLE_TESTS
233+ check:
234+ find . -maxdepth 1 -name "*.js" | xargs -L 1 $(top_srcdir)/scripts/style_checker.js $(top_srcdir)/scripts/third_party/jslint.js
235++endif
236
237=== added file 'debian/patches/dont-add-launchers-on-edubuntu'
238--- debian/patches/dont-add-launchers-on-edubuntu 1970-01-01 00:00:00 +0000
239+++ debian/patches/dont-add-launchers-on-edubuntu 2012-10-04 15:17:28 +0000
240@@ -0,0 +1,20 @@
241+--- webapps-applications-2.4.6.orig/scripts/install-default-webapps-in-launcher.py
242++++ webapps-applications-2.4.6/scripts/install-default-webapps-in-launcher.py
243+@@ -1,5 +1,6 @@
244+ #!/usr/bin/python
245+ from gi.repository import Gio
246++import os
247+
248+ PREINSTALLED_LAUNCHER_DESKTOP_FILES = ["application://ubuntu-amazon-default.desktop", "application://UbuntuOneMusiconeubuntucom.desktop"]
249+
250+@@ -7,6 +8,10 @@ UNITY_LAUNCHER_SETTINGS = "com.canonical
251+ UNITY_LAUNCHER_FAVORITE_KEY = "favorites"
252+
253+ def install_default_webapps_in_launcher():
254++ # Workaround for the script triggering on systems where it shouldn't.
255++ if os.path.exists("/usr/share/glib-2.0/schemas/95_edubuntu-artwork.gschema.override"):
256++ return
257++
258+ new_desktop_files = PREINSTALLED_LAUNCHER_DESKTOP_FILES
259+
260+ if len(new_desktop_files) != 0:
261
262=== added file 'debian/patches/migration-script.patch'
263--- debian/patches/migration-script.patch 1970-01-01 00:00:00 +0000
264+++ debian/patches/migration-script.patch 2012-10-04 15:17:28 +0000
265@@ -0,0 +1,46 @@
266+=== modified file 'scripts/Makefile.am'
267+Index: webapps-applications/scripts/Makefile.am
268+===================================================================
269+--- webapps-applications.orig/scripts/Makefile.am 2012-09-21 16:44:22.384214216 -0400
270++++ webapps-applications/scripts/Makefile.am 2012-09-21 16:45:58.516215233 -0400
271+@@ -1,4 +1,5 @@
272+ EXTRA_DIST = \
273++ install-default-webapps-in-launcher.py\
274+ style_checker.js\
275+ icon_uris_checker.sh\
276+ po2json.py\
277+Index: webapps-applications/scripts/install-default-webapps-in-launcher.py
278+===================================================================
279+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
280++++ webapps-applications/scripts/install-default-webapps-in-launcher.py 2012-09-21 18:02:35.204263884 -0400
281+@@ -0,0 +1,30 @@
282++#!/usr/bin/python
283++from gi.repository import Gio
284++
285++PREINSTALLED_LAUNCHER_DESKTOP_FILES = ["application://ubuntu-amazon-default.desktop", "application://UbuntuOneMusiconeubuntucom.desktop"]
286++
287++UNITY_LAUNCHER_SETTINGS = "com.canonical.Unity.Launcher"
288++UNITY_LAUNCHER_FAVORITE_KEY = "favorites"
289++
290++def install_default_webapps_in_launcher():
291++ new_desktop_files = PREINSTALLED_LAUNCHER_DESKTOP_FILES
292++
293++ if len(new_desktop_files) != 0:
294++ try:
295++ settings = Gio.Settings.new (UNITY_LAUNCHER_SETTINGS)
296++ if not settings.is_writable(UNITY_LAUNCHER_FAVORITE_KEY):
297++ print "Unity Webapps migration process (preinstallation): 'favorites' key not writable"
298++ return
299++ favorites = settings.get_strv(UNITY_LAUNCHER_FAVORITE_KEY)
300++
301++ # only append the desktop icons that are not already present in the favorites list if any
302++ favorites.extend(list (set(new_desktop_files).difference(favorites)))
303++
304++ settings.set_strv(UNITY_LAUNCHER_FAVORITE_KEY, favorites)
305++ settings.sync()
306++ except:
307++ pass
308++
309++if __name__ == "__main__":
310++ install_default_webapps_in_launcher()
311++
312
313=== added file 'debian/patches/series'
314--- debian/patches/series 1970-01-01 00:00:00 +0000
315+++ debian/patches/series 2012-10-04 15:17:28 +0000
316@@ -0,0 +1,3 @@
317+disable-tests.patch
318+migration-script.patch
319+dont-add-launchers-on-edubuntu
320
321=== added directory 'debian/source'
322=== renamed directory 'debian/source' => 'debian/source.moved'
323=== added file 'debian/source/format'
324--- debian/source/format 1970-01-01 00:00:00 +0000
325+++ debian/source/format 2012-10-04 15:17:28 +0000
326@@ -0,0 +1,1 @@
327+3.0 (quilt)
328
329=== added file 'debian/unity-webapps-common.install'
330--- debian/unity-webapps-common.install 1970-01-01 00:00:00 +0000
331+++ debian/unity-webapps-common.install 2012-10-04 15:17:28 +0000
332@@ -0,0 +1,2 @@
333+debian/*.pkla var/lib/polkit-1/localauthority/10-vendor.d/
334+debian/aptdaemon-*.cfg etc/aptdaemon/high-trust-repository-whitelist.d
335\ No newline at end of file
336
337=== added file 'debian/unity-webapps-common.migrations'
338--- debian/unity-webapps-common.migrations 1970-01-01 00:00:00 +0000
339+++ debian/unity-webapps-common.migrations 2012-10-04 15:17:28 +0000
340@@ -0,0 +1,1 @@
341+scripts/install-default-webapps-in-launcher.py
342
343=== renamed file 'debian/unity-webapps-common.migrations' => 'debian/unity-webapps-common.migrations.moved'

Subscribers

People subscribed via source and target branches

to all changes: