Merge lp:~laney/sessioninstaller/commandnotfound-dep into lp:sessioninstaller

Proposed by Iain Lane
Status: Superseded
Proposed branch: lp:~laney/sessioninstaller/commandnotfound-dep
Merge into: lp:sessioninstaller
Diff against target: 459 lines (+380/-0)
15 files modified
.bzr-builddeb/default.conf (+3/-0)
debian/changelog (+218/-0)
debian/compat (+1/-0)
debian/control (+47/-0)
debian/copyright (+36/-0)
debian/dirs (+2/-0)
debian/examples (+1/-0)
debian/patches/01_disable_install_print_drivers.patch (+15/-0)
debian/patches/02_no_crash_on_install_provides.patch (+16/-0)
debian/patches/series (+2/-0)
debian/postinst (+13/-0)
debian/prerem (+15/-0)
debian/rules (+8/-0)
debian/source/format (+1/-0)
debian/watch (+2/-0)
To merge this branch: bzr merge lp:~laney/sessioninstaller/commandnotfound-dep
Reviewer Review Type Date Requested Status
Aptdaemon Developers Pending
Review via email: mp+190103@code.launchpad.net

This proposal has been superseded by a proposal from 2013-10-09.

Description of the change

Uploading this to saucy; please merge it to the packaging branch (could we move that under ubuntu-core-dev?)

To post a comment you must log in.

Unmerged revisions

57. By Iain Lane

releasing package sessioninstaller version 0.20+bzr141-0ubuntu2

56. By Iain Lane

Depend on python-commandnotfound for InstallProvideFiles. (LP: #1060507)

55. By Martin Pitt

releasing version 0.20+bzr141-0ubuntu1

54. By Martin Pitt

* New upstream snapshot:
  - Includes 03_gstreamer_1.0.patch, 04_dont_double_defer.patch,
    05_parent_process_name.patch, drop these.
  - Don't crash on parsing broken .desktop files. (LP: #1190097)

53. By Martin Pitt

Update Vcs-* headers for saucy branch.

52. By Martin Pitt

releasing version 0.20+bzr134-0ubuntu6

51. By Martin Pitt

* debian/patches/05_parent_process_name.patch:
  - Cherry pick upstream patch to fix the detection of the client application.
    Patch from Sebastian Heinlein, thanks! (LP: #1049467)

50. By Martin Pitt

releasing version 0.20+bzr134-0ubuntu5

49. By Martin Pitt

* debian/patches/04_dont_double_defer.patch:
  - Cherry pick upstream patch to avoid calling errback twice on the
    same deferred object (LP: #1056545)

48. By Martin Pitt

releasing version 0.20+bzr134-0ubuntu4

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory '.bzr-builddeb'
2=== added file '.bzr-builddeb/default.conf'
3--- .bzr-builddeb/default.conf 1970-01-01 00:00:00 +0000
4+++ .bzr-builddeb/default.conf 2013-10-09 11:54:13 +0000
5@@ -0,0 +1,3 @@
6+[BUILDDEB]
7+merge=True
8+export-upstream = lp:sessioninstaller
9
10=== added directory 'debian'
11=== added file 'debian/changelog'
12--- debian/changelog 1970-01-01 00:00:00 +0000
13+++ debian/changelog 2013-10-09 11:54:13 +0000
14@@ -0,0 +1,218 @@
15+sessioninstaller (0.20+bzr141-0ubuntu2) saucy; urgency=low
16+
17+ * Depend on python-commandnotfound for InstallProvideFiles. (LP: #1060507)
18+
19+ -- Iain Lane <iain@orangesquash.org.uk> Wed, 09 Oct 2013 12:52:03 +0100
20+
21+sessioninstaller (0.20+bzr141-0ubuntu1) saucy; urgency=low
22+
23+ * Update Vcs-* headers for saucy branch.
24+ * New upstream snapshot:
25+ - Includes 03_gstreamer_1.0.patch, 04_dont_double_defer.patch,
26+ 05_parent_process_name.patch, drop these.
27+ - Don't crash on parsing broken .desktop files. (LP: #1190097)
28+
29+ -- Martin Pitt <martin.pitt@ubuntu.com> Thu, 13 Jun 2013 12:50:45 +0200
30+
31+sessioninstaller (0.20+bzr134-0ubuntu6) raring; urgency=low
32+
33+ * debian/patches/05_parent_process_name.patch:
34+ - Cherry pick upstream patch to fix the detection of the client application.
35+ Patch from Sebastian Heinlein, thanks! (LP: #1049467)
36+
37+ -- POJAR GEORGE <geoubuntu@gmail.com> Mon, 08 Apr 2013 08:45:12 +0000
38+
39+sessioninstaller (0.20+bzr134-0ubuntu5) raring; urgency=low
40+
41+ * debian/patches/04_dont_double_defer.patch:
42+ - Cherry pick upstream patch to avoid calling errback twice on the
43+ same deferred object (LP: #1056545)
44+
45+ -- Michael Terry <mterry@ubuntu.com> Thu, 28 Mar 2013 14:25:57 -0400
46+
47+sessioninstaller (0.20+bzr134-0ubuntu4) raring; urgency=low
48+
49+ [ Michael Vogt ]
50+ * fix Bzr-Vcs header
51+
52+ [ Iain Lane ]
53+ * Cherry-pick upstream patch to learn about gstreamer 1.0 and use g-i
54+ GStreamer bindings instead of static python ones.
55+ * Drop Depends on python-gst0.10 and add one on the gstreamer-1.0 gir
56+ package instead.
57+
58+ -- Iain Lane <iain.lane@canonical.com> Wed, 13 Feb 2013 10:11:13 +0000
59+
60+sessioninstaller (0.20+bzr134-0ubuntu3) raring; urgency=low
61+
62+ [ Benjamin Kerensa ]
63+ * Fix typo in core.py (LP: 988775)
64+
65+ [ Michael Vogt ]
66+ * new bzr version
67+ * drop 03_synchronous_transactions.patch (in trunk now)
68+
69+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 05 Nov 2012 12:42:35 +0100
70+
71+sessioninstaller (0.20+bzr131-0ubuntu2) quantal; urgency=low
72+
73+ * Cherry-pick upstream revision 132 to make transactions synchronous, as is
74+ expected (LP: #1042231)
75+
76+ -- Iain Lane <iain.lane@canonical.com> Thu, 20 Sep 2012 16:13:18 +0100
77+
78+sessioninstaller (0.20+bzr131-0ubuntu1) quantal; urgency=low
79+
80+ * debian/control: Update Vcs-* to Quantal branch.
81+ * New upstream snapshot:
82+ - Fix typo in error message. (LP: #790500)
83+ - Make sure not to accidentally call defer.callback() twice (LP #848605)
84+ - Work around static vs. GI gobject binding crash. (LP: #1028640)
85+ * Drop fix-defer-callback.patch, included upstream.
86+
87+ -- Martin Pitt <martin.pitt@ubuntu.com> Tue, 21 Aug 2012 08:50:56 +0200
88+
89+sessioninstaller (0.20+bzr128-0ubuntu1.1) precise-proposed; urgency=low
90+
91+ * debian/patches/fix-defer-callback.patch:
92+ - Make sure not to accidentally call defer.callback() twice
93+ (LP: #848605)
94+
95+ -- Michael Terry <mterry@ubuntu.com> Mon, 23 Jul 2012 16:18:37 -0400
96+
97+sessioninstaller (0.20+bzr128-0ubuntu1) precise-proposed; urgency=low
98+
99+ * New upstream release that fixes:
100+ - merged lp:~aptdaemon-developers/sessioninstaller/multiarch
101+ LP: #899001
102+ - Fix missing translation for the restrcited packages tooltip
103+ LP: #972427
104+ - Don't translate debugging messages LP: #792436
105+ - Fix a string substition if the sender_name of InstallPackageNames
106+ is unknown
107+ - Check if packages are available at all and show a corresponding
108+ error message if not (string addition) instead of a generic and
109+ no descriptive message
110+
111+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 25 Apr 2012 15:04:59 +0200
112+
113+sessioninstaller (0.20+bzr123-0ubuntu2) precise; urgency=low
114+
115+ * debian/control: Fix dependencies: python-gobject → python-gi.
116+
117+ -- Martin Pitt <martin.pitt@ubuntu.com> Tue, 13 Mar 2012 19:31:36 +0100
118+
119+sessioninstaller (0.20+bzr123-0ubuntu1) precise; urgency=low
120+
121+ * New upstream snapshot:
122+ - Port to PyGI and GTK 3. (LP: #801202)
123+ * debian/control: Move Vcs-Bzr: to precise branch.
124+ * debian/control: C/R/P: gnome-codec-install, to clean this up on upgrades.
125+ session-installer is the preferred UI now.
126+ * debian/control: Update dependencies for PyGI/GTK 3 port.
127+ * debian/control: Bump Standards-Version to 3.9.2 (no changes necessary).
128+
129+ -- Martin Pitt <martin.pitt@ubuntu.com> Mon, 14 Nov 2011 15:26:01 +0100
130+
131+sessioninstaller (0.20+bzr120-0ubuntu2) oneiric; urgency=low
132+
133+ * Fixed two typos in debian/control (LP: #793396)
134+
135+ -- Alexander Fougner <fougner89@gmail.com> Fri, 24 Jun 2011 12:42:19 +0200
136+
137+sessioninstaller (0.20+bzr120-0ubuntu1) oneiric; urgency=low
138+
139+ * new bzr snapshot
140+ * updated from python-support to dh_python2
141+
142+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 10 Jun 2011 12:53:49 +0200
143+
144+sessioninstaller (0.20+bzr119-0ubuntu2) natty; urgency=low
145+
146+ * debian/patches/02_no_crash_on_install_provides.patch:
147+ - do not raise a exception in _install_provide_files()
148+ LP: #762431
149+
150+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 18 Apr 2011 11:51:08 +0200
151+
152+sessioninstaller (0.20+bzr119-0ubuntu1) natty; urgency=low
153+
154+ * new bzr bugfix snaphot:
155+ - migrate backend to defer
156+ - fix crash in _render_warning (LP: #713984)
157+ * debian/patches/02_backends_defer.patch:
158+ - dropped, part of upstream now
159+
160+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 31 Mar 2011 18:08:42 +0200
161+
162+sessioninstaller (0.20+bzr117-0ubuntu1) natty; urgency=low
163+
164+ * New bzr version:
165+ - Migrate from aptdaemon.defer to defer. (LP: #703330)
166+ * debian/patches/02_backends_defer.patch:
167+ - Migrate also backends to defer.
168+ * debian/control:
169+ - Depends on python-defer.
170+ - Depends on python-xapian.
171+
172+ -- Julien Lavergne <gilir@ubuntu.com> Fri, 14 Jan 2011 22:39:37 +0100
173+
174+sessioninstaller (0.20+bzr115-0ubuntu1) maverick; urgency=low
175+
176+ * New bzr version that use the command-not-found database to
177+ find files asked for by the InstallProviding interface. This
178+ helps e.g. brasero to find the cdrdao package when it needs it
179+ (LP: #630877)
180+
181+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 24 Sep 2010 10:50:55 +0200
182+
183+sessioninstaller (0.20+bzr112-0ubuntu1) maverick; urgency=low
184+
185+ * debian/patches/01_disable_install_print_drivers.patch:
186+ - silently exit on "InstallPrinterDrivers" (this is not
187+ implmented yet) (LP: #633913)
188+ * new bzr snapshot that fixes crash in InstallPrinterDrivers()
189+ (LP: #612140)
190+
191+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 13 Sep 2010 16:02:53 +0200
192+
193+sessioninstaller (0.20-1) unstable; urgency=low
194+
195+ * New upstream release.
196+ * debian/control: Set Standards-Version to 3.9.0
197+
198+ -- Julian Andres Klode <jak@debian.org> Mon, 12 Jul 2010 14:03:40 +0200
199+
200+sessioninstaller (0.10+bzr104-1) unstable; urgency=low
201+
202+ * Initial Upload to Debian (Closes: #558797)
203+ - Change maintainer and VCS fields accordingly.
204+ * Use python-support instead of python-central.
205+ * Really use 3.0 (quilt) source format.
206+ * debian/control: Use Vcs-* headers instead of XS-Vcs-* ones.
207+ * debian/watch: Add watch file.
208+
209+ -- Julian Andres Klode <jak@debian.org> Sun, 06 Jun 2010 14:59:03 +0200
210+
211+sessioninstaller (0.10+bzr104-0ubuntu1) maverick; urgency=low
212+
213+ * new bzr snapshot:
214+ - support mime-type install
215+ - support icons/applications
216+
217+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 27 May 2010 10:03:53 +0200
218+
219+sessioninstaller (0.10-0ubuntu2) maverick; urgency=low
220+
221+ * debian/copyright:
222+ Use machine readable format
223+ * debian/source/format:
224+ Use 3.0 (quilt)
225+
226+ -- Sebastian Heinlein <devel@glatzor.de> Sun, 16 May 2010 16:21:00 +0200
227+
228+sessioninstaller (0.10-0ubuntu1~ppa1) lucid; urgency=low
229+
230+ * Initial Release.
231+
232+ -- Sebastian Heinlein <glatzor@ubuntu.com> Fri, 05 Dec 2008 14:29:13 -0800
233
234=== added file 'debian/compat'
235--- debian/compat 1970-01-01 00:00:00 +0000
236+++ debian/compat 2013-10-09 11:54:13 +0000
237@@ -0,0 +1,1 @@
238+7
239
240=== added file 'debian/control'
241--- debian/control 1970-01-01 00:00:00 +0000
242+++ debian/control 2013-10-09 11:54:13 +0000
243@@ -0,0 +1,47 @@
244+Source: sessioninstaller
245+Section: gnome
246+Priority: extra
247+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
248+XSBC-Original-Maintainer: Julian Andres Klode <jak@debian.org>
249+Build-Depends: debhelper (>= 7.3),
250+ python (>= 2.6.6-3~),
251+ python-setuptools,
252+ python-distutils-extra
253+Standards-Version: 3.9.2
254+X-Python-Version: >= 2.5
255+Homepage: http://launchpad.net/sessioninstaller
256+Vcs-Bzr: lp:~aptdaemon-developers/sessioninstaller/ubuntu-saucy
257+Vcs-Browser: http://bazaar.launchpad.net/~aptdaemon-developers/sessioninstaller/ubuntu-saucy
258+
259+Package: sessioninstaller
260+Architecture: all
261+Depends: ${shlibs:Depends},
262+ ${misc:Depends},
263+ ${python:Depends},
264+ aptdaemon (>=0.30),
265+ python-aptdaemon.gtk3widgets,
266+ python-commandnotfound,
267+ python-defer,
268+ python-xapian,
269+ python-gi,
270+ gir1.2-gtk-3.0,
271+ gir1.2-gstreamer-1.0
272+Conflicts: packagekit-gnome, gnome-codec-install
273+Replaces: gnome-codec-install
274+Provides: gnome-codec-install
275+Description: APT based installer using PackageKit's session DBus API
276+ Sessioninstaller allows applications to easily install additional software
277+ (e.g. extensions or GStreamer codecs), uninstall files and perform simple
278+ software status queries by implementing the distribution neutral
279+ D-Bus session interface of PackageKit.
280+ .
281+ The whole process including confirmation, error reporting and progress
282+ and notification is handled by sessioninstaller.
283+ .
284+ The reference implementation of the D-Bus interface can be found in
285+ gnome-packagekit. It was also adpoted by KPackageKit.
286+ .
287+ In contrast to gnome-packagekit and KPackageKit it doesn't use the PackageKit
288+ daemon for querying and installation, but instead makes use of APT and
289+ aptdaemon (alternatively synaptic can be used).
290+
291
292=== added file 'debian/copyright'
293--- debian/copyright 1970-01-01 00:00:00 +0000
294+++ debian/copyright 2013-10-09 11:54:13 +0000
295@@ -0,0 +1,36 @@
296+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
297+Name: SessionInstaller
298+Source: http://launchpad.net/sessioninstaller
299+Maintainer: Sebastian Heinlein <devel@glatzor.de>
300+
301+Copyright: 2008-2010, Sebastian Heinlein <devel@glatzor.de>
302+License: GPL-2+
303+
304+Files: sessioninstaller/core.py
305+Copyright: 2008-2010, Sebastian Heinlein <devel@glatzor.de>
306+ 2009, Richard Hughes <richard@hughsie.com>
307+ 2008, Sebastian Dröge <sebastian.droege@collabora.co.uk>
308+License: GPL-2+
309+
310+Files: sessioninstaller/backends/synaptic.py
311+Copyright: 2008-2010, Sebastian Heinlein <devel@glatzor.de>
312+ 2005-2007, Canonical Ltd.
313+License: GPL-2+
314+
315+License: GPL-2+
316+ This package is free software; you can redistribute it and/or modify
317+ it under the terms of the GNU General Public License as published by
318+ the Free Software Foundation; either version 2 of the License, or
319+ (at your option) any later version.
320+ .
321+ This package is distributed in the hope that it will be useful,
322+ but WITHOUT ANY WARRANTY; without even the implied warranty of
323+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
324+ GNU General Public License for more details.
325+ .
326+ You should have received a copy of the GNU General Public License
327+ along with this package; if not, write to the Free Software
328+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
329+ .
330+ On Debian systems, the complete text of the GNU General
331+ Public License can be found in `/usr/share/common-licenses/GPL'.
332
333=== added file 'debian/dirs'
334--- debian/dirs 1970-01-01 00:00:00 +0000
335+++ debian/dirs 2013-10-09 11:54:13 +0000
336@@ -0,0 +1,2 @@
337+usr/bin
338+usr/sbin
339
340=== added file 'debian/docs'
341=== added file 'debian/examples'
342--- debian/examples 1970-01-01 00:00:00 +0000
343+++ debian/examples 2013-10-09 11:54:13 +0000
344@@ -0,0 +1,1 @@
345+test
346
347=== added directory 'debian/patches'
348=== added file 'debian/patches/01_disable_install_print_drivers.patch'
349--- debian/patches/01_disable_install_print_drivers.patch 1970-01-01 00:00:00 +0000
350+++ debian/patches/01_disable_install_print_drivers.patch 2013-10-09 11:54:13 +0000
351@@ -0,0 +1,15 @@
352+## Description: add some description
353+## Origin/Author: add some origin or author
354+## Bug: bug URL
355+Index: sessioninstaller-0.20+bzr112/sessioninstaller/core.py
356+===================================================================
357+--- sessioninstaller-0.20+bzr112.orig/sessioninstaller/core.py 2010-09-13 15:51:41.291392000 +0200
358++++ sessioninstaller-0.20+bzr112/sessioninstaller/core.py 2010-09-13 15:51:40.361392000 +0200
359+@@ -1025,6 +1025,7 @@
360+
361+ @track_usage
362+ def _install_printer_drivers(self, xid, resources, interaction):
363++ return
364+ header = _("Installing printer drivers on request isn't supported")
365+ message = _("Currently autodetection and installation of "
366+ "missing printer drivers is not supported.")
367
368=== added file 'debian/patches/02_no_crash_on_install_provides.patch'
369--- debian/patches/02_no_crash_on_install_provides.patch 1970-01-01 00:00:00 +0000
370+++ debian/patches/02_no_crash_on_install_provides.patch 2013-10-09 11:54:13 +0000
371@@ -0,0 +1,16 @@
372+## Description: do not raise exception on _install_provide_files()
373+## Origin/Author: Michael Vogt <michael.vogt@ubuntu.com>
374+## Bug: https://bugs.launchpad.net/ubuntu/+source/sessioninstaller/+bug/762431
375+Index: sessioninstaller-0.20+bzr119/sessioninstaller/core.py
376+===================================================================
377+--- sessioninstaller-0.20+bzr119.orig/sessioninstaller/core.py 2011-04-18 11:39:42.493047332 +0200
378++++ sessioninstaller-0.20+bzr119/sessioninstaller/core.py 2011-04-18 11:39:41.543045940 +0200
379+@@ -711,7 +711,7 @@
380+ dia = ErrorDialog(header, message)
381+ dia.run()
382+ dia.hide()
383+- raise errors.ModifyInternalError(message)
384++ #raise errors.ModifyInternalError(message)
385+
386+ @dbus_deferred_method(PACKAGEKIT_MODIFY_DBUS_INTERFACE,
387+ in_signature="uass", out_signature="",
388
389=== added file 'debian/patches/series'
390--- debian/patches/series 1970-01-01 00:00:00 +0000
391+++ debian/patches/series 2013-10-09 11:54:13 +0000
392@@ -0,0 +1,2 @@
393+01_disable_install_print_drivers.patch
394+02_no_crash_on_install_provides.patch
395
396=== added file 'debian/postinst'
397--- debian/postinst 1970-01-01 00:00:00 +0000
398+++ debian/postinst 2013-10-09 11:54:13 +0000
399@@ -0,0 +1,13 @@
400+#!/bin/sh
401+# postinst script for gstreamer0.10-packagekit
402+
403+set -e
404+
405+update-alternatives --install /usr/bin/gstreamer-codec-install \
406+ gstreamer-codec-install \
407+ /usr/bin/gst-install 80 || true
408+
409+#DEBHELPER#
410+
411+exit 0
412+
413
414=== added file 'debian/prerem'
415--- debian/prerem 1970-01-01 00:00:00 +0000
416+++ debian/prerem 2013-10-09 11:54:13 +0000
417@@ -0,0 +1,15 @@
418+#!/bin/sh
419+# prerm script for sessioninstaller
420+
421+set -e
422+
423+if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then
424+ update-alternatives --remove gstreamer-codec-install \
425+ /usr/bin/gst-installer || true
426+
427+fi
428+
429+#DEBHELPER#
430+
431+exit 0
432+
433
434=== added file 'debian/rules'
435--- debian/rules 1970-01-01 00:00:00 +0000
436+++ debian/rules 2013-10-09 11:54:13 +0000
437@@ -0,0 +1,8 @@
438+#!/usr/bin/make -f
439+
440+%:
441+ dh $@ --with python2
442+
443+override_dh_auto_clean:
444+ dh_auto_clean
445+ rm -rf build po/sessioninstaller.pot
446
447=== added directory 'debian/source'
448=== added file 'debian/source/format'
449--- debian/source/format 1970-01-01 00:00:00 +0000
450+++ debian/source/format 2013-10-09 11:54:13 +0000
451@@ -0,0 +1,1 @@
452+3.0 (quilt)
453
454=== added file 'debian/watch'
455--- debian/watch 1970-01-01 00:00:00 +0000
456+++ debian/watch 2013-10-09 11:54:13 +0000
457@@ -0,0 +1,2 @@
458+version=3
459+http://launchpad.net/sessioninstaller/+download .*/sessioninstaller-([0-9.]+)\.tgz

Subscribers

People subscribed via source and target branches