Merge lp:~andrewsomething/packagekit/2.28.0-0ubuntu1 into lp:~packagekit/packagekit/ubuntu-packagekit-gnome

Proposed by Andrew Starr-Bochicchio
Status: Needs review
Proposed branch: lp:~andrewsomething/packagekit/2.28.0-0ubuntu1
Merge into: lp:~packagekit/packagekit/ubuntu-packagekit-gnome
Diff against target: None lines
To merge this branch: bzr merge lp:~andrewsomething/packagekit/2.28.0-0ubuntu1
To post a comment you must log in.
Revision history for this message
Andrew Starr-Bochicchio (andrewsomething) wrote :

Not sure of the status of this project, but this corresponds to the actual package in Ubuntu Karmic.

Unmerged revisions

60. By Andrew Starr-Bochicchio

Sync on actual Ubuntu package v2.28.0-0ubuntu1

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'debian/README.source'
2--- debian/README.source 1970-01-01 00:00:00 +0000
3+++ debian/README.source 2009-09-22 00:16:37 +0000
4@@ -0,0 +1,31 @@
5+This package uses quilt in order to apply patches to the upstream source.
6+Patches are stored in debian/patches. For further details, see the man page for
7+quilt.
8+
9+All commands described below should be run from the top directory of the
10+package source tree, unless otherwise stated.
11+
12+ * To generate the fully patched source, in a form ready for editing, that
13+ would be built to create Debian packages, run:
14+
15+ export QUILT_PATCHES=debian/patches
16+ quilt push -a
17+
18+ * To modify the source and save those modifications so that they will be
19+ applied when building the package, pick a suitably informative patch file
20+ name, for example Modify_README.source, and then run:
21+
22+ export QUILT_PATCHES=debian/patches
23+ quilt new Modify_README.source
24+ quilt edit README.source
25+
26+ This will place you in your default editor to modify the file.
27+ Once your are done editing, save the file and run:
28+
29+ quilt refresh
30+
31+ * To remove source modifications that are currently being applied when
32+ building the package, run:
33+
34+ export QUILT_PATCHES=debian/patches
35+ quilt top
36
37=== modified file 'debian/changelog'
38--- debian/changelog 2009-01-21 14:57:54 +0000
39+++ debian/changelog 2009-09-22 00:16:37 +0000
40@@ -1,3 +1,83 @@
41+packagekit-gnome (2.28.0-0ubuntu1) karmic; urgency=low
42+
43+ [ Savvas Radevic ]
44+ * debian/python-packagekit-gtk.install: Check
45+ debian/tmp/usr/lib/python*/*-packages/
46+ * debian/control:
47+ + Drop devicekit build-dependency libdevkit-gobject-dev, fixed upstream
48+ (LP: #406426)
49+ + Add build-dependency libdbus-glib-1-dev
50+ * debian/patches:
51+ + defaults.patch: watch_active_transactions -> true (activates icon applet)
52+ + configure.patch: Removed GDK_MULTIHEAD_SAFE patch (fixed upstream)
53+ + fix_path_to_gstreamer_helper.patch: Use g_strcmp0 instead of egg_strequal
54+ * debian/docs: add AUTHORS
55+
56+ [ Andrew Starr-Bochicchio ]
57+ * New upstream release (LP: #414239)
58+ * debian/patches/configure.patch
59+ - Drop completely. ARM build issue with cast-align fixed upstream.
60+ * Add debian/README.source explaining quilt patch system.
61+ * debian/control:
62+ - Bump Standards-Version to 3.8.3
63+ - Drop XS from Vcs fields.
64+
65+ -- Andrew Starr-Bochicchio <a.starr.b@gmail.com> Mon, 21 Sep 2009 19:36:14 -0400
66+
67+packagekit-gnome (2.27.2-0ubuntu3) karmic; urgency=low
68+
69+ * debian/patches/configure.patch:
70+ + FTBFS on some archs: Disable -Wcast-align. (LP: #249104)
71+ + FTBFS: Disable GDK_MULTIHEAD_SAFE, as it breaks with new libcanberra-gtk.
72+ (LP: #419554)
73+ * debian/packagekit-gnome.install:
74+ - Use directories, there is no need to name files one by one:
75+ + debian/tmp/usr/bin/
76+ + debian/tmp/usr/share/man/
77+ + debian/tmp/usr/share/locale/
78+ + debian/tmp/usr/share/applications/
79+ + debian/tmp/usr/share/gnome-packagekit/
80+ + debian/tmp/usr/share/icons/hicolor/ (LP: #349572)
81+ - Sort list
82+ * debian/copyright: Now dep5-compatible, updated FSF address.
83+ * debian/control: Removed "edge" from XS-Vcs-Bzr.
84+
85+ -- Savvas Radevic <vicedar@gmail.com> Wed, 26 Aug 2009 21:27:12 +0200
86+
87+packagekit-gnome (2.27.2-0ubuntu2) karmic; urgency=low
88+
89+ * Fixed debian/control:
90+ - Build-depends on libpackagekit-glib-dev >=0.4.4
91+
92+ -- Anthony Mercatante <tonio@ubuntu.com> Wed, 17 Jun 2009 03:14:44 +0200
93+
94+packagekit-gnome (2.27.2-0ubuntu1) karmic; urgency=low
95+
96+ [ Sebastian Heinlein ]
97+ * New upstream version
98+ * debian/control:
99+ - Add build dependency on libcanberra-gtk-dev and quilt
100+ - Remove dependency of packagekit-gnome on python-gtk2
101+ * debian/packagekit-gnome.install:
102+ - Sorted
103+ * debian/rules:
104+ - Move files in the .install file instead
105+ - Add quilt support
106+ * debian/patches:
107+ - Update fix_path_to_gstreamer_helper.patch
108+ - Update defaults.patch: Disabling notifications of not started automatic
109+ updates on battery power and disabling the firmware installer
110+ - Use quilt as patch manager
111+
112+ [ Anthony Mercatante ]
113+ * Build depends on
114+ - libdevkit-gobject-dev
115+ - libdevkit-power-gobject-dev
116+ - libapt-pkg-dev
117+ * Bump Standards-Version to 3.8.1
118+
119+ -- Anthony Mercatante <tonio@ubuntu.com> Thu, 11 Jun 2009 11:27:19 +0200
120+
121 packagekit-gnome (0.3.13-0ubuntu1) jaunty; urgency=low
122
123 * New upstream release
124
125=== added file 'debian/changelog.dch.save'
126--- debian/changelog.dch.save 1970-01-01 00:00:00 +0000
127+++ debian/changelog.dch.save 2009-09-22 00:16:37 +0000
128@@ -0,0 +1,169 @@
129+packagekit-gnome (2.27.91-0ubuntu1) karmic; urgency=low
130+
131+ [ Savvas Radevic ]
132+ * New upstream release (LP: #414239)
133+ * debian/python-packagekit-gtk.install: Check
134+ debian/tmp/usr/lib/python*/*-packages/
135+http://launchpadlibrarian.net/30904928/packagekit-gnome_2.27.91-0ubuntu1.diff.gz * debian/rules: Use dh_install --fail-missing, useful to warn if a file
136+ was not included in the package.
137+ * debian/control:
138+ + Drop devicekit build-dependency libdevkit-gobject-dev, fixed upstream
139+ (LP: #406426)
140+ + Add build-dependency libdbus-glib-1-dev
141+ * debian/patches:
142+ + defaults.patch: watch_active_transactions -> true (activates icon applet)
143+ + configure.patch: Removed GDK_MULTIHEAD_SAFE patch (fixed upstream)
144+ + fix_path_to_gstreamer_helper.patch: Use g_strcmp0 instead of egg_strequal
145+ * debian/docs: add AUTHORS
146+
147+ [ Andrew Starr-Bochicchio ]
148+ *
149+
150+ -- Andrew Starr-Bochicchio <a.starr.b@gmail.com> Mon, 21 Sep 2009 19:35:36 -0400
151+
152+packagekit-gnome (2.27.2-0ubuntu3) karmic; urgency=low
153+
154+ * debian/patches/configure.patch:
155+ + FTBFS on some archs: Disable -Wcast-align. (LP: #249104)
156+ + FTBFS: Disable GDK_MULTIHEAD_SAFE, as it breaks with new libcanberra-gtk.
157+ (LP: #419554)
158+ * debian/packagekit-gnome.install:
159+ - Use directories, there is no need to name files one by one:
160+ + debian/tmp/usr/bin/
161+ + debian/tmp/usr/share/man/
162+ + debian/tmp/usr/share/locale/
163+ + debian/tmp/usr/share/applications/
164+ + debian/tmp/usr/share/gnome-packagekit/
165+ + debian/tmp/usr/share/icons/hicolor/ (LP: #349572)
166+ - Sort list
167+ * debian/copyright: Now dep5-compatible, updated FSF address.
168+ * debian/control: Removed "edge" from XS-Vcs-Bzr.
169+
170+ -- Savvas Radevic <vicedar@gmail.com> Wed, 26 Aug 2009 21:27:12 +0200
171+
172+packagekit-gnome (2.27.2-0ubuntu2) karmic; urgency=low
173+
174+ * Fixed debian/control:
175+ - Build-depends on libpackagekit-glib-dev >=0.4.4
176+
177+ -- Anthony Mercatante <tonio@ubuntu.com> Wed, 17 Jun 2009 03:14:44 +0200
178+
179+packagekit-gnome (2.27.2-0ubuntu1) karmic; urgency=low
180+
181+ [ Sebastian Heinlein ]
182+ * New upstream version
183+ * debian/control:
184+ - Add build dependency on libcanberra-gtk-dev and quilt
185+ - Remove dependency of packagekit-gnome on python-gtk2
186+ * debian/packagekit-gnome.install:
187+ - Sorted
188+ * debian/rules:
189+ - Move files in the .install file instead
190+ - Add quilt support
191+ * debian/patches:
192+ - Update fix_path_to_gstreamer_helper.patch
193+ - Update defaults.patch: Disabling notifications of not started automatic
194+ updates on battery power and disabling the firmware installer
195+ - Use quilt as patch manager
196+
197+ [ Anthony Mercatante ]
198+ * Build depends on
199+ - libdevkit-gobject-dev
200+ - libdevkit-power-gobject-dev
201+ - libapt-pkg-dev
202+ * Bump Standards-Version to 3.8.1
203+
204+ -- Anthony Mercatante <tonio@ubuntu.com> Thu, 11 Jun 2009 11:27:19 +0200
205+
206+packagekit-gnome (0.3.13-0ubuntu1) jaunty; urgency=low
207+
208+ * New upstream release
209+ * debian/control, debian/rules:
210+ - Add support for the Python GTK client and ship it in a separate
211+ package python-packagekit-gtk
212+ - Add build dep on libarchive-dev and xmlto
213+
214+ -- Sebastian Heinlein <glatzor@ubuntu.com> Wed, 21 Jan 2009 14:40:57 +0100
215+
216+packagekit-gnome (0.3.6-0ubuntu1) intrepid; urgency=low
217+
218+ * New upstream release
219+ * debian/patches:
220+ - Add 01_fix_path_to_gstreamer_helper: Change the hardcoded path to
221+ the gstreamer codec helper
222+ - Add 02_defaults: Disable firmware installation and newest filter
223+
224+ -- Sebastian Heinlein <glatzor@ubuntu.com> Sat, 11 Oct 2008 09:11:16 +0200
225+
226+packagekit-gnome (0.3.5-1) UNRELEASED; urgency=low
227+
228+ * New upstream release
229+ * debian/control:
230+ - Replace build dependency on packagekit-dev by libpackagekit-dev
231+ - More detailed package description
232+ - Raise required packagekit version to 0.3.5
233+
234+ -- Sebastian Heinlein <glatzor@ubuntu.com> Tue, 30 Sep 2008 11:14:05 +0200
235+
236+packagekit-gnome (0.3.3-0ubuntu1) intrepid; urgency=low
237+
238+ * New upstream release
239+ * debian/rules:
240+ - Move the autostart desktop file to /etx/xdg/autostart
241+ * debian/control:
242+ - Raise build dependency version on packagekit-dev
243+ - Do not depend on packagekit of the same version
244+ - Update XS-Vcs information
245+ * debian/watch: Added
246+
247+ -- Sebastian Heinlein <glatzor@ubuntu.com> Fri, 19 Sep 2008 05:39:15 +0200
248+
249+packagekit-gnome (0.2.3-0ubuntu1) intrepid; urgency=low
250+
251+ * New upstream release
252+ * Upgrade the Standards-Version to 3.8.0, no changes required.
253+
254+ -- James Westby <james.westby@canonical.com> Tue, 15 Jul 2008 16:26:38 +0100
255+
256+packagekit-gnome (0.2.2-0ubuntu1) intrepid; urgency=low
257+
258+ * new upstream release
259+ * add libck-connector-dev to the build-depends
260+ * add vcs-bzr header
261+
262+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 03 Jul 2008 12:30:16 +0200
263+
264+packagekit-gnome (0.1.11-1ppa2) hardy; urgency=low
265+
266+ * New upstream release
267+ * Add missing build dependency on libpolkit-gnome-dev and libsqlite3-dev
268+
269+ -- Sebastian Heinlein <glatzor@ubuntu.com> Thu, 15 May 2008 20:48:34 +0200
270+
271+packagekit-gnome (0.1.7-1) hardy; urgency=low
272+
273+ * New upstream release
274+ * Add build dependency on libsexy-dev
275+ * Add build dependecy on packagekit-dev of the same source verion or higher
276+ * Raise dependency on packagekit to the same version
277+
278+ -- Sebastian Heinlein <glatzor@ubuntu.com> Thu, 21 Feb 2008 15:55:54 +0100
279+
280+packagekit-gnome (0.1.6-0ubuntu1) hardy; urgency=low
281+
282+ * New upstream release
283+
284+ -- Sebastian Heinlein <glatzor@ubuntu.com> Mon, 11 Feb 2008 16:41:56 +0100
285+
286+packagekit-gnome (0.1.3-ubuntu1) gutsy; urgency=low
287+
288+ * Upload new snapshot to PPA
289+
290+ -- Sebastian Heinlein <glatzor@ubuntu.com> Fri, 23 Nov 2007 18:34:41 +0100
291+
292+packagekit-gnome (0.1.1+20071029) unstable; urgency=low
293+
294+ * Initial release
295+
296+ -- Sebastian Heinlein <glatzor@ubuntu.com> Mon, 29 Oct 2007 07:09:32 -0400
297+
298
299=== modified file 'debian/control'
300--- debian/control 2009-01-21 13:40:18 +0000
301+++ debian/control 2009-09-22 00:16:37 +0000
302@@ -4,7 +4,8 @@
303 Maintainer: Sebastian Heinlein <glatzor@ubuntu.com>
304 Build-Depends: cdbs,
305 debhelper (>= 5),
306- libpackagekit-glib-dev,
307+ quilt,
308+ libpackagekit-glib-dev (>= 0.4.4),
309 libxml-perl,
310 docbook-utils,
311 gnome-doc-utils,
312@@ -15,32 +16,34 @@
313 libnotify-dev,
314 libglade2-dev,
315 libgconf2-dev,
316- libsexy-dev,
317 libpolkit-gnome-dev (>= 0.8),
318+ libgnome-menu-dev,
319+ libunique-dev,
320 libsqlite3-dev,
321+ libcanberra-gtk-dev,
322 libck-connector-dev,
323+ libdbus-glib-1-dev,
324 python-dev,
325- python-central (>= 0.5)
326-Standards-Version: 3.8.0
327+ python-central (>= 0.5),
328+ libdevkit-power-gobject-dev (>= 007),
329+ libapt-pkg-dev
330+Standards-Version: 3.8.3
331 Homepage: http://www.packagekit.org
332-XS-Vcs-Bzr: https://code.edge.launchpad.net/~packagekit/packagekit/ubuntu-packagekit-gnome
333-XS-Vcs-Browser: http://bazaar.launchpad.net/~packagekit/packagekit/ubuntu-packagekit-gnome/files
334+Vcs-Bzr: https://code.launchpad.net/~packagekit/packagekit/ubuntu-packagekit-gnome
335+Vcs-Browser: http://bazaar.launchpad.net/~packagekit/packagekit/ubuntu-packagekit-gnome/files
336 XS-Python-Version: current
337
338 Package: packagekit-gnome
339 Architecture: any
340 Depends: ${shlibs:Depends},
341 ${misc:Depends},
342- ${python:Depends},
343- python-gtk2,
344- packagekit (>= 0.3.5)
345-XB-Python-Version: ${python:Versions}
346+ packagekit (>= 0.4.0)
347 Description: graphical distribution neutral software management tools
348 PackageKit allows to perform simple software management tasks over a DBus
349 interface e.g. refreshing the cache, updating, installing and removing
350 software packages or searching for multimedia codecs and file handlers.
351 .
352- This package contains a set of GTK based applications for PackageKit:
353+ This package contains a set of GTK+ based applications for PackageKit:
354 - Status icon for PackageKit transactions (gpk-update-icon)
355 - System update tool (gpk-update-viewer)
356 - Software installation and removal tool (gpk-applications)
357@@ -56,7 +59,7 @@
358 python-packagekit,
359 python-gtk2
360 XB-Python-Version: ${python:Versions}
361-Description: Python GTK widgets for PackageKit clients
362+Description: Python GTK+ widgets for PackageKit clients
363 PackageKit allows to perform simple software management tasks over a DBus
364 interface e.g refreshing the cache, updating, installing and removing
365 software packages or searching for multimedia codecs and file handlers.
366
367=== modified file 'debian/copyright'
368--- debian/copyright 2007-11-20 18:09:23 +0000
369+++ debian/copyright 2009-09-22 00:16:37 +0000
370@@ -1,20 +1,17 @@
371-This package was debianized by Sebastian Heinlein <glatzor@ubuntu.com> on
372-Mon, 29 Oct 2007 07:09:32 -0400.
373-
374-It was downloaded from http://svn.gnome.org/svn/gnome-packagekit/trunk
375-
376-Upstream Author(s):
377-
378- Richard Hughes <richard@hughsie.com>
379-
380-Copyright:
381-
382- Copyright (C) 2007 Richard Hughes <richard@hughsie.com>
383-
384-License:
385-
386- Licensed under the GNU General Public License Version 2
387-
388+Format-Specification: http://dep.debian.net/deps/dep5
389+Name: gpick
390+Maintainer: Richard Hughes <richard@hughsie.com>
391+Source: http://www.packagekit.org/releases/
392+
393+Files: *, src/*, po/*, man/*, data/*, docs/*, help/*, python/*
394+Copyright: Copyright © 2007 Richard Hughes <richard@hughsie.com>
395+License: GPL-2+
396+
397+Files: debian/*
398+Copyright: Copyright © 2007 Sebastian Heinlein <glatzor@ubuntu.com>
399+License: GPL-2+
400+
401+License: GPL-2+
402 This program is free software; you can redistribute it and/or modify
403 it under the terms of the GNU General Public License as published by
404 the Free Software Foundation; either version 2 of the License, or
405@@ -25,9 +22,10 @@
406 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
407 GNU General Public License for more details.
408
409- You should have received a copy of the GNU General Public License
410- along with this program; if not, write to the Free Software
411- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
412-
413-The Debian packaging is (C) 2007, Sebastian Heinlein <glatzor@ubuntu.com> and
414-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
415+ You should have received a copy of the GNU General Public License along
416+ with this program; if not, write to the Free Software Foundation, Inc.,
417+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
418+
419+ On Debian systems, the full text of the GPL-2+ can be found at
420+ '/usr/share/common-licenses/GPL-2'.
421+
422
423=== removed file 'debian/dirs'
424=== modified file 'debian/docs'
425--- debian/docs 2007-11-20 18:09:23 +0000
426+++ debian/docs 2009-09-22 00:16:37 +0000
427@@ -1,3 +1,4 @@
428 NEWS
429 README
430 TODO
431+AUTHORS
432
433=== modified file 'debian/packagekit-gnome.install'
434--- debian/packagekit-gnome.install 2008-12-10 21:10:10 +0000
435+++ debian/packagekit-gnome.install 2009-09-22 00:16:37 +0000
436@@ -1,29 +1,11 @@
437 debian/tmp/etc/gconf/schemas/gnome-packagekit.schemas
438-debian/tmp/usr/bin/gpk-repo
439-debian/tmp/usr/bin/gpk-install-package-name
440-debian/tmp/usr/bin/gpk-install-provide-file
441-debian/tmp/usr/bin/gpk-install-local-file
442-debian/tmp/usr/bin/gpk-log
443-debian/tmp/usr/bin/gpk-prefs
444-debian/tmp/usr/bin/gpk-install-catalog
445-debian/tmp/usr/bin/gpk-service-pack
446-debian/tmp/usr/bin/gpk-update-icon
447-debian/tmp/usr/bin/gpk-update-viewer
448-debian/tmp/usr/bin/gpk-install-mime-type
449-debian/tmp/usr/bin/gpk-backend-status
450-debian/tmp/usr/bin/gpk-application
451-debian/tmp/usr/share/locale/*/LC_MESSAGES/gnome-packagekit.mo
452+debian/tmp/usr/bin/
453+debian/tmp/usr/share/applications/
454+debian/tmp/usr/share/gnome/autostart/*desktop /etc/xdg/autostart
455+debian/tmp/usr/share/gnome/help/gnome-packagekit/
456 debian/tmp/usr/share/gnome-packagekit/
457-debian/tmp/usr/share/gnome-packagekit/icons/hicolor/
458-debian/tmp/usr/share/man/man1/*.1
459-debian/tmp/usr/share/gnome/autostart/gpk-update-icon.desktop
460-debian/tmp/usr/share/gnome/help/gnome-packagekit/
461-debian/tmp/usr/share/omf/gnome-packagekit/
462-debian/tmp/usr/share/applications/gpk-application.desktop
463-debian/tmp/usr/share/applications/gpk-update-viewer.desktop
464-debian/tmp/usr/share/applications/gpk-service-pack.desktop
465-debian/tmp/usr/share/applications/gpk-install-file.desktop
466-debian/tmp/usr/share/applications/gpk-log.desktop
467-debian/tmp/usr/share/applications/gpk-prefs.desktop
468-debian/tmp/usr/share/applications/gpk-install-catalog.desktop
469-debian/tmp/usr/share/applications/gpk-repo.desktop
470+debian/tmp/usr/share/icons/hicolor/
471+debian/tmp/usr/share/locale/
472+debian/tmp/usr/share/man/
473+debian/tmp/usr/share/omf/gnome-packagekit/*.omf
474+
475
476=== removed file 'debian/patches/01_fix_path_to_gstreamer_helper.patch'
477--- debian/patches/01_fix_path_to_gstreamer_helper.patch 2008-10-11 07:59:50 +0000
478+++ debian/patches/01_fix_path_to_gstreamer_helper.patch 1970-01-01 00:00:00 +0000
479@@ -1,14 +0,0 @@
480-diff --git a/src/gpk-client.c b/src/gpk-client.c
481-index 1887c62..122e6d3 100644
482---- a/src/gpk-client.c
483-+++ b/src/gpk-client.c
484-@@ -3076,8 +3076,7 @@ static gboolean
485- gpk_client_path_is_trusted (const gchar *exec)
486- {
487- /* special case the plugin helper -- it's trusted */
488-- if (egg_strequal (exec, "/usr/libexec/gst-install-plugins-helper") ||
489-- egg_strequal (exec, "/usr/libexec/pk-gstreamer-install"))
490-+ if (egg_strequal (exec, "/usr/lib/packagekit/pk-gstreamer-install"))
491- return TRUE;
492- #if 0
493- /* debugging code, should never be run... */
494
495=== removed file 'debian/patches/02_defaults.patch'
496--- debian/patches/02_defaults.patch 2008-10-11 08:00:36 +0000
497+++ debian/patches/02_defaults.patch 1970-01-01 00:00:00 +0000
498@@ -1,22 +0,0 @@
499-=== modified file 'data/gnome-packagekit.schemas.in'
500---- data/gnome-packagekit.schemas.in 2008-10-11 07:54:52 +0000
501-+++ data/gnome-packagekit.schemas.in 2008-10-11 07:55:27 +0000
502-@@ -6,7 +6,7 @@
503- <applyto>/apps/gnome-packagekit/enable_check_firmware</applyto>
504- <owner>gnome-packagekit</owner>
505- <type>bool</type>
506-- <default>true</default>
507-+ <default>false</default>
508- <locale name="C">
509- <short>Ask the user if additional firmware should be installed</short>
510- <long>Ask the user if additional firmware should be installed</long>
511-@@ -282,7 +282,7 @@
512- <applyto>/apps/gnome-packagekit/application/filter_newest</applyto>
513- <owner>gnome-packagekit</owner>
514- <type>bool</type>
515-- <default>true</default>
516-+ <default>false</default>
517- <locale name="C">
518- <short>If we should filter using newest in gpk-application</short>
519- <long>If we should filter package lists using newest in gpk-application</long>
520-
521
522=== added file 'debian/patches/defaults.patch'
523--- debian/patches/defaults.patch 1970-01-01 00:00:00 +0000
524+++ debian/patches/defaults.patch 2009-09-22 00:16:37 +0000
525@@ -0,0 +1,31 @@
526+Index: packagekit-gnome-2.27.91/data/gnome-packagekit.schemas.in
527+===================================================================
528+--- packagekit-gnome-2.27.91.orig/data/gnome-packagekit.schemas.in 2009-08-24 10:51:02.000000000 +0200
529++++ packagekit-gnome-2.27.91/data/gnome-packagekit.schemas.in 2009-08-27 17:05:19.000000000 +0200
530+@@ -6,7 +6,7 @@
531+ <applyto>/apps/gnome-packagekit/enable_check_firmware</applyto>
532+ <owner>gnome-packagekit</owner>
533+ <type>bool</type>
534+- <default>true</default>
535++ <default>false</default>
536+ <locale name="C">
537+ <short>Ask the user if additional firmware should be installed</short>
538+ <long>Ask the user if additional firmware should be installed</long>
539+@@ -126,7 +126,7 @@
540+ <applyto>/apps/gnome-packagekit/update-icon/notify_update_not_battery</applyto>
541+ <owner>gnome-packagekit</owner>
542+ <type>bool</type>
543+- <default>true</default>
544++ <default>false</default>
545+ <locale name="C">
546+ <short>Notify the user when the automatic update was not started on battery power</short>
547+ <long>Notify the user when the update was not automatically started while running on battery power</long>
548+@@ -246,7 +246,7 @@
549+ <applyto>/apps/gnome-packagekit/update-icon/watch_active_transactions</applyto>
550+ <owner>gnome-packagekit</owner>
551+ <type>bool</type>
552+- <default>false</default>
553++ <default>true</default>
554+ <locale name="C">
555+ <short>Show transactions that have the original application running</short>
556+ <long>
557
558=== added file 'debian/patches/fix_path_to_gstreamer_helper.patch'
559--- debian/patches/fix_path_to_gstreamer_helper.patch 1970-01-01 00:00:00 +0000
560+++ debian/patches/fix_path_to_gstreamer_helper.patch 2009-09-22 00:16:37 +0000
561@@ -0,0 +1,14 @@
562+Index: packagekit-gnome-2.27.5/src/gpk-dbus-task.c
563+===================================================================
564+--- packagekit-gnome-2.27.5.orig/src/gpk-dbus-task.c 2009-08-27 13:32:57.000000000 +0200
565++++ packagekit-gnome-2.27.5/src/gpk-dbus-task.c 2009-08-27 13:33:23.000000000 +0200
566+@@ -3147,8 +3147,7 @@
567+ gpk_dbus_task_path_is_trusted (const gchar *exec)
568+ {
569+ /* special case the plugin helper -- it's trusted */
570+- if (g_strcmp0 (exec, "/usr/libexec/gst-install-plugins-helper") == 0 ||
571+- g_strcmp0 (exec, "/usr/libexec/pk-gstreamer-install") == 0)
572++ if (g_strcmp0 (exec, "/usr/lib/packagekit/pk-gstreamer-install"))
573+ return TRUE;
574+ return FALSE;
575+ }
576
577=== added file 'debian/patches/series'
578--- debian/patches/series 1970-01-01 00:00:00 +0000
579+++ debian/patches/series 2009-09-22 00:16:37 +0000
580@@ -0,0 +1,2 @@
581+fix_path_to_gstreamer_helper.patch
582+defaults.patch
583
584=== modified file 'debian/python-packagekit-gtk.install'
585--- debian/python-packagekit-gtk.install 2008-12-10 21:09:42 +0000
586+++ debian/python-packagekit-gtk.install 2009-09-22 00:16:37 +0000
587@@ -1,2 +1,1 @@
588-debian/tmp/usr/lib/python2.*/site-packages/packagekit/genums.py
589-debian/tmp/usr/lib/python2.*/site-packages/packagekit/gtkwidgets.py
590+debian/tmp/usr/lib/python*/*-packages/
591
592=== modified file 'debian/rules'
593--- debian/rules 2008-12-10 21:09:20 +0000
594+++ debian/rules 2009-09-22 00:16:37 +0000
595@@ -1,19 +1,10 @@
596 #!/usr/bin/make -f
597
598-DEB_PYTHON_SYSTEM := pycentral
599-
600-include /usr/share/cdbs/1/rules/simple-patchsys.mk
601 include /usr/share/cdbs/1/rules/debhelper.mk
602-include /usr/share/cdbs/1/class/autotools.mk
603-include /usr/share/cdbs/1/class/makefile.mk
604+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
605 include /usr/share/cdbs/1/class/gnome.mk
606
607 DEB_CONFIGURE_EXTRA_FLAGS := --disable-scrollkeeper
608
609-binary-install/packagekit-gnome::
610- mkdir -p debian/tmp/etc/xdg/autostart
611- mv debian/tmp/usr/share/gnome/autostart/*desktop \
612- debian/tmp/etc/xdg/autostart
613-
614 binary-install/python-packagekit-gtk::
615 dh_pycentral -p$(cdbs_curpkg)

Subscribers

People subscribed via source and target branches

to all changes: