Merge lp:~laney/sessioninstaller/raring-0ubuntu4 into lp:sessioninstaller

Proposed by Iain Lane
Status: Needs review
Proposed branch: lp:~laney/sessioninstaller/raring-0ubuntu4
Merge into: lp:sessioninstaller
Diff against target: 565 lines (+481/-0)
16 files modified
.bzr-builddeb/default.conf (+3/-0)
debian/changelog (+186/-0)
debian/compat (+1/-0)
debian/control (+46/-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/03_gstreamer_1.0.patch (+133/-0)
debian/patches/series (+3/-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/raring-0ubuntu4
Reviewer Review Type Date Requested Status
Aptdaemon Developers Pending
Review via email: mp+148129@code.launchpad.net

Description of the change

I uploaded this; please merge to the packaging branch.

Could this be moved to somewhere under ~ubuntu-core-dev or just to the UDD
branch? I don't like that uploaders can't push.

To post a comment you must log in.
Revision history for this message
Iain Lane (laney) wrote :

bah, bzr lp-propose got the target branch wrong. It should be lp:~aptdaemon-developers/sessioninstaller/ubuntu-raring

Unmerged revisions

48. By Iain Lane

releasing version 0.20+bzr134-0ubuntu4

47. By Iain Lane

* Cherry-pick upstream patch to learn about gstreamer 1.0 and use g-i
  GStreamer bindings instead of static python ones.
* Drop Depends on python-gst0.10 and add one on the gstreamer-1.0 gir
  package instead.

46. By Michael Vogt

fix Bzr-Vcs header

45. By Michael Vogt

releasing version 0.20+bzr134-0ubuntu3

44. By Michael Vogt

merged from lp:~laney/sessioninstaller/distro-fix-1042231

43. By Martin Pitt

releasing version 0.20+bzr131-0ubuntu1

42. By Martin Pitt

* New upstream snapshot:
  - Fix typo in error message. (LP: #790500)
  - Make sure not to accidentally call defer.callback() twice (LP #848605)
  - Work around static vs. GI gobject binding crash. (LP: #1028640)
* Drop fix-defer-callback.patch, included upstream.

41. By Martin Pitt

debian/control: Update Vcs-* to Quantal branch.

40. By Martin Pitt

* debian/patches/fix-defer-callback.patch:
  - Make sure not to accidentally call defer.callback() twice
    (LP: #848605)

39. By Martin Pitt

* New upstream release that fixes:
  - merged lp:~aptdaemon-developers/sessioninstaller/multiarch
    LP: #899001
  - Fix missing translation for the restrcited packages tooltip
    LP: #972427
  - Don't translate debugging messages LP: #792436
  - Fix a string substition if the sender_name of InstallPackageNames
    is unknown
  - Check if packages are available at all and show a corresponding
    error message if not (string addition) instead of a generic and
    no descriptive message

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-02-13 10:34:25 +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-02-13 10:34:25 +0000
14@@ -0,0 +1,186 @@
15+sessioninstaller (0.20+bzr134-0ubuntu4) raring; urgency=low
16+
17+ [ Michael Vogt ]
18+ * fix Bzr-Vcs header
19+
20+ [ Iain Lane ]
21+ * Cherry-pick upstream patch to learn about gstreamer 1.0 and use g-i
22+ GStreamer bindings instead of static python ones.
23+ * Drop Depends on python-gst0.10 and add one on the gstreamer-1.0 gir
24+ package instead.
25+
26+ -- Iain Lane <iain.lane@canonical.com> Wed, 13 Feb 2013 10:11:13 +0000
27+
28+sessioninstaller (0.20+bzr134-0ubuntu3) raring; urgency=low
29+
30+ [ Benjamin Kerensa ]
31+ * Fix typo in core.py (LP: 988775)
32+
33+ [ Michael Vogt ]
34+ * new bzr version
35+ * drop 03_synchronous_transactions.patch (in trunk now)
36+
37+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 05 Nov 2012 12:42:35 +0100
38+
39+sessioninstaller (0.20+bzr131-0ubuntu2) quantal; urgency=low
40+
41+ * Cherry-pick upstream revision 132 to make transactions synchronous, as is
42+ expected (LP: #1042231)
43+
44+ -- Iain Lane <iain.lane@canonical.com> Thu, 20 Sep 2012 16:13:18 +0100
45+
46+sessioninstaller (0.20+bzr131-0ubuntu1) quantal; urgency=low
47+
48+ * debian/control: Update Vcs-* to Quantal branch.
49+ * New upstream snapshot:
50+ - Fix typo in error message. (LP: #790500)
51+ - Make sure not to accidentally call defer.callback() twice (LP #848605)
52+ - Work around static vs. GI gobject binding crash. (LP: #1028640)
53+ * Drop fix-defer-callback.patch, included upstream.
54+
55+ -- Martin Pitt <martin.pitt@ubuntu.com> Tue, 21 Aug 2012 08:50:56 +0200
56+
57+sessioninstaller (0.20+bzr128-0ubuntu1.1) precise-proposed; urgency=low
58+
59+ * debian/patches/fix-defer-callback.patch:
60+ - Make sure not to accidentally call defer.callback() twice
61+ (LP: #848605)
62+
63+ -- Michael Terry <mterry@ubuntu.com> Mon, 23 Jul 2012 16:18:37 -0400
64+
65+sessioninstaller (0.20+bzr128-0ubuntu1) precise-proposed; urgency=low
66+
67+ * New upstream release that fixes:
68+ - merged lp:~aptdaemon-developers/sessioninstaller/multiarch
69+ LP: #899001
70+ - Fix missing translation for the restrcited packages tooltip
71+ LP: #972427
72+ - Don't translate debugging messages LP: #792436
73+ - Fix a string substition if the sender_name of InstallPackageNames
74+ is unknown
75+ - Check if packages are available at all and show a corresponding
76+ error message if not (string addition) instead of a generic and
77+ no descriptive message
78+
79+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 25 Apr 2012 15:04:59 +0200
80+
81+sessioninstaller (0.20+bzr123-0ubuntu2) precise; urgency=low
82+
83+ * debian/control: Fix dependencies: python-gobject → python-gi.
84+
85+ -- Martin Pitt <martin.pitt@ubuntu.com> Tue, 13 Mar 2012 19:31:36 +0100
86+
87+sessioninstaller (0.20+bzr123-0ubuntu1) precise; urgency=low
88+
89+ * New upstream snapshot:
90+ - Port to PyGI and GTK 3. (LP: #801202)
91+ * debian/control: Move Vcs-Bzr: to precise branch.
92+ * debian/control: C/R/P: gnome-codec-install, to clean this up on upgrades.
93+ session-installer is the preferred UI now.
94+ * debian/control: Update dependencies for PyGI/GTK 3 port.
95+ * debian/control: Bump Standards-Version to 3.9.2 (no changes necessary).
96+
97+ -- Martin Pitt <martin.pitt@ubuntu.com> Mon, 14 Nov 2011 15:26:01 +0100
98+
99+sessioninstaller (0.20+bzr120-0ubuntu2) oneiric; urgency=low
100+
101+ * Fixed two typos in debian/control (LP: #793396)
102+
103+ -- Alexander Fougner <fougner89@gmail.com> Fri, 24 Jun 2011 12:42:19 +0200
104+
105+sessioninstaller (0.20+bzr120-0ubuntu1) oneiric; urgency=low
106+
107+ * new bzr snapshot
108+ * updated from python-support to dh_python2
109+
110+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 10 Jun 2011 12:53:49 +0200
111+
112+sessioninstaller (0.20+bzr119-0ubuntu2) natty; urgency=low
113+
114+ * debian/patches/02_no_crash_on_install_provides.patch:
115+ - do not raise a exception in _install_provide_files()
116+ LP: #762431
117+
118+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 18 Apr 2011 11:51:08 +0200
119+
120+sessioninstaller (0.20+bzr119-0ubuntu1) natty; urgency=low
121+
122+ * new bzr bugfix snaphot:
123+ - migrate backend to defer
124+ - fix crash in _render_warning (LP: #713984)
125+ * debian/patches/02_backends_defer.patch:
126+ - dropped, part of upstream now
127+
128+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 31 Mar 2011 18:08:42 +0200
129+
130+sessioninstaller (0.20+bzr117-0ubuntu1) natty; urgency=low
131+
132+ * New bzr version:
133+ - Migrate from aptdaemon.defer to defer. (LP: #703330)
134+ * debian/patches/02_backends_defer.patch:
135+ - Migrate also backends to defer.
136+ * debian/control:
137+ - Depends on python-defer.
138+ - Depends on python-xapian.
139+
140+ -- Julien Lavergne <gilir@ubuntu.com> Fri, 14 Jan 2011 22:39:37 +0100
141+
142+sessioninstaller (0.20+bzr115-0ubuntu1) maverick; urgency=low
143+
144+ * New bzr version that use the command-not-found database to
145+ find files asked for by the InstallProviding interface. This
146+ helps e.g. brasero to find the cdrdao package when it needs it
147+ (LP: #630877)
148+
149+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 24 Sep 2010 10:50:55 +0200
150+
151+sessioninstaller (0.20+bzr112-0ubuntu1) maverick; urgency=low
152+
153+ * debian/patches/01_disable_install_print_drivers.patch:
154+ - silently exit on "InstallPrinterDrivers" (this is not
155+ implmented yet) (LP: #633913)
156+ * new bzr snapshot that fixes crash in InstallPrinterDrivers()
157+ (LP: #612140)
158+
159+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 13 Sep 2010 16:02:53 +0200
160+
161+sessioninstaller (0.20-1) unstable; urgency=low
162+
163+ * New upstream release.
164+ * debian/control: Set Standards-Version to 3.9.0
165+
166+ -- Julian Andres Klode <jak@debian.org> Mon, 12 Jul 2010 14:03:40 +0200
167+
168+sessioninstaller (0.10+bzr104-1) unstable; urgency=low
169+
170+ * Initial Upload to Debian (Closes: #558797)
171+ - Change maintainer and VCS fields accordingly.
172+ * Use python-support instead of python-central.
173+ * Really use 3.0 (quilt) source format.
174+ * debian/control: Use Vcs-* headers instead of XS-Vcs-* ones.
175+ * debian/watch: Add watch file.
176+
177+ -- Julian Andres Klode <jak@debian.org> Sun, 06 Jun 2010 14:59:03 +0200
178+
179+sessioninstaller (0.10+bzr104-0ubuntu1) maverick; urgency=low
180+
181+ * new bzr snapshot:
182+ - support mime-type install
183+ - support icons/applications
184+
185+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 27 May 2010 10:03:53 +0200
186+
187+sessioninstaller (0.10-0ubuntu2) maverick; urgency=low
188+
189+ * debian/copyright:
190+ Use machine readable format
191+ * debian/source/format:
192+ Use 3.0 (quilt)
193+
194+ -- Sebastian Heinlein <devel@glatzor.de> Sun, 16 May 2010 16:21:00 +0200
195+
196+sessioninstaller (0.10-0ubuntu1~ppa1) lucid; urgency=low
197+
198+ * Initial Release.
199+
200+ -- Sebastian Heinlein <glatzor@ubuntu.com> Fri, 05 Dec 2008 14:29:13 -0800
201
202=== added file 'debian/compat'
203--- debian/compat 1970-01-01 00:00:00 +0000
204+++ debian/compat 2013-02-13 10:34:25 +0000
205@@ -0,0 +1,1 @@
206+7
207
208=== added file 'debian/control'
209--- debian/control 1970-01-01 00:00:00 +0000
210+++ debian/control 2013-02-13 10:34:25 +0000
211@@ -0,0 +1,46 @@
212+Source: sessioninstaller
213+Section: gnome
214+Priority: extra
215+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
216+XSBC-Original-Maintainer: Julian Andres Klode <jak@debian.org>
217+Build-Depends: debhelper (>= 7.3),
218+ python (>= 2.6.6-3~),
219+ python-setuptools,
220+ python-distutils-extra
221+Standards-Version: 3.9.2
222+X-Python-Version: >= 2.5
223+Homepage: http://launchpad.net/sessioninstaller
224+Vcs-Bzr: lp:~aptdaemon-developers/sessioninstaller/ubuntu-quantal
225+Vcs-Browser: http://bazaar.launchpad.net/~aptdaemon-developers/sessioninstaller/ubuntu-raring
226+
227+Package: sessioninstaller
228+Architecture: all
229+Depends: ${shlibs:Depends},
230+ ${misc:Depends},
231+ ${python:Depends},
232+ aptdaemon (>=0.30),
233+ python-aptdaemon.gtk3widgets,
234+ python-defer,
235+ python-xapian,
236+ python-gi,
237+ gir1.2-gtk-3.0,
238+ gir1.2-gstreamer-1.0
239+Conflicts: packagekit-gnome, gnome-codec-install
240+Replaces: gnome-codec-install
241+Provides: gnome-codec-install
242+Description: APT based installer using PackageKit's session DBus API
243+ Sessioninstaller allows applications to easily install additional software
244+ (e.g. extensions or GStreamer codecs), uninstall files and perform simple
245+ software status queries by implementing the distribution neutral
246+ D-Bus session interface of PackageKit.
247+ .
248+ The whole process including confirmation, error reporting and progress
249+ and notification is handled by sessioninstaller.
250+ .
251+ The reference implementation of the D-Bus interface can be found in
252+ gnome-packagekit. It was also adpoted by KPackageKit.
253+ .
254+ In contrast to gnome-packagekit and KPackageKit it doesn't use the PackageKit
255+ daemon for querying and installation, but instead makes use of APT and
256+ aptdaemon (alternatively synaptic can be used).
257+
258
259=== added file 'debian/copyright'
260--- debian/copyright 1970-01-01 00:00:00 +0000
261+++ debian/copyright 2013-02-13 10:34:25 +0000
262@@ -0,0 +1,36 @@
263+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
264+Name: SessionInstaller
265+Source: http://launchpad.net/sessioninstaller
266+Maintainer: Sebastian Heinlein <devel@glatzor.de>
267+
268+Copyright: 2008-2010, Sebastian Heinlein <devel@glatzor.de>
269+License: GPL-2+
270+
271+Files: sessioninstaller/core.py
272+Copyright: 2008-2010, Sebastian Heinlein <devel@glatzor.de>
273+ 2009, Richard Hughes <richard@hughsie.com>
274+ 2008, Sebastian Dröge <sebastian.droege@collabora.co.uk>
275+License: GPL-2+
276+
277+Files: sessioninstaller/backends/synaptic.py
278+Copyright: 2008-2010, Sebastian Heinlein <devel@glatzor.de>
279+ 2005-2007, Canonical Ltd.
280+License: GPL-2+
281+
282+License: GPL-2+
283+ This package is free software; you can redistribute it and/or modify
284+ it under the terms of the GNU General Public License as published by
285+ the Free Software Foundation; either version 2 of the License, or
286+ (at your option) any later version.
287+ .
288+ This package is distributed in the hope that it will be useful,
289+ but WITHOUT ANY WARRANTY; without even the implied warranty of
290+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
291+ GNU General Public License for more details.
292+ .
293+ You should have received a copy of the GNU General Public License
294+ along with this package; if not, write to the Free Software
295+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
296+ .
297+ On Debian systems, the complete text of the GNU General
298+ Public License can be found in `/usr/share/common-licenses/GPL'.
299
300=== added file 'debian/dirs'
301--- debian/dirs 1970-01-01 00:00:00 +0000
302+++ debian/dirs 2013-02-13 10:34:25 +0000
303@@ -0,0 +1,2 @@
304+usr/bin
305+usr/sbin
306
307=== added file 'debian/docs'
308=== added file 'debian/examples'
309--- debian/examples 1970-01-01 00:00:00 +0000
310+++ debian/examples 2013-02-13 10:34:25 +0000
311@@ -0,0 +1,1 @@
312+test
313
314=== added directory 'debian/patches'
315=== added file 'debian/patches/01_disable_install_print_drivers.patch'
316--- debian/patches/01_disable_install_print_drivers.patch 1970-01-01 00:00:00 +0000
317+++ debian/patches/01_disable_install_print_drivers.patch 2013-02-13 10:34:25 +0000
318@@ -0,0 +1,15 @@
319+## Description: add some description
320+## Origin/Author: add some origin or author
321+## Bug: bug URL
322+Index: sessioninstaller-0.20+bzr112/sessioninstaller/core.py
323+===================================================================
324+--- sessioninstaller-0.20+bzr112.orig/sessioninstaller/core.py 2010-09-13 15:51:41.291392000 +0200
325++++ sessioninstaller-0.20+bzr112/sessioninstaller/core.py 2010-09-13 15:51:40.361392000 +0200
326+@@ -1025,6 +1025,7 @@
327+
328+ @track_usage
329+ def _install_printer_drivers(self, xid, resources, interaction):
330++ return
331+ header = _("Installing printer drivers on request isn't supported")
332+ message = _("Currently autodetection and installation of "
333+ "missing printer drivers is not supported.")
334
335=== added file 'debian/patches/02_no_crash_on_install_provides.patch'
336--- debian/patches/02_no_crash_on_install_provides.patch 1970-01-01 00:00:00 +0000
337+++ debian/patches/02_no_crash_on_install_provides.patch 2013-02-13 10:34:25 +0000
338@@ -0,0 +1,16 @@
339+## Description: do not raise exception on _install_provide_files()
340+## Origin/Author: Michael Vogt <michael.vogt@ubuntu.com>
341+## Bug: https://bugs.launchpad.net/ubuntu/+source/sessioninstaller/+bug/762431
342+Index: sessioninstaller-0.20+bzr119/sessioninstaller/core.py
343+===================================================================
344+--- sessioninstaller-0.20+bzr119.orig/sessioninstaller/core.py 2011-04-18 11:39:42.493047332 +0200
345++++ sessioninstaller-0.20+bzr119/sessioninstaller/core.py 2011-04-18 11:39:41.543045940 +0200
346+@@ -711,7 +711,7 @@
347+ dia = ErrorDialog(header, message)
348+ dia.run()
349+ dia.hide()
350+- raise errors.ModifyInternalError(message)
351++ #raise errors.ModifyInternalError(message)
352+
353+ @dbus_deferred_method(PACKAGEKIT_MODIFY_DBUS_INTERFACE,
354+ in_signature="uass", out_signature="",
355
356=== added file 'debian/patches/03_gstreamer_1.0.patch'
357--- debian/patches/03_gstreamer_1.0.patch 1970-01-01 00:00:00 +0000
358+++ debian/patches/03_gstreamer_1.0.patch 2013-02-13 10:34:25 +0000
359@@ -0,0 +1,133 @@
360+Description: Teach sessioninstaller about gstreamer-1.0 packages and use g-i gst bindings
361+Author: Iain Lane <iain.lane@canonical.com>
362+Origin: http://bazaar.launchpad.net/~aptdaemon-developers/sessioninstaller/main/revision/135
363+Bug-Ubuntu: https://bugs.launchpad.net/sessioninstaller/+bug/1084061
364+
365+=== modified file 'sessioninstaller/core.py'
366+Index: b/sessioninstaller/core.py
367+===================================================================
368+--- a/sessioninstaller/core.py
369++++ b/sessioninstaller/core.py
370+@@ -44,6 +44,7 @@
371+ import gettext
372+ from gi.repository import Gio
373+ from gi.repository import GObject
374++from gi.repository import Gst
375+ from gi.repository import Gtk
376+ from gi.repository import Pango
377+ from xdg.DesktopEntry import DesktopEntry
378+@@ -59,9 +60,6 @@
379+ else:
380+ from backends.dummy import DummyBackend as Backend
381+
382+-# WARNING: This pulls in the static gobject bindings which collide with the GI
383+-# ones!
384+-import gst
385+
386+ gettext.textdomain("sessioninstaller")
387+ gettext.bindtextdomain("sessioninstaller")
388+@@ -89,17 +87,28 @@
389+ "urisink": "Gstreamer-Uri-Sinks",
390+ "element": "Gstreamer-Elements"}
391+
392+-RESTRICTED_PACKAGES = ["gstreamer0.10-plugins-bad",
393+- "gstreamer0.10-plugins-bad-multiverse",
394+- "gstreamer0.10-ffmpeg",
395+- "gstreamer0.10-plugins-ugly"]
396+-
397+-GSTREAMER_SCORING = {"gstreamer0.10-plugins-good": 100,
398+- "gstreamer0.10-fluendo-mp3": 90,
399+- "gstreamer0.10-ffmpeg": 79,
400+- "gstreamer0.10-plugins-ugly": 80,
401+- "gstreamer0.10-plugins-bad": 70,
402+- "gstreamer0.10-plugins-bad-multiverse": 60}
403++RESTRICTED_010_PACKAGES = ["gstreamer0.10-plugins-bad",
404++ "gstreamer0.10-plugins-bad-multiverse",
405++ "gstreamer0.10-ffmpeg",
406++ "gstreamer0.10-plugins-ugly"]
407++
408++RESTRICTED_10_PACKAGES = ["gstreamer1.0-plugins-bad",
409++ "gstreamer1.0-libav",
410++ "gstreamer1.0-plugins-ugly"]
411++
412++GSTREAMER_010_SCORING = {"gstreamer0.10-plugins-good": 100,
413++ "gstreamer0.10-fluendo-mp3": 90,
414++ "gstreamer0.10-ffmpeg": 79,
415++ "gstreamer0.10-plugins-ugly": 80,
416++ "gstreamer0.10-plugins-bad": 70,
417++ "gstreamer0.10-plugins-bad-multiverse": 60}
418++
419++GSTREAMER_10_SCORING = {"gstreamer1.0-plugins-good": 100,
420++# "gstreamer1.0-fluendo-mp3": 90,
421++ "gstreamer1.0-libav": 79,
422++ "gstreamer1.0-plugins-ugly": 80,
423++ "gstreamer1.0-plugins-bad": 70}
424++
425+
426+ logging.basicConfig(format="%(levelname)s:%(message)s")
427+ log = logging.getLogger("sessioninstaller")
428+@@ -1148,6 +1157,7 @@
429+ """
430+ log.info("InstallGstreamerResources() was called: %s, %s, %s", xid,
431+ resources, interaction)
432++ Gst.init(None)
433+ return self._install_gstreamer_resources(xid, resources, interaction,
434+ sender)
435+
436+@@ -1174,7 +1184,7 @@
437+ match.group("fields")):
438+ caps_str += ", %s" % field[0]
439+ # gst.Caps.__init__ cannot handle unicode instances
440+- caps = gst.Caps(str(caps_str))
441++ caps = Gst.Caps.from_string(str(caps_str))
442+ else:
443+ element = match.group("structname")
444+ record = GSTREAMER_RECORD_MAP[match.group("kind")]
445+@@ -1310,7 +1320,13 @@
446+ # Check if the package could not be free in usage or distribution
447+ # Allow to prefer special packages
448+ try:
449+- score = GSTREAMER_SCORING[pkg.name]
450++ pkg_name = pkg.name.split(":")[0]
451++ if pkg_name in GSTREAMER_010_SCORING.keys():
452++ score = GSTREAMER_010_SCORING[pkg_name]
453++ elif pkg_name in GSTREAMER_10_SCORING.keys():
454++ score = GSTREAMER_10_SCORING[pkg_name]
455++ else:
456++ raise KeyError
457+ except KeyError:
458+ score = 0
459+ if _is_package_restricted(pkg):
460+@@ -1321,7 +1337,7 @@
461+ continue
462+ if struct.caps:
463+ try:
464+- pkg_caps = gst.Caps(pkg.candidate.record[struct.record])
465++ pkg_caps = Gst.Caps.from_string(pkg.candidate.record[struct.record])
466+ except KeyError:
467+ continue
468+ if not pkg_caps.intersect(struct.caps):
469+@@ -1500,8 +1516,8 @@
470+
471+ def _is_package_restricted(pkg):
472+ """If a package is possibly restricted in use."""
473+- return (pkg.name.split(":")[0] in RESTRICTED_PACKAGES or
474+- pkg.candidate.origins[0].component in ("non-free",
475++ return (pkg.name.split(":")[0] in RESTRICTED_010_PACKAGES + RESTRICTED_10_PACKAGES \
476++ or pkg.candidate.origins[0].component in ("non-free",
477+ "restricted",
478+ "multiverse"))
479+
480+Index: b/sessioninstaller/gstinstaller.py
481+===================================================================
482+--- a/sessioninstaller/gstinstaller.py
483++++ b/sessioninstaller/gstinstaller.py
484+@@ -102,7 +102,7 @@
485+ log.critical("Could not find any packages to operate on")
486+ sys.exit(1)
487+ except Exception, error:
488+- log.error(error.message)
489++ log.exception(error)
490+ sys.exit(2)
491+ log.info("Finished succesfully")
492+ sys.exit(0)
493
494=== added file 'debian/patches/series'
495--- debian/patches/series 1970-01-01 00:00:00 +0000
496+++ debian/patches/series 2013-02-13 10:34:25 +0000
497@@ -0,0 +1,3 @@
498+01_disable_install_print_drivers.patch
499+02_no_crash_on_install_provides.patch
500+03_gstreamer_1.0.patch
501
502=== added file 'debian/postinst'
503--- debian/postinst 1970-01-01 00:00:00 +0000
504+++ debian/postinst 2013-02-13 10:34:25 +0000
505@@ -0,0 +1,13 @@
506+#!/bin/sh
507+# postinst script for gstreamer0.10-packagekit
508+
509+set -e
510+
511+update-alternatives --install /usr/bin/gstreamer-codec-install \
512+ gstreamer-codec-install \
513+ /usr/bin/gst-install 80 || true
514+
515+#DEBHELPER#
516+
517+exit 0
518+
519
520=== added file 'debian/prerem'
521--- debian/prerem 1970-01-01 00:00:00 +0000
522+++ debian/prerem 2013-02-13 10:34:25 +0000
523@@ -0,0 +1,15 @@
524+#!/bin/sh
525+# prerm script for sessioninstaller
526+
527+set -e
528+
529+if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then
530+ update-alternatives --remove gstreamer-codec-install \
531+ /usr/bin/gst-installer || true
532+
533+fi
534+
535+#DEBHELPER#
536+
537+exit 0
538+
539
540=== added file 'debian/rules'
541--- debian/rules 1970-01-01 00:00:00 +0000
542+++ debian/rules 2013-02-13 10:34:25 +0000
543@@ -0,0 +1,8 @@
544+#!/usr/bin/make -f
545+
546+%:
547+ dh $@ --with python2
548+
549+override_dh_auto_clean:
550+ dh_auto_clean
551+ rm -rf build po/sessioninstaller.pot
552
553=== added directory 'debian/source'
554=== added file 'debian/source/format'
555--- debian/source/format 1970-01-01 00:00:00 +0000
556+++ debian/source/format 2013-02-13 10:34:25 +0000
557@@ -0,0 +1,1 @@
558+3.0 (quilt)
559
560=== added file 'debian/watch'
561--- debian/watch 1970-01-01 00:00:00 +0000
562+++ debian/watch 2013-02-13 10:34:25 +0000
563@@ -0,0 +1,2 @@
564+version=3
565+http://launchpad.net/sessioninstaller/+download .*/sessioninstaller-([0-9.]+)\.tgz

Subscribers

People subscribed via source and target branches