[PackageKit-commit] packagekit: Branch 'master' - 27 commits
Richard Hughes
hughsient at kemper.freedesktop.org
Mon Jul 4 08:32:35 PDT 2011
.gitignore | 70
Makefile.am | 71
NEWS | 33
RELEASE | 10
backends/.gitignore | 1
backends/Makefile.am | 2
backends/alpm/.gitignore | 10
backends/alpm/Makefile.am | 2
backends/apt/.gitignore | 10
backends/apt/Makefile.am | 2
backends/aptcc/.gitignore | 2
backends/aptcc/Makefile.am | 7
backends/aptcc/apt.cpp | 112 -
backends/aptcc/apt.h | 6
backends/aptcc/pk-backend-aptcc.cpp | 37
backends/aptcc/pkconffile | 84
backends/aptcc/pkconffile.nodiff | 14
backends/box/.gitignore | 10
backends/box/Makefile.am | 2
backends/conary/.gitignore | 10
backends/conary/Makefile.am | 2
backends/conary/TODO | 9
backends/conary/conaryBackend.py | 118 -
backends/dummy/.gitignore | 10
backends/dummy/Makefile.am | 2
backends/entropy/Makefile.am | 2
backends/opkg/.gitignore | 10
backends/opkg/Makefile.am | 2
backends/pisi/.gitignore | 10
backends/pisi/Makefile.am | 2
backends/poldek/.gitignore | 10
backends/poldek/Makefile.am | 2
backends/portage/.gitignore | 10
backends/portage/Makefile.am | 2
backends/ports/.gitignore | 6
backends/ports/Makefile.am | 2
backends/ports/helpers/Makefile.am | 2
backends/ports/ruby_packagekit/Makefile.am | 2
backends/razor/.gitignore | 10
backends/razor/Makefile.am | 2
backends/slapt/.gitignore | 2
backends/slapt/Makefile.am | 2
backends/smart/.gitignore | 5
backends/smart/Makefile.am | 2
backends/test/.gitignore | 9
backends/test/Makefile.am | 2
backends/test/helpers/.gitignore | 2
backends/test/helpers/Makefile.am | 2
backends/urpmi/.gitignore | 9
backends/urpmi/Makefile.am | 2
backends/urpmi/helpers/Makefile.am | 2
backends/urpmi/helpers/perl_packagekit/Makefile.am | 2
backends/urpmi/helpers/urpmi_backend/Makefile.am | 13
backends/yum/.gitignore | 12
backends/yum/Makefile.am | 2
backends/yum/yumBackend.py | 23
backends/zif/.gitignore | 1
backends/zif/Makefile.am | 2
backends/zif/pk-backend-zif.c | 157 +
backends/zypp/.gitignore | 10
backends/zypp/Makefile.am | 2
client/.gitignore | 20
client/Makefile.am | 4
configure.ac | 15
contrib/Makefile.am | 2
contrib/PackageKit.spec.in | 2
contrib/browser-plugin/.gitignore | 25
contrib/browser-plugin/Makefile.am | 2
contrib/browser-plugin/pk-main.c | 8
contrib/command-not-found/.gitignore | 7
contrib/command-not-found/Makefile.am | 2
contrib/command-not-found/pk-command-not-found.c | 12
contrib/cron/.gitignore | 1
contrib/cron/Makefile.am | 2
contrib/debuginfo-install/.gitignore | 7
contrib/debuginfo-install/Makefile.am | 4
contrib/device-rebind/.gitignore | 7
contrib/device-rebind/Makefile.am | 4
contrib/gstreamer-plugin/.gitignore | 5
contrib/gstreamer-plugin/Makefile.am | 2
contrib/gtk-module/.gitignore | 6
contrib/gtk-module/Makefile.am | 2
contrib/gtk-module/gtk-2.0/Makefile.am | 2
contrib/gtk-module/gtk-3.0/Makefile.am | 2
contrib/pm-utils/Makefile.am | 2
contrib/yum-packagekit/Makefile.am | 2
data/.gitignore | 3
data/Makefile.am | 2
data/tests/.gitignore | 4
data/tests/Makefile.am | 2
docs/.gitignore | 4
docs/Makefile.am | 7
docs/api/.gitignore | 25
docs/api/Makefile.am | 21
docs/api/dbus/.gitignore | 2
docs/api/dbus/Makefile.am | 8
docs/html/.gitignore | 2
docs/html/Makefile.am | 2
docs/html/img/Makefile.am | 2
docs/html/img/thumbnails/.gitignore | 1
docs/html/img/thumbnails/Makefile.am | 2
docs/html/pk-download.html | 1
docs/html/pk-matrix.html | 14
docs/html/videos/Makefile.am | 2
etc/.gitignore | 4
etc/Makefile.am | 2
git.mk | 200 ++
lib/.gitignore | 3
lib/Makefile.am | 2
lib/packagekit-glib2/.gitignore | 17
lib/packagekit-glib2/Makefile.am | 4
lib/packagekit-glib2/pk-client.c | 52
lib/packagekit-glib2/pk-enum.c | 1
lib/packagekit-glib2/pk-enum.h | 1
lib/packagekit-glib2/pk-package.c | 6
lib/packagekit-glib2/pk-results.c | 27
lib/packagekit-qt/.gitignore | 3
lib/packagekit-qt/Makefile.am | 2
lib/packagekit-qt/modules/.gitignore | 2
lib/packagekit-qt/modules/Makefile.am | 2
lib/packagekit-qt/src/.gitignore | 13
lib/packagekit-qt/src/Makefile.am | 2
lib/packagekit-qt/src/enum.h | 1
lib/packagekit-qt/test/.gitignore | 6
lib/packagekit-qt/test/Makefile.am | 2
lib/packagekit-qt2/.gitignore | 10
lib/packagekit-qt2/Makefile.am | 2
lib/packagekit-qt2/modules/Makefile.am | 2
lib/packagekit-qt2/transaction.h | 3
lib/python/.gitignore | 1
lib/python/Makefile.am | 2
lib/python/packagekit/.gitignore | 2
lib/python/packagekit/Makefile.am | 5
po/PackageKit.pot | 2035 ---------------------
po/ar.po | 2
po/bg_BG.po | 2
po/ca at valencia.po | 2
po/fa_IR.po | 2
po/ga.po | 2
po/kk.po | 2
po/ko.po | 2
po/sl.po | 750 +++----
po/wa.po | 2
policy/.gitignore | 8
policy/Makefile.am | 2
src/.gitignore | 15
src/Makefile.am | 2
src/pk-backend.c | 10
src/pk-cache.c | 16
src/pk-transaction-extra.c | 40
src/pk-transaction.c | 5
tools/.gitignore | 7
tools/Makefile.am | 2
153 files changed, 1385 insertions(+), 3126 deletions(-)
New commits:
commit 84fb796a49ad86e0aefa5a8318ca6bb77df4f846
Author: Richard Hughes <richard at hughsie.com>
Date: Mon Jul 4 16:32:05 2011 +0100
Release version 0.6.16
diff --git a/NEWS b/NEWS
index 0678822..1148b63 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,36 @@
+Version 0.6.16
+~~~~~~~~~~~~~~
+Released: 2011-07-04
+
+Libraries:
+ - glib: Added element-type annotations for each function returning a GPtrArray (Alex Eftimie)
+ - glib: Ensure packages from the progress handler have the package_id assigned (Richard Hughes)
+
+Backends:
+ - aptcc: Better put last fix in pk_backend_initialize (Daniel Nicoletti)
+ - aptcc: Fix bug that resolved packages were emited as installed when updates (Daniel Nicoletti)
+ - aptcc: Fix getDetails to actually use the resolved version, deb#606135 (Daniel Nicoletti)
+ - aptcc: Initial support to conffile handling (Daniel Nicoletti)
+ - aptcc: Set env var to disable apt-listbugs closes deb#628835 (Daniel Nicoletti)
+ - conary: Don't show redirected packages (Jesse Zhang)
+ - conary: Simplify _resolve_list (Jesse Zhang)
+ - yum: Emit RepoDetail when refreshing a repository (Richard Hughes)
+ - yum: Fix CVE-2011-2515 which only affects the YUM backend (Richard Hughes)
+ - zif: Fix a critical warning when getting details about a package (Richard Hughes)
+ - zif: Implement UpdateSystem (Richard Hughes)
+
+New Features:
+ - Generate .tar.xz release tarballs (Richard Hughes)
+ - Support looking up Plasma services (Kevin Kofler)
+
+Bugfixes:
+ - Do not hardcode G_DISABLE_DEPRECATED as it breaks with GTK+-2 and GLib (Richard Hughes)
+ - Do not hardcode the UID_MIN as 500. Fixes rh#717110 (Richard Hughes)
+ - Do not try to parse any arguments in command-not-found (Richard Hughes)
+ - Ensure we save the updates cache for the pre-transaction checks (Richard Hughes)
+ - Fix a build error in the browser plugin when using old versions of gdk (Richard Hughes)
+ - Update the PackageKit matrix webpage to reflect current backends (Robert Xu)
+
Version 0.6.15
~~~~~~~~~~~~~~
Released: 2011-06-07
diff --git a/configure.ac b/configure.ac
index ab4b96e..9097b1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,7 @@ AC_SUBST(PK_VERSION)
# AGE If libpackagekit can be linked into executables which can be
# built with previous versions of this library. Don't use.
LT_CURRENT=14
-LT_REVISION=7
+LT_REVISION=8
LT_AGE=0
AC_SUBST(LT_CURRENT)
AC_SUBST(LT_REVISION)
diff --git a/docs/html/pk-download.html b/docs/html/pk-download.html
index 42adf35..f8951de 100644
--- a/docs/html/pk-download.html
+++ b/docs/html/pk-download.html
@@ -72,6 +72,7 @@ Releases are normally on the first working Monday of each month.
</p>
<table>
<tr><td><b>Version</b></td><td> </td><td><b>Date</b></td></tr>
+<tr><td>0.6.16</td><td></td><td>2011-07-04</td></tr>
<tr><td>0.6.15</td><td></td><td>2011-06-07</td></tr>
<tr><td>0.6.14</td><td></td><td>2011-05-04</td></tr>
<tr><td>0.6.13</td><td></td><td>2011-03-07</td></tr>
diff --git a/po/ar.po b/po/ar.po
index 78308bd..929abe4 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: PackageKit\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-05-04 10:50+0100\n"
-"PO-Revision-Date: 2011-06-07 08:11+0000\n"
+"PO-Revision-Date: 2011-07-04 15:31+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Arabic (http://www.transifex.net/projects/p/freedesktop/team/ar/)\n"
"MIME-Version: 1.0\n"
diff --git a/po/bg_BG.po b/po/bg_BG.po
index 68b2ee9..d71d77e 100644
--- a/po/bg_BG.po
+++ b/po/bg_BG.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: PackageKit\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-05-04 10:50+0100\n"
-"PO-Revision-Date: 2011-06-07 08:12+0000\n"
+"PO-Revision-Date: 2011-07-04 15:31+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/freedesktop/team/bg_BG/)\n"
"MIME-Version: 1.0\n"
diff --git a/po/ca at valencia.po b/po/ca at valencia.po
index 560e100..93effbd 100644
--- a/po/ca at valencia.po
+++ b/po/ca at valencia.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: PackageKit\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-05-04 10:50+0100\n"
-"PO-Revision-Date: 2011-06-07 08:13+0000\n"
+"PO-Revision-Date: 2011-07-04 15:31+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Catalan (Valencian) (http://www.transifex.net/projects/p/freedesktop/team/ca@valencia/)\n"
"MIME-Version: 1.0\n"
diff --git a/po/fa_IR.po b/po/fa_IR.po
index d049aeb..ceda718 100644
--- a/po/fa_IR.po
+++ b/po/fa_IR.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: PackageKit\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-05-04 10:50+0100\n"
-"PO-Revision-Date: 2011-06-07 08:13+0000\n"
+"PO-Revision-Date: 2011-07-04 15:31+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Persian (Iran) (http://www.transifex.net/projects/p/freedesktop/team/fa_IR/)\n"
"MIME-Version: 1.0\n"
diff --git a/po/ga.po b/po/ga.po
index 17019c8..c7bfc29 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: PackageKit\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-05-04 10:50+0100\n"
-"PO-Revision-Date: 2011-06-07 08:10+0000\n"
+"PO-Revision-Date: 2011-07-04 15:31+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Irish (http://www.transifex.net/projects/p/freedesktop/team/ga/)\n"
"MIME-Version: 1.0\n"
diff --git a/po/kk.po b/po/kk.po
index 6493eba..c8a3033 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: PackageKit\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-05-04 10:50+0100\n"
-"PO-Revision-Date: 2011-06-07 08:13+0000\n"
+"PO-Revision-Date: 2011-07-04 15:31+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Kazakh (http://www.transifex.net/projects/p/freedesktop/team/kk/)\n"
"MIME-Version: 1.0\n"
diff --git a/po/ko.po b/po/ko.po
index 09d2a10..605cc3e 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: PackageKit\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-05-04 10:50+0100\n"
-"PO-Revision-Date: 2011-06-07 08:13+0000\n"
+"PO-Revision-Date: 2011-07-04 15:31+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Korean (http://www.transifex.net/projects/p/freedesktop/team/ko/)\n"
"MIME-Version: 1.0\n"
diff --git a/po/sl.po b/po/sl.po
index ce05637..c0d225c 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,13 +2,14 @@
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
#
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2010.
msgid ""
msgstr ""
"Project-Id-Version: PackageKit\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-05-04 10:50+0100\n"
-"PO-Revision-Date: 2011-06-07 08:13+0000\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"PO-Revision-Date: 2011-06-16 19:02+0000\n"
+"Last-Translator: andrejz <andrej.znidarsic at gmail.com>\n"
"Language-Team: Slovenian <lugos-slo at lugos.si>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,114 +21,114 @@ msgstr ""
#. TRANSLATORS: the role is the point of the transaction, e.g. update-system
#: ../client/pk-console.c:174 ../client/pk-console.c:596
msgid "Transaction"
-msgstr ""
+msgstr "Transakcija"
#. TRANSLATORS: this is the time the transaction was started in system
#. timezone
#: ../client/pk-console.c:176
msgid "System time"
-msgstr ""
+msgstr "Sistemski Äas"
#. TRANSLATORS: this is if the transaction succeeded or not
#: ../client/pk-console.c:178
msgid "Succeeded"
-msgstr ""
+msgstr "Uspešno"
#: ../client/pk-console.c:178
msgid "True"
-msgstr ""
+msgstr "Prav"
#: ../client/pk-console.c:178
msgid "False"
-msgstr ""
+msgstr "Napak"
#. TRANSLATORS: this is the transactions role, e.g. "update-system"
#: ../client/pk-console.c:180
msgid "Role"
-msgstr ""
+msgstr "Vloga"
#. TRANSLATORS: this is The duration of the transaction
#: ../client/pk-console.c:185
msgid "Duration"
-msgstr ""
+msgstr "Trajanje"
#: ../client/pk-console.c:185
msgid "(seconds)"
-msgstr ""
+msgstr "(sekund)"
#. TRANSLATORS: this is The command line used to do the action
#: ../client/pk-console.c:189
msgid "Command line"
-msgstr ""
+msgstr "Ukazna vrstica"
#. TRANSLATORS: this is the user ID of the user that started the action
#: ../client/pk-console.c:191
msgid "User ID"
-msgstr ""
+msgstr "Uporabnikov ID"
#. TRANSLATORS: this is the username, e.g. hughsie
#: ../client/pk-console.c:198
msgid "Username"
-msgstr ""
+msgstr "Uporabniško ime"
#. TRANSLATORS: this is the users real name, e.g. "Richard Hughes"
#: ../client/pk-console.c:202
msgid "Real name"
-msgstr ""
+msgstr "Pravo ime"
#: ../client/pk-console.c:210
msgid "Affected packages:"
-msgstr ""
+msgstr "Paketi pod vplivom:"
#: ../client/pk-console.c:212
msgid "Affected packages: None"
-msgstr ""
+msgstr "Paketi pod vplivom: brez"
#. TRANSLATORS: this is the distro, e.g. Fedora 10
#: ../client/pk-console.c:247
msgid "Distribution"
-msgstr ""
+msgstr "Distribucija"
#. TRANSLATORS: this is type of update, stable or testing
#: ../client/pk-console.c:249
msgid "Type"
-msgstr ""
+msgstr "Vrsta"
#. TRANSLATORS: this is any summary text describing the upgrade
#. TRANSLATORS: this is the summary of the group
#: ../client/pk-console.c:251 ../client/pk-console.c:290
msgid "Summary"
-msgstr ""
+msgstr "Povzetek"
#. TRANSLATORS: this is the group category name
#: ../client/pk-console.c:279
msgid "Category"
-msgstr ""
+msgstr "Kategorija"
#. TRANSLATORS: this is group identifier
#: ../client/pk-console.c:281
msgid "ID"
-msgstr ""
+msgstr "ID"
#. TRANSLATORS: this is the parent group
#: ../client/pk-console.c:284
msgid "Parent"
-msgstr ""
+msgstr "Nadrejeni predmet"
#. TRANSLATORS: this is the name of the parent group
#: ../client/pk-console.c:287
msgid "Name"
-msgstr ""
+msgstr "Ime"
#. TRANSLATORS: this is preferred icon for the group
#: ../client/pk-console.c:293
msgid "Icon"
-msgstr ""
+msgstr "Ikona"
#. TRANSLATORS: this is a header for the package that can be updated
#: ../client/pk-console.c:339
msgid "Details about the update:"
-msgstr ""
+msgstr "Podrobnosti o posodobitvi:"
#. TRANSLATORS: details about the update, package name and version
#. TRANSLATORS: the package that is being processed
@@ -137,175 +138,175 @@ msgstr ""
#: ../lib/packagekit-glib2/pk-task-text.c:124
#: ../lib/packagekit-glib2/pk-task-text.c:206
msgid "Package"
-msgstr ""
+msgstr "Paket"
#. TRANSLATORS: details about the update, any packages that this update
#. updates
#: ../client/pk-console.c:348
msgid "Updates"
-msgstr ""
+msgstr "Posodobitve"
#. TRANSLATORS: details about the update, any packages that this update
#. obsoletes
#: ../client/pk-console.c:352
msgid "Obsoletes"
-msgstr ""
+msgstr "Zastarelo"
#. TRANSLATORS: details about the update, the vendor URLs
#. TRANSLATORS: the vendor (e.g. vmware) that is providing the EULA
#: ../client/pk-console.c:356 ../lib/packagekit-glib2/pk-task-text.c:209
msgid "Vendor"
-msgstr ""
+msgstr "Ponudnik"
#. TRANSLATORS: details about the update, the bugzilla URLs
#: ../client/pk-console.c:360
msgid "Bugzilla"
-msgstr ""
+msgstr "Bugzilla"
#. TRANSLATORS: details about the update, the CVE URLs
#: ../client/pk-console.c:364
msgid "CVE"
-msgstr ""
+msgstr "CVE"
#. TRANSLATORS: details about the update, if the package requires a restart
#: ../client/pk-console.c:368
msgid "Restart"
-msgstr ""
+msgstr "Ponovno zaženi"
#. TRANSLATORS: details about the update, any description of the update
#: ../client/pk-console.c:372
msgid "Update text"
-msgstr ""
+msgstr "Opis posodobitve"
#. TRANSLATORS: details about the update, the changelog for the package
#: ../client/pk-console.c:376
msgid "Changes"
-msgstr ""
+msgstr "Spremembe"
#. TRANSLATORS: details about the update, the ongoing state of the update
#: ../client/pk-console.c:380
msgid "State"
-msgstr ""
+msgstr "Stanje"
#. TRANSLATORS: details about the update, date the update was issued
#: ../client/pk-console.c:384
msgid "Issued"
-msgstr ""
+msgstr "Izdano"
#. TRANSLATORS: details about the update, date the update was updated
#. TRANSLATORS: The action of the package, in past tense
#: ../client/pk-console.c:388 ../lib/packagekit-glib2/pk-console-shared.c:524
msgid "Updated"
-msgstr ""
+msgstr "Posodobljeno"
#. TRANSLATORS: if the repo is enabled
#: ../client/pk-console.c:424
msgid "Enabled"
-msgstr ""
+msgstr "OmogoÄeno"
#. TRANSLATORS: if the repo is disabled
#: ../client/pk-console.c:427
msgid "Disabled"
-msgstr ""
+msgstr "OnemogoÄeno"
#. TRANSLATORS: a package requires the system to be restarted
#: ../client/pk-console.c:459
msgid "System restart required by:"
-msgstr ""
+msgstr "Ponoven zagon sistema je zahteval paket:"
#. TRANSLATORS: a package requires the session to be restarted
#: ../client/pk-console.c:462
msgid "Session restart required:"
-msgstr ""
+msgstr "Zahteven je ponoven zagon seje:"
#. TRANSLATORS: a package requires the system to be restarted due to a
#. security update
#: ../client/pk-console.c:465
msgid "System restart (security) required by:"
-msgstr ""
+msgstr "Ponoven zagon sistema (varnostna posodobitev) je zahteval paket:"
#. TRANSLATORS: a package requires the session to be restarted due to a
#. security update
#: ../client/pk-console.c:468
msgid "Session restart (security) required:"
-msgstr ""
+msgstr "Zahtevan je ponoven zagon seje (varnostna posodobitev):"
#. TRANSLATORS: a package requires the application to be restarted
#: ../client/pk-console.c:471
msgid "Application restart required by:"
-msgstr ""
+msgstr "Ponoven zagon programa je zahteval paket:"
#. TRANSLATORS: This a list of details about the package
#: ../client/pk-console.c:506
msgid "Package description"
-msgstr ""
+msgstr "Opis paketa"
#. TRANSLATORS: This a message (like a little note that may be of interest)
#. from the transaction
#: ../client/pk-console.c:537
msgid "Message:"
-msgstr ""
+msgstr "SporoÄilo:"
#. TRANSLATORS: This where the package has no files
#: ../client/pk-console.c:558
msgid "No files"
-msgstr ""
+msgstr "Ni datotek"
#. TRANSLATORS: This a list files contained in the package
#: ../client/pk-console.c:563
msgid "Package files"
-msgstr ""
+msgstr "Datoteke paketov"
#. TRANSLATORS: the percentage complete of the transaction
#: ../client/pk-console.c:631
msgid "Percentage"
-msgstr ""
+msgstr "Odstotek"
#. TRANSLATORS: the status of the transaction (e.g. downloading)
#: ../client/pk-console.c:649
msgid "Status"
-msgstr ""
+msgstr "Stanje"
#. TRANSLATORS: the results from the transaction
#: ../client/pk-console.c:678
msgid "Results:"
-msgstr ""
+msgstr "Rezultati:"
#. TRANSLATORS: we failed to get any results, which is pretty fatal in my book
#: ../client/pk-console.c:685
msgid "Fatal error"
-msgstr ""
+msgstr "Usodna napaka"
#. TRANSLATORS: the user asked to update everything, but there is nothing that
#. can be updated
#: ../client/pk-console.c:701
msgid "There are no packages to update."
-msgstr ""
+msgstr "Ni paketov za posodobitev"
#. TRANSLATORS: the transaction failed in a way we could not expect
#: ../client/pk-console.c:704
#: ../contrib/command-not-found/pk-command-not-found.c:639
msgid "The transaction failed"
-msgstr ""
+msgstr "Transakcija je spodletela"
#. TRANSLATORS: print a message when there are no updates
#: ../client/pk-console.c:733
msgid "There are no updates available at this time."
-msgstr ""
+msgstr "Trenutno ni posodobitev na voljo."
#: ../client/pk-console.c:756
msgid "There are no upgrades available at this time."
-msgstr ""
+msgstr "Trenutno ni nadgradenj na voljo."
#. TRANSLATORS: a package needs to restart their system
#: ../client/pk-console.c:823
msgid "Please restart the computer to complete the update."
-msgstr ""
+msgstr "Znova zaženite raÄunalnik za dokonÄanje posodobitve."
#. TRANSLATORS: a package needs to restart the session
#: ../client/pk-console.c:826
msgid "Please logout and login to complete the update."
-msgstr ""
+msgstr "Odjavite se in se znova prijavite za dokonÄanje posodobitve."
#. TRANSLATORS: a package needs to restart their system (due to security)
#: ../client/pk-console.c:829
@@ -313,6 +314,8 @@ msgid ""
"Please restart the computer to complete the update as important security "
"updates have been installed."
msgstr ""
+"Ponovno zaženite raÄunalnik za konÄanje posodobitve, saj so bile nameÅ¡Äene "
+"pomembne varnostne posodobitve."
#. TRANSLATORS: a package needs to restart the session (due to security)
#: ../client/pk-console.c:832
@@ -320,6 +323,8 @@ msgid ""
"Please logout and login to complete the update as important security updates"
" have been installed."
msgstr ""
+"Odjavite se in se ponovno prijavite za konÄanje posodobitve, saj so bile "
+"nameÅ¡Äene pomembne varnostne posodobitve."
#. TRANSLATORS: The user used 'pkcon install dave.rpm' rather than 'pkcon
#. install-local dave.rpm'
@@ -329,27 +334,29 @@ msgid ""
"Expected package name, actually got file. Try using 'pkcon install-local %s'"
" instead."
msgstr ""
+"PriÄakovano je bilo ime paketa, pridobljena je bila datoteka. Namesto tega "
+"poskusite z uporabo 'pkcon install local %s'."
#. TRANSLATORS: There was an error getting the list of files for the package.
#. The detailed error follows
#: ../client/pk-console.c:866
#, c-format
msgid "This tool could not find any available package: %s"
-msgstr ""
+msgstr "To orodje ni moglo najti nobenega razpoložljivega paketa: %s"
#. TRANSLATORS: There was an error getting the list of files for the package.
#. The detailed error follows
#: ../client/pk-console.c:894
#, c-format
msgid "This tool could not find the installed package: %s"
-msgstr ""
+msgstr "To orodje ni moglo najti nameÅ¡Äenega paketa: %s"
#. TRANSLATORS: There was an error getting the list of files for the package.
#. The detailed error follows
#: ../client/pk-console.c:922 ../client/pk-console.c:950
#, c-format
msgid "This tool could not find the package: %s"
-msgstr ""
+msgstr "To orodje ni moglo najti paketa: %s"
#. TRANSLATORS: There was an error getting the list of files for the package.
#. The detailed error follows
@@ -364,60 +371,62 @@ msgstr ""
#: ../client/pk-console.c:1090
#, c-format
msgid "This tool could not find all the packages: %s"
-msgstr ""
+msgstr "To orodje ni moglo najti vseh paketov: %s"
#. TRANSLATORS: This is when the daemon crashed, and we are up shit creek
#. without a paddle
#: ../client/pk-console.c:1119
msgid "The daemon crashed mid-transaction!"
-msgstr ""
+msgstr "Ozadnji program se je sesul med transakcijo!"
#. TRANSLATORS: This is the header to the --help menu
#: ../client/pk-console.c:1153
msgid "PackageKit Console Interface"
-msgstr ""
+msgstr "PackageKit vmesnik konzole"
#. these are commands we can use with pkcon
#: ../client/pk-console.c:1155
msgid "Subcommands:"
-msgstr ""
+msgstr "Podukazi:"
#. TRANSLATORS: we keep a database updated with the time that an action was
#. last executed
#: ../client/pk-console.c:1235
msgid "Failed to get the time since this action was last completed"
-msgstr ""
+msgstr "Ni bilo mogoÄe dobiti Äasa odkar je bilo dejanje zadnjiÄ konÄano"
#. TRANSLATORS: command line argument, just show the version string
#: ../client/pk-console.c:1277 ../client/pk-monitor.c:371
msgid "Show the program version and exit"
-msgstr ""
+msgstr "Prikaži razliÄico programa in zapri"
#. TRANSLATORS: command line argument, use a filter to narrow down results
#: ../client/pk-console.c:1280
msgid "Set the filter, e.g. installed"
-msgstr ""
+msgstr "Nastavi filter, na primer nameÅ¡Äeno"
#. TRANSLATORS: command line argument, use a non-standard install prefix
#: ../client/pk-console.c:1283
msgid "Set the install root, e.g. '/' or '/mnt/ltsp'"
-msgstr ""
+msgstr "Izberite korensko mapo namestitve, na primer '/' ali '/mnt/ltsp'"
#. TRANSLATORS: command line argument, work asynchronously
#: ../client/pk-console.c:1286
msgid "Exit without waiting for actions to complete"
-msgstr ""
+msgstr "Zapri brez Äakanja na konÄanje dejavnosti"
#. command line argument, do we ask questions
#: ../client/pk-console.c:1289
#: ../contrib/debuginfo-install/pk-debuginfo-install.c:525
msgid "Install the packages without asking for confirmation"
-msgstr ""
+msgstr "Namesti vse pakete brez spraševanja za potrditev"
#. TRANSLATORS: command line argument, this command is not a priority
#: ../client/pk-console.c:1292
msgid "Run the command using idle network bandwidth and also using less power"
msgstr ""
+"Požene ukaz z uporabo pasovne širine nedejavnega omrežja in tudi porabi manj"
+" energije"
#. TRANSLATORS: command line argument, just output without fancy formatting
#: ../client/pk-console.c:1295
@@ -425,123 +434,125 @@ msgid ""
"Print to screen a machine readable output, rather than using animated "
"widgets"
msgstr ""
+"Izpiše zaslon na strojno berljiv izhod namesto uporabe animiranih gradnikov"
#. TRANSLATORS: command line argument, just output without fancy formatting
#: ../client/pk-console.c:1298
msgid "The maximum metadata cache age. Use -1 for 'never'."
msgstr ""
+"NajveÄja starost predpomnilnika metapodakov. Uporabite -1 za 'nikoli'."
#. TRANSLATORS: command line argument, --help
#: ../client/pk-console.c:1301
msgid "Show help options."
-msgstr ""
+msgstr "Pokaži možnosti pomoÄi"
#. TRANSLATORS: we failed to contact the daemon
#: ../client/pk-console.c:1331
msgid "Failed to parse command line"
-msgstr ""
+msgstr "RazÄlenjevanje ukazne vrstice je spodletelo"
#. TRANSLATORS: we failed to contact the daemon
#: ../client/pk-console.c:1341
msgid "Failed to contact PackageKit"
-msgstr ""
+msgstr "Vzpostavitev stika s PackageKit je spodletela"
#. TRANSLATORS: The user specified an incorrect filter
#: ../client/pk-console.c:1394
msgid "The proxy could not be set"
-msgstr ""
+msgstr "PosredniÅ¡kega strežnika ni bilo mogoÄe nastaviti"
#. TRANSLATORS: The user specified an incorrect filter
#: ../client/pk-console.c:1406
msgid "The install root could not be set"
-msgstr ""
+msgstr "Korenske mape namestitve ni bilo mogoÄe nastaviti"
#. TRANSLATORS: The user specified an incorrect filter
#: ../client/pk-console.c:1418
msgid "The filter specified was invalid"
-msgstr ""
+msgstr "Navedeni filter je bil neveljaven"
#. TRANSLATORS: a search type can be name, details, file, etc
#: ../client/pk-console.c:1437
msgid "A search type is required, e.g. name"
-msgstr ""
+msgstr "Zahtevana je vrsta iskanja, na primer ime"
#. TRANSLATORS: the user needs to provide a search term
#: ../client/pk-console.c:1444 ../client/pk-console.c:1456
#: ../client/pk-console.c:1468 ../client/pk-console.c:1480
msgid "A search term is required"
-msgstr ""
+msgstr "Zahtevan je iskalni izraz"
#. TRANSLATORS: the search type was provided, but invalid
#: ../client/pk-console.c:1490
msgid "Invalid search type"
-msgstr ""
+msgstr "Neveljavna vrsta iskanja"
#. TRANSLATORS: the user did not specify what they wanted to install
#: ../client/pk-console.c:1496
msgid "A package name to install is required"
-msgstr ""
+msgstr "Zahtevano je ime paketa za namestitev"
#. TRANSLATORS: the user did not specify what they wanted to install
#: ../client/pk-console.c:1505
msgid "A filename to install is required"
-msgstr ""
+msgstr "Zahtevano je ime datoteke za namestitev"
#. TRANSLATORS: geeky error, 99.9999% of users won't see this
#: ../client/pk-console.c:1516
msgid "A type, key_id and package_id are required"
-msgstr ""
+msgstr "Zahtevane so vrsta, key_id in package_id"
#. TRANSLATORS: the user did not specify what they wanted to remove
#: ../client/pk-console.c:1527
msgid "A package name to remove is required"
-msgstr ""
+msgstr "Zahtevano je ime paketa za odstranitev"
#. TRANSLATORS: the user did not specify anything about what to download or
#. where
#: ../client/pk-console.c:1536
msgid "A destination directory and the package names to download are required"
-msgstr ""
+msgstr "Zahtevana sta ciljna mapa in imena paketov za prejem"
#. TRANSLATORS: the directory does not exist, so we can't continue
#: ../client/pk-console.c:1543
msgid "Directory not found"
-msgstr ""
+msgstr "Mape ni mogoÄe najti"
#. TRANSLATORS: geeky error, 99.9999% of users won't see this
#: ../client/pk-console.c:1552
msgid "A licence identifier (eula-id) is required"
-msgstr ""
+msgstr "Zahtevano je doloÄilo licence (eula-id)"
#. TRANSLATORS: geeky error, 99.9999% of users won't see this
#: ../client/pk-console.c:1563
msgid "A transaction identifier (tid) is required"
-msgstr ""
+msgstr "Zahtevano je doloÄilo transakcije (tid)"
#. TRANSLATORS: The user did not specify a package name
#: ../client/pk-console.c:1584
msgid "A package name to resolve is required"
-msgstr ""
+msgstr "Zahtevano je ime paketa za razrešitev"
#. TRANSLATORS: The user did not specify a repository (software source) name
#: ../client/pk-console.c:1595 ../client/pk-console.c:1606
msgid "A repository name is required"
-msgstr ""
+msgstr "Zahtevano je ime skladiÅ¡Äa"
#. TRANSLATORS: The user didn't provide any data
#: ../client/pk-console.c:1617
msgid "A repo name, parameter and value are required"
-msgstr ""
+msgstr "Zahtevani so ime, parameter in vrednst skladiÅ¡Äa."
#. TRANSLATORS: The user didn't specify what action to use
#: ../client/pk-console.c:1634
msgid "An action, e.g. 'update-system' is required"
-msgstr ""
+msgstr "Zahtevano je dejanje kot na primer 'update-system'"
#. TRANSLATORS: The user specified an invalid action
#: ../client/pk-console.c:1641
msgid "A correct role is required"
-msgstr ""
+msgstr "Zahtevana je pravilna vloga"
#. TRANSLATORS: The user did not provide a package name
#. TRANSLATORS: This is when the user fails to supply the package name
@@ -549,78 +560,81 @@ msgstr ""
#: ../client/pk-console.c:1674 ../client/pk-console.c:1694
#: ../client/pk-console.c:1703 ../client/pk-generate-pack.c:314
msgid "A package name is required"
-msgstr ""
+msgstr "Treba je navesti ime paketa"
#. TRANSLATORS: each package "provides" certain things, e.g. mime(gstreamer-
#. decoder-mp3), the user didn't specify it
#: ../client/pk-console.c:1683
msgid "A package provide string is required"
-msgstr ""
+msgstr "Zahtevan je niz, ki ga zagotovi paket"
#. TRANSLATORS: The user did not provide a distro name
#: ../client/pk-console.c:1727
msgid "A distribution name is required"
-msgstr ""
+msgstr "Zahtevano je ime distribucije"
#. TRANSLATORS: The user did not provide an upgrade type
#: ../client/pk-console.c:1733
msgid "An upgrade type is required, e.g. 'minimal', 'default' or 'complete'"
msgstr ""
+"Zahtevana je vrsta nadgradnje, na primer 'minimal', 'default' ali "
+"'complete'."
#. TRANSLATORS: The user tried to use an unsupported option on the command
#. line
#: ../client/pk-console.c:1783
#, c-format
msgid "Option '%s' is not supported"
-msgstr ""
+msgstr "Možnost '%s' ni podprta"
#. TRANSLATORS: Generic failure of what they asked to do
#: ../client/pk-console.c:1793
msgid "Command failed"
-msgstr ""
+msgstr "Ukaz je spodletel"
#. TRANSLATORS: we can exclude certain packages (glibc) when we know they'll
#. exist on the target
#: ../client/pk-generate-pack.c:253
msgid "Set the file name of dependencies to be excluded"
-msgstr ""
+msgstr "Nastavite ime datoteke odvisnosti za izkljuÄitev"
#. TRANSLATORS: the output location
#: ../client/pk-generate-pack.c:256
msgid ""
"The output file or directory (the current directory is used if omitted)"
msgstr ""
+"Izhodna datoteka ali mapa (Äe je izpuÅ¡Äena je uporabljena trenutna mapa)"
#. TRANSLATORS: put a list of packages in the pack
#: ../client/pk-generate-pack.c:259
msgid "The package to be put into the service pack"
-msgstr ""
+msgstr "Paket je treba postaviti v servisni paket"
#. TRANSLATORS: put all pending updates in the pack
#: ../client/pk-generate-pack.c:262
msgid "Put all updates available in the service pack"
-msgstr ""
+msgstr "Daj vse posodobitve v servisni paket"
#. TRANSLATORS: This is when the user fails to supply the correct arguments
#: ../client/pk-generate-pack.c:298
msgid "Neither --package or --updates option selected."
-msgstr ""
+msgstr "Izbrana ni niti možnost --package ali --updates."
#. TRANSLATORS: This is when the user fails to supply just one argument
#: ../client/pk-generate-pack.c:306
msgid "Both options selected."
-msgstr ""
+msgstr "Obe možnosti sta izbrani."
#. TRANSLATORS: This is when the user fails to supply the output
#: ../client/pk-generate-pack.c:322
msgid "A output directory or file name is required"
-msgstr ""
+msgstr "Zahtevano je ime izhodne mape ali datoteke"
#. TRANSLATORS: This is when the daemon is not-installed/broken and fails to
#. startup
#: ../client/pk-generate-pack.c:340
msgid "The daemon failed to startup"
-msgstr ""
+msgstr "Zagon ozadnjega programa je spodletel"
#. TRANSLATORS: This is when the backend doesn't have the capability to get-
#. depends
@@ -628,7 +642,7 @@ msgstr ""
#. download
#: ../client/pk-generate-pack.c:351 ../client/pk-generate-pack.c:357
msgid "The package manager cannot perform this type of operation."
-msgstr ""
+msgstr "Upravljalnik paketov ne more izvesti te vrste opravila,"
#. TRANSLATORS: This is when the distro didn't include libarchive support into
#. PK
@@ -637,281 +651,284 @@ msgid ""
"Service packs cannot be created as PackageKit was not built with libarchive "
"support."
msgstr ""
+"Paketov popravkov ni mogoÄe ustvariti, ker PackageKit ni bil izgrajen s "
+"podporo libarchive."
#. TRANSLATORS: the user specified an absolute path, but didn't get the
#. extension correct
#: ../client/pk-generate-pack.c:375
msgid "If specifying a file, the service pack name must end with"
msgstr ""
+"V primeru da navedete datoteko, se more ime paketa popravkov konÄati z"
#. TRANSLATORS: This is when file already exists
#: ../client/pk-generate-pack.c:391
msgid "A pack with the same name already exists, do you want to overwrite it?"
-msgstr ""
+msgstr "Paket z enakim imenom že obstaja, ali ga želite prepisati?"
#. TRANSLATORS: This is when the pack was not overwritten
#: ../client/pk-generate-pack.c:394
msgid "The pack was not overwritten."
-msgstr ""
+msgstr "Paket ni bil prepisan."
#. TRANSLATORS: This is when the temporary directory cannot be created, the
#. directory name follows
#: ../client/pk-generate-pack.c:407
msgid "Failed to create directory:"
-msgstr ""
+msgstr "Ustvarjanje mape ni uspelo:"
#. TRANSLATORS: This is when the list of packages from the remote computer
#. cannot be opened
#: ../client/pk-generate-pack.c:419
msgid "Failed to open package list."
-msgstr ""
+msgstr "Odpiranje seznama paketov ni uspelo."
#. TRANSLATORS: The package name is being matched up to available packages
#: ../client/pk-generate-pack.c:428
msgid "Finding package name."
-msgstr ""
+msgstr "Iskanje imena paketa."
#. TRANSLATORS: This is when the package cannot be found in any software
#. source. The detailed error follows
#: ../client/pk-generate-pack.c:432
#, c-format
msgid "Failed to find package '%s': %s"
-msgstr ""
+msgstr "Napaka med iskanjem paketa '%s': %s"
#. TRANSLATORS: This is telling the user we are in the process of making the
#. pack
#: ../client/pk-generate-pack.c:440
msgid "Creating service pack..."
-msgstr ""
+msgstr "Ustvarjanje servisnega paketa ..."
#. TRANSLATORS: we succeeded in making the file
#: ../client/pk-generate-pack.c:455
#, c-format
msgid "Service pack created '%s'"
-msgstr ""
+msgstr "Servisni paket '%s' je bil ustvarjen"
#. TRANSLATORS: we failed to make te file
#: ../client/pk-generate-pack.c:460
#, c-format
msgid "Failed to create '%s': %s"
-msgstr ""
+msgstr "Ustvarjanje '%s' je spodletelo: %s"
#: ../client/pk-monitor.c:284
msgid "Failed to get daemon state"
-msgstr ""
+msgstr "Stanja ozadnjega programa ni bilo mogoÄe dobiti"
#: ../client/pk-monitor.c:349
msgid "Failed to get properties"
-msgstr ""
+msgstr "Lastnosti ni bilo mogoÄe dobiti"
#. TRANSLATORS: this is a program that monitors PackageKit
#: ../client/pk-monitor.c:387
msgid "PackageKit Monitor"
-msgstr ""
+msgstr "Nadzornik PackageKit"
#. TRANSLATORS: when we are getting data from the daemon
#: ../contrib/browser-plugin/pk-plugin-install.c:499
msgid "Getting package information..."
-msgstr ""
+msgstr "Pridobivanje podrobnosti paketa ..."
#. TRANSLATORS: run an applicaiton
#: ../contrib/browser-plugin/pk-plugin-install.c:505
#, c-format
msgid "Run %s"
-msgstr ""
+msgstr "Zaženi %s"
#. TRANSLATORS: show the installed version of a package
#: ../contrib/browser-plugin/pk-plugin-install.c:511
msgid "Installed version"
-msgstr ""
+msgstr "NameÅ¡Äena razliÄica"
#. TRANSLATORS: run the application now
#: ../contrib/browser-plugin/pk-plugin-install.c:519
#, c-format
msgid "Run version %s now"
-msgstr ""
+msgstr "Zaženi razliÄico %s zdaj"
#. TRANSLATORS: run the application now
#: ../contrib/browser-plugin/pk-plugin-install.c:525
msgid "Run now"
-msgstr ""
+msgstr "Zaženi zdaj"
#. TRANSLATORS: update to a new version of the package
#: ../contrib/browser-plugin/pk-plugin-install.c:531
#, c-format
msgid "Update to version %s"
-msgstr ""
+msgstr "Posodobi na razliÄico %s"
#. TRANSLATORS: To install a package
#: ../contrib/browser-plugin/pk-plugin-install.c:537
#, c-format
msgid "Install %s now"
-msgstr ""
+msgstr "Namesti %s zdaj"
#. TRANSLATORS: the version of the package
#: ../contrib/browser-plugin/pk-plugin-install.c:540
msgid "Version"
-msgstr ""
+msgstr "RazliÄica"
#. TRANSLATORS: noting found, so can't install
#: ../contrib/browser-plugin/pk-plugin-install.c:545
msgid "No packages found for your system"
-msgstr ""
+msgstr "Na vaÅ¡emu sistemu ni bilo mogoÄe najti paketov"
#. TRANSLATORS: package is being installed
#: ../contrib/browser-plugin/pk-plugin-install.c:550
msgid "Installing..."
-msgstr ""
+msgstr "NameÅ¡Äanje ..."
#. TRANSLATORS: downloading repo data so we can search
#: ../contrib/command-not-found/pk-command-not-found.c:366
msgid "Downloading details about the software sources."
-msgstr ""
+msgstr "Prejemanje podrobnosti o virih programov."
#. TRANSLATORS: downloading file lists so we can search
#: ../contrib/command-not-found/pk-command-not-found.c:370
msgid "Downloading filelists (this may take some time to complete)."
-msgstr ""
+msgstr "Pridobivanje seznamov datotek (to lahko traja nekaj Äasa)."
#. TRANSLATORS: waiting for native lock
#: ../contrib/command-not-found/pk-command-not-found.c:374
msgid "Waiting for package manager lock."
-msgstr ""
+msgstr "ÄŒakanje na zaklep upravljalnika paketov."
#. TRANSLATORS: loading package cache so we can search
#: ../contrib/command-not-found/pk-command-not-found.c:378
msgid "Loading list of packages."
-msgstr ""
+msgstr "Nalaganje seznama paketov."
#. TRANSLATORS: we failed to find the package, this shouldn't happen
#: ../contrib/command-not-found/pk-command-not-found.c:444
msgid "Failed to search for file"
-msgstr ""
+msgstr "Iskanje datoteke je spodletelo"
#. TRANSLATORS: the transaction failed in a way we could not expect
#: ../contrib/command-not-found/pk-command-not-found.c:456
msgid "Getting the list of files failed"
-msgstr ""
+msgstr "Dobivanje seznama datotek je spodletelo"
#. TRANSLATORS: we failed to launch the executable, the error follows
#: ../contrib/command-not-found/pk-command-not-found.c:602
msgid "Failed to launch:"
-msgstr ""
+msgstr "Zaganjanje izvedljive datoteke je spodletelo:"
#. TRANSLATORS: we failed to install the package
#: ../contrib/command-not-found/pk-command-not-found.c:630
msgid "Failed to install packages"
-msgstr ""
+msgstr "Namestitev paketov je spodletela"
#. TRANSLATORS: tool that gets called when the command is not found
#: ../contrib/command-not-found/pk-command-not-found.c:706
msgid "PackageKit Command Not Found"
-msgstr ""
+msgstr "PackageKit Ukaza ni mogoÄe najti"
#. TRANSLATORS: the prefix of all the output telling the user
#. * why it's not executing. NOTE: this is lowercase to mimic
#. * the style of bash itself -- apologies
#: ../contrib/command-not-found/pk-command-not-found.c:741
msgid "command not found"
-msgstr ""
+msgstr "ukaza ni mogoÄe najti"
#. TRANSLATORS: tell the user what we think the command is
#: ../contrib/command-not-found/pk-command-not-found.c:759
msgid "Similar command is:"
-msgstr ""
+msgstr "Podoben ukaz je:"
#. TRANSLATORS: Ask the user if we should run the similar command
#: ../contrib/command-not-found/pk-command-not-found.c:773
msgid "Run similar command:"
-msgstr ""
+msgstr "Poženi podoben ukaz:"
#. TRANSLATORS: show the user a list of commands that they could have meant
#. TRANSLATORS: show the user a list of commands we could run
#: ../contrib/command-not-found/pk-command-not-found.c:787
#: ../contrib/command-not-found/pk-command-not-found.c:796
msgid "Similar commands are:"
-msgstr ""
+msgstr "Podobni ukazi so:"
#. TRANSLATORS: ask the user to choose a file to run
#: ../contrib/command-not-found/pk-command-not-found.c:803
msgid "Please choose a command to run"
-msgstr ""
+msgstr "Izberite ukaz za zagon"
#. TRANSLATORS: tell the user what package provides the command
#: ../contrib/command-not-found/pk-command-not-found.c:821
msgid "The package providing this file is:"
-msgstr ""
+msgstr "Paket, ki zagotavlja to datoteko, je:"
#. TRANSLATORS: as the user if we want to install a package to provide the
#. command
#: ../contrib/command-not-found/pk-command-not-found.c:828
#, c-format
msgid "Install package '%s' to provide command '%s'?"
-msgstr ""
+msgstr "Ali želite namestiti paket '%s', ki bo zagotavljal ukaz '%s'?"
#. TRANSLATORS: Show the user a list of packages that provide this command
#: ../contrib/command-not-found/pk-command-not-found.c:855
msgid "Packages providing this file are:"
-msgstr ""
+msgstr "Paketi, ki zagotavljajo to datoteko so:"
#. TRANSLATORS: Show the user a list of packages that they can install to
#. provide this command
#: ../contrib/command-not-found/pk-command-not-found.c:865
msgid "Suitable packages are:"
-msgstr ""
+msgstr "Primerni paketi so:"
#. get selection
#. TRANSLATORS: ask the user to choose a file to install
#: ../contrib/command-not-found/pk-command-not-found.c:874
msgid "Please choose a package to install"
-msgstr ""
+msgstr "Izberite paket za namestitev"
#. TRANSLATORS: we are starting to install the packages
#: ../contrib/debuginfo-install/pk-debuginfo-install.c:195
msgid "Starting install"
-msgstr ""
+msgstr "ZaÄenjanje namestitve"
#. TRANSLATORS: we couldn't find the package name, non-fatal
#: ../contrib/debuginfo-install/pk-debuginfo-install.c:407
#, c-format
msgid "Failed to find the package %s, or already installed: %s"
-msgstr ""
+msgstr "Iskanje paketa %s je spodletelo ali pa je že nameÅ¡Äen: %s"
#. command line argument, simulate what would be done, but don't actually do
#. it
#: ../contrib/debuginfo-install/pk-debuginfo-install.c:516
msgid ""
"Don't actually install any packages, only simulate what would be installed"
-msgstr ""
+msgstr "Ne namesti paketov, le simuliraj kaj bi bilo nameÅ¡Äeno"
#. command line argument, do we skip packages that depend on the ones
#. specified
#: ../contrib/debuginfo-install/pk-debuginfo-install.c:519
msgid "Do not install dependencies of the core packages"
-msgstr ""
+msgstr "Ne namesti odvisnosti osnovnih paketov"
#. command line argument, do we operate quietly
#: ../contrib/debuginfo-install/pk-debuginfo-install.c:522
msgid "Do not display information or progress"
-msgstr ""
+msgstr "Ne prikaži podrobnosti ali napredka"
#. TRANSLATORS: tool that gets called when the command is not found
#: ../contrib/debuginfo-install/pk-debuginfo-install.c:540
msgid "PackageKit Debuginfo Installer"
-msgstr ""
+msgstr "Namestilnik Debuginfo PackageKit"
#. TRANSLATORS: the use needs to specify a list of package names on the
#. command line
#: ../contrib/debuginfo-install/pk-debuginfo-install.c:554
#, c-format
msgid "ERROR: Specify package names to install."
-msgstr ""
+msgstr "NAPAKA: Navedite imena paketov za namestitev."
#. TRANSLATORS: we are getting the list of repositories
#: ../contrib/debuginfo-install/pk-debuginfo-install.c:590
#, c-format
msgid "Getting sources list"
-msgstr ""
+msgstr "Dobivanje seznama virov"
#. TRANSLATORS: operation was not successful
#: ../contrib/debuginfo-install/pk-debuginfo-install.c:600
@@ -921,7 +938,7 @@ msgstr ""
#: ../contrib/debuginfo-install/pk-debuginfo-install.c:870
#: ../contrib/debuginfo-install/pk-debuginfo-install.c:914
msgid "FAILED."
-msgstr ""
+msgstr "SPODLETELO."
#. TRANSLATORS: all completed 100%
#: ../contrib/debuginfo-install/pk-debuginfo-install.c:615
@@ -933,105 +950,105 @@ msgstr ""
#: ../contrib/debuginfo-install/pk-debuginfo-install.c:929
#, c-format
msgid "OK."
-msgstr ""
+msgstr "V redu."
#. TRANSLATORS: tell the user what we found
#: ../contrib/debuginfo-install/pk-debuginfo-install.c:618
#, c-format
msgid "Found %i enabled and %i disabled sources."
-msgstr ""
+msgstr "Najdenih je bilo %i omogoÄenih in %i onemogoÄenih virov."
#. TRANSLATORS: we're finding repositories that match out pattern
#: ../contrib/debuginfo-install/pk-debuginfo-install.c:625
#, c-format
msgid "Finding debugging sources"
-msgstr ""
+msgstr "Iskanje virov razhroÅ¡Äevanja"
#. TRANSLATORS: tell the user what we found
#: ../contrib/debuginfo-install/pk-debuginfo-install.c:658
#, c-format
msgid "Found %i disabled debuginfo repos."
-msgstr ""
+msgstr "Najdenih je bilo %i onemogoÄenih skladiÅ¡Ä debuginfo."
#. TRANSLATORS: we're now enabling all the debug sources we found
#: ../contrib/debuginfo-install/pk-debuginfo-install.c:665
#, c-format
msgid "Enabling debugging sources"
-msgstr ""
+msgstr "OmogoÄanje virov razhroÅ¡Äevanje"
#. TRANSLATORS: tell the user how many we enabled
#: ../contrib/debuginfo-install/pk-debuginfo-install.c:693
#, c-format
msgid "Enabled %i debugging sources."
-msgstr ""
+msgstr "OmogoÄenih je bilo %i virov razhroÅ¡Äevanja."
#. TRANSLATORS: we're now finding packages that match in all the repos
#: ../contrib/debuginfo-install/pk-debuginfo-install.c:700
#, c-format
msgid "Finding debugging packages"
-msgstr ""
+msgstr "Iskanje paketov razhroÅ¡Äevanja"
#. TRANSLATORS: we couldn't find the package name, non-fatal
#: ../contrib/debuginfo-install/pk-debuginfo-install.c:712
#, c-format
msgid "Failed to find the package %s: %s"
-msgstr ""
+msgstr "Iskanje paketa %s je spodletelo: %s"
#. TRANSLATORS: we couldn't find the debuginfo package name, non-fatal
#: ../contrib/debuginfo-install/pk-debuginfo-install.c:735
#, c-format
msgid "Failed to find the debuginfo package %s: %s"
-msgstr ""
+msgstr "Paketa debuginfo %s ni bilo mogoÄe najti: %s"
#. TRANSLATORS: no debuginfo packages could be found to be installed
#: ../contrib/debuginfo-install/pk-debuginfo-install.c:763
#, c-format
msgid "Found no packages to install."
-msgstr ""
+msgstr "Ni bilo najdenih paketov za namestitev."
#. TRANSLATORS: tell the user we found some packages, and then list them
#: ../contrib/debuginfo-install/pk-debuginfo-install.c:777
#, c-format
msgid "Found %i packages:"
-msgstr ""
+msgstr "Najdenih je bilo %i paketov:"
#. TRANSLATORS: tell the user we are searching for deps
#: ../contrib/debuginfo-install/pk-debuginfo-install.c:793
#, c-format
msgid "Finding packages that depend on these packages"
-msgstr ""
+msgstr "Iskanje paketov, ki so odvisni od teh paketov"
#. TRANSLATORS: could not install, detailed error follows
#: ../contrib/debuginfo-install/pk-debuginfo-install.c:806
#, c-format
msgid "Could not find dependant packages: %s"
-msgstr ""
+msgstr "Ni mogoÄe najti odvisnih paketov: %s"
#. TRANSLATORS: tell the user we found some more packages
#: ../contrib/debuginfo-install/pk-debuginfo-install.c:822
#, c-format
msgid "Found %i extra packages."
-msgstr ""
+msgstr "Najdenih je bilo %i dodatnih paketov"
#. TRANSLATORS: tell the user we found some more packages
#: ../contrib/debuginfo-install/pk-debuginfo-install.c:826
#, c-format
msgid "No extra packages required."
-msgstr ""
+msgstr "Ni dodatnih zahtevanih paketov."
#. TRANSLATORS: tell the user we found some packages (and deps), and then list
#. them
#: ../contrib/debuginfo-install/pk-debuginfo-install.c:835
#, c-format
msgid "Found %i packages to install:"
-msgstr ""
+msgstr "Najdenih je bilo %i paketov za namestitev:"
#. TRANSLATORS: simulate mode is a testing mode where we quit before the
#. action
#: ../contrib/debuginfo-install/pk-debuginfo-install.c:848
#, c-format
msgid "Not installing packages in simulate mode"
-msgstr ""
+msgstr "Paketi v naÄinu simuliranja niso nameÅ¡Äeni"
#. TRANSLATORS: we are now installing the debuginfo packages we found earlier
#. TRANSLATORS: transaction state, installing packages
@@ -1039,763 +1056,763 @@ msgstr ""
#: ../lib/packagekit-glib2/pk-console-shared.c:296
#, c-format
msgid "Installing packages"
-msgstr ""
+msgstr "NameÅ¡Äanje paketov"
#. TRANSLATORS: could not install, detailed error follows
#: ../contrib/debuginfo-install/pk-debuginfo-install.c:873
#, c-format
msgid "Could not install packages: %s"
-msgstr ""
+msgstr "Paketov ni mogoÄe namestiti: %s"
#. TRANSLATORS: we are now disabling all debuginfo repos we previously enabled
#: ../contrib/debuginfo-install/pk-debuginfo-install.c:905
#, c-format
msgid "Disabling sources previously enabled"
-msgstr ""
+msgstr "OnemogoÄanje prej omogoÄenih virov"
#. TRANSLATORS: no debuginfo packages could be found to be installed, detailed
#. error follows
#: ../contrib/debuginfo-install/pk-debuginfo-install.c:917
#, c-format
msgid "Could not disable the debugging sources: %s"
-msgstr ""
+msgstr "Virov razhroÅ¡Äevanja ni mogoÄe onemogoÄiti: %s"
#. TRANSLATORS: we disabled all the debugging repos that we enabled before
#: ../contrib/debuginfo-install/pk-debuginfo-install.c:932
#, c-format
msgid "Disabled %i debugging sources."
-msgstr ""
+msgstr "OnemogoÄenih je bilo %i virov razhroÅ¡Äevanja."
#. TRANSLATORS: couldn't open device to write
#: ../contrib/device-rebind/pk-device-rebind.c:62
msgid "Failed to open file"
-msgstr ""
+msgstr "Ni bilo mogoÄe odpreti datoteke"
#. TRANSLATORS: could not write to the device
#: ../contrib/device-rebind/pk-device-rebind.c:71
msgid "Failed to write to the file"
-msgstr ""
+msgstr "Pisanje v datoteko je spodletelo"
#. TRANSLATORS: we failed to release the current driver
#: ../contrib/device-rebind/pk-device-rebind.c:111
#: ../contrib/device-rebind/pk-device-rebind.c:148
msgid "Failed to write to device"
-msgstr ""
+msgstr "Pisanje v napravo je spodletelo"
#. TRANSLATORS: the device could not be found in sysfs
#: ../contrib/device-rebind/pk-device-rebind.c:176
msgid "Device could not be found"
-msgstr ""
+msgstr "Naprave ni bilo mogoÄe najti"
#. TRANSLATORS: we failed to release the current driver
#: ../contrib/device-rebind/pk-device-rebind.c:203
msgid "Failed to unregister driver"
-msgstr ""
+msgstr "Odstranitev vpisa gonilnika je spodletela"
#. TRANSLATORS: we failed to bind the old driver
#: ../contrib/device-rebind/pk-device-rebind.c:212
msgid "Failed to register driver"
-msgstr ""
+msgstr "Vpis gonilnika je spodletel"
#. TRANSLATORS: user did not specify a device sysfs path that exists
#: ../contrib/device-rebind/pk-device-rebind.c:261
msgid "Device path not found"
-msgstr ""
+msgstr "Poti naprave ni bilo mogoÄe najti"
#. TRANSLATORS: user did not specify a valid device sysfs path
#: ../contrib/device-rebind/pk-device-rebind.c:269
msgid "Incorrect device path specified"
-msgstr ""
+msgstr "Navedena je bila nepravilna pot naprave"
#: ../contrib/device-rebind/pk-device-rebind.c:294
msgid "Show extra debugging information"
-msgstr ""
+msgstr "Prikaži dodatne podrobnosti razhroÅ¡Äevanja"
#. command line argument, simulate what would be done, but don't actually do
#. it
#: ../contrib/device-rebind/pk-device-rebind.c:297
msgid "Don't actually touch the hardware, only simulate what would be done"
-msgstr ""
+msgstr "Ne dotikaj se strojne opreme, le simuliraj kaj bi bilo narejeno"
#. TRANSLATORS: command line option: a list of files to install
#: ../contrib/device-rebind/pk-device-rebind.c:300
msgid "Device paths"
-msgstr ""
+msgstr "Poti naprav"
#. TRANSLATORS: tool that gets called when the device needs reloading after
#. installing firmware
#: ../contrib/device-rebind/pk-device-rebind.c:315
msgid "PackageKit Device Reloader"
-msgstr ""
+msgstr "Ponovni nalagalnik naprav PackageKit"
#. TRANSLATORS: user did not specify a valid device sysfs path
#: ../contrib/device-rebind/pk-device-rebind.c:323
msgid "You need to specify at least one valid device path"
-msgstr ""
+msgstr "Navesti morate vsaj eno veljavno pot naprave"
#. TRANSLATORS: user did not specify a valid device sysfs path
#: ../contrib/device-rebind/pk-device-rebind.c:333
msgid "This script can only be used by the root user"
-msgstr ""
+msgstr "Ta skript lahko uporabi le skrbnik"
#. TRANSLATORS: we're going to verify the path first
#: ../contrib/device-rebind/pk-device-rebind.c:342
msgid "Verifying device path"
-msgstr ""
+msgstr "Preverjanje veljavnosti poti naprave"
#. TRANSLATORS: user did not specify a device sysfs path that exists
#: ../contrib/device-rebind/pk-device-rebind.c:347
msgid "Failed to verify device path"
-msgstr ""
+msgstr "Preverjanje veljavnosti poti naprave je spodletelo"
#. TRANSLATORS: we're going to try
#: ../contrib/device-rebind/pk-device-rebind.c:361
msgid "Attempting to rebind device"
-msgstr ""
+msgstr "Poskus ponovne vezave naprave"
#. TRANSLATORS: we failed to release the current driver
#: ../contrib/device-rebind/pk-device-rebind.c:366
msgid "Failed to rebind device"
-msgstr ""
+msgstr "Ponovna vezava naprave je spodletela"
#: ../data/packagekit-catalog.xml.in.h:1
msgid "PackageKit Catalog"
-msgstr ""
+msgstr "Katalog PackageKit"
#: ../data/packagekit-package-list.xml.in.h:1
msgid "PackageKit Package List"
-msgstr ""
+msgstr "Seznam pakteov PackageKit"
#: ../data/packagekit-servicepack.xml.in.h:1
msgid "PackageKit Service Pack"
-msgstr ""
+msgstr "Paket popravkov PackageKit"
#: ../lib/packagekit-glib2/pk-console-shared.c:64
#, c-format
msgid "Please enter a number from 1 to %i: "
-msgstr ""
+msgstr "Vpišite število med 1 in %i: "
#. TRANSLATORS: more than one package could be found that matched, to follow
#. is a list of possible packages
#: ../lib/packagekit-glib2/pk-console-shared.c:198
msgid "More than one package matches:"
-msgstr ""
+msgstr "Ujema se veÄ paketov:"
#. TRANSLATORS: This finds out which package in the list to use
#: ../lib/packagekit-glib2/pk-console-shared.c:209
msgid "Please choose the correct package: "
-msgstr ""
+msgstr "Izberite pravi paket: "
#. TRANSLATORS: This is when the transaction status is not known
#: ../lib/packagekit-glib2/pk-console-shared.c:264
msgid "Unknown state"
-msgstr ""
+msgstr "Neznano stanje"
#. TRANSLATORS: transaction state, the daemon is in the process of starting
#: ../lib/packagekit-glib2/pk-console-shared.c:268
msgid "Starting"
-msgstr ""
+msgstr "ZaÄenjanje"
#. TRANSLATORS: transaction state, the transaction is waiting for another to
#. complete
#: ../lib/packagekit-glib2/pk-console-shared.c:272
msgid "Waiting in queue"
-msgstr ""
+msgstr "ÄŒaka v vrsti"
#. TRANSLATORS: transaction state, just started
#: ../lib/packagekit-glib2/pk-console-shared.c:276
msgid "Running"
-msgstr ""
+msgstr "Izvajanje"
#. TRANSLATORS: transaction state, is querying data
#: ../lib/packagekit-glib2/pk-console-shared.c:280
msgid "Querying"
-msgstr ""
+msgstr "Poizvedovanje"
#. TRANSLATORS: transaction state, getting data from a server
#: ../lib/packagekit-glib2/pk-console-shared.c:284
msgid "Getting information"
-msgstr ""
+msgstr "Dobivanje podatkov"
#. TRANSLATORS: transaction state, removing packages
#: ../lib/packagekit-glib2/pk-console-shared.c:288
msgid "Removing packages"
-msgstr ""
+msgstr "Odstranjevanje paketov"
#. TRANSLATORS: transaction state, downloading package files
#. TRANSLATORS: The role of the transaction, in present tense
#: ../lib/packagekit-glib2/pk-console-shared.c:292
#: ../lib/packagekit-glib2/pk-console-shared.c:670
msgid "Downloading packages"
-msgstr ""
+msgstr "Prejemanje paketov"
#. TRANSLATORS: transaction state, refreshing internal lists
#: ../lib/packagekit-glib2/pk-console-shared.c:300
msgid "Refreshing software list"
-msgstr ""
+msgstr "Osveževanje seznama programov"
#. TRANSLATORS: transaction state, installing updates
#: ../lib/packagekit-glib2/pk-console-shared.c:304
msgid "Installing updates"
-msgstr ""
+msgstr "NameÅ¡Äanje posodobitev"
#. TRANSLATORS: transaction state, removing old packages, and cleaning config
#. files
#: ../lib/packagekit-glib2/pk-console-shared.c:308
msgid "Cleaning up packages"
-msgstr ""
+msgstr "ÄŒiÅ¡Äenje paketov"
#. TRANSLATORS: transaction state, obsoleting old packages
#: ../lib/packagekit-glib2/pk-console-shared.c:312
msgid "Obsoleting packages"
-msgstr ""
+msgstr "Nastavljanje zastarelih paketov"
#. TRANSLATORS: transaction state, checking the transaction before we do it
#: ../lib/packagekit-glib2/pk-console-shared.c:316
msgid "Resolving dependencies"
-msgstr ""
+msgstr "Razreševanje odvisnosti"
#. TRANSLATORS: transaction state, checking if we have all the security keys
#. for the operation
#: ../lib/packagekit-glib2/pk-console-shared.c:320
msgid "Checking signatures"
-msgstr ""
+msgstr "Preverjanje podpisov"
#. TRANSLATORS: transaction state, when we return to a previous system state
#. TRANSLATORS: The role of the transaction, in present tense
#: ../lib/packagekit-glib2/pk-console-shared.c:324
#: ../lib/packagekit-glib2/pk-console-shared.c:630
msgid "Rolling back"
-msgstr ""
+msgstr "PovraÄanje"
#. TRANSLATORS: transaction state, when we're doing a test transaction
#: ../lib/packagekit-glib2/pk-console-shared.c:328
msgid "Testing changes"
-msgstr ""
+msgstr "Preizkušanje sprememb"
#. TRANSLATORS: transaction state, when we're writing to the system package
#. database
#: ../lib/packagekit-glib2/pk-console-shared.c:332
msgid "Committing changes"
-msgstr ""
+msgstr "Uveljavljanje sprememb"
#. TRANSLATORS: transaction state, requesting data from a server
#: ../lib/packagekit-glib2/pk-console-shared.c:336
msgid "Requesting data"
-msgstr ""
+msgstr "Zahtevanje podatkov"
#. TRANSLATORS: transaction state, all done!
#: ../lib/packagekit-glib2/pk-console-shared.c:340
msgid "Finished"
-msgstr ""
+msgstr "KonÄano"
#. TRANSLATORS: transaction state, in the process of cancelling
#: ../lib/packagekit-glib2/pk-console-shared.c:344
msgid "Cancelling"
-msgstr ""
+msgstr "Preklicevanje"
#. TRANSLATORS: transaction state, downloading metadata
#: ../lib/packagekit-glib2/pk-console-shared.c:348
msgid "Downloading repository information"
-msgstr ""
+msgstr "Prejemanje podatkov o skladiÅ¡Äih"
#. TRANSLATORS: transaction state, downloading metadata
#: ../lib/packagekit-glib2/pk-console-shared.c:352
msgid "Downloading list of packages"
-msgstr ""
+msgstr "Prejemanje seznama paketov"
#. TRANSLATORS: transaction state, downloading metadata
#: ../lib/packagekit-glib2/pk-console-shared.c:356
msgid "Downloading file lists"
-msgstr ""
+msgstr "Prejemanje seznamov datotek"
#. TRANSLATORS: transaction state, downloading metadata
#: ../lib/packagekit-glib2/pk-console-shared.c:360
msgid "Downloading lists of changes"
-msgstr ""
+msgstr "Prejemanje seznamov sprememb"
#. TRANSLATORS: transaction state, downloading metadata
#: ../lib/packagekit-glib2/pk-console-shared.c:364
msgid "Downloading groups"
-msgstr ""
+msgstr "Prejemanje skupin"
#. TRANSLATORS: transaction state, downloading metadata
#: ../lib/packagekit-glib2/pk-console-shared.c:368
msgid "Downloading update information"
-msgstr ""
+msgstr "Prejemanje podatkov o posodobitvi"
#. TRANSLATORS: transaction state, repackaging delta files
#: ../lib/packagekit-glib2/pk-console-shared.c:372
msgid "Repackaging files"
-msgstr ""
+msgstr "Prepakiranje datotek"
#. TRANSLATORS: transaction state, loading databases
#: ../lib/packagekit-glib2/pk-console-shared.c:376
msgid "Loading cache"
-msgstr ""
+msgstr "Nalaganje predpomnilnika"
#. TRANSLATORS: transaction state, scanning for running processes
#: ../lib/packagekit-glib2/pk-console-shared.c:380
msgid "Scanning applications"
-msgstr ""
+msgstr "Preiskovanje programov"
#. TRANSLATORS: transaction state, generating a list of packages installed on
#. the system
#: ../lib/packagekit-glib2/pk-console-shared.c:384
msgid "Generating package lists"
-msgstr ""
+msgstr "Ustvarjanje seznamov paketov"
#. TRANSLATORS: transaction state, when we're waiting for the native tools to
#. exit
#: ../lib/packagekit-glib2/pk-console-shared.c:388
msgid "Waiting for package manager lock"
-msgstr ""
+msgstr "ÄŒakanje na zaklep upravljalnika paketov"
#. TRANSLATORS: transaction state, waiting for user to type in a password
#: ../lib/packagekit-glib2/pk-console-shared.c:392
msgid "Waiting for authentication"
-msgstr ""
+msgstr "ÄŒakanje na overitev"
#. TRANSLATORS: transaction state, we are updating the list of processes
#: ../lib/packagekit-glib2/pk-console-shared.c:396
msgid "Updating running applications"
-msgstr ""
+msgstr "Posodabljanje izvajajoÄih programov"
#. TRANSLATORS: transaction state, we are checking executable files currently
#. in use
#: ../lib/packagekit-glib2/pk-console-shared.c:400
msgid "Checking applications in use"
-msgstr ""
+msgstr "Preverjanje programov, ki se uporabljajo"
#. TRANSLATORS: transaction state, we are checking for libraries currently in
#. use
#: ../lib/packagekit-glib2/pk-console-shared.c:404
msgid "Checking libraries in use"
-msgstr ""
+msgstr "Preverjanje knjižnic, ki so v uporabi"
#. TRANSLATORS: transaction state, we are copying package files before or
#. after the transaction
#: ../lib/packagekit-glib2/pk-console-shared.c:408
msgid "Copying files"
-msgstr ""
+msgstr "Kopiranje datotek"
#. TRANSLATORS: The type of update
#: ../lib/packagekit-glib2/pk-console-shared.c:426
msgid "Trivial"
-msgstr ""
+msgstr "Trivialna"
#. TRANSLATORS: The type of update
#: ../lib/packagekit-glib2/pk-console-shared.c:430
msgid "Normal"
-msgstr ""
+msgstr "ObiÄajna"
#. TRANSLATORS: The type of update
#: ../lib/packagekit-glib2/pk-console-shared.c:434
msgid "Important"
-msgstr ""
+msgstr "Pomembna"
#. TRANSLATORS: The type of update
#: ../lib/packagekit-glib2/pk-console-shared.c:438
msgid "Security"
-msgstr ""
+msgstr "Varnostna"
#. TRANSLATORS: The type of update
#: ../lib/packagekit-glib2/pk-console-shared.c:442
msgid "Bug fix "
-msgstr ""
+msgstr "Popravljanje hroÅ¡Äev "
#. TRANSLATORS: The type of update
#: ../lib/packagekit-glib2/pk-console-shared.c:446
msgid "Enhancement"
-msgstr ""
+msgstr "Izboljšava"
#. TRANSLATORS: The type of update
#: ../lib/packagekit-glib2/pk-console-shared.c:450
msgid "Blocked"
-msgstr ""
+msgstr "Blokirana"
#. TRANSLATORS: The state of a package
#. TRANSLATORS: The action of the package, in past tense
#: ../lib/packagekit-glib2/pk-console-shared.c:455
#: ../lib/packagekit-glib2/pk-console-shared.c:528
msgid "Installed"
-msgstr ""
+msgstr "NameÅ¡Äen"
#. TRANSLATORS: The state of a package, i.e. not installed
#: ../lib/packagekit-glib2/pk-console-shared.c:460
msgid "Available"
-msgstr ""
+msgstr "Na voljo"
#. TRANSLATORS: The action of the package, in present tense
#: ../lib/packagekit-glib2/pk-console-shared.c:478
msgid "Downloading"
-msgstr ""
+msgstr "Prejemanje"
#. TRANSLATORS: The action of the package, in present tense
#: ../lib/packagekit-glib2/pk-console-shared.c:482
msgid "Updating"
-msgstr ""
+msgstr "Posodabljanje"
#. TRANSLATORS: The action of the package, in present tense
#. TRANSLATORS: The role of the transaction, in present tense
#: ../lib/packagekit-glib2/pk-console-shared.c:486
#: ../lib/packagekit-glib2/pk-console-shared.c:606
msgid "Installing"
-msgstr ""
+msgstr "NameÅ¡Äanje"
#. TRANSLATORS: The action of the package, in present tense
#. TRANSLATORS: The role of the transaction, in present tense
#: ../lib/packagekit-glib2/pk-console-shared.c:490
#: ../lib/packagekit-glib2/pk-console-shared.c:602
msgid "Removing"
-msgstr ""
+msgstr "Odstranjevanje"
#. TRANSLATORS: The action of the package, in present tense
#: ../lib/packagekit-glib2/pk-console-shared.c:494
msgid "Cleaning up"
-msgstr ""
+msgstr "ÄŒiÅ¡Äenje"
#. TRANSLATORS: The action of the package, in present tense
#: ../lib/packagekit-glib2/pk-console-shared.c:498
msgid "Obsoleting"
-msgstr ""
+msgstr "Nastavljanje zastarelih paketov"
#. TRANSLATORS: The action of the package, in present tense
#: ../lib/packagekit-glib2/pk-console-shared.c:502
msgid "Reinstalling"
-msgstr ""
+msgstr "Ponovno nameÅ¡Äanje"
#. TRANSLATORS: The action of the package, in past tense
#: ../lib/packagekit-glib2/pk-console-shared.c:520
msgid "Downloaded"
-msgstr ""
+msgstr "Prejeto"
#. TRANSLATORS: The action of the package, in past tense
#: ../lib/packagekit-glib2/pk-console-shared.c:532
msgid "Removed"
-msgstr ""
+msgstr "Odstranjeno"
#. TRANSLATORS: The action of the package, in past tense
#: ../lib/packagekit-glib2/pk-console-shared.c:536
msgid "Cleaned up"
-msgstr ""
+msgstr "PoÄiÅ¡Äeno"
#. TRANSLATORS: The action of the package, in past tense
#: ../lib/packagekit-glib2/pk-console-shared.c:540
msgid "Obsoleted"
-msgstr ""
+msgstr "NadomeÅ¡Äeno"
#. TRANSLATORS: The action of the package, in past tense
#: ../lib/packagekit-glib2/pk-console-shared.c:544
msgid "Reinstalled"
-msgstr ""
+msgstr "Ponovno nameÅ¡Äeno"
#. TRANSLATORS: The role of the transaction, in present tense
#: ../lib/packagekit-glib2/pk-console-shared.c:562
msgid "Unknown role type"
-msgstr ""
+msgstr "Neznana vloga"
#. TRANSLATORS: The role of the transaction, in present tense
#: ../lib/packagekit-glib2/pk-console-shared.c:566
msgid "Getting dependencies"
-msgstr ""
+msgstr "Dobivanje odvisnosti"
#. TRANSLATORS: The role of the transaction, in present tense
#: ../lib/packagekit-glib2/pk-console-shared.c:570
msgid "Getting update details"
-msgstr ""
+msgstr "Dobivanje podrobnosti posodobitev"
#. TRANSLATORS: The role of the transaction, in present tense
#: ../lib/packagekit-glib2/pk-console-shared.c:574
msgid "Getting details"
-msgstr ""
+msgstr "Dobivanje podrobnosti"
#. TRANSLATORS: The role of the transaction, in present tense
#: ../lib/packagekit-glib2/pk-console-shared.c:578
msgid "Getting requires"
-msgstr ""
+msgstr "Dobivanje zahtevanega"
#. TRANSLATORS: The role of the transaction, in present tense
#: ../lib/packagekit-glib2/pk-console-shared.c:582
msgid "Getting updates"
-msgstr ""
+msgstr "Dobivanje posodobitev"
#. TRANSLATORS: The role of the transaction, in present tense
#: ../lib/packagekit-glib2/pk-console-shared.c:586
msgid "Searching by details"
-msgstr ""
+msgstr "Iskanje po podrobnosti"
#. TRANSLATORS: The role of the transaction, in present tense
#: ../lib/packagekit-glib2/pk-console-shared.c:590
msgid "Searching by file"
-msgstr ""
+msgstr "Iskanje po datoteki"
#. TRANSLATORS: The role of the transaction, in present tense
#: ../lib/packagekit-glib2/pk-console-shared.c:594
msgid "Searching groups"
-msgstr ""
+msgstr "Iskanje skupin"
#. TRANSLATORS: The role of the transaction, in present tense
#: ../lib/packagekit-glib2/pk-console-shared.c:598
msgid "Searching by name"
-msgstr ""
+msgstr "Iskanje po imenu"
#. TRANSLATORS: The role of the transaction, in present tense
#: ../lib/packagekit-glib2/pk-console-shared.c:610
msgid "Installing files"
-msgstr ""
+msgstr "NameÅ¡Äanje datotek"
#. TRANSLATORS: The role of the transaction, in present tense
#: ../lib/packagekit-glib2/pk-console-shared.c:614
msgid "Refreshing cache"
-msgstr ""
+msgstr "Osveževanje predpomnilnika"
#. TRANSLATORS: The role of the transaction, in present tense
#: ../lib/packagekit-glib2/pk-console-shared.c:618
msgid "Updating packages"
-msgstr ""
+msgstr "Posodabljanje paketov"
#. TRANSLATORS: The role of the transaction, in present tense
#: ../lib/packagekit-glib2/pk-console-shared.c:622
msgid "Updating system"
-msgstr ""
+msgstr "Posodabljanje sistema"
#. TRANSLATORS: The role of the transaction, in present tense
#: ../lib/packagekit-glib2/pk-console-shared.c:626
msgid "Canceling"
-msgstr ""
+msgstr "Preklicevanje"
#. TRANSLATORS: The role of the transaction, in present tense
#: ../lib/packagekit-glib2/pk-console-shared.c:634
msgid "Getting repositories"
-msgstr ""
+msgstr "Dobivanje skladiÅ¡Ä"
#. TRANSLATORS: The role of the transaction, in present tense
#: ../lib/packagekit-glib2/pk-console-shared.c:638
msgid "Enabling repository"
-msgstr ""
+msgstr "OmogoÄanje skladiÅ¡Äa"
#. TRANSLATORS: The role of the transaction, in present tense
#: ../lib/packagekit-glib2/pk-console-shared.c:642
msgid "Setting data"
-msgstr ""
+msgstr "Nastavljanje podatkov"
#. TRANSLATORS: The role of the transaction, in present tense
#: ../lib/packagekit-glib2/pk-console-shared.c:646
msgid "Resolving"
-msgstr ""
+msgstr "Razreševanje"
#. TRANSLATORS: The role of the transaction, in present tense
#: ../lib/packagekit-glib2/pk-console-shared.c:650
msgid "Getting file list"
-msgstr ""
+msgstr "Dobivanje seznama datotek"
#. TRANSLATORS: The role of the transaction, in present tense
#: ../lib/packagekit-glib2/pk-console-shared.c:654
msgid "Getting provides"
-msgstr ""
+msgstr "Dobivanje ponudnikov"
#. TRANSLATORS: The role of the transaction, in present tense
#: ../lib/packagekit-glib2/pk-console-shared.c:658
msgid "Installing signature"
-msgstr ""
+msgstr "NameÅ¡Äanje podpisa"
#. TRANSLATORS: The role of the transaction, in present tense
#: ../lib/packagekit-glib2/pk-console-shared.c:662
msgid "Getting packages"
-msgstr ""
+msgstr "Dobivanje paketov"
#. TRANSLATORS: The role of the transaction, in present tense
#: ../lib/packagekit-glib2/pk-console-shared.c:666
msgid "Accepting EULA"
-msgstr ""
+msgstr "Sprejemanje licence"
#. TRANSLATORS: The role of the transaction, in present tense
#: ../lib/packagekit-glib2/pk-console-shared.c:674
msgid "Getting upgrades"
-msgstr ""
+msgstr "Dobivanje nadgradenj"
#. TRANSLATORS: The role of the transaction, in present tense
#: ../lib/packagekit-glib2/pk-console-shared.c:678
msgid "Getting categories"
-msgstr ""
+msgstr "Dobivanje kategorij"
#. TRANSLATORS: The role of the transaction, in present tense
#: ../lib/packagekit-glib2/pk-console-shared.c:682
msgid "Getting transactions"
-msgstr ""
+msgstr "Dobivanje transakcij"
#. TRANSLATORS: The role of the transaction, in present tense
#: ../lib/packagekit-glib2/pk-console-shared.c:686
#: ../lib/packagekit-glib2/pk-console-shared.c:690
msgid "Simulating install"
-msgstr ""
+msgstr "Simuliranje namestitve"
#. TRANSLATORS: The role of the transaction, in present tense
#: ../lib/packagekit-glib2/pk-console-shared.c:694
msgid "Simulating remove"
-msgstr ""
+msgstr "Simuliranje odstranjevanja"
#. TRANSLATORS: The role of the transaction, in present tense
#: ../lib/packagekit-glib2/pk-console-shared.c:698
msgid "Simulating update"
-msgstr ""
+msgstr "Simuliranje posodobitve"
#. TRANSLATORS: turn on all debugging
#: ../lib/packagekit-glib2/pk-debug.c:133
msgid "Show debugging information for all files"
-msgstr ""
+msgstr "Pokaži podrobnosti razhroÅ¡Äevanja za vse datoteke"
#: ../lib/packagekit-glib2/pk-debug.c:201
msgid "Debugging Options"
-msgstr ""
+msgstr "Možnosti razhroÅ¡Äevanja"
#: ../lib/packagekit-glib2/pk-debug.c:201
msgid "Show debugging options"
-msgstr ""
+msgstr "Pokaži možnosti razhroÅ¡Äevanja"
#. TRANSLATORS: ask the user if they are comfortable installing insecure
#. packages
#: ../lib/packagekit-glib2/pk-task-text.c:67
msgid "Do you want to allow installing of unsigned software?"
-msgstr ""
+msgstr "Ali želite dovoliti nameÅ¡Äanje nepodpisanih programov?"
#. TRANSLATORS: tell the user we've not done anything
#: ../lib/packagekit-glib2/pk-task-text.c:72
msgid "The unsigned software will not be installed."
-msgstr ""
+msgstr "Nepodpisani programi ne bodo nameÅ¡Äeni."
#. TRANSLATORS: the package repository is signed by a key that is not
#. recognised
#: ../lib/packagekit-glib2/pk-task-text.c:121
msgid "Software source signature required"
-msgstr ""
+msgstr "Zahtevan je podpis programskih virov"
#. TRANSLATORS: the package repository name
#: ../lib/packagekit-glib2/pk-task-text.c:127
msgid "Software source name"
-msgstr ""
+msgstr "Ime programskega vira"
#. TRANSLATORS: the key URL
#: ../lib/packagekit-glib2/pk-task-text.c:130
msgid "Key URL"
-msgstr ""
+msgstr "URL kljuÄa"
#. TRANSLATORS: the username of the key
#: ../lib/packagekit-glib2/pk-task-text.c:133
msgid "Key user"
-msgstr ""
+msgstr "KljuÄ uporabnika"
#. TRANSLATORS: the key ID, usually a few hex digits
#: ../lib/packagekit-glib2/pk-task-text.c:136
msgid "Key ID"
-msgstr ""
+msgstr "ID kljuÄa"
#. TRANSLATORS: the key fingerprint, again, yet more hex
#: ../lib/packagekit-glib2/pk-task-text.c:139
msgid "Key fingerprint"
-msgstr ""
+msgstr "Podpis kljuÄa"
#. TRANSLATORS: the timestamp (a bit like a machine readable time)
#: ../lib/packagekit-glib2/pk-task-text.c:142
msgid "Key Timestamp"
-msgstr ""
+msgstr "ÄŒasovni žig kljuÄa"
#. TRANSLATORS: ask the user if they want to import
#: ../lib/packagekit-glib2/pk-task-text.c:155
msgid "Do you accept this signature?"
-msgstr ""
+msgstr "Ali sprejemate podpis?"
#. TRANSLATORS: tell the user we've not done anything
#: ../lib/packagekit-glib2/pk-task-text.c:160
msgid "The signature was not accepted."
-msgstr ""
+msgstr "Podpis ni bil sprejet."
#. TRANSLATORS: this is another name for a software licence that has to be
#. read before installing
#: ../lib/packagekit-glib2/pk-task-text.c:203
msgid "End user licence agreement required"
-msgstr ""
+msgstr "Zahtevan je sprejem uporabniške licence"
#. TRANSLATORS: the EULA text itself (long and boring)
#: ../lib/packagekit-glib2/pk-task-text.c:212
msgid "Agreement"
-msgstr ""
+msgstr "Licenca"
#. TRANSLATORS: ask the user if they've read and accepted the EULA
#: ../lib/packagekit-glib2/pk-task-text.c:221
msgid "Do you accept this agreement?"
-msgstr ""
+msgstr "Ali sprejmete to licenco?"
#. TRANSLATORS: tell the user we've not done anything
#: ../lib/packagekit-glib2/pk-task-text.c:226
msgid "The agreement was not accepted."
-msgstr ""
+msgstr "Licenca ni bila sprejeta"
#. TRANSLATORS: the user needs to change media inserted into the computer
#: ../lib/packagekit-glib2/pk-task-text.c:265
msgid "Media change required"
-msgstr ""
+msgstr "Zahtevana je sprememba medija"
#. TRANSLATORS: the type, e.g. DVD, CD, etc
#: ../lib/packagekit-glib2/pk-task-text.c:268
msgid "Media type"
-msgstr ""
+msgstr "Vrsta medija"
#. TRANSLATORS: the media label, usually like 'disk-1of3'
#: ../lib/packagekit-glib2/pk-task-text.c:271
msgid "Media label"
-msgstr ""
+msgstr "Oznaka medija"
#. TRANSLATORS: the media description, usually like 'Fedora 12 disk 5'
#: ../lib/packagekit-glib2/pk-task-text.c:274
msgid "Text"
-msgstr ""
+msgstr "Besedilo"
#. TRANSLATORS: ask the user to insert the media
#: ../lib/packagekit-glib2/pk-task-text.c:280
msgid "Please insert the correct media"
-msgstr ""
+msgstr "Vstavite pravilen medij"
#. TRANSLATORS: tell the user we've not done anything as they are lazy
#: ../lib/packagekit-glib2/pk-task-text.c:285
msgid "The correct media was not inserted."
-msgstr ""
+msgstr "Pravilen medij ni bil vstavljen."
#. TRANSLATORS: When processing, we might have to remove other dependencies
#: ../lib/packagekit-glib2/pk-task-text.c:300
msgid "The following packages have to be removed:"
-msgstr ""
+msgstr "Naslednje pakete je treba odstraniti:"
#. TRANSLATORS: When processing, we might have to install other dependencies
#: ../lib/packagekit-glib2/pk-task-text.c:305
msgid "The following packages have to be installed:"
-msgstr ""
+msgstr "Namestiti je treba naslednje pakete:"
#. TRANSLATORS: When processing, we might have to update other dependencies
#: ../lib/packagekit-glib2/pk-task-text.c:310
msgid "The following packages have to be updated:"
-msgstr ""
+msgstr "Posodobiti je treba naslednje pakete:"
#. TRANSLATORS: When processing, we might have to reinstall other dependencies
#: ../lib/packagekit-glib2/pk-task-text.c:315
msgid "The following packages have to be reinstalled:"
-msgstr ""
+msgstr "Ponovno je treba namestiti naslednje pakete:"
#. TRANSLATORS: When processing, we might have to downgrade other dependencies
#: ../lib/packagekit-glib2/pk-task-text.c:320
msgid "The following packages have to be downgraded:"
-msgstr ""
+msgstr "Naslednje pakete je treba podgraditi:"
#. TRANSLATORS: ask the user if the proposed changes are okay
#: ../lib/packagekit-glib2/pk-task-text.c:380
msgid "Proceed with changes?"
-msgstr ""
+msgstr "Ali želite nadaljevati s spremembami?"
#. TRANSLATORS: tell the user we didn't do anything
#: ../lib/packagekit-glib2/pk-task-text.c:385
msgid "The transaction did not proceed."
-msgstr ""
+msgstr "Transakcija se ni nadaljevala."
#. SECURITY:
#. - Normal users do not require admin authentication to accept new
@@ -1805,70 +1822,74 @@ msgstr ""
#.
#: ../policy/org.freedesktop.packagekit.policy.in.h:7
msgid "Accept EULA"
-msgstr ""
+msgstr "Sprejmi EULA"
#: ../policy/org.freedesktop.packagekit.policy.in.h:8
msgid "Authentication is required to accept a EULA"
-msgstr ""
+msgstr "Za sprejetje EULA je zahtevana overitev"
#: ../policy/org.freedesktop.packagekit.policy.in.h:9
msgid ""
"Authentication is required to cancel a task that was not started by yourself"
-msgstr ""
+msgstr "Za preklic opravila, ki ga niste zaÄeli sami, je zahtevana overitev."
#: ../policy/org.freedesktop.packagekit.policy.in.h:10
msgid "Authentication is required to change software source parameters"
-msgstr ""
+msgstr "Za spremembo parametrov programskih virov je zahtevana overitev"
#: ../policy/org.freedesktop.packagekit.policy.in.h:11
msgid ""
"Authentication is required to change the location used to decompress "
"packages"
-msgstr ""
+msgstr "Za spremembo mesta za razširitev paketov je zahtevana overitev"
#: ../policy/org.freedesktop.packagekit.policy.in.h:12
msgid ""
"Authentication is required to consider a key used for signing packages as "
"trusted"
msgstr ""
+"Za upoÅ¡tevanje kljuÄa za podpisovanje paketov kot zaupanja vredne je "
+"zahtevana overitev"
#: ../policy/org.freedesktop.packagekit.policy.in.h:13
msgid "Authentication is required to install a signed package"
-msgstr ""
+msgstr "Za namestitev podpisanega paketa je zahtevana overitev"
#: ../policy/org.freedesktop.packagekit.policy.in.h:14
msgid "Authentication is required to install an untrusted package"
-msgstr ""
+msgstr "Za namestitev paketa, ki ni zaupanja vreden, je zahtevana overitev"
#: ../policy/org.freedesktop.packagekit.policy.in.h:15
msgid "Authentication is required to refresh the system sources"
-msgstr ""
+msgstr "Za osvežitev sistemskih virov je zahtevana overitev"
#: ../policy/org.freedesktop.packagekit.policy.in.h:16
msgid "Authentication is required to reload the device with a new driver"
-msgstr ""
+msgstr "Za ponovno nalaganje naprave z novim gonilnikom je zahtevana overitev"
#: ../policy/org.freedesktop.packagekit.policy.in.h:17
msgid "Authentication is required to remove packages"
-msgstr ""
+msgstr "Za odstranitev paketov je zahtevana overitev"
#: ../policy/org.freedesktop.packagekit.policy.in.h:18
msgid "Authentication is required to rollback a transaction"
-msgstr ""
+msgstr "Za povrnitev transakcije je zahtevana overitev"
#: ../policy/org.freedesktop.packagekit.policy.in.h:19
msgid ""
"Authentication is required to set the network proxy used for downloading "
"packages"
msgstr ""
+"Za nastavitev omrežnega posredniškega strežnika, uporabljenega za prejem "
+"paketov je zahtevana overitev"
#: ../policy/org.freedesktop.packagekit.policy.in.h:20
msgid "Authentication is required to update packages"
-msgstr ""
+msgstr "Za posodobitev paketov je zahtevana overitev"
#: ../policy/org.freedesktop.packagekit.policy.in.h:21
msgid "Authentication is required to upgrade the operating system"
-msgstr ""
+msgstr "Za nadgradnjo operacijskega sistema je zahtevana overitev"
#. SECURITY:
#. - Normal users are allowed to cancel their own task without
@@ -1877,7 +1898,7 @@ msgstr ""
#.
#: ../policy/org.freedesktop.packagekit.policy.in.h:27
msgid "Cancel foreign task"
-msgstr ""
+msgstr "PrekliÄi tujo nalogo"
#. SECURITY:
#. - This is used when users want to install to a different prefix, for
@@ -1887,7 +1908,7 @@ msgstr ""
#.
#: ../policy/org.freedesktop.packagekit.policy.in.h:34
msgid "Change location that packages are installed"
-msgstr ""
+msgstr "Spremeni mesto namestitve paketov"
#. SECURITY:
#. - Normal users require admin authentication to enable or disable
@@ -1896,7 +1917,7 @@ msgstr ""
#.
#: ../policy/org.freedesktop.packagekit.policy.in.h:40
msgid "Change software source parameters"
-msgstr ""
+msgstr "Spremeni parametre programskih virov"
#. SECURITY:
#. - Normal users do not need authentication to install signed packages
@@ -1906,7 +1927,7 @@ msgstr ""
#.
#: ../policy/org.freedesktop.packagekit.policy.in.h:47
msgid "Install signed package"
-msgstr ""
+msgstr "Namesti podpisan paket"
#. SECURITY:
#. - Normal users require admin authentication to install untrusted or
@@ -1916,7 +1937,7 @@ msgstr ""
#.
#: ../policy/org.freedesktop.packagekit.policy.in.h:54
msgid "Install untrusted local file"
-msgstr ""
+msgstr "Namesti krajevno datoteko, ki ni zaupanja vredna"
#. SECURITY:
#. - Normal users do not require admin authentication to refresh the
@@ -1924,7 +1945,7 @@ msgstr ""
#.
#: ../policy/org.freedesktop.packagekit.policy.in.h:59
msgid "Refresh system sources"
-msgstr ""
+msgstr "Osveži sistemske vire"
#. SECURITY:
#. - Normal users require admin authentication to rebind a driver
@@ -1935,7 +1956,7 @@ msgstr ""
#.
#: ../policy/org.freedesktop.packagekit.policy.in.h:67
msgid "Reload a device"
-msgstr ""
+msgstr "Ponovno naloži napravo"
#. SECURITY:
#. - Normal users require admin authentication to remove packages as
@@ -1948,7 +1969,7 @@ msgstr ""
#.
#: ../policy/org.freedesktop.packagekit.policy.in.h:77
msgid "Remove package"
-msgstr ""
+msgstr "Odstrani paket"
#. SECURITY:
#. - Normal users require admin authentication to rollback system state
@@ -1957,7 +1978,7 @@ msgstr ""
#.
#: ../policy/org.freedesktop.packagekit.policy.in.h:83
msgid "Rollback to a previous transaction"
-msgstr ""
+msgstr "Povrni na predhodno transakcijo"
#. SECURITY:
#. - Normal users do not require admin authentication to set the proxy
@@ -1965,7 +1986,7 @@ msgstr ""
#.
#: ../policy/org.freedesktop.packagekit.policy.in.h:88
msgid "Set network proxy"
-msgstr ""
+msgstr "Nastavi omrežni posredniški strežnik"
#. SECURITY:
#. - Normal users require admin authentication to add signing keys.
@@ -1975,7 +1996,7 @@ msgstr ""
#.
#: ../policy/org.freedesktop.packagekit.policy.in.h:95
msgid "Trust a key used for signing packages"
-msgstr ""
+msgstr "Zaupaj kljuÄu za podpisovanje paketov"
#. SECURITY:
#. - Normal users do not require admin authentication to update the
@@ -1986,7 +2007,7 @@ msgstr ""
#.
#: ../policy/org.freedesktop.packagekit.policy.in.h:103
msgid "Update packages"
-msgstr ""
+msgstr "Posodobi pakete"
#. SECURITY:
#. - Normal users require admin authentication to upgrade the disto as
@@ -1995,22 +2016,22 @@ msgstr ""
#.
#: ../policy/org.freedesktop.packagekit.policy.in.h:109
msgid "Upgrade System"
-msgstr ""
+msgstr "Nadgradi sistem"
#. TRANSLATORS: failed due to DBus security
#: ../src/pk-main.c:91
msgid "Startup failed due to security policies on this machine."
-msgstr ""
+msgstr "Zagon je spodletel zaradi varnostnih pravil na tej napravi"
#. TRANSLATORS: only two ways this can fail...
#: ../src/pk-main.c:93
msgid "This can happen for two reasons:"
-msgstr ""
+msgstr "To se lahko zgodi zaradi dveh razlogov:"
#. TRANSLATORS: only allowed to be owned by root
#: ../src/pk-main.c:95
msgid "The correct user is not launching the executable (usually root)"
-msgstr ""
+msgstr "Izvedljive datoteke ne zaganja pravi uporabnik (obiÄajno skrbnik)"
#. TRANSLATORS: or we are installed in a prefix
#: ../src/pk-main.c:97
@@ -2018,76 +2039,77 @@ msgid ""
"The org.freedesktop.PackageKit.conf file is not installed in the system "
"directory:"
msgstr ""
+"Datoteka org.freedesktop.PackageKit.conf ni nameÅ¡Äena v sistemski mapi:"
#. TRANSLATORS: a backend is the system package tool, e.g. yum, apt
#: ../src/pk-main.c:223
msgid "Packaging backend to use, e.g. dummy"
-msgstr ""
+msgstr "Zaledje pakiranja za uporabo, na primer preizkusno"
#. TRANSLATORS: if we should run in the background
#: ../src/pk-main.c:226
msgid "Daemonize and detach from the terminal"
-msgstr ""
+msgstr "Ustvari ozadnji program in loÄi od terminala"
#. TRANSLATORS: if we should not monitor how long we are inactive for
#: ../src/pk-main.c:229
msgid "Disable the idle timer"
-msgstr ""
+msgstr "OnemogoÄi Äasomer nedejavnosti"
#. TRANSLATORS: show version
#: ../src/pk-main.c:232
msgid "Show version and exit"
-msgstr ""
+msgstr "Pokaži razliÄico in konÄaj"
#. TRANSLATORS: exit after we've started up, used for user profiling
#: ../src/pk-main.c:235
msgid "Exit after a small delay"
-msgstr ""
+msgstr "KonÄaj po kratki zakasnitvi"
#. TRANSLATORS: exit straight away, used for automatic profiling
#: ../src/pk-main.c:238
msgid "Exit after the engine has loaded"
-msgstr ""
+msgstr "KonÄaj, ko se programnik naloži"
#. TRANSLATORS: describing the service that is running
#: ../src/pk-main.c:253
msgid "PackageKit service"
-msgstr ""
+msgstr "Storitev PackageKit"
#. TRANSLATORS: fatal error, dbus is not running
#: ../src/pk-main.c:298
msgid "Cannot connect to the system bus"
-msgstr ""
+msgstr "Ni se mogoÄe povezati s sistemskim vodilom"
#: ../src/pk-main.c:344
msgid "Failed to load any of the specified backends:"
-msgstr ""
+msgstr "Nalaganje kateregakoli od navedenih zaledij je spodletelo:"
#. TRANSLATORS: cannot register on system bus, unknown reason -- geeky error
#. follows
#: ../src/pk-main.c:358
msgid "Error trying to start:"
-msgstr ""
+msgstr "Napaka med poskusom zagona:"
#. TRANSLATORS: is not GPG signed
#: ../src/pk-transaction.c:2611 ../src/pk-transaction.c:2618
msgid "The software is not from a trusted source."
-msgstr ""
+msgstr "Ta program ni iz zaupanega vira."
#: ../src/pk-transaction.c:2623
msgid "Do not update this package unless you are sure it is safe to do so."
-msgstr ""
+msgstr "Tega paketa ne posodobite, Äe niste prepriÄani, da je to varno."
#: ../src/pk-transaction.c:2624
msgid "Do not update these packages unless you are sure it is safe to do so."
-msgstr ""
+msgstr "Ne posodobite teh paketov, Äe niste prepriÄani, da je to varno."
#: ../src/pk-transaction.c:2634
msgid "Do not install this package unless you are sure it is safe to do so."
-msgstr ""
+msgstr "Ne namestite tega paketa, Äe niste prepriÄani, da je to varno."
#: ../src/pk-transaction.c:2635
msgid "Do not install these packages unless you are sure it is safe to do so."
-msgstr ""
+msgstr "Ne namestite teh paketov, Äe niste prepriÄani, da je to varno."
diff --git a/po/wa.po b/po/wa.po
index 964c37b..e8a09cd 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: PackageKit\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-05-04 10:50+0100\n"
-"PO-Revision-Date: 2011-06-07 08:12+0000\n"
+"PO-Revision-Date: 2011-07-04 15:31+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Walloon (http://www.transifex.net/projects/p/freedesktop/team/wa/)\n"
"MIME-Version: 1.0\n"
commit 7daec14f84ebfc25ab82b7063ca7d2998e0ef343
Author: Richard Hughes <richard at hughsie.com>
Date: Mon Jul 4 16:30:11 2011 +0100
zif: trivially update to the actual released version of zif_store_array_get_updates()
diff --git a/backends/zif/pk-backend-zif.c b/backends/zif/pk-backend-zif.c
index 19ccab7..8662e6d 100644
--- a/backends/zif/pk-backend-zif.c
+++ b/backends/zif/pk-backend-zif.c
@@ -3950,6 +3950,7 @@ pk_backend_update_system_thread (PkBackend *backend)
guint i;
ZifPackage *package;
ZifState *state_local;
+ ZifStore *store_local = NULL;
pk_backend_set_status (backend, PK_STATUS_ENUM_QUERY);
pk_backend_set_percentage (backend, 0);
@@ -3995,7 +3996,9 @@ pk_backend_update_system_thread (PkBackend *backend)
/* get all updates */
state_local = zif_state_get_child (priv->state);
+ store_local = zif_store_local_new ();
updates = zif_store_array_get_updates (store_array,
+ store_local,
state_local,
&error);
if (updates == NULL) {
@@ -4064,6 +4067,8 @@ pk_backend_update_system_thread (PkBackend *backend)
}
out:
pk_backend_finished (backend);
+ if (store_local != NULL)
+ g_object_unref (store_local);
if (updates != NULL)
g_ptr_array_unref (updates);
if (store_array != NULL)
commit b5971144135b477896211e72555891514ec8c693
Author: Richard Hughes <richard at hughsie.com>
Date: Fri Jul 1 09:20:40 2011 +0100
Fix CVE-2011-2515 which affects the YUM backend
In commit 290933489b1aaeb1017d10fb59ccf3231e309115, YUM changed the behaviour
when checking signatures on a package. The commit added a new configuration key
'localpkg_gpgcheck' which only affects local packages, but the key was set by
default to False, unlike 'gpgcheck' which was used for local and remote
packages before this commit.
This meant that an end user could install a local unsigned rpm package using
PackageKit without a GPG trust check, and the user would be told the untrusted
package is itself trusted. This would cause PackageKit to use a different
(weaker) PolicyKit authentication that what would be required of an unsigned
package.
To exploit this low-impact vulnerability, a user would have to manually
download an unsigned package file and would still be required to authenticate
to install the package unless this has been changed by an administrator.
Now, PackageKit sets internaly 'localpkg_gpgcheck' to match 'gpgcheck' for all
versions of yum with this new feature to match the expected behaviour.
Red Hat would like to thank Peter Robinson for reporting this issue.
See http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-2515 for more details.
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=717566
diff --git a/backends/yum/yumBackend.py b/backends/yum/yumBackend.py
index d66f862..d9a293c 100755
--- a/backends/yum/yumBackend.py
+++ b/backends/yum/yumBackend.py
@@ -1732,8 +1732,12 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage):
# if only_trusted is true, it means that we will only update signed files
if only_trusted:
self.yumbase.conf.gpgcheck = 1
+ if hasattr(self.yumbase.conf, 'localpkg_gpgcheck'):
+ self.yumbase.conf.localpkg_gpgcheck = 1
else:
self.yumbase.conf.gpgcheck = 0
+ if hasattr(self.yumbase.conf, 'localpkg_gpgcheck'):
+ self.yumbase.conf.localpkg_gpgcheck = 0
self.yumbase.conf.throttle = "60%" # Set bandwidth throttle to 60%
# to avoid taking all the system's bandwidth.
@@ -1956,8 +1960,12 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage):
# if only_trusted is true, it means that we will only update signed files
if only_trusted:
self.yumbase.conf.gpgcheck = 1
+ if hasattr(self.yumbase.conf, 'localpkg_gpgcheck'):
+ self.yumbase.conf.localpkg_gpgcheck = 1
else:
self.yumbase.conf.gpgcheck = 0
+ if hasattr(self.yumbase.conf, 'localpkg_gpgcheck'):
+ self.yumbase.conf.localpkg_gpgcheck = 0
for package_id in package_ids:
grp = self._is_meta_package(package_id)
@@ -2149,8 +2157,12 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage):
# If only_trusted is true, it means that we will only install trusted files
if only_trusted or simulate:
self.yumbase.conf.gpgcheck = 1
+ if hasattr(self.yumbase.conf, 'localpkg_gpgcheck'):
+ self.yumbase.conf.localpkg_gpgcheck = 1
else:
self.yumbase.conf.gpgcheck = 0
+ if hasattr(self.yumbase.conf, 'localpkg_gpgcheck'):
+ self.yumbase.conf.localpkg_gpgcheck = 0
# self.yumbase.installLocal fails for unsigned packages when self.yumbase.conf.gpgcheck = 1
# This means we don't run runYumTransaction, and don't get the GPG failure in
@@ -2304,8 +2316,12 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage):
# if only_trusted is true, it means that we will only update signed files
if only_trusted:
self.yumbase.conf.gpgcheck = 1
+ if hasattr(self.yumbase.conf, 'localpkg_gpgcheck'):
+ self.yumbase.conf.localpkg_gpgcheck = 1
else:
self.yumbase.conf.gpgcheck = 0
+ if hasattr(self.yumbase.conf, 'localpkg_gpgcheck'):
+ self.yumbase.conf.localpkg_gpgcheck = 0
txmbrs = []
try:
commit 534c7b587d0b9032c34f49218b898fab70b4412c
Author: Richard Hughes <richard at hughsie.com>
Date: Wed Jun 29 23:11:27 2011 +0100
zif: Implement UpdateSystem() by adding all the results from GetUpdates to a transaction
diff --git a/backends/zif/pk-backend-zif.c b/backends/zif/pk-backend-zif.c
index c6e041e..19ccab7 100644
--- a/backends/zif/pk-backend-zif.c
+++ b/backends/zif/pk-backend-zif.c
@@ -3938,6 +3938,140 @@ out:
}
/**
+ * pk_backend_update_system_thread:
+ */
+static gboolean
+pk_backend_update_system_thread (PkBackend *backend)
+{
+ gboolean ret;
+ GError *error = NULL;
+ GPtrArray *updates = NULL;
+ GPtrArray *store_array = NULL;
+ guint i;
+ ZifPackage *package;
+ ZifState *state_local;
+
+ pk_backend_set_status (backend, PK_STATUS_ENUM_QUERY);
+ pk_backend_set_percentage (backend, 0);
+
+ /* setup steps */
+ ret = zif_state_set_steps (priv->state,
+ NULL,
+ 10, /* add remote */
+ 10, /* get updates */
+ 10, /* add updates */
+ 70, /* run transaction */
+ -1);
+ g_assert (ret);
+
+ /* get a store_array of remote stores */
+ store_array = zif_store_array_new ();
+ state_local = zif_state_get_child (priv->state);
+ ret = zif_store_array_add_remote_enabled (store_array,
+ state_local,
+ &error);
+ if (!ret) {
+ pk_backend_error_code (backend,
+ pk_backend_convert_error (error),
+ "failed to add enabled stores: %s",
+ error->message);
+ g_error_free (error);
+ goto out;
+ }
+
+ /* use these stores for the transaction */
+ zif_transaction_set_stores_remote (priv->transaction, store_array);
+
+ /* this section done */
+ ret = zif_state_done (priv->state, &error);
+ if (!ret) {
+ pk_backend_error_code (backend,
+ PK_ERROR_ENUM_TRANSACTION_CANCELLED,
+ "cancelled: %s",
+ error->message);
+ g_error_free (error);
+ goto out;
+ }
+
+ /* get all updates */
+ state_local = zif_state_get_child (priv->state);
+ updates = zif_store_array_get_updates (store_array,
+ state_local,
+ &error);
+ if (updates == NULL) {
+ pk_backend_error_code (backend,
+ PK_ERROR_ENUM_TRANSACTION_ERROR,
+ "failed to get updates: %s",
+ error->message);
+ g_error_free (error);
+ goto out;
+ }
+
+ /* this section done */
+ ret = zif_state_done (priv->state, &error);
+ if (!ret) {
+ pk_backend_error_code (backend,
+ PK_ERROR_ENUM_TRANSACTION_CANCELLED,
+ "cancelled: %s",
+ error->message);
+ g_error_free (error);
+ goto out;
+ }
+
+ /* add them as an update to the transaction */
+ for (i = 0; i < updates->len; i++) {
+ package = g_ptr_array_index (updates, i);
+ ret = zif_transaction_add_install_as_update (priv->transaction,
+ package,
+ &error);
+ if (!ret) {
+ pk_backend_error_code (backend,
+ PK_ERROR_ENUM_TRANSACTION_ERROR,
+ "failed to add package %s: %s",
+ zif_package_get_printable (package),
+ error->message);
+ g_error_free (error);
+ goto out;
+ }
+ }
+
+ /* this section done */
+ ret = zif_state_done (priv->state, &error);
+ if (!ret) {
+ pk_backend_error_code (backend,
+ PK_ERROR_ENUM_TRANSACTION_CANCELLED,
+ "cancelled: %s",
+ error->message);
+ g_error_free (error);
+ goto out;
+ }
+
+ /* run transaction */
+ state_local = zif_state_get_child (priv->state);
+ ret = pk_backend_run_transaction (backend, state_local);
+ if (!ret)
+ goto out;
+
+ /* this section done */
+ ret = zif_state_done (priv->state, &error);
+ if (!ret) {
+ pk_backend_error_code (backend,
+ PK_ERROR_ENUM_TRANSACTION_CANCELLED,
+ "cancelled: %s",
+ error->message);
+ g_error_free (error);
+ goto out;
+ }
+out:
+ pk_backend_finished (backend);
+ if (updates != NULL)
+ g_ptr_array_unref (updates);
+ if (store_array != NULL)
+ g_ptr_array_unref (store_array);
+ return TRUE;
+}
+
+/**
* pk_backend_install_packages_thread:
*/
static gboolean
@@ -5102,6 +5236,15 @@ pk_backend_update_packages (PkBackend *backend, gboolean only_trusted, gchar **p
}
/**
+ * pk_backend_update_system:
+ */
+void
+pk_backend_update_system (PkBackend *backend, gboolean only_trusted)
+{
+ pk_backend_thread_create (backend, pk_backend_update_system_thread);
+}
+
+/**
* pk_backend_upgrade_system:
*/
void
commit 8cb69128cd85d630cbac45fc9d593e22420ce3ba
Author: Richard Hughes <richard at hughsie.com>
Date: Tue Jun 28 14:52:16 2011 +0100
Do not hardcode the UID_MIN as 500. Fixes rh#717110
diff --git a/src/pk-transaction-extra.c b/src/pk-transaction-extra.c
index cb3ee09..659f206 100644
--- a/src/pk-transaction-extra.c
+++ b/src/pk-transaction-extra.c
@@ -44,6 +44,9 @@
#include "pk-proc.h"
#include "pk-conf.h"
+/* for when parsing /etc/login.defs fails */
+#define PK_TRANSACTION_EXTRA_UID_MIN_DEFALT 500
+
#define PK_POST_TRANS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PK_TYPE_POST_TRANS, PkTransactionExtraPrivate))
struct PkTransactionExtraPrivate
@@ -789,6 +792,37 @@ out:
return uid;
}
+static guint
+pk_transaction_extra_get_uid_min (void)
+{
+ gboolean ret;
+ guint i;
+ gchar *data = NULL;
+ gchar **split = NULL;
+ GError *error = NULL;
+ guint uid_min = G_MAXUINT;
+
+ /* get contents */
+ ret = g_file_get_contents ("/etc/login.defs", &data, NULL, &error);
+ if (!ret) {
+ g_warning ("failed to get login UID_MIN: %s",
+ error->message);
+ g_error_free (error);
+ goto out;
+ }
+ split = g_strsplit (data, "\n", -1);
+ for (i = 0; split[i] != NULL; i++) {
+ if (!g_str_has_prefix (split[i], "UID_MIN"))
+ continue;
+ uid_min = atoi (g_strchug (split[i]+7));
+ break;
+ }
+out:
+ g_free (data);
+ g_strfreev (split);
+ return uid_min;
+}
+
/**
* pk_transaction_extra_check_library_restart:
**/
@@ -805,6 +839,7 @@ pk_transaction_extra_check_library_restart (PkTransactionExtra *extra)
GPtrArray *files_system;
PkPackage *package;
GPtrArray *pids;
+ guint uid_min;
g_return_val_if_fail (PK_IS_POST_TRANS (extra), FALSE);
@@ -820,6 +855,11 @@ pk_transaction_extra_check_library_restart (PkTransactionExtra *extra)
/* set status */
pk_transaction_extra_set_status_changed (extra, PK_STATUS_ENUM_CHECK_LIBRARIES);
+ /* get user UID range */
+ uid_min = pk_transaction_extra_get_uid_min ();
+ if (uid_min == G_MAXUINT)
+ uid_min = PK_TRANSACTION_EXTRA_UID_MIN_DEFALT;
+
/* find the package name of each pid */
for (i=0; i<pids->len; i++) {
pid = GPOINTER_TO_INT (g_ptr_array_index (pids, i));
commit a74ad8ea111bd01771280ce6028eb69b3bb6dc4f
Author: Richard Hughes <richard at hughsie.com>
Date: Tue Jun 28 13:15:16 2011 +0100
Ensure we save the updates cache for the pre-transaction checks
We need to save this regardless of the UseUpdateCache config value.
diff --git a/src/pk-cache.c b/src/pk-cache.c
index 571e7f1..5d38a03 100644
--- a/src/pk-cache.c
+++ b/src/pk-cache.c
@@ -35,8 +35,6 @@
struct PkCachePrivate
{
- PkConf *conf;
- gboolean use_cache;
PkResults *get_updates;
};
@@ -51,12 +49,6 @@ pk_cache_get_results (PkCache *cache, PkRoleEnum role)
{
g_return_val_if_fail (PK_IS_CACHE (cache), NULL);
- /* do not use */
- if (!cache->priv->use_cache) {
- g_debug ("not using cache");
- return NULL;
- }
-
/* only support GetUpdates */
if (role != PK_ROLE_ENUM_GET_UPDATES) {
g_debug ("only caching update lists");
@@ -78,12 +70,6 @@ pk_cache_set_results (PkCache *cache, PkRoleEnum role, PkResults *results)
g_return_val_if_fail (PK_IS_CACHE (cache), FALSE);
g_return_val_if_fail (results != NULL, FALSE);
- /* do not use */
- if (!cache->priv->use_cache) {
- g_debug ("not using cache");
- return FALSE;
- }
-
/* only support GetUpdates */
if (role != PK_ROLE_ENUM_GET_UPDATES) {
g_debug ("only caching update lists");
@@ -153,8 +139,6 @@ pk_cache_init (PkCache *cache)
{
cache->priv = PK_CACHE_GET_PRIVATE (cache);
cache->priv->get_updates = NULL;
- cache->priv->conf = pk_conf_new ();
- cache->priv->use_cache = pk_conf_get_bool (cache->priv->conf, "UseUpdateCache");
}
/**
diff --git a/src/pk-transaction.c b/src/pk-transaction.c
index 80c2450..d898ae4 100644
--- a/src/pk-transaction.c
+++ b/src/pk-transaction.c
@@ -3719,6 +3719,11 @@ pk_transaction_try_emit_cache (PkTransaction *transaction)
guint i;
guint idle_id;
+ /* not allowed to use a cache */
+ ret = pk_conf_get_bool (transaction->priv->conf, "UseUpdateCache");
+ if (!ret)
+ goto out;
+
/* get results */
results = pk_cache_get_results (transaction->priv->cache, transaction->priv->role);
if (results == NULL)
commit 5a8c9067452fe103791c53c9790325953d814fd2
Author: Richard Hughes <richard at hughsie.com>
Date: Tue Jun 28 11:30:59 2011 +0100
zif: Fix a critical warning when getting details about a package
diff --git a/backends/zif/pk-backend-zif.c b/backends/zif/pk-backend-zif.c
index 33461f9..c6e041e 100644
--- a/backends/zif/pk-backend-zif.c
+++ b/backends/zif/pk-backend-zif.c
@@ -2609,7 +2609,7 @@ pk_backend_get_details_thread (PkBackend *backend)
}
/* get group */
- state_tmp = zif_state_get_child (state_local);
+ state_tmp = zif_state_get_child (state_loop);
group_str = zif_package_get_group (package, state_tmp, &error);
/* not being in a group is non-fatal */
@@ -2649,7 +2649,7 @@ pk_backend_get_details_thread (PkBackend *backend)
}
/* get url */
- state_tmp = zif_state_get_child (state_local);
+ state_tmp = zif_state_get_child (state_loop);
url = zif_package_get_url (package, state_tmp, NULL);
/* this section done */
@@ -2664,7 +2664,7 @@ pk_backend_get_details_thread (PkBackend *backend)
}
/* get size */
- state_tmp = zif_state_get_child (state_local);
+ state_tmp = zif_state_get_child (state_loop);
size = zif_package_get_size (package, state_tmp, NULL);
/* this section done */
commit ab05a1fcf83ba2668dcdb4b7d9618baae88f3b05
Author: Robert Xu <robxu9 at gmail.com>
Date: Thu Jun 23 00:02:09 2011 -0400
Update the PackageKit matrix webpage to reflect current backends.
diff --git a/docs/html/pk-matrix.html b/docs/html/pk-matrix.html
index 9226b41..1deeeff 100644
--- a/docs/html/pk-matrix.html
+++ b/docs/html/pk-matrix.html
@@ -405,8 +405,8 @@
<td><img src="img/status-bad.png" alt="[no]"/></td><!-- apt -->
<td><img src="img/status-bad.png" alt="[no]"/></td><!-- alpm -->
<td><img src="img/status-bad.png" alt="[no]"/></td><!-- box -->
-<td><img src="img/status-bad.png" alt="[no]"/></td><!-- conary -->
-<td><img src="img/status-good.png" alt="[no]"/></td><!-- entropy -->
+<td><img src="img/status-good.png" alt="[yes]"/></td><!-- conary -->
+<td><img src="img/status-good.png" alt="[yes]"/></td><!-- entropy -->
<td><img src="img/status-bad.png" alt="[no]"/></td><!-- opkg -->
<td><img src="img/status-bad.png" alt="[no]"/></td><!-- pisi -->
<td><img src="img/status-bad.png" alt="[no]"/></td><!-- poldek -->
@@ -415,7 +415,7 @@
<td><img src="img/status-bad.png" alt="[no]"/></td><!-- slapt -->
<td><img src="img/status-bad.png" alt="[no]"/></td><!-- smart -->
<td><img src="img/status-bad.png" alt="[no]"/></td><!-- urpmi -->
-<td><img src="img/status-bad.png" alt="[no]"/></td><!-- yum -->
+<td><img src="img/status-good.png" alt="[yes]"/></td><!-- yum -->
<td><img src="img/status-bad.png" alt="[no]"/></td><!-- zypp -->
</tr>
<tr>
@@ -510,7 +510,7 @@
<td><img src="img/status-bad.png" alt="[no]"/></td><!-- slapt -->
<td><img src="img/status-bad.png" alt="[no]"/></td><!-- smart -->
<td><img src="img/status-bad.png" alt="[no]"/></td><!-- urpmi -->
-<td><img src="img/status-bad.png" alt="[no]"/></td><!-- yum -->
+<td><img src="img/status-good.png" alt="[yes]"/></td><!-- yum -->
<td><img src="img/status-bad.png" alt="[no]"/></td><!-- zypp -->
</tr>
<tr>
@@ -529,7 +529,7 @@
<td><img src="img/status-bad.png" alt="[no]"/></td><!-- slapt -->
<td><img src="img/status-bad.png" alt="[no]"/></td><!-- smart -->
<td><img src="img/status-bad.png" alt="[no]"/></td><!-- urpmi -->
-<td><img src="img/status-bad.png" alt="[no]"/></td><!-- yum -->
+<td><img src="img/status-good.png" alt="[yes]"/></td><!-- yum -->
<td><img src="img/status-bad.png" alt="[no]"/></td><!-- zypp -->
</tr>
<tr>
@@ -548,7 +548,7 @@
<td><img src="img/status-bad.png" alt="[no]"/></td><!-- slapt -->
<td><img src="img/status-bad.png" alt="[no]"/></td><!-- smart -->
<td><img src="img/status-bad.png" alt="[no]"/></td><!-- urpmi -->
-<td><img src="img/status-bad.png" alt="[no]"/></td><!-- yum -->
+<td><img src="img/status-good.png" alt="[yes]"/></td><!-- yum -->
<td><img src="img/status-bad.png" alt="[no]"/></td><!-- zypp -->
</tr>
<tr>
@@ -567,7 +567,7 @@
<td><img src="img/status-bad.png" alt="[no]"/></td><!-- slapt -->
<td><img src="img/status-bad.png" alt="[no]"/></td><!-- smart -->
<td><img src="img/status-bad.png" alt="[no]"/></td><!-- urpmi -->
-<td><img src="img/status-bad.png" alt="[no]"/></td><!-- yum -->
+<td><img src="img/status-good.png" alt="[yes]"/></td><!-- yum -->
<td><img src="img/status-bad.png" alt="[no]"/></td><!-- zypp -->
</tr>
<tr>
commit 9524579555da3cc546a165fda89352098db38539
Author: Jesse Zhang <zh.jesse at gmail.com>
Date: Mon Jun 20 13:58:56 2011 +0800
conary: simplify _resolve_list
diff --git a/backends/conary/TODO b/backends/conary/TODO
index 8979cec..e6294f0 100644
--- a/backends/conary/TODO
+++ b/backends/conary/TODO
@@ -1,5 +1,3 @@
-* the XML cache doesn't include all packages (e.g. ubuntu-font-family/automake)
- - there is probably bugs in the tool ('ticache') that generates the cache.
* should support system model
- don't use conary API directly in conaryBackend.py
- move self.xmlcache into conarypk, so it won't come in the way of system
@@ -7,11 +5,6 @@
- implement search (pending upcoming features of conary)
* fix use of post_process and implement _pkg_compare in conaryFilter.py
- http://lists.freedesktop.org/archives/packagekit/2011-March/006245.html
-* simplify _resolve_list(). It calls conary API directly and has much
- duplication with resolve().
- - _show_package_list() has duplication with the newly added _show_packages()
- - the data structure dict(trove, metadata) (as used in _show_package_list())
- is too complicated than necessary.
* decide what to do with package components
* conarypk.py: move _classic_build_update_job()/_classic_get_package_update()/_classic_get_updateall_job()
out of the ConaryPk and change them into functions, as the _model* functions.
diff --git a/backends/conary/conaryBackend.py b/backends/conary/conaryBackend.py
index b472558..46d37f8 100755
--- a/backends/conary/conaryBackend.py
+++ b/backends/conary/conaryBackend.py
@@ -131,7 +131,7 @@ class PackageKitConaryBackend(PackageKitBaseBackend):
def _search_package(self, pkg_list, name):
for pkg in pkg_list:
- if pkg["trove"][0] == name:
+ if pkg["name"] == name:
return pkg
return None
@@ -146,17 +146,14 @@ class PackageKitConaryBackend(PackageKitBaseBackend):
searchlist(str)ist as the package for search like
filters(str) as the filter
"""
- fltlist = filters
if where not in ("name", "details", "group", "all"):
self.error(ERROR_UNKNOWN, "DORK---- search where not found")
pkgList = self.xmlcache.search(searchlist, where )
if len(pkgList) > 0 :
- to_resolve = [self._convert_package((p["name"], None, None), p)
- for p in pkgList]
-
- self._resolve_list(to_resolve, fltlist)
+ pkgs = self._resolve_list(pkgList, filters)
+ self._show_package_list(pkgs)
else:
self.message(MESSAGE_COULD_NOT_FIND_PACKAGE,"search not found")
@@ -172,7 +169,7 @@ class PackageKitConaryBackend(PackageKitBaseBackend):
self._resolve_repo(pkgFilter, pkg_list)
package_list = pkgFilter.post_process()
- self._show_package_list(package_list)
+ return package_list
def _resolve_local(self, pkgFilter, pkg_list):
'''Find out installed packages from pkg_list
@@ -184,18 +181,17 @@ class PackageKitConaryBackend(PackageKitBaseBackend):
'''
ret = []
- list_trove_all = [p.get("trove") for p in pkg_list]
- db_trove_list = self.client.db.findTroves(None, list_trove_all, allowMissing=True)
+ troves_all = [(p["name"], None, None) for p in pkg_list]
+ troves_local = self.client.db.findTroves(None, troves_all,
+ allowMissing=True)
+
+ for trv in troves_local:
+ pkg = self._search_package(pkg_list, trv[0])
+ ret.append(pkg)
- list_installed = []
- for trv in list_trove_all:
- if trv in db_trove_list:
- pkg = self._search_package(pkg_list, trv[0])
- # A package may have different versions/flavors installed.
- for t in db_trove_list[trv]:
- list_installed.append(self._convert_package(t, pkg["metadata"]))
- ret.append(pkg)
- pkgFilter.add_installed(list_installed)
+ # A package may have different versions/flavors installed.
+ for t in troves_local[trv]:
+ pkgFilter.add_installed([self._convert_package(t, pkg)])
return ret
@@ -207,24 +203,16 @@ class PackageKitConaryBackend(PackageKitBaseBackend):
No return value.
'''
- list_trove_all = []
- for pkg in pkg_list:
- name, version, flavor = pkg.get("trove")
- trv = (name, version, self.conary.flavor)
- list_trove_all.append(trv)
-
- repo_trove_list = self.client.repos.findTroves(self.conary.default_label,
- list_trove_all, allowMissing=True)
-
- list_available = []
- for trv in list_trove_all:
- if trv in repo_trove_list:
- # only use the first trove in the list
- t = repo_trove_list[trv][0]
- pkg = self._search_package(pkg_list, t[0])
- pkg["trove"] = t
- list_available.append(pkg)
- pkgFilter.add_available(list_available)
+ troves_all = [(pkg["name"], None, self.conary.flavor) for pkg in
+ pkg_list]
+ troves_repo = self.client.repos.findTroves(self.conary.default_label,
+ troves_all, allowMissing=True)
+
+ for trv in troves_repo:
+ # only use the first trove in the list
+ t = troves_repo[trv][0]
+ pkg = self._search_package(pkg_list, t[0])
+ pkgFilter.add_available([self._convert_package(t, pkg)])
def resolve(self, filters, package ):
"""
@@ -239,32 +227,17 @@ class PackageKitConaryBackend(PackageKitBaseBackend):
if pkg_dict is None:
return None
- # Our list of troves doesn't contain information about whether trove is
- # installed, so ConaryFilter can't do proper filtering. Don't pass
- # @filters to it. Instead manually check the filters before calling
- # add_installed() and add_available().
- pkgfilter = ConaryFilter()
-
- is_found_locally = False
- if FILTER_NOT_INSTALLED not in filters:
- trove_installed = self.conary.query(pkg_dict.get("name"))
- for trv in trove_installed:
- pkg = self._convert_package(trv, pkg_dict)
- pkgfilter.add_installed([pkg])
- is_found_locally = True
+ pkgs = self._resolve_list([pkg_dict], filters)
+ self._show_package_list(pkgs)
- if not is_found_locally and FILTER_INSTALLED not in filters:
- trove_available = self.conary.repo_query(pkg_dict.get("name"))
- for trv in trove_available:
- pkg = self._convert_package(trv, pkg_dict)
- pkgfilter.add_available([pkg])
+ def _show_package_list(self, lst):
+ '''Emit Package signals for a list of packages
- package_list = pkgfilter.post_process()
- self._show_package_list(package_list)
+ pkgs should be a list of (trove, status) tuples.
- def _show_package_list(self, lst):
- """@lst(list(tuple) = [ ( troveTuple, status ) ]
- """
+ Trove is a dict of {(name, version, flavor), metadata}, as constructed
+ by _convert_package.
+ '''
def is_redirected_package(version):
# The format of a revision string is
# "<upstream version>-<source count>-<build count>".
@@ -344,19 +317,6 @@ class PackageKitConaryBackend(PackageKitBaseBackend):
self.percentage(None)
self.xmlcache.refresh()
- def _show_packages(self, pkgs):
- '''Emit Package signals for a list of packages
-
- pkgs should be a list of (name, Version, Flavor, status) tuples.
- '''
- for (name, v, f, status) in pkgs:
- version = str(v.trailingRevision())
- arch = conarypk.get_arch(f)
- label = str(v.trailingLabel())
- pkg_id = get_package_id(name, version, arch, label)
- summary = self._format_package_summary(name, "")
- self.package(pkg_id, status, summary)
-
def _display_update_jobs(self, install_jobs, erase_jobs, update_jobs):
'''Emit package status for a list of installing/erasing/updating jobs
'''
@@ -370,7 +330,9 @@ class PackageKitConaryBackend(PackageKitBaseBackend):
for (name, (oldVer, oldFla), (newVer, newFla)) in update_jobs:
ret.append((name, oldVer, oldFla, INFO_UPDATING))
- self._show_packages(ret)
+ pkgs = [(self._convert_package((n, v, f), {}), info)
+ for (n, v, f, info) in ret]
+ self._show_package_list(pkgs)
def install_packages(self, only_trusted, package_ids):
self._install_packages(only_trusted, package_ids)
@@ -489,7 +451,9 @@ class PackageKitConaryBackend(PackageKitBaseBackend):
info = self._get_update_priority(name)
ret.append((name, newVer, newFla, info))
- self._show_packages(ret)
+ pkgs = [(self._convert_package((n, v, f), {}), info)
+ for (n, v, f, info) in ret]
+ self._show_package_list(pkgs)
@ConaryExceptionHandler
def get_updates(self, filters):
commit ecd27739cd8e4d63e50d7b8bfd92aeaca4035807
Author: Jesse Zhang <zh.jesse at gmail.com>
Date: Fri Jun 17 16:36:57 2011 +0800
conary: don't show redirected packages
diff --git a/backends/conary/TODO b/backends/conary/TODO
index b4e975c..8979cec 100644
--- a/backends/conary/TODO
+++ b/backends/conary/TODO
@@ -13,7 +13,5 @@
- the data structure dict(trove, metadata) (as used in _show_package_list())
is too complicated than necessary.
* decide what to do with package components
-* don't show dead packages:
- - version == '0'
* conarypk.py: move _classic_build_update_job()/_classic_get_package_update()/_classic_get_updateall_job()
out of the ConaryPk and change them into functions, as the _model* functions.
diff --git a/backends/conary/conaryBackend.py b/backends/conary/conaryBackend.py
index 093475e..b472558 100755
--- a/backends/conary/conaryBackend.py
+++ b/backends/conary/conaryBackend.py
@@ -265,9 +265,17 @@ class PackageKitConaryBackend(PackageKitBaseBackend):
def _show_package_list(self, lst):
"""@lst(list(tuple) = [ ( troveTuple, status ) ]
"""
+ def is_redirected_package(version):
+ # The format of a revision string is
+ # "<upstream version>-<source count>-<build count>".
+ # If upstream version is 0, the package has become nil.
+ return version.split("-")[0] == "0"
+
for pkg, status in lst:
name, v, f = pkg["trove"]
version = str(v.trailingRevision())
+ if is_redirected_package(version):
+ continue
label = str(v.trailingLabel())
arch = conarypk.get_arch(f)
commit 9345191c9041b9cafd5ecdf89d1f84772a92adb7
Author: Kevin Kofler <kevin.kofler at chello.at>
Date: Mon Jun 20 03:05:18 2011 +0200
Support looking up Plasma services (yum and zif backends only for now).
Add a PK_PROVIDES_ENUM_PLASMA_SERVICE enum entry.
Handle it in the yum and zif backends.
Signed-off-by: Richard Hughes <richard at hughsie.com>
diff --git a/backends/yum/yumBackend.py b/backends/yum/yumBackend.py
index 05f5ce0..d66f862 100755
--- a/backends/yum/yumBackend.py
+++ b/backends/yum/yumBackend.py
@@ -902,12 +902,15 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage):
return [ "mimehandler(%s)" % value ]
if provides_type == PROVIDES_POSTSCRIPT_DRIVER:
return [ "postscriptdriver(%s)" % value ]
+ if provides_type == PROVIDES_PLASMA_SERVICE:
+ return [ "plasma4(%s)" % value ]
if provides_type == PROVIDES_ANY:
provides = []
provides.append(self._get_provides_query(PROVIDES_CODEC, value)[0])
provides.append(self._get_provides_query(PROVIDES_FONT, value)[0])
provides.append(self._get_provides_query(PROVIDES_MIMETYPE, value)[0])
provides.append(self._get_provides_query(PROVIDES_POSTSCRIPT_DRIVER, value)[0])
+ provides.append(self._get_provides_query(PROVIDES_PLASMA_SERVICE, value)[0])
provides.append(value)
return provides
diff --git a/backends/zif/pk-backend-zif.c b/backends/zif/pk-backend-zif.c
index 9ef27ab..33461f9 100644
--- a/backends/zif/pk-backend-zif.c
+++ b/backends/zif/pk-backend-zif.c
@@ -5139,11 +5139,14 @@ pk_backend_what_provides (PkBackend *backend, PkBitfield filters,
g_ptr_array_add (array, g_strdup_printf ("mimehandler(%s)", values[i]));
} else if (provides == PK_PROVIDES_ENUM_POSTSCRIPT_DRIVER) {
g_ptr_array_add (array, g_strdup_printf ("postscriptdriver(%s)", values[i]));
+ } else if (provides == PK_PROVIDES_ENUM_PLASMA_SERVICE) {
+ g_ptr_array_add (array, g_strdup_printf ("plasma4(%s)", values[i]));
} else if (provides == PK_PROVIDES_ENUM_ANY) {
g_ptr_array_add (array, g_strdup_printf ("gstreamer0.10(%s)", values[i]));
g_ptr_array_add (array, g_strdup_printf ("font(%s)", values[i]));
g_ptr_array_add (array, g_strdup_printf ("mimehandler(%s)", values[i]));
g_ptr_array_add (array, g_strdup_printf ("postscriptdriver(%s)", values[i]));
+ g_ptr_array_add (array, g_strdup_printf ("plasma4(%s)", values[i]));
} else {
pk_backend_error_code (backend,
PK_ERROR_ENUM_PROVIDE_TYPE_NOT_SUPPORTED,
diff --git a/lib/packagekit-glib2/pk-enum.c b/lib/packagekit-glib2/pk-enum.c
index 3d0cdf2..724d98c 100644
--- a/lib/packagekit-glib2/pk-enum.c
+++ b/lib/packagekit-glib2/pk-enum.c
@@ -359,6 +359,7 @@ static const PkEnumMatch enum_provides[] = {
{PK_PROVIDES_ENUM_HARDWARE_DRIVER, "driver"},
{PK_PROVIDES_ENUM_FONT, "font"},
{PK_PROVIDES_ENUM_POSTSCRIPT_DRIVER, "postscript-driver"},
+ {PK_PROVIDES_ENUM_PLASMA_SERVICE, "plasma-service"},
{0, NULL}
};
diff --git a/lib/packagekit-glib2/pk-enum.h b/lib/packagekit-glib2/pk-enum.h
index 48dc5ec..52bea6e 100644
--- a/lib/packagekit-glib2/pk-enum.h
+++ b/lib/packagekit-glib2/pk-enum.h
@@ -498,6 +498,7 @@ typedef enum {
PK_PROVIDES_ENUM_FONT,
PK_PROVIDES_ENUM_HARDWARE_DRIVER,
PK_PROVIDES_ENUM_POSTSCRIPT_DRIVER,
+ PK_PROVIDES_ENUM_PLASMA_SERVICE,
PK_PROVIDES_ENUM_LAST
} PkProvidesEnum;
diff --git a/lib/packagekit-qt/src/enum.h b/lib/packagekit-qt/src/enum.h
index 4a54bf4..f870370 100644
--- a/lib/packagekit-qt/src/enum.h
+++ b/lib/packagekit-qt/src/enum.h
@@ -450,6 +450,7 @@ public:
ProvidesFont,
ProvidesHardwareDriver,
ProvidesPostscriptDriver,
+ ProvidesPlasmaService,
/* this always has to be at the end of the list */
LastProvides
} Provides;
diff --git a/lib/packagekit-qt2/transaction.h b/lib/packagekit-qt2/transaction.h
index 5c2ff1a..04e6bcf 100644
--- a/lib/packagekit-qt2/transaction.h
+++ b/lib/packagekit-qt2/transaction.h
@@ -337,7 +337,8 @@ public:
ProvidesMimetype,
ProvidesFont,
ProvidesHardwareDriver,
- ProvidesPostscriptDriver
+ ProvidesPostscriptDriver,
+ ProvidesPlasmaService
} Provides;
/**
commit c35a405946beacaaebacdb48eb7b4bd9c0ffe7ca
Author: Richard Hughes <richard at hughsie.com>
Date: Sat Jun 18 08:53:10 2011 +0100
Use pk_package_set_id() in the daemon now we cannot write to PkPackage:package-id
diff --git a/src/pk-backend.c b/src/pk-backend.c
index ff8dde0..293fe87 100644
--- a/src/pk-backend.c
+++ b/src/pk-backend.c
@@ -1132,15 +1132,19 @@ pk_backend_package (PkBackend *backend, PkInfoEnum info, const gchar *package_id
gchar *summary_safe = NULL;
PkPackage *item = NULL;
gboolean ret;
+ GError *error = NULL;
g_return_val_if_fail (PK_IS_BACKEND (backend), FALSE);
g_return_val_if_fail (package_id != NULL, FALSE);
g_return_val_if_fail (backend->priv->locked != FALSE, FALSE);
/* check we are valid */
- ret = pk_package_id_check (package_id);
+ item = pk_package_new ();
+ ret = pk_package_set_id (item, package_id, &error);
if (!ret) {
- g_warning ("package_id invalid and cannot be processed: %s", package_id);
+ g_warning ("package_id %s invalid and cannot be processed: %s",
+ package_id, error->message);
+ g_error_free (error);
goto out;
}
@@ -1159,10 +1163,8 @@ pk_backend_package (PkBackend *backend, PkInfoEnum info, const gchar *package_id
}
/* create a new package object AFTER we emulate the info value */
- item = pk_package_new ();
g_object_set (item,
"info", info,
- "package-id", package_id,
"summary", summary_safe,
NULL);
commit 0305a4ec631fdcbe34586415d62b0d988f0feac1
Author: Richard Hughes <richard at hughsie.com>
Date: Fri Jun 17 16:45:20 2011 +0100
yum: Emit RepoDetail when refreshing a repository
diff --git a/backends/yum/yumBackend.py b/backends/yum/yumBackend.py
index 78b7b19..05f5ce0 100755
--- a/backends/yum/yumBackend.py
+++ b/backends/yum/yumBackend.py
@@ -1797,6 +1797,10 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage):
bump = (95/len(self.yumbase.repos.listEnabled()))/2
for repo in self.yumbase.repos.listEnabled():
+
+ # emit details for UI
+ self.repo_detail(repo.id, repo.name, True)
+
# is physical media
if repo.mediaid:
continue
commit de58b8c9972efb4c8e393ad67e97c8ee657b0d78
Author: Richard Hughes <richard at hughsie.com>
Date: Fri Jun 17 16:39:03 2011 +0100
Do not try to parse any arguments in command-not-found
diff --git a/contrib/command-not-found/pk-command-not-found.c b/contrib/command-not-found/pk-command-not-found.c
index 004d148..8ec959d 100644
--- a/contrib/command-not-found/pk-command-not-found.c
+++ b/contrib/command-not-found/pk-command-not-found.c
@@ -676,7 +676,6 @@ int
main (int argc, char *argv[])
{
gboolean ret;
- GOptionContext *context;
GPtrArray *array = NULL;
gchar **package_ids = NULL;
PkCnfPolicyConfig *config = NULL;
@@ -687,10 +686,6 @@ main (int argc, char *argv[])
gchar **parts;
guint retval = EXIT_SUCCESS;
- const GOptionEntry options[] = {
- { NULL}
- };
-
setlocale (LC_ALL, "");
bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
@@ -701,13 +696,6 @@ main (int argc, char *argv[])
dbus_g_thread_init ();
g_type_init ();
- context = g_option_context_new (NULL);
- /* TRANSLATORS: tool that gets called when the command is not found */
- g_option_context_set_summary (context, _("PackageKit Command Not Found"));
- g_option_context_add_main_entries (context, options, NULL);
- g_option_context_parse (context, &argc, &argv, NULL);
- g_option_context_free (context);
-
/* don't show debugging, unless VERBOSE is specified */
pk_debug_add_log_domain (G_LOG_DOMAIN);
commit 02ef9094e7d6b7ed59f61cc5e988d06db4cafc8f
Author: Richard Hughes <richard at hughsie.com>
Date: Thu Jun 16 15:38:58 2011 +0100
Fix a build error in the browser plugin when using old versions of gdk
diff --git a/contrib/browser-plugin/pk-main.c b/contrib/browser-plugin/pk-main.c
index b9378cb..4f6fc75 100644
--- a/contrib/browser-plugin/pk-main.c
+++ b/contrib/browser-plugin/pk-main.c
@@ -209,17 +209,17 @@ pk_main_create_window (PkPlugin *plugin)
if (gdk_window == NULL) {
GdkWindowAttr attr;
GdkWindow *parent;
- GdkDisplay *gdk_display;
+ GdkDisplay *display;
// TODO - is it correct? Do we want to translate xdisplay -> GdkDisplay?
- gdk_display = gdk_display_get_default ();
- if (gdk_display == NULL) {
+ display = gdk_display_get_default ();
+ if (display == NULL) {
pk_debug ("invalid display returned by gdk_display_get_default ()\n");
return;
}
/* get parent */
- parent = gdk_x11_window_foreign_new_for_display (gdk_display, xwindow);
+ parent = gdk_x11_window_foreign_new_for_display (display, xwindow);
if (parent == NULL) {
pk_debug ("invalid window given for setup (id %lu)\n", xwindow);
return;
commit a6a527f8e117d3b8758a30975e87931b8f75d9d5
Author: Richard Hughes <richard at hughsie.com>
Date: Thu Jun 16 11:46:47 2011 +0100
glib: Ensure packages emitted from the progress handler have the package_id assigned correctly
Using g_object_set(pkg,package-id,id) meant that the package_id wasn't being
checked, nor was the package_id_split[] array being allocated.
The result was that any client trying to do pk_package_get_name() on the
PkPackage from the progress handler would segfault.
The fix is to disallow setting the package-id property using g_object_set(),
and to force users to call pk_package_set_id() which handles errors and does
the right thing.
Many thanks to Alex Eftimie for spotting the problem and testing this patch.
diff --git a/lib/packagekit-glib2/pk-client.c b/lib/packagekit-glib2/pk-client.c
index b089b40..870b8bf 100644
--- a/lib/packagekit-glib2/pk-client.c
+++ b/lib/packagekit-glib2/pk-client.c
@@ -955,41 +955,47 @@ static void
pk_client_package_cb (DBusGProxy *proxy, const gchar *info_text, const gchar *package_id, const gchar *summary, PkClientState *state)
{
gboolean ret;
+ GError *error = NULL;
PkInfoEnum info_enum;
- PkPackage *item;
PkPackage *package;
g_return_if_fail (PK_IS_CLIENT (state->client));
- /* add to results */
- info_enum = pk_info_enum_from_string (info_text);
- if (info_enum != PK_INFO_ENUM_FINISHED) {
- item = pk_package_new ();
- g_object_set (item,
- "info", info_enum,
- "package-id", package_id,
- "summary", summary,
- NULL);
- pk_results_add_package (state->results, item);
- g_object_unref (item);
- }
-
- /* save package-id */
- ret = pk_progress_set_package_id (state->progress, package_id);
- if (state->progress_callback != NULL && ret)
- state->progress_callback (state->progress, PK_PROGRESS_TYPE_PACKAGE_ID, state->progress_user_data);
-
- /* save package object */
+ /* create virtual package */
package = pk_package_new ();
- pk_package_set_id (package, package_id, NULL);
+ ret = pk_package_set_id (package, package_id, &error);
+ if (!ret) {
+ g_warning ("failed to set package id for %s", package_id);
+ g_error_free (error);
+ goto out;
+ }
+ info_enum = pk_info_enum_from_string (info_text);
g_object_set (package,
"info", info_enum,
"summary", summary,
"role", state->role,
"transaction-id", state->transaction_id,
NULL);
+
+ /* add to results */
+ if (info_enum != PK_INFO_ENUM_FINISHED)
+ pk_results_add_package (state->results, package);
+
+ /* save package-id */
+ ret = pk_progress_set_package_id (state->progress, package_id);
+ if (state->progress_callback != NULL && ret) {
+ state->progress_callback (state->progress,
+ PK_PROGRESS_TYPE_PACKAGE_ID,
+ state->progress_user_data);
+ }
+
+ /* save package object */
ret = pk_progress_set_package (state->progress, package);
- if (state->progress_callback != NULL && ret)
- state->progress_callback (state->progress, PK_PROGRESS_TYPE_PACKAGE, state->progress_user_data);
+ if (state->progress_callback != NULL && ret) {
+ state->progress_callback (state->progress,
+ PK_PROGRESS_TYPE_PACKAGE,
+ state->progress_user_data);
+ }
+out:
g_object_unref (package);
}
diff --git a/lib/packagekit-glib2/pk-package.c b/lib/packagekit-glib2/pk-package.c
index f797bc8..9267f0c 100644
--- a/lib/packagekit-glib2/pk-package.c
+++ b/lib/packagekit-glib2/pk-package.c
@@ -423,10 +423,6 @@ pk_package_set_property (GObject *object, guint prop_id, const GValue *value, GP
case PROP_INFO:
priv->info = g_value_get_uint (value);
break;
- case PROP_PACKAGE_ID:
- g_free (priv->package_id);
- priv->package_id = g_strdup (g_value_get_string (value));
- break;
case PROP_SUMMARY:
g_free (priv->summary);
priv->summary = g_strdup (g_value_get_string (value));
@@ -529,7 +525,7 @@ pk_package_class_init (PkPackageClass *klass)
pspec = g_param_spec_string ("package-id", NULL,
"The full package_id, e.g. 'gnome-power-manager;0.1.2;i386;fedora'",
NULL,
- G_PARAM_READWRITE);
+ G_PARAM_READABLE);
g_object_class_install_property (object_class, PROP_PACKAGE_ID, pspec);
/**
commit 101ced7d38b6ac522080d27a1e80ff91c5d33161
Author: Richard Hughes <richard at hughsie.com>
Date: Wed Jun 15 12:44:42 2011 +0100
Do not hardcode G_DISABLE_DEPRECATED as it breaks with GTK+-2 and GLib
Also remove the other CPPFLAGS as they are making building PackageKit more fragile.
diff --git a/configure.ac b/configure.ac
index 7f05c0c..ab4b96e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,15 +76,6 @@ AM_PATH_PYTHON
PYTHON_PACKAGE_DIR=${pythondir}/packagekit
AC_SUBST(PYTHON_PACKAGE_DIR)
-
-dnl ---------------------------------------------------------------------------
-dnl - Extra verbose warning switches
-dnl ---------------------------------------------------------------------------
-CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
-CPPFLAGS="$CPPFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED"
-CPPFLAGS="$CPPFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE"
-CPPFLAGS="$CPPFLAGS -DGSEAL_ENABLE"
-
dnl ---------------------------------------------------------------------------
dnl - Use strict options (default enabled for devs, disabled in releases)
dnl ---------------------------------------------------------------------------
commit 0cd337cf60a7dea654bd3b1802bf3a6f6caf393b
Author: Richard Hughes <richard at hughsie.com>
Date: Tue Jun 14 14:46:38 2011 +0100
Remove PackageKit.pot as it's autogenerated and is breaking buildbot
diff --git a/po/PackageKit.pot b/po/PackageKit.pot
deleted file mode 100644
index cedb1fd..0000000
--- a/po/PackageKit.pot
+++ /dev/null
@@ -1,2035 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-04 10:50+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. TRANSLATORS: this is an atomic transaction
-#. TRANSLATORS: the role is the point of the transaction, e.g. update-system
-#: ../client/pk-console.c:174 ../client/pk-console.c:596
-msgid "Transaction"
-msgstr ""
-
-#. TRANSLATORS: this is the time the transaction was started in system timezone
-#: ../client/pk-console.c:176
-msgid "System time"
-msgstr ""
-
-#. TRANSLATORS: this is if the transaction succeeded or not
-#: ../client/pk-console.c:178
-msgid "Succeeded"
-msgstr ""
-
-#: ../client/pk-console.c:178
-msgid "True"
-msgstr ""
-
-#: ../client/pk-console.c:178
-msgid "False"
-msgstr ""
-
-#. TRANSLATORS: this is the transactions role, e.g. "update-system"
-#: ../client/pk-console.c:180
-msgid "Role"
-msgstr ""
-
-#. TRANSLATORS: this is The duration of the transaction
-#: ../client/pk-console.c:185
-msgid "Duration"
-msgstr ""
-
-#: ../client/pk-console.c:185
-msgid "(seconds)"
-msgstr ""
-
-#. TRANSLATORS: this is The command line used to do the action
-#: ../client/pk-console.c:189
-msgid "Command line"
-msgstr ""
-
-#. TRANSLATORS: this is the user ID of the user that started the action
-#: ../client/pk-console.c:191
-msgid "User ID"
-msgstr ""
-
-#. TRANSLATORS: this is the username, e.g. hughsie
-#: ../client/pk-console.c:198
-msgid "Username"
-msgstr ""
-
-#. TRANSLATORS: this is the users real name, e.g. "Richard Hughes"
-#: ../client/pk-console.c:202
-msgid "Real name"
-msgstr ""
-
-#: ../client/pk-console.c:210
-msgid "Affected packages:"
-msgstr ""
-
-#: ../client/pk-console.c:212
-msgid "Affected packages: None"
-msgstr ""
-
-#. TRANSLATORS: this is the distro, e.g. Fedora 10
-#: ../client/pk-console.c:247
-msgid "Distribution"
-msgstr ""
-
-#. TRANSLATORS: this is type of update, stable or testing
-#: ../client/pk-console.c:249
-msgid "Type"
-msgstr ""
-
-#. TRANSLATORS: this is any summary text describing the upgrade
-#. TRANSLATORS: this is the summary of the group
-#: ../client/pk-console.c:251 ../client/pk-console.c:290
-msgid "Summary"
-msgstr ""
-
-#. TRANSLATORS: this is the group category name
-#: ../client/pk-console.c:279
-msgid "Category"
-msgstr ""
-
-#. TRANSLATORS: this is group identifier
-#: ../client/pk-console.c:281
-msgid "ID"
-msgstr ""
-
-#. TRANSLATORS: this is the parent group
-#: ../client/pk-console.c:284
-msgid "Parent"
-msgstr ""
-
-#. TRANSLATORS: this is the name of the parent group
-#: ../client/pk-console.c:287
-msgid "Name"
-msgstr ""
-
-#. TRANSLATORS: this is preferred icon for the group
-#: ../client/pk-console.c:293
-msgid "Icon"
-msgstr ""
-
-#. TRANSLATORS: this is a header for the package that can be updated
-#: ../client/pk-console.c:339
-msgid "Details about the update:"
-msgstr ""
-
-#. TRANSLATORS: details about the update, package name and version
-#. TRANSLATORS: the package that is being processed
-#. TRANSLATORS: the package that is not signed by a known key
-#. TRANSLATORS: the package name that was trying to be installed
-#: ../client/pk-console.c:345 ../client/pk-console.c:615
-#: ../lib/packagekit-glib2/pk-task-text.c:124
-#: ../lib/packagekit-glib2/pk-task-text.c:206
-msgid "Package"
-msgstr ""
-
-#. TRANSLATORS: details about the update, any packages that this update updates
-#: ../client/pk-console.c:348
-msgid "Updates"
-msgstr ""
-
-#. TRANSLATORS: details about the update, any packages that this update obsoletes
-#: ../client/pk-console.c:352
-msgid "Obsoletes"
-msgstr ""
-
-#. TRANSLATORS: details about the update, the vendor URLs
-#. TRANSLATORS: the vendor (e.g. vmware) that is providing the EULA
-#: ../client/pk-console.c:356 ../lib/packagekit-glib2/pk-task-text.c:209
-msgid "Vendor"
-msgstr ""
-
-#. TRANSLATORS: details about the update, the bugzilla URLs
-#: ../client/pk-console.c:360
-msgid "Bugzilla"
-msgstr ""
-
-#. TRANSLATORS: details about the update, the CVE URLs
-#: ../client/pk-console.c:364
-msgid "CVE"
-msgstr ""
-
-#. TRANSLATORS: details about the update, if the package requires a restart
-#: ../client/pk-console.c:368
-msgid "Restart"
-msgstr ""
-
-#. TRANSLATORS: details about the update, any description of the update
-#: ../client/pk-console.c:372
-msgid "Update text"
-msgstr ""
-
-#. TRANSLATORS: details about the update, the changelog for the package
-#: ../client/pk-console.c:376
-msgid "Changes"
-msgstr ""
-
-#. TRANSLATORS: details about the update, the ongoing state of the update
-#: ../client/pk-console.c:380
-msgid "State"
-msgstr ""
-
-#. TRANSLATORS: details about the update, date the update was issued
-#: ../client/pk-console.c:384
-msgid "Issued"
-msgstr ""
-
-#. TRANSLATORS: details about the update, date the update was updated
-#. TRANSLATORS: The action of the package, in past tense
-#: ../client/pk-console.c:388 ../lib/packagekit-glib2/pk-console-shared.c:524
-msgid "Updated"
-msgstr ""
-
-#. TRANSLATORS: if the repo is enabled
-#: ../client/pk-console.c:424
-msgid "Enabled"
-msgstr ""
-
-#. TRANSLATORS: if the repo is disabled
-#: ../client/pk-console.c:427
-msgid "Disabled"
-msgstr ""
-
-#. TRANSLATORS: a package requires the system to be restarted
-#: ../client/pk-console.c:459
-msgid "System restart required by:"
-msgstr ""
-
-#. TRANSLATORS: a package requires the session to be restarted
-#: ../client/pk-console.c:462
-msgid "Session restart required:"
-msgstr ""
-
-#. TRANSLATORS: a package requires the system to be restarted due to a security update
-#: ../client/pk-console.c:465
-msgid "System restart (security) required by:"
-msgstr ""
-
-#. TRANSLATORS: a package requires the session to be restarted due to a security update
-#: ../client/pk-console.c:468
-msgid "Session restart (security) required:"
-msgstr ""
-
-#. TRANSLATORS: a package requires the application to be restarted
-#: ../client/pk-console.c:471
-msgid "Application restart required by:"
-msgstr ""
-
-#. TRANSLATORS: This a list of details about the package
-#: ../client/pk-console.c:506
-msgid "Package description"
-msgstr ""
-
-#. TRANSLATORS: This a message (like a little note that may be of interest) from the transaction
-#: ../client/pk-console.c:537
-msgid "Message:"
-msgstr ""
-
-#. TRANSLATORS: This where the package has no files
-#: ../client/pk-console.c:558
-msgid "No files"
-msgstr ""
-
-#. TRANSLATORS: This a list files contained in the package
-#: ../client/pk-console.c:563
-msgid "Package files"
-msgstr ""
-
-#. TRANSLATORS: the percentage complete of the transaction
-#: ../client/pk-console.c:631
-msgid "Percentage"
-msgstr ""
-
-#. TRANSLATORS: the status of the transaction (e.g. downloading)
-#: ../client/pk-console.c:649
-msgid "Status"
-msgstr ""
-
-#. TRANSLATORS: the results from the transaction
-#: ../client/pk-console.c:678
-msgid "Results:"
-msgstr ""
-
-#. TRANSLATORS: we failed to get any results, which is pretty fatal in my book
-#: ../client/pk-console.c:685
-msgid "Fatal error"
-msgstr ""
-
-#. TRANSLATORS: the user asked to update everything, but there is nothing that can be updated
-#: ../client/pk-console.c:701
-msgid "There are no packages to update."
-msgstr ""
-
-#. TRANSLATORS: the transaction failed in a way we could not expect
-#: ../client/pk-console.c:704
-#: ../contrib/command-not-found/pk-command-not-found.c:639
-msgid "The transaction failed"
-msgstr ""
-
-#. TRANSLATORS: print a message when there are no updates
-#: ../client/pk-console.c:733
-msgid "There are no updates available at this time."
-msgstr ""
-
-#: ../client/pk-console.c:756
-msgid "There are no upgrades available at this time."
-msgstr ""
-
-#. TRANSLATORS: a package needs to restart their system
-#: ../client/pk-console.c:823
-msgid "Please restart the computer to complete the update."
-msgstr ""
-
-#. TRANSLATORS: a package needs to restart the session
-#: ../client/pk-console.c:826
-msgid "Please logout and login to complete the update."
-msgstr ""
-
-#. TRANSLATORS: a package needs to restart their system (due to security)
-#: ../client/pk-console.c:829
-msgid ""
-"Please restart the computer to complete the update as important security "
-"updates have been installed."
-msgstr ""
-
-#. TRANSLATORS: a package needs to restart the session (due to security)
-#: ../client/pk-console.c:832
-msgid ""
-"Please logout and login to complete the update as important security updates "
-"have been installed."
-msgstr ""
-
-#. TRANSLATORS: The user used 'pkcon install dave.rpm' rather than 'pkcon install-local dave.rpm'
-#: ../client/pk-console.c:858
-#, c-format
-msgid ""
-"Expected package name, actually got file. Try using 'pkcon install-local %s' "
-"instead."
-msgstr ""
-
-#. TRANSLATORS: There was an error getting the list of files for the package. The detailed error follows
-#: ../client/pk-console.c:866
-#, c-format
-msgid "This tool could not find any available package: %s"
-msgstr ""
-
-#. TRANSLATORS: There was an error getting the list of files for the package. The detailed error follows
-#: ../client/pk-console.c:894
-#, c-format
-msgid "This tool could not find the installed package: %s"
-msgstr ""
-
-#. TRANSLATORS: There was an error getting the list of files for the package. The detailed error follows
-#: ../client/pk-console.c:922 ../client/pk-console.c:950
-#, c-format
-msgid "This tool could not find the package: %s"
-msgstr ""
-
-#. TRANSLATORS: There was an error getting the list of files for the package. The detailed error follows
-#. TRANSLATORS: There was an error getting the dependencies for the package. The detailed error follows
-#. TRANSLATORS: There was an error getting the details about the package. The detailed error follows
-#. TRANSLATORS: The package name was not found in any software sources. The detailed error follows
-#: ../client/pk-console.c:978 ../client/pk-console.c:1006
-#: ../client/pk-console.c:1034 ../client/pk-console.c:1062
-#: ../client/pk-console.c:1090
-#, c-format
-msgid "This tool could not find all the packages: %s"
-msgstr ""
-
-#. TRANSLATORS: This is when the daemon crashed, and we are up shit creek without a paddle
-#: ../client/pk-console.c:1119
-msgid "The daemon crashed mid-transaction!"
-msgstr ""
-
-#. TRANSLATORS: This is the header to the --help menu
-#: ../client/pk-console.c:1153
-msgid "PackageKit Console Interface"
-msgstr ""
-
-#. these are commands we can use with pkcon
-#: ../client/pk-console.c:1155
-msgid "Subcommands:"
-msgstr ""
-
-#. TRANSLATORS: we keep a database updated with the time that an action was last executed
-#: ../client/pk-console.c:1235
-msgid "Failed to get the time since this action was last completed"
-msgstr ""
-
-#. TRANSLATORS: command line argument, just show the version string
-#: ../client/pk-console.c:1277 ../client/pk-monitor.c:371
-msgid "Show the program version and exit"
-msgstr ""
-
-#. TRANSLATORS: command line argument, use a filter to narrow down results
-#: ../client/pk-console.c:1280
-msgid "Set the filter, e.g. installed"
-msgstr ""
-
-#. TRANSLATORS: command line argument, use a non-standard install prefix
-#: ../client/pk-console.c:1283
-msgid "Set the install root, e.g. '/' or '/mnt/ltsp'"
-msgstr ""
-
-#. TRANSLATORS: command line argument, work asynchronously
-#: ../client/pk-console.c:1286
-msgid "Exit without waiting for actions to complete"
-msgstr ""
-
-#. command line argument, do we ask questions
-#: ../client/pk-console.c:1289
-#: ../contrib/debuginfo-install/pk-debuginfo-install.c:525
-msgid "Install the packages without asking for confirmation"
-msgstr ""
-
-#. TRANSLATORS: command line argument, this command is not a priority
-#: ../client/pk-console.c:1292
-msgid "Run the command using idle network bandwidth and also using less power"
-msgstr ""
-
-#. TRANSLATORS: command line argument, just output without fancy formatting
-#: ../client/pk-console.c:1295
-msgid ""
-"Print to screen a machine readable output, rather than using animated widgets"
-msgstr ""
-
-#. TRANSLATORS: command line argument, just output without fancy formatting
-#: ../client/pk-console.c:1298
-msgid "The maximum metadata cache age. Use -1 for 'never'."
-msgstr ""
-
-#. TRANSLATORS: command line argument, --help
-#: ../client/pk-console.c:1301
-msgid "Show help options."
-msgstr ""
-
-#. TRANSLATORS: we failed to contact the daemon
-#: ../client/pk-console.c:1331
-msgid "Failed to parse command line"
-msgstr ""
-
-#. TRANSLATORS: we failed to contact the daemon
-#: ../client/pk-console.c:1341
-msgid "Failed to contact PackageKit"
-msgstr ""
-
-#. TRANSLATORS: The user specified an incorrect filter
-#: ../client/pk-console.c:1394
-msgid "The proxy could not be set"
-msgstr ""
-
-#. TRANSLATORS: The user specified an incorrect filter
-#: ../client/pk-console.c:1406
-msgid "The install root could not be set"
-msgstr ""
-
-#. TRANSLATORS: The user specified an incorrect filter
-#: ../client/pk-console.c:1418
-msgid "The filter specified was invalid"
-msgstr ""
-
-#. TRANSLATORS: a search type can be name, details, file, etc
-#: ../client/pk-console.c:1437
-msgid "A search type is required, e.g. name"
-msgstr ""
-
-#. TRANSLATORS: the user needs to provide a search term
-#: ../client/pk-console.c:1444 ../client/pk-console.c:1456
-#: ../client/pk-console.c:1468 ../client/pk-console.c:1480
-msgid "A search term is required"
-msgstr ""
-
-#. TRANSLATORS: the search type was provided, but invalid
-#: ../client/pk-console.c:1490
-msgid "Invalid search type"
-msgstr ""
-
-#. TRANSLATORS: the user did not specify what they wanted to install
-#: ../client/pk-console.c:1496
-msgid "A package name to install is required"
-msgstr ""
-
-#. TRANSLATORS: the user did not specify what they wanted to install
-#: ../client/pk-console.c:1505
-msgid "A filename to install is required"
-msgstr ""
-
-#. TRANSLATORS: geeky error, 99.9999% of users won't see this
-#: ../client/pk-console.c:1516
-msgid "A type, key_id and package_id are required"
-msgstr ""
-
-#. TRANSLATORS: the user did not specify what they wanted to remove
-#: ../client/pk-console.c:1527
-msgid "A package name to remove is required"
-msgstr ""
-
-#. TRANSLATORS: the user did not specify anything about what to download or where
-#: ../client/pk-console.c:1536
-msgid "A destination directory and the package names to download are required"
-msgstr ""
-
-#. TRANSLATORS: the directory does not exist, so we can't continue
-#: ../client/pk-console.c:1543
-msgid "Directory not found"
-msgstr ""
-
-#. TRANSLATORS: geeky error, 99.9999% of users won't see this
-#: ../client/pk-console.c:1552
-msgid "A licence identifier (eula-id) is required"
-msgstr ""
-
-#. TRANSLATORS: geeky error, 99.9999% of users won't see this
-#: ../client/pk-console.c:1563
-msgid "A transaction identifier (tid) is required"
-msgstr ""
-
-#. TRANSLATORS: The user did not specify a package name
-#: ../client/pk-console.c:1584
-msgid "A package name to resolve is required"
-msgstr ""
-
-#. TRANSLATORS: The user did not specify a repository (software source) name
-#: ../client/pk-console.c:1595 ../client/pk-console.c:1606
-msgid "A repository name is required"
-msgstr ""
-
-#. TRANSLATORS: The user didn't provide any data
-#: ../client/pk-console.c:1617
-msgid "A repo name, parameter and value are required"
-msgstr ""
-
-#. TRANSLATORS: The user didn't specify what action to use
-#: ../client/pk-console.c:1634
-msgid "An action, e.g. 'update-system' is required"
-msgstr ""
-
-#. TRANSLATORS: The user specified an invalid action
-#: ../client/pk-console.c:1641
-msgid "A correct role is required"
-msgstr ""
-
-#. TRANSLATORS: The user did not provide a package name
-#. TRANSLATORS: This is when the user fails to supply the package name
-#: ../client/pk-console.c:1651 ../client/pk-console.c:1665
-#: ../client/pk-console.c:1674 ../client/pk-console.c:1694
-#: ../client/pk-console.c:1703 ../client/pk-generate-pack.c:314
-msgid "A package name is required"
-msgstr ""
-
-#. TRANSLATORS: each package "provides" certain things, e.g. mime(gstreamer-decoder-mp3), the user didn't specify it
-#: ../client/pk-console.c:1683
-msgid "A package provide string is required"
-msgstr ""
-
-#. TRANSLATORS: The user did not provide a distro name
-#: ../client/pk-console.c:1727
-msgid "A distribution name is required"
-msgstr ""
-
-#. TRANSLATORS: The user did not provide an upgrade type
-#: ../client/pk-console.c:1733
-msgid "An upgrade type is required, e.g. 'minimal', 'default' or 'complete'"
-msgstr ""
-
-#. TRANSLATORS: The user tried to use an unsupported option on the command line
-#: ../client/pk-console.c:1783
-#, c-format
-msgid "Option '%s' is not supported"
-msgstr ""
-
-#. TRANSLATORS: Generic failure of what they asked to do
-#: ../client/pk-console.c:1793
-msgid "Command failed"
-msgstr ""
-
-#. TRANSLATORS: we can exclude certain packages (glibc) when we know they'll exist on the target
-#: ../client/pk-generate-pack.c:253
-msgid "Set the file name of dependencies to be excluded"
-msgstr ""
-
-#. TRANSLATORS: the output location
-#: ../client/pk-generate-pack.c:256
-msgid "The output file or directory (the current directory is used if omitted)"
-msgstr ""
-
-#. TRANSLATORS: put a list of packages in the pack
-#: ../client/pk-generate-pack.c:259
-msgid "The package to be put into the service pack"
-msgstr ""
-
-#. TRANSLATORS: put all pending updates in the pack
-#: ../client/pk-generate-pack.c:262
-msgid "Put all updates available in the service pack"
-msgstr ""
-
-#. TRANSLATORS: This is when the user fails to supply the correct arguments
-#: ../client/pk-generate-pack.c:298
-msgid "Neither --package or --updates option selected."
-msgstr ""
-
-#. TRANSLATORS: This is when the user fails to supply just one argument
-#: ../client/pk-generate-pack.c:306
-msgid "Both options selected."
-msgstr ""
-
-#. TRANSLATORS: This is when the user fails to supply the output
-#: ../client/pk-generate-pack.c:322
-msgid "A output directory or file name is required"
-msgstr ""
-
-#. TRANSLATORS: This is when the daemon is not-installed/broken and fails to startup
-#: ../client/pk-generate-pack.c:340
-msgid "The daemon failed to startup"
-msgstr ""
-
-#. TRANSLATORS: This is when the backend doesn't have the capability to get-depends
-#. TRANSLATORS: This is when the backend doesn't have the capability to download
-#: ../client/pk-generate-pack.c:351 ../client/pk-generate-pack.c:357
-msgid "The package manager cannot perform this type of operation."
-msgstr ""
-
-#. TRANSLATORS: This is when the distro didn't include libarchive support into PK
-#: ../client/pk-generate-pack.c:364
-msgid ""
-"Service packs cannot be created as PackageKit was not built with libarchive "
-"support."
-msgstr ""
-
-#. TRANSLATORS: the user specified an absolute path, but didn't get the extension correct
-#: ../client/pk-generate-pack.c:375
-msgid "If specifying a file, the service pack name must end with"
-msgstr ""
-
-#. TRANSLATORS: This is when file already exists
-#: ../client/pk-generate-pack.c:391
-msgid "A pack with the same name already exists, do you want to overwrite it?"
-msgstr ""
-
-#. TRANSLATORS: This is when the pack was not overwritten
-#: ../client/pk-generate-pack.c:394
-msgid "The pack was not overwritten."
-msgstr ""
-
-#. TRANSLATORS: This is when the temporary directory cannot be created, the directory name follows
-#: ../client/pk-generate-pack.c:407
-msgid "Failed to create directory:"
-msgstr ""
-
-#. TRANSLATORS: This is when the list of packages from the remote computer cannot be opened
-#: ../client/pk-generate-pack.c:419
-msgid "Failed to open package list."
-msgstr ""
-
-#. TRANSLATORS: The package name is being matched up to available packages
-#: ../client/pk-generate-pack.c:428
-msgid "Finding package name."
-msgstr ""
-
-#. TRANSLATORS: This is when the package cannot be found in any software source. The detailed error follows
-#: ../client/pk-generate-pack.c:432
-#, c-format
-msgid "Failed to find package '%s': %s"
-msgstr ""
-
-#. TRANSLATORS: This is telling the user we are in the process of making the pack
-#: ../client/pk-generate-pack.c:440
-msgid "Creating service pack..."
-msgstr ""
-
-#. TRANSLATORS: we succeeded in making the file
-#: ../client/pk-generate-pack.c:455
-#, c-format
-msgid "Service pack created '%s'"
-msgstr ""
-
-#. TRANSLATORS: we failed to make te file
-#: ../client/pk-generate-pack.c:460
-#, c-format
-msgid "Failed to create '%s': %s"
-msgstr ""
-
-#: ../client/pk-monitor.c:284
-msgid "Failed to get daemon state"
-msgstr ""
-
-#: ../client/pk-monitor.c:349
-msgid "Failed to get properties"
-msgstr ""
-
-#. TRANSLATORS: this is a program that monitors PackageKit
-#: ../client/pk-monitor.c:387
-msgid "PackageKit Monitor"
-msgstr ""
-
-#. TRANSLATORS: when we are getting data from the daemon
-#: ../contrib/browser-plugin/pk-plugin-install.c:499
-msgid "Getting package information..."
-msgstr ""
-
-#. TRANSLATORS: run an applicaiton
-#: ../contrib/browser-plugin/pk-plugin-install.c:505
-#, c-format
-msgid "Run %s"
-msgstr ""
-
-#. TRANSLATORS: show the installed version of a package
-#: ../contrib/browser-plugin/pk-plugin-install.c:511
-msgid "Installed version"
-msgstr ""
-
-#. TRANSLATORS: run the application now
-#: ../contrib/browser-plugin/pk-plugin-install.c:519
-#, c-format
-msgid "Run version %s now"
-msgstr ""
-
-#. TRANSLATORS: run the application now
-#: ../contrib/browser-plugin/pk-plugin-install.c:525
-msgid "Run now"
-msgstr ""
-
-#. TRANSLATORS: update to a new version of the package
-#: ../contrib/browser-plugin/pk-plugin-install.c:531
-#, c-format
-msgid "Update to version %s"
-msgstr ""
-
-#. TRANSLATORS: To install a package
-#: ../contrib/browser-plugin/pk-plugin-install.c:537
-#, c-format
-msgid "Install %s now"
-msgstr ""
-
-#. TRANSLATORS: the version of the package
-#: ../contrib/browser-plugin/pk-plugin-install.c:540
-msgid "Version"
-msgstr ""
-
-#. TRANSLATORS: noting found, so can't install
-#: ../contrib/browser-plugin/pk-plugin-install.c:545
-msgid "No packages found for your system"
-msgstr ""
-
-#. TRANSLATORS: package is being installed
-#: ../contrib/browser-plugin/pk-plugin-install.c:550
-msgid "Installing..."
-msgstr ""
-
-#. TRANSLATORS: downloading repo data so we can search
-#: ../contrib/command-not-found/pk-command-not-found.c:366
-msgid "Downloading details about the software sources."
-msgstr ""
-
-#. TRANSLATORS: downloading file lists so we can search
-#: ../contrib/command-not-found/pk-command-not-found.c:370
-msgid "Downloading filelists (this may take some time to complete)."
-msgstr ""
-
-#. TRANSLATORS: waiting for native lock
-#: ../contrib/command-not-found/pk-command-not-found.c:374
-msgid "Waiting for package manager lock."
-msgstr ""
-
-#. TRANSLATORS: loading package cache so we can search
-#: ../contrib/command-not-found/pk-command-not-found.c:378
-msgid "Loading list of packages."
-msgstr ""
-
-#. TRANSLATORS: we failed to find the package, this shouldn't happen
-#: ../contrib/command-not-found/pk-command-not-found.c:444
-msgid "Failed to search for file"
-msgstr ""
-
-#. TRANSLATORS: the transaction failed in a way we could not expect
-#: ../contrib/command-not-found/pk-command-not-found.c:456
-msgid "Getting the list of files failed"
-msgstr ""
-
-#. TRANSLATORS: we failed to launch the executable, the error follows
-#: ../contrib/command-not-found/pk-command-not-found.c:602
-msgid "Failed to launch:"
-msgstr ""
-
-#. TRANSLATORS: we failed to install the package
-#: ../contrib/command-not-found/pk-command-not-found.c:630
-msgid "Failed to install packages"
-msgstr ""
-
-#. TRANSLATORS: tool that gets called when the command is not found
-#: ../contrib/command-not-found/pk-command-not-found.c:706
-msgid "PackageKit Command Not Found"
-msgstr ""
-
-#. TRANSLATORS: the prefix of all the output telling the user
-#. * why it's not executing. NOTE: this is lowercase to mimic
-#. * the style of bash itself -- apologies
-#: ../contrib/command-not-found/pk-command-not-found.c:741
-msgid "command not found"
-msgstr ""
-
-#. TRANSLATORS: tell the user what we think the command is
-#: ../contrib/command-not-found/pk-command-not-found.c:759
-msgid "Similar command is:"
-msgstr ""
-
-#. TRANSLATORS: Ask the user if we should run the similar command
-#: ../contrib/command-not-found/pk-command-not-found.c:773
-msgid "Run similar command:"
-msgstr ""
-
-#. TRANSLATORS: show the user a list of commands that they could have meant
-#. TRANSLATORS: show the user a list of commands we could run
-#: ../contrib/command-not-found/pk-command-not-found.c:787
-#: ../contrib/command-not-found/pk-command-not-found.c:796
-msgid "Similar commands are:"
-msgstr ""
-
-#. TRANSLATORS: ask the user to choose a file to run
-#: ../contrib/command-not-found/pk-command-not-found.c:803
-msgid "Please choose a command to run"
-msgstr ""
-
-#. TRANSLATORS: tell the user what package provides the command
-#: ../contrib/command-not-found/pk-command-not-found.c:821
-msgid "The package providing this file is:"
-msgstr ""
-
-#. TRANSLATORS: as the user if we want to install a package to provide the command
-#: ../contrib/command-not-found/pk-command-not-found.c:828
-#, c-format
-msgid "Install package '%s' to provide command '%s'?"
-msgstr ""
-
-#. TRANSLATORS: Show the user a list of packages that provide this command
-#: ../contrib/command-not-found/pk-command-not-found.c:855
-msgid "Packages providing this file are:"
-msgstr ""
-
-#. TRANSLATORS: Show the user a list of packages that they can install to provide this command
-#: ../contrib/command-not-found/pk-command-not-found.c:865
-msgid "Suitable packages are:"
-msgstr ""
-
-#. get selection
-#. TRANSLATORS: ask the user to choose a file to install
-#: ../contrib/command-not-found/pk-command-not-found.c:874
-msgid "Please choose a package to install"
-msgstr ""
-
-#. TRANSLATORS: we are starting to install the packages
-#: ../contrib/debuginfo-install/pk-debuginfo-install.c:195
-msgid "Starting install"
-msgstr ""
-
-#. TRANSLATORS: we couldn't find the package name, non-fatal
-#: ../contrib/debuginfo-install/pk-debuginfo-install.c:407
-#, c-format
-msgid "Failed to find the package %s, or already installed: %s"
-msgstr ""
-
-#. command line argument, simulate what would be done, but don't actually do it
-#: ../contrib/debuginfo-install/pk-debuginfo-install.c:516
-msgid ""
-"Don't actually install any packages, only simulate what would be installed"
-msgstr ""
-
-#. command line argument, do we skip packages that depend on the ones specified
-#: ../contrib/debuginfo-install/pk-debuginfo-install.c:519
-msgid "Do not install dependencies of the core packages"
-msgstr ""
-
-#. command line argument, do we operate quietly
-#: ../contrib/debuginfo-install/pk-debuginfo-install.c:522
-msgid "Do not display information or progress"
-msgstr ""
-
-#. TRANSLATORS: tool that gets called when the command is not found
-#: ../contrib/debuginfo-install/pk-debuginfo-install.c:540
-msgid "PackageKit Debuginfo Installer"
-msgstr ""
-
-#. TRANSLATORS: the use needs to specify a list of package names on the command line
-#: ../contrib/debuginfo-install/pk-debuginfo-install.c:554
-#, c-format
-msgid "ERROR: Specify package names to install."
-msgstr ""
-
-#. TRANSLATORS: we are getting the list of repositories
-#: ../contrib/debuginfo-install/pk-debuginfo-install.c:590
-#, c-format
-msgid "Getting sources list"
-msgstr ""
-
-#. TRANSLATORS: operation was not successful
-#: ../contrib/debuginfo-install/pk-debuginfo-install.c:600
-#: ../contrib/debuginfo-install/pk-debuginfo-install.c:675
-#: ../contrib/debuginfo-install/pk-debuginfo-install.c:759
-#: ../contrib/debuginfo-install/pk-debuginfo-install.c:803
-#: ../contrib/debuginfo-install/pk-debuginfo-install.c:870
-#: ../contrib/debuginfo-install/pk-debuginfo-install.c:914
-msgid "FAILED."
-msgstr ""
-
-#. TRANSLATORS: all completed 100%
-#: ../contrib/debuginfo-install/pk-debuginfo-install.c:615
-#: ../contrib/debuginfo-install/pk-debuginfo-install.c:655
-#: ../contrib/debuginfo-install/pk-debuginfo-install.c:690
-#: ../contrib/debuginfo-install/pk-debuginfo-install.c:774
-#: ../contrib/debuginfo-install/pk-debuginfo-install.c:818
-#: ../contrib/debuginfo-install/pk-debuginfo-install.c:885
-#: ../contrib/debuginfo-install/pk-debuginfo-install.c:929
-#, c-format
-msgid "OK."
-msgstr ""
-
-#. TRANSLATORS: tell the user what we found
-#: ../contrib/debuginfo-install/pk-debuginfo-install.c:618
-#, c-format
-msgid "Found %i enabled and %i disabled sources."
-msgstr ""
-
-#. TRANSLATORS: we're finding repositories that match out pattern
-#: ../contrib/debuginfo-install/pk-debuginfo-install.c:625
-#, c-format
-msgid "Finding debugging sources"
-msgstr ""
-
-#. TRANSLATORS: tell the user what we found
-#: ../contrib/debuginfo-install/pk-debuginfo-install.c:658
-#, c-format
-msgid "Found %i disabled debuginfo repos."
-msgstr ""
-
-#. TRANSLATORS: we're now enabling all the debug sources we found
-#: ../contrib/debuginfo-install/pk-debuginfo-install.c:665
-#, c-format
-msgid "Enabling debugging sources"
-msgstr ""
-
-#. TRANSLATORS: tell the user how many we enabled
-#: ../contrib/debuginfo-install/pk-debuginfo-install.c:693
-#, c-format
-msgid "Enabled %i debugging sources."
-msgstr ""
-
-#. TRANSLATORS: we're now finding packages that match in all the repos
-#: ../contrib/debuginfo-install/pk-debuginfo-install.c:700
-#, c-format
-msgid "Finding debugging packages"
-msgstr ""
-
-#. TRANSLATORS: we couldn't find the package name, non-fatal
-#: ../contrib/debuginfo-install/pk-debuginfo-install.c:712
-#, c-format
-msgid "Failed to find the package %s: %s"
-msgstr ""
-
-#. TRANSLATORS: we couldn't find the debuginfo package name, non-fatal
-#: ../contrib/debuginfo-install/pk-debuginfo-install.c:735
-#, c-format
-msgid "Failed to find the debuginfo package %s: %s"
-msgstr ""
-
-#. TRANSLATORS: no debuginfo packages could be found to be installed
-#: ../contrib/debuginfo-install/pk-debuginfo-install.c:763
-#, c-format
-msgid "Found no packages to install."
-msgstr ""
-
-#. TRANSLATORS: tell the user we found some packages, and then list them
-#: ../contrib/debuginfo-install/pk-debuginfo-install.c:777
-#, c-format
-msgid "Found %i packages:"
-msgstr ""
-
-#. TRANSLATORS: tell the user we are searching for deps
-#: ../contrib/debuginfo-install/pk-debuginfo-install.c:793
-#, c-format
-msgid "Finding packages that depend on these packages"
-msgstr ""
-
-#. TRANSLATORS: could not install, detailed error follows
-#: ../contrib/debuginfo-install/pk-debuginfo-install.c:806
-#, c-format
-msgid "Could not find dependant packages: %s"
-msgstr ""
-
-#. TRANSLATORS: tell the user we found some more packages
-#: ../contrib/debuginfo-install/pk-debuginfo-install.c:822
-#, c-format
-msgid "Found %i extra packages."
-msgstr ""
-
-#. TRANSLATORS: tell the user we found some more packages
-#: ../contrib/debuginfo-install/pk-debuginfo-install.c:826
-#, c-format
-msgid "No extra packages required."
-msgstr ""
-
-#. TRANSLATORS: tell the user we found some packages (and deps), and then list them
-#: ../contrib/debuginfo-install/pk-debuginfo-install.c:835
-#, c-format
-msgid "Found %i packages to install:"
-msgstr ""
-
-#. TRANSLATORS: simulate mode is a testing mode where we quit before the action
-#: ../contrib/debuginfo-install/pk-debuginfo-install.c:848
-#, c-format
-msgid "Not installing packages in simulate mode"
-msgstr ""
-
-#. TRANSLATORS: we are now installing the debuginfo packages we found earlier
-#. TRANSLATORS: transaction state, installing packages
-#: ../contrib/debuginfo-install/pk-debuginfo-install.c:860
-#: ../lib/packagekit-glib2/pk-console-shared.c:296
-#, c-format
-msgid "Installing packages"
-msgstr ""
-
-#. TRANSLATORS: could not install, detailed error follows
-#: ../contrib/debuginfo-install/pk-debuginfo-install.c:873
-#, c-format
-msgid "Could not install packages: %s"
-msgstr ""
-
-#. TRANSLATORS: we are now disabling all debuginfo repos we previously enabled
-#: ../contrib/debuginfo-install/pk-debuginfo-install.c:905
-#, c-format
-msgid "Disabling sources previously enabled"
-msgstr ""
-
-#. TRANSLATORS: no debuginfo packages could be found to be installed, detailed error follows
-#: ../contrib/debuginfo-install/pk-debuginfo-install.c:917
-#, c-format
-msgid "Could not disable the debugging sources: %s"
-msgstr ""
-
-#. TRANSLATORS: we disabled all the debugging repos that we enabled before
-#: ../contrib/debuginfo-install/pk-debuginfo-install.c:932
-#, c-format
-msgid "Disabled %i debugging sources."
-msgstr ""
-
-#. TRANSLATORS: couldn't open device to write
-#: ../contrib/device-rebind/pk-device-rebind.c:62
-msgid "Failed to open file"
-msgstr ""
-
-#. TRANSLATORS: could not write to the device
-#: ../contrib/device-rebind/pk-device-rebind.c:71
-msgid "Failed to write to the file"
-msgstr ""
-
-#. TRANSLATORS: we failed to release the current driver
-#: ../contrib/device-rebind/pk-device-rebind.c:111
-#: ../contrib/device-rebind/pk-device-rebind.c:148
-msgid "Failed to write to device"
-msgstr ""
-
-#. TRANSLATORS: the device could not be found in sysfs
-#: ../contrib/device-rebind/pk-device-rebind.c:176
-msgid "Device could not be found"
-msgstr ""
-
-#. TRANSLATORS: we failed to release the current driver
-#: ../contrib/device-rebind/pk-device-rebind.c:203
-msgid "Failed to unregister driver"
-msgstr ""
-
-#. TRANSLATORS: we failed to bind the old driver
-#: ../contrib/device-rebind/pk-device-rebind.c:212
-msgid "Failed to register driver"
-msgstr ""
-
-#. TRANSLATORS: user did not specify a device sysfs path that exists
-#: ../contrib/device-rebind/pk-device-rebind.c:261
-msgid "Device path not found"
-msgstr ""
-
-#. TRANSLATORS: user did not specify a valid device sysfs path
-#: ../contrib/device-rebind/pk-device-rebind.c:269
-msgid "Incorrect device path specified"
-msgstr ""
-
-#: ../contrib/device-rebind/pk-device-rebind.c:294
-msgid "Show extra debugging information"
-msgstr ""
-
-#. command line argument, simulate what would be done, but don't actually do it
-#: ../contrib/device-rebind/pk-device-rebind.c:297
-msgid "Don't actually touch the hardware, only simulate what would be done"
-msgstr ""
-
-#. TRANSLATORS: command line option: a list of files to install
-#: ../contrib/device-rebind/pk-device-rebind.c:300
-msgid "Device paths"
-msgstr ""
-
-#. TRANSLATORS: tool that gets called when the device needs reloading after installing firmware
-#: ../contrib/device-rebind/pk-device-rebind.c:315
-msgid "PackageKit Device Reloader"
-msgstr ""
-
-#. TRANSLATORS: user did not specify a valid device sysfs path
-#: ../contrib/device-rebind/pk-device-rebind.c:323
-msgid "You need to specify at least one valid device path"
-msgstr ""
-
-#. TRANSLATORS: user did not specify a valid device sysfs path
-#: ../contrib/device-rebind/pk-device-rebind.c:333
-msgid "This script can only be used by the root user"
-msgstr ""
-
-#. TRANSLATORS: we're going to verify the path first
-#: ../contrib/device-rebind/pk-device-rebind.c:342
-msgid "Verifying device path"
-msgstr ""
-
-#. TRANSLATORS: user did not specify a device sysfs path that exists
-#: ../contrib/device-rebind/pk-device-rebind.c:347
-msgid "Failed to verify device path"
-msgstr ""
-
-#. TRANSLATORS: we're going to try
-#: ../contrib/device-rebind/pk-device-rebind.c:361
-msgid "Attempting to rebind device"
-msgstr ""
-
-#. TRANSLATORS: we failed to release the current driver
-#: ../contrib/device-rebind/pk-device-rebind.c:366
-msgid "Failed to rebind device"
-msgstr ""
-
-#: ../data/packagekit-catalog.xml.in.h:1
-msgid "PackageKit Catalog"
-msgstr ""
-
-#: ../data/packagekit-package-list.xml.in.h:1
-msgid "PackageKit Package List"
-msgstr ""
-
-#: ../data/packagekit-servicepack.xml.in.h:1
-msgid "PackageKit Service Pack"
-msgstr ""
-
-#: ../lib/packagekit-glib2/pk-console-shared.c:64
-#, c-format
-msgid "Please enter a number from 1 to %i: "
-msgstr ""
-
-#. TRANSLATORS: more than one package could be found that matched, to follow is a list of possible packages
-#: ../lib/packagekit-glib2/pk-console-shared.c:198
-msgid "More than one package matches:"
-msgstr ""
-
-#. TRANSLATORS: This finds out which package in the list to use
-#: ../lib/packagekit-glib2/pk-console-shared.c:209
-msgid "Please choose the correct package: "
-msgstr ""
-
-#. TRANSLATORS: This is when the transaction status is not known
-#: ../lib/packagekit-glib2/pk-console-shared.c:264
-msgid "Unknown state"
-msgstr ""
-
-#. TRANSLATORS: transaction state, the daemon is in the process of starting
-#: ../lib/packagekit-glib2/pk-console-shared.c:268
-msgid "Starting"
-msgstr ""
-
-#. TRANSLATORS: transaction state, the transaction is waiting for another to complete
-#: ../lib/packagekit-glib2/pk-console-shared.c:272
-msgid "Waiting in queue"
-msgstr ""
-
-#. TRANSLATORS: transaction state, just started
-#: ../lib/packagekit-glib2/pk-console-shared.c:276
-msgid "Running"
-msgstr ""
-
-#. TRANSLATORS: transaction state, is querying data
-#: ../lib/packagekit-glib2/pk-console-shared.c:280
-msgid "Querying"
-msgstr ""
-
-#. TRANSLATORS: transaction state, getting data from a server
-#: ../lib/packagekit-glib2/pk-console-shared.c:284
-msgid "Getting information"
-msgstr ""
-
-#. TRANSLATORS: transaction state, removing packages
-#: ../lib/packagekit-glib2/pk-console-shared.c:288
-msgid "Removing packages"
-msgstr ""
-
-#. TRANSLATORS: transaction state, downloading package files
-#. TRANSLATORS: The role of the transaction, in present tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:292
-#: ../lib/packagekit-glib2/pk-console-shared.c:670
-msgid "Downloading packages"
-msgstr ""
-
-#. TRANSLATORS: transaction state, refreshing internal lists
-#: ../lib/packagekit-glib2/pk-console-shared.c:300
-msgid "Refreshing software list"
-msgstr ""
-
-#. TRANSLATORS: transaction state, installing updates
-#: ../lib/packagekit-glib2/pk-console-shared.c:304
-msgid "Installing updates"
-msgstr ""
-
-#. TRANSLATORS: transaction state, removing old packages, and cleaning config files
-#: ../lib/packagekit-glib2/pk-console-shared.c:308
-msgid "Cleaning up packages"
-msgstr ""
-
-#. TRANSLATORS: transaction state, obsoleting old packages
-#: ../lib/packagekit-glib2/pk-console-shared.c:312
-msgid "Obsoleting packages"
-msgstr ""
-
-#. TRANSLATORS: transaction state, checking the transaction before we do it
-#: ../lib/packagekit-glib2/pk-console-shared.c:316
-msgid "Resolving dependencies"
-msgstr ""
-
-#. TRANSLATORS: transaction state, checking if we have all the security keys for the operation
-#: ../lib/packagekit-glib2/pk-console-shared.c:320
-msgid "Checking signatures"
-msgstr ""
-
-#. TRANSLATORS: transaction state, when we return to a previous system state
-#. TRANSLATORS: The role of the transaction, in present tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:324
-#: ../lib/packagekit-glib2/pk-console-shared.c:630
-msgid "Rolling back"
-msgstr ""
-
-#. TRANSLATORS: transaction state, when we're doing a test transaction
-#: ../lib/packagekit-glib2/pk-console-shared.c:328
-msgid "Testing changes"
-msgstr ""
-
-#. TRANSLATORS: transaction state, when we're writing to the system package database
-#: ../lib/packagekit-glib2/pk-console-shared.c:332
-msgid "Committing changes"
-msgstr ""
-
-#. TRANSLATORS: transaction state, requesting data from a server
-#: ../lib/packagekit-glib2/pk-console-shared.c:336
-msgid "Requesting data"
-msgstr ""
-
-#. TRANSLATORS: transaction state, all done!
-#: ../lib/packagekit-glib2/pk-console-shared.c:340
-msgid "Finished"
-msgstr ""
-
-#. TRANSLATORS: transaction state, in the process of cancelling
-#: ../lib/packagekit-glib2/pk-console-shared.c:344
-msgid "Cancelling"
-msgstr ""
-
-#. TRANSLATORS: transaction state, downloading metadata
-#: ../lib/packagekit-glib2/pk-console-shared.c:348
-msgid "Downloading repository information"
-msgstr ""
-
-#. TRANSLATORS: transaction state, downloading metadata
-#: ../lib/packagekit-glib2/pk-console-shared.c:352
-msgid "Downloading list of packages"
-msgstr ""
-
-#. TRANSLATORS: transaction state, downloading metadata
-#: ../lib/packagekit-glib2/pk-console-shared.c:356
-msgid "Downloading file lists"
-msgstr ""
-
-#. TRANSLATORS: transaction state, downloading metadata
-#: ../lib/packagekit-glib2/pk-console-shared.c:360
-msgid "Downloading lists of changes"
-msgstr ""
-
-#. TRANSLATORS: transaction state, downloading metadata
-#: ../lib/packagekit-glib2/pk-console-shared.c:364
-msgid "Downloading groups"
-msgstr ""
-
-#. TRANSLATORS: transaction state, downloading metadata
-#: ../lib/packagekit-glib2/pk-console-shared.c:368
-msgid "Downloading update information"
-msgstr ""
-
-#. TRANSLATORS: transaction state, repackaging delta files
-#: ../lib/packagekit-glib2/pk-console-shared.c:372
-msgid "Repackaging files"
-msgstr ""
-
-#. TRANSLATORS: transaction state, loading databases
-#: ../lib/packagekit-glib2/pk-console-shared.c:376
-msgid "Loading cache"
-msgstr ""
-
-#. TRANSLATORS: transaction state, scanning for running processes
-#: ../lib/packagekit-glib2/pk-console-shared.c:380
-msgid "Scanning applications"
-msgstr ""
-
-#. TRANSLATORS: transaction state, generating a list of packages installed on the system
-#: ../lib/packagekit-glib2/pk-console-shared.c:384
-msgid "Generating package lists"
-msgstr ""
-
-#. TRANSLATORS: transaction state, when we're waiting for the native tools to exit
-#: ../lib/packagekit-glib2/pk-console-shared.c:388
-msgid "Waiting for package manager lock"
-msgstr ""
-
-#. TRANSLATORS: transaction state, waiting for user to type in a password
-#: ../lib/packagekit-glib2/pk-console-shared.c:392
-msgid "Waiting for authentication"
-msgstr ""
-
-#. TRANSLATORS: transaction state, we are updating the list of processes
-#: ../lib/packagekit-glib2/pk-console-shared.c:396
-msgid "Updating running applications"
-msgstr ""
-
-#. TRANSLATORS: transaction state, we are checking executable files currently in use
-#: ../lib/packagekit-glib2/pk-console-shared.c:400
-msgid "Checking applications in use"
-msgstr ""
-
-#. TRANSLATORS: transaction state, we are checking for libraries currently in use
-#: ../lib/packagekit-glib2/pk-console-shared.c:404
-msgid "Checking libraries in use"
-msgstr ""
-
-#. TRANSLATORS: transaction state, we are copying package files before or after the transaction
-#: ../lib/packagekit-glib2/pk-console-shared.c:408
-msgid "Copying files"
-msgstr ""
-
-#. TRANSLATORS: The type of update
-#: ../lib/packagekit-glib2/pk-console-shared.c:426
-msgid "Trivial"
-msgstr ""
-
-#. TRANSLATORS: The type of update
-#: ../lib/packagekit-glib2/pk-console-shared.c:430
-msgid "Normal"
-msgstr ""
-
-#. TRANSLATORS: The type of update
-#: ../lib/packagekit-glib2/pk-console-shared.c:434
-msgid "Important"
-msgstr ""
-
-#. TRANSLATORS: The type of update
-#: ../lib/packagekit-glib2/pk-console-shared.c:438
-msgid "Security"
-msgstr ""
-
-#. TRANSLATORS: The type of update
-#: ../lib/packagekit-glib2/pk-console-shared.c:442
-msgid "Bug fix "
-msgstr ""
-
-#. TRANSLATORS: The type of update
-#: ../lib/packagekit-glib2/pk-console-shared.c:446
-msgid "Enhancement"
-msgstr ""
-
-#. TRANSLATORS: The type of update
-#: ../lib/packagekit-glib2/pk-console-shared.c:450
-msgid "Blocked"
-msgstr ""
-
-#. TRANSLATORS: The state of a package
-#. TRANSLATORS: The action of the package, in past tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:455
-#: ../lib/packagekit-glib2/pk-console-shared.c:528
-msgid "Installed"
-msgstr ""
-
-#. TRANSLATORS: The state of a package, i.e. not installed
-#: ../lib/packagekit-glib2/pk-console-shared.c:460
-msgid "Available"
-msgstr ""
-
-#. TRANSLATORS: The action of the package, in present tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:478
-msgid "Downloading"
-msgstr ""
-
-#. TRANSLATORS: The action of the package, in present tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:482
-msgid "Updating"
-msgstr ""
-
-#. TRANSLATORS: The action of the package, in present tense
-#. TRANSLATORS: The role of the transaction, in present tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:486
-#: ../lib/packagekit-glib2/pk-console-shared.c:606
-msgid "Installing"
-msgstr ""
-
-#. TRANSLATORS: The action of the package, in present tense
-#. TRANSLATORS: The role of the transaction, in present tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:490
-#: ../lib/packagekit-glib2/pk-console-shared.c:602
-msgid "Removing"
-msgstr ""
-
-#. TRANSLATORS: The action of the package, in present tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:494
-msgid "Cleaning up"
-msgstr ""
-
-#. TRANSLATORS: The action of the package, in present tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:498
-msgid "Obsoleting"
-msgstr ""
-
-#. TRANSLATORS: The action of the package, in present tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:502
-msgid "Reinstalling"
-msgstr ""
-
-#. TRANSLATORS: The action of the package, in past tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:520
-msgid "Downloaded"
-msgstr ""
-
-#. TRANSLATORS: The action of the package, in past tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:532
-msgid "Removed"
-msgstr ""
-
-#. TRANSLATORS: The action of the package, in past tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:536
-msgid "Cleaned up"
-msgstr ""
-
-#. TRANSLATORS: The action of the package, in past tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:540
-msgid "Obsoleted"
-msgstr ""
-
-#. TRANSLATORS: The action of the package, in past tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:544
-msgid "Reinstalled"
-msgstr ""
-
-#. TRANSLATORS: The role of the transaction, in present tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:562
-msgid "Unknown role type"
-msgstr ""
-
-#. TRANSLATORS: The role of the transaction, in present tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:566
-msgid "Getting dependencies"
-msgstr ""
-
-#. TRANSLATORS: The role of the transaction, in present tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:570
-msgid "Getting update details"
-msgstr ""
-
-#. TRANSLATORS: The role of the transaction, in present tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:574
-msgid "Getting details"
-msgstr ""
-
-#. TRANSLATORS: The role of the transaction, in present tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:578
-msgid "Getting requires"
-msgstr ""
-
-#. TRANSLATORS: The role of the transaction, in present tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:582
-msgid "Getting updates"
-msgstr ""
-
-#. TRANSLATORS: The role of the transaction, in present tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:586
-msgid "Searching by details"
-msgstr ""
-
-#. TRANSLATORS: The role of the transaction, in present tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:590
-msgid "Searching by file"
-msgstr ""
-
-#. TRANSLATORS: The role of the transaction, in present tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:594
-msgid "Searching groups"
-msgstr ""
-
-#. TRANSLATORS: The role of the transaction, in present tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:598
-msgid "Searching by name"
-msgstr ""
-
-#. TRANSLATORS: The role of the transaction, in present tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:610
-msgid "Installing files"
-msgstr ""
-
-#. TRANSLATORS: The role of the transaction, in present tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:614
-msgid "Refreshing cache"
-msgstr ""
-
-#. TRANSLATORS: The role of the transaction, in present tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:618
-msgid "Updating packages"
-msgstr ""
-
-#. TRANSLATORS: The role of the transaction, in present tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:622
-msgid "Updating system"
-msgstr ""
-
-#. TRANSLATORS: The role of the transaction, in present tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:626
-msgid "Canceling"
-msgstr ""
-
-#. TRANSLATORS: The role of the transaction, in present tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:634
-msgid "Getting repositories"
-msgstr ""
-
-#. TRANSLATORS: The role of the transaction, in present tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:638
-msgid "Enabling repository"
-msgstr ""
-
-#. TRANSLATORS: The role of the transaction, in present tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:642
-msgid "Setting data"
-msgstr ""
-
-#. TRANSLATORS: The role of the transaction, in present tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:646
-msgid "Resolving"
-msgstr ""
-
-#. TRANSLATORS: The role of the transaction, in present tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:650
-msgid "Getting file list"
-msgstr ""
-
-#. TRANSLATORS: The role of the transaction, in present tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:654
-msgid "Getting provides"
-msgstr ""
-
-#. TRANSLATORS: The role of the transaction, in present tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:658
-msgid "Installing signature"
-msgstr ""
-
-#. TRANSLATORS: The role of the transaction, in present tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:662
-msgid "Getting packages"
-msgstr ""
-
-#. TRANSLATORS: The role of the transaction, in present tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:666
-msgid "Accepting EULA"
-msgstr ""
-
-#. TRANSLATORS: The role of the transaction, in present tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:674
-msgid "Getting upgrades"
-msgstr ""
-
-#. TRANSLATORS: The role of the transaction, in present tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:678
-msgid "Getting categories"
-msgstr ""
-
-#. TRANSLATORS: The role of the transaction, in present tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:682
-msgid "Getting transactions"
-msgstr ""
-
-#. TRANSLATORS: The role of the transaction, in present tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:686
-#: ../lib/packagekit-glib2/pk-console-shared.c:690
-msgid "Simulating install"
-msgstr ""
-
-#. TRANSLATORS: The role of the transaction, in present tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:694
-msgid "Simulating remove"
-msgstr ""
-
-#. TRANSLATORS: The role of the transaction, in present tense
-#: ../lib/packagekit-glib2/pk-console-shared.c:698
-msgid "Simulating update"
-msgstr ""
-
-#. TRANSLATORS: turn on all debugging
-#: ../lib/packagekit-glib2/pk-debug.c:133
-msgid "Show debugging information for all files"
-msgstr ""
-
-#: ../lib/packagekit-glib2/pk-debug.c:201
-msgid "Debugging Options"
-msgstr ""
-
-#: ../lib/packagekit-glib2/pk-debug.c:201
-msgid "Show debugging options"
-msgstr ""
-
-#. TRANSLATORS: ask the user if they are comfortable installing insecure packages
-#: ../lib/packagekit-glib2/pk-task-text.c:67
-msgid "Do you want to allow installing of unsigned software?"
-msgstr ""
-
-#. TRANSLATORS: tell the user we've not done anything
-#: ../lib/packagekit-glib2/pk-task-text.c:72
-msgid "The unsigned software will not be installed."
-msgstr ""
-
-#. TRANSLATORS: the package repository is signed by a key that is not recognised
-#: ../lib/packagekit-glib2/pk-task-text.c:121
-msgid "Software source signature required"
-msgstr ""
-
-#. TRANSLATORS: the package repository name
-#: ../lib/packagekit-glib2/pk-task-text.c:127
-msgid "Software source name"
-msgstr ""
-
-#. TRANSLATORS: the key URL
-#: ../lib/packagekit-glib2/pk-task-text.c:130
-msgid "Key URL"
-msgstr ""
-
-#. TRANSLATORS: the username of the key
-#: ../lib/packagekit-glib2/pk-task-text.c:133
-msgid "Key user"
-msgstr ""
-
-#. TRANSLATORS: the key ID, usually a few hex digits
-#: ../lib/packagekit-glib2/pk-task-text.c:136
-msgid "Key ID"
-msgstr ""
-
-#. TRANSLATORS: the key fingerprint, again, yet more hex
-#: ../lib/packagekit-glib2/pk-task-text.c:139
-msgid "Key fingerprint"
-msgstr ""
-
-#. TRANSLATORS: the timestamp (a bit like a machine readable time)
-#: ../lib/packagekit-glib2/pk-task-text.c:142
-msgid "Key Timestamp"
-msgstr ""
-
-#. TRANSLATORS: ask the user if they want to import
-#: ../lib/packagekit-glib2/pk-task-text.c:155
-msgid "Do you accept this signature?"
-msgstr ""
-
-#. TRANSLATORS: tell the user we've not done anything
-#: ../lib/packagekit-glib2/pk-task-text.c:160
-msgid "The signature was not accepted."
-msgstr ""
-
-#. TRANSLATORS: this is another name for a software licence that has to be read before installing
-#: ../lib/packagekit-glib2/pk-task-text.c:203
-msgid "End user licence agreement required"
-msgstr ""
-
-#. TRANSLATORS: the EULA text itself (long and boring)
-#: ../lib/packagekit-glib2/pk-task-text.c:212
-msgid "Agreement"
-msgstr ""
-
-#. TRANSLATORS: ask the user if they've read and accepted the EULA
-#: ../lib/packagekit-glib2/pk-task-text.c:221
-msgid "Do you accept this agreement?"
-msgstr ""
-
-#. TRANSLATORS: tell the user we've not done anything
-#: ../lib/packagekit-glib2/pk-task-text.c:226
-msgid "The agreement was not accepted."
-msgstr ""
-
-#. TRANSLATORS: the user needs to change media inserted into the computer
-#: ../lib/packagekit-glib2/pk-task-text.c:265
-msgid "Media change required"
-msgstr ""
-
-#. TRANSLATORS: the type, e.g. DVD, CD, etc
-#: ../lib/packagekit-glib2/pk-task-text.c:268
-msgid "Media type"
-msgstr ""
-
-#. TRANSLATORS: the media label, usually like 'disk-1of3'
-#: ../lib/packagekit-glib2/pk-task-text.c:271
-msgid "Media label"
-msgstr ""
-
-#. TRANSLATORS: the media description, usually like 'Fedora 12 disk 5'
-#: ../lib/packagekit-glib2/pk-task-text.c:274
-msgid "Text"
-msgstr ""
-
-#. TRANSLATORS: ask the user to insert the media
-#: ../lib/packagekit-glib2/pk-task-text.c:280
-msgid "Please insert the correct media"
-msgstr ""
-
-#. TRANSLATORS: tell the user we've not done anything as they are lazy
-#: ../lib/packagekit-glib2/pk-task-text.c:285
-msgid "The correct media was not inserted."
-msgstr ""
-
-#. TRANSLATORS: When processing, we might have to remove other dependencies
-#: ../lib/packagekit-glib2/pk-task-text.c:300
-msgid "The following packages have to be removed:"
-msgstr ""
-
-#. TRANSLATORS: When processing, we might have to install other dependencies
-#: ../lib/packagekit-glib2/pk-task-text.c:305
-msgid "The following packages have to be installed:"
-msgstr ""
-
-#. TRANSLATORS: When processing, we might have to update other dependencies
-#: ../lib/packagekit-glib2/pk-task-text.c:310
-msgid "The following packages have to be updated:"
-msgstr ""
-
-#. TRANSLATORS: When processing, we might have to reinstall other dependencies
-#: ../lib/packagekit-glib2/pk-task-text.c:315
-msgid "The following packages have to be reinstalled:"
-msgstr ""
-
-#. TRANSLATORS: When processing, we might have to downgrade other dependencies
-#: ../lib/packagekit-glib2/pk-task-text.c:320
-msgid "The following packages have to be downgraded:"
-msgstr ""
-
-#. TRANSLATORS: ask the user if the proposed changes are okay
-#: ../lib/packagekit-glib2/pk-task-text.c:380
-msgid "Proceed with changes?"
-msgstr ""
-
-#. TRANSLATORS: tell the user we didn't do anything
-#: ../lib/packagekit-glib2/pk-task-text.c:385
-msgid "The transaction did not proceed."
-msgstr ""
-
-#. SECURITY:
-#. - Normal users do not require admin authentication to accept new
-#. licence agreements.
-#. - Change this to 'auth_admin' for environments where users should not
-#. be given the option to make legal decisions.
-#.
-#: ../policy/org.freedesktop.packagekit.policy.in.h:7
-msgid "Accept EULA"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:8
-msgid "Authentication is required to accept a EULA"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:9
-msgid ""
-"Authentication is required to cancel a task that was not started by yourself"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:10
-msgid "Authentication is required to change software source parameters"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:11
-msgid ""
-"Authentication is required to change the location used to decompress packages"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:12
-msgid ""
-"Authentication is required to consider a key used for signing packages as "
-"trusted"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:13
-msgid "Authentication is required to install a signed package"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:14
-msgid "Authentication is required to install an untrusted package"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:15
-msgid "Authentication is required to refresh the system sources"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:16
-msgid "Authentication is required to reload the device with a new driver"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:17
-msgid "Authentication is required to remove packages"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:18
-msgid "Authentication is required to rollback a transaction"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:19
-msgid ""
-"Authentication is required to set the network proxy used for downloading "
-"packages"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:20
-msgid "Authentication is required to update packages"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:21
-msgid "Authentication is required to upgrade the operating system"
-msgstr ""
-
-#. SECURITY:
-#. - Normal users are allowed to cancel their own task without
-#. authentication, but a different user id needs the admin password
-#. to cancel another users task.
-#.
-#: ../policy/org.freedesktop.packagekit.policy.in.h:27
-msgid "Cancel foreign task"
-msgstr ""
-
-#. SECURITY:
-#. - This is used when users want to install to a different prefix, for
-#. instance to a LTSP image or a virtual machine.
-#. - This could be used to overwrite files not owned by the user using
-#. a carefully created package file.
-#.
-#: ../policy/org.freedesktop.packagekit.policy.in.h:34
-msgid "Change location that packages are installed"
-msgstr ""
-
-#. SECURITY:
-#. - Normal users require admin authentication to enable or disable
-#. software sources as this can be used to enable new updates or
-#. install different versions of software.
-#.
-#: ../policy/org.freedesktop.packagekit.policy.in.h:40
-msgid "Change software source parameters"
-msgstr ""
-
-#. SECURITY:
-#. - Normal users do not need authentication to install signed packages
-#. from signed repositories, as this cannot exploit a system.
-#. - Paranoid users (or parents!) can change this to 'auth_admin' or
-#. 'auth_admin_keep'.
-#.
-#: ../policy/org.freedesktop.packagekit.policy.in.h:47
-msgid "Install signed package"
-msgstr ""
-
-#. SECURITY:
-#. - Normal users require admin authentication to install untrusted or
-#. unrecognised packages, as allowing users to do this without a
-#. password would be a massive security hole.
-#. - This is not retained as each package should be authenticated.
-#.
-#: ../policy/org.freedesktop.packagekit.policy.in.h:54
-msgid "Install untrusted local file"
-msgstr ""
-
-#. SECURITY:
-#. - Normal users do not require admin authentication to refresh the
-#. cache, as this doesn't actually install or remove software.
-#.
-#: ../policy/org.freedesktop.packagekit.policy.in.h:59
-msgid "Refresh system sources"
-msgstr ""
-
-#. SECURITY:
-#. - Normal users require admin authentication to rebind a driver
-#. so that it works after we install firmware.
-#. - This should not be set to 'yes' as unprivileged users could then
-#. try to rebind drivers in use, for instance security authentication
-#. devices.
-#.
-#: ../policy/org.freedesktop.packagekit.policy.in.h:67
-msgid "Reload a device"
-msgstr ""
-
-#. SECURITY:
-#. - Normal users require admin authentication to remove packages as
-#. this can make the system unbootable or stop other applications from
-#. working.
-#. - Be sure to close the tool used to remove the packages after the
-#. admin authentication has been obtained, otherwise packages can still
-#. be removed. If this is not possible, change this authentication to
-#. 'auth_admin'.
-#.
-#: ../policy/org.freedesktop.packagekit.policy.in.h:77
-msgid "Remove package"
-msgstr ""
-
-#. SECURITY:
-#. - Normal users require admin authentication to rollback system state
-#. as this will change a large number of packages, and could expose the
-#. system to previously patched security vulnerabilities.
-#.
-#: ../policy/org.freedesktop.packagekit.policy.in.h:83
-msgid "Rollback to a previous transaction"
-msgstr ""
-
-#. SECURITY:
-#. - Normal users do not require admin authentication to set the proxy
-#. used for downloading packages.
-#.
-#: ../policy/org.freedesktop.packagekit.policy.in.h:88
-msgid "Set network proxy"
-msgstr ""
-
-#. SECURITY:
-#. - Normal users require admin authentication to add signing keys.
-#. - This implies adding an explicit trust, and should not be granted
-#. without a secure authentication.
-#. - This is not kept as each package should be authenticated.
-#.
-#: ../policy/org.freedesktop.packagekit.policy.in.h:95
-msgid "Trust a key used for signing packages"
-msgstr ""
-
-#. SECURITY:
-#. - Normal users do not require admin authentication to update the
-#. system as the packages will be signed, and the action is required
-#. to update the system when unattended.
-#. - Changing this to anything other than 'yes' will break unattended
-#. updates.
-#.
-#: ../policy/org.freedesktop.packagekit.policy.in.h:103
-msgid "Update packages"
-msgstr ""
-
-#. SECURITY:
-#. - Normal users require admin authentication to upgrade the disto as
-#. this can make the system unbootable or stop other applications from
-#. working.
-#.
-#: ../policy/org.freedesktop.packagekit.policy.in.h:109
-msgid "Upgrade System"
-msgstr ""
-
-#. TRANSLATORS: failed due to DBus security
-#: ../src/pk-main.c:91
-msgid "Startup failed due to security policies on this machine."
-msgstr ""
-
-#. TRANSLATORS: only two ways this can fail...
-#: ../src/pk-main.c:93
-msgid "This can happen for two reasons:"
-msgstr ""
-
-#. TRANSLATORS: only allowed to be owned by root
-#: ../src/pk-main.c:95
-msgid "The correct user is not launching the executable (usually root)"
-msgstr ""
-
-#. TRANSLATORS: or we are installed in a prefix
-#: ../src/pk-main.c:97
-msgid ""
-"The org.freedesktop.PackageKit.conf file is not installed in the system "
-"directory:"
-msgstr ""
-
-#. TRANSLATORS: a backend is the system package tool, e.g. yum, apt
-#: ../src/pk-main.c:223
-msgid "Packaging backend to use, e.g. dummy"
-msgstr ""
-
-#. TRANSLATORS: if we should run in the background
-#: ../src/pk-main.c:226
-msgid "Daemonize and detach from the terminal"
-msgstr ""
-
-#. TRANSLATORS: if we should not monitor how long we are inactive for
-#: ../src/pk-main.c:229
-msgid "Disable the idle timer"
-msgstr ""
-
-#. TRANSLATORS: show version
-#: ../src/pk-main.c:232
-msgid "Show version and exit"
-msgstr ""
-
-#. TRANSLATORS: exit after we've started up, used for user profiling
-#: ../src/pk-main.c:235
-msgid "Exit after a small delay"
-msgstr ""
-
-#. TRANSLATORS: exit straight away, used for automatic profiling
-#: ../src/pk-main.c:238
-msgid "Exit after the engine has loaded"
-msgstr ""
-
-#. TRANSLATORS: describing the service that is running
-#: ../src/pk-main.c:253
-msgid "PackageKit service"
-msgstr ""
-
-#. TRANSLATORS: fatal error, dbus is not running
-#: ../src/pk-main.c:298
-msgid "Cannot connect to the system bus"
-msgstr ""
-
-#: ../src/pk-main.c:344
-msgid "Failed to load any of the specified backends:"
-msgstr ""
-
-#. TRANSLATORS: cannot register on system bus, unknown reason -- geeky error follows
-#: ../src/pk-main.c:358
-msgid "Error trying to start:"
-msgstr ""
-
-#. TRANSLATORS: is not GPG signed
-#: ../src/pk-transaction.c:2611 ../src/pk-transaction.c:2618
-msgid "The software is not from a trusted source."
-msgstr ""
-
-#: ../src/pk-transaction.c:2623
-msgid "Do not update this package unless you are sure it is safe to do so."
-msgstr ""
-
-#: ../src/pk-transaction.c:2624
-msgid "Do not update these packages unless you are sure it is safe to do so."
-msgstr ""
-
-#: ../src/pk-transaction.c:2634
-msgid "Do not install this package unless you are sure it is safe to do so."
-msgstr ""
-
-#: ../src/pk-transaction.c:2635
-msgid "Do not install these packages unless you are sure it is safe to do so."
-msgstr ""
commit c015c4d5596e89cfbe15ed6957751da68d1a1a46
Author: Richard Hughes <richard at hughsie.com>
Date: Mon Jun 13 11:19:55 2011 +0100
Generate .tar.gz release tarballs
This brings us into the current decade, with a fast and efficient compression format.
It will also reduce the amount of storage we require for each release.
diff --git a/configure.ac b/configure.ac
index 4a1c4bd..7f05c0c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ m4_define([pk_version],
AC_INIT([PackageKit],[pk_version],[richard at hughsie.com],[PackageKit])
AC_CONFIG_SRCDIR(src)
-AM_INIT_AUTOMAKE([1.9 tar-ustar dist-bzip2])
+AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-xz tar-ustar])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
diff --git a/contrib/PackageKit.spec.in b/contrib/PackageKit.spec.in
index 521b34f..c832b2b 100644
--- a/contrib/PackageKit.spec.in
+++ b/contrib/PackageKit.spec.in
@@ -9,7 +9,7 @@ Version: #VERSION#
Release: 0.#BUILD#%{?alphatag}%{?dist}
License: GPLv2+ and LGPLv2+
URL: http://www.packagekit.org
-Source0: http://www.packagekit.org/releases/%{name}-%{version}.tar.gz
+Source0: http://www.packagekit.org/releases/%{name}-%{version}.tar.xz
Requires: PackageKit-glib = %{version}-%{release}
Requires: PackageKit-backend
commit d8775da1854734e4670d452a384141f7a2f14fe7
Author: Richard Hughes <richard at hughsie.com>
Date: Mon Jun 13 10:30:40 2011 +0100
Autogenerate the .gitignore files using git.mk
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index d56ce36..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,70 +0,0 @@
-Makefile
-Makefile.in
-aclocal.m4
-config.cache
-autom4te.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-configure.scan
-compile
-depcomp
-intl
-libtool
-ltconfig
-ltmain.sh
-missing
-mkinstalldirs
-install-sh
-stamp-h
-stamp-h1
-stamp-h.in
-version.h
-intl
-macros
-INSTALL
-PackageKit-*.tar.*
-org.freedesktop.PackageKit.conf
-xml-i18n-extract.in
-xml-i18n-extract
-xml-i18n-merge.in
-xml-i18n-merge
-xml-i18n-update.in
-xml-i18n-update
-intltool-extract.in
-intltool-extract
-intltool-merge.in
-intltool-merge
-intltool-update.in
-intltool-update
-xmldocs.make
-omf.make
-gtk-doc.make
-*~
-*.pc
-py-compile
-*.swp
-tags
-*.patch
-NEWS.new
-.lock-wscript
-.waf-*
-_build_
-waf-lightc
-wafadmin
-packagekit.types
-.anjuta
-*.cache
-*.anjuta
-ChangeLog
-.deps
-.acb
-*.la
-*.lo
-*.o
-*.lai
-*.so
diff --git a/Makefile.am b/Makefile.am
index 4961fa6..a440e21 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,8 +2,6 @@ AUTOMAKE_OPTIONS = 1.7
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-NULL =
-
SUBDIRS = \
po \
policy \
@@ -15,8 +13,7 @@ SUBDIRS = \
tools \
backends \
contrib \
- docs \
- $(NULL)
+ docs
clean-local :
rm -f *~
@@ -28,35 +25,32 @@ snapshot:
$(MAKE) dist distdir=$(PACKAGE)-$(VERSION)-`date +"%Y%m%d"`
DISTCLEANFILES = \
- PackageKit-*.tar.gz \
- packagekit.pc \
- intltool-extract \
- intltool-merge \
- intltool-update \
- packagekit-decl-list.txt \
- packagekit-decl.txt \
- packagekit-overrides.txt \
- packagekit-sections.txt \
- packagekit.types \
- $(NULL)
+ PackageKit-*.tar.*
MAINTAINERCLEANFILES = \
- *~ \
- intltool-*.in \
- compile \
- configure \
- INSTALL \
- install-sh \
- missing \
- mkinstalldirs \
- config.guess \
- ltmain.sh \
- config.sub \
- depcomp \
- Makefile.in \
- config.h.* \
- aclocal.m4 \
- $(NULL)
+ $(srcdir)/INSTALL \
+ $(srcdir)/ABOUT-NLS \
+ $(srcdir)/aclocal.m4 \
+ $(srcdir)/autoscan.log \
+ $(srcdir)/compile \
+ $(srcdir)/config.guess \
+ $(srcdir)/config.rpath \
+ $(srcdir)/config.h.in \
+ $(srcdir)/config.sub \
+ $(srcdir)/configure.scan \
+ $(srcdir)/depcomp \
+ $(srcdir)/install-sh \
+ $(srcdir)/ltmain.sh \
+ $(srcdir)/missing \
+ $(srcdir)/mkinstalldirs \
+ $(srcdir)/omf.make \
+ $(srcdir)/xmldocs.make \
+ $(srcdir)/gtk-doc.make \
+ $(srcdir)/ChangeLog \
+ $(srcdir)/py-compile \
+ `find "$(srcdir)" -type f -name Makefile -print` \
+ `find "$(srcdir)" -type f -name Makefile.in -print` \
+ `find "$(srcdir)" -type f -name *.pyc -print`
EXTRA_DIST = \
COPYING \
@@ -65,21 +59,20 @@ EXTRA_DIST = \
INSTALL \
README \
HACKING \
- TODO \
+ TODO \
NEWS \
- autogen.sh \
+ autogen.sh \
config.h \
moc.mk \
- intltool-extract.in \
- intltool-merge.in \
- intltool-update.in \
+ intltool-extract.in \
+ intltool-merge.in \
+ intltool-update.in \
$(NULL)
DISTCHECK_CONFIGURE_FLAGS = \
--enable-gtk-doc \
--with-security-framework=dummy \
- --disable-tests \
- $(NULL)
+ --disable-tests
distclean-local:
if test $(srdcir) = .; then :; else \
@@ -101,3 +94,5 @@ ChangeLog:
fi
.PHONY: ChangeLog
+
+-include $(top_srcdir)/git.mk
diff --git a/backends/.gitignore b/backends/.gitignore
deleted file mode 100644
index 8b13789..0000000
--- a/backends/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/backends/Makefile.am b/backends/Makefile.am
index ba378df..050b737 100644
--- a/backends/Makefile.am
+++ b/backends/Makefile.am
@@ -79,3 +79,5 @@ endif
clean-local :
rm -f *~
+
+-include $(top_srcdir)/git.mk
diff --git a/backends/alpm/.gitignore b/backends/alpm/.gitignore
deleted file mode 100644
index c851833..0000000
--- a/backends/alpm/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
-*.loT
-*.o
-*~
-
diff --git a/backends/alpm/Makefile.am b/backends/alpm/Makefile.am
index d7c6b00..5a5468a 100644
--- a/backends/alpm/Makefile.am
+++ b/backends/alpm/Makefile.am
@@ -52,3 +52,5 @@ libpk_backend_alpm_la_CFLAGS = $(PK_PLUGIN_CFLAGS) \
$(WARNINGFLAGS_C)
EXTRA_DIST = $(conf_DATA) $(libpk_backend_alpm_la_SOURCES:.c=.h)
+
+-include $(top_srcdir)/git.mk
diff --git a/backends/apt/.gitignore b/backends/apt/.gitignore
deleted file mode 100644
index c851833..0000000
--- a/backends/apt/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
-*.loT
-*.o
-*~
-
diff --git a/backends/apt/Makefile.am b/backends/apt/Makefile.am
index 044295a..14e913d 100644
--- a/backends/apt/Makefile.am
+++ b/backends/apt/Makefile.am
@@ -33,3 +33,5 @@ install-data-hook:
clean-local :
rm -f *~
rm -f *.pyc
+
+-include $(top_srcdir)/git.mk
diff --git a/backends/aptcc/.gitignore b/backends/aptcc/.gitignore
deleted file mode 100644
index 8a8544c..0000000
--- a/backends/aptcc/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.deps
-
diff --git a/backends/aptcc/Makefile.am b/backends/aptcc/Makefile.am
index c7b34fd..a8993f1 100644
--- a/backends/aptcc/Makefile.am
+++ b/backends/aptcc/Makefile.am
@@ -46,3 +46,5 @@ install-data-hook:
clean-local :
rm -f *~
rm -f *.pyc
+
+-include $(top_srcdir)/git.mk
diff --git a/backends/box/.gitignore b/backends/box/.gitignore
deleted file mode 100644
index c851833..0000000
--- a/backends/box/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
-*.loT
-*.o
-*~
-
diff --git a/backends/box/Makefile.am b/backends/box/Makefile.am
index 23bd9bf..4a98427 100644
--- a/backends/box/Makefile.am
+++ b/backends/box/Makefile.am
@@ -9,3 +9,5 @@ libpk_backend_box_la_LDFLAGS = -module -avoid-version
libpk_backend_box_la_CFLAGS = $(PK_PLUGIN_CFLAGS) $(WARNINGFLAGS_C)
libpk_backend_box_la_INCLUDES = $(BOX_CFLAGS)
+
+-include $(top_srcdir)/git.mk
diff --git a/backends/conary/.gitignore b/backends/conary/.gitignore
deleted file mode 100644
index 03a0663..0000000
--- a/backends/conary/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
-*.loT
-*.o
-*~
-*.pyc
diff --git a/backends/conary/Makefile.am b/backends/conary/Makefile.am
index 7a3fed3..344d339 100644
--- a/backends/conary/Makefile.am
+++ b/backends/conary/Makefile.am
@@ -26,3 +26,5 @@ install-data-hook:
clean-local :
rm -f *~
+
+-include $(top_srcdir)/git.mk
diff --git a/backends/dummy/.gitignore b/backends/dummy/.gitignore
deleted file mode 100644
index c851833..0000000
--- a/backends/dummy/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
-*.loT
-*.o
-*~
-
diff --git a/backends/dummy/Makefile.am b/backends/dummy/Makefile.am
index 8cce1a2..e8cb813 100644
--- a/backends/dummy/Makefile.am
+++ b/backends/dummy/Makefile.am
@@ -8,3 +8,5 @@ libpk_backend_dummy_la_LIBADD = $(PK_PLUGIN_LIBS)
libpk_backend_dummy_la_LDFLAGS = -module -avoid-version
libpk_backend_dummy_la_CFLAGS = $(PK_PLUGIN_CFLAGS) $(WARNINGFLAGS_C)
+
+-include $(top_srcdir)/git.mk
diff --git a/backends/entropy/Makefile.am b/backends/entropy/Makefile.am
index 4897780..0312308 100644
--- a/backends/entropy/Makefile.am
+++ b/backends/entropy/Makefile.am
@@ -17,3 +17,5 @@ install-data-hook:
clean-local :
rm -f *~
rm -f *.pyc
+
+-include $(top_srcdir)/git.mk
diff --git a/backends/opkg/.gitignore b/backends/opkg/.gitignore
deleted file mode 100644
index c851833..0000000
--- a/backends/opkg/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
-*.loT
-*.o
-*~
-
diff --git a/backends/opkg/Makefile.am b/backends/opkg/Makefile.am
index 7959b95..fae638d 100644
--- a/backends/opkg/Makefile.am
+++ b/backends/opkg/Makefile.am
@@ -9,3 +9,5 @@ libpk_backend_opkg_la_LIBADD = $(PK_PLUGIN_LIBS) $(OPKG_LIBS)
libpk_backend_opkg_la_LDFLAGS = -module -avoid-version
libpk_backend_opkg_la_CFLAGS = $(PK_PLUGIN_CFLAGS) $(OPKG_CFLAGS) $(WARNINGFLAGS_C)
+
+-include $(top_srcdir)/git.mk
diff --git a/backends/pisi/.gitignore b/backends/pisi/.gitignore
deleted file mode 100644
index 03a0663..0000000
--- a/backends/pisi/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
-*.loT
-*.o
-*~
-*.pyc
diff --git a/backends/pisi/Makefile.am b/backends/pisi/Makefile.am
index 33b0154..f02dd5c 100644
--- a/backends/pisi/Makefile.am
+++ b/backends/pisi/Makefile.am
@@ -18,3 +18,5 @@ install-data-hook:
clean-local :
rm -f *~
+
+-include $(top_srcdir)/git.mk
diff --git a/backends/poldek/.gitignore b/backends/poldek/.gitignore
deleted file mode 100644
index c851833..0000000
--- a/backends/poldek/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
-*.loT
-*.o
-*~
-
diff --git a/backends/poldek/Makefile.am b/backends/poldek/Makefile.am
index 6208d6e..74d07e4 100644
--- a/backends/poldek/Makefile.am
+++ b/backends/poldek/Makefile.am
@@ -7,3 +7,5 @@ libpk_backend_poldek_la_SOURCES = pk-backend-poldek.c
libpk_backend_poldek_la_LIBADD = $(PK_PLUGIN_LIBS) $(POLDEK_LIBS)
libpk_backend_poldek_la_LDFLAGS = -module -avoid-version
libpk_backend_poldek_la_CFLAGS = $(PK_PLUGIN_CFLAGS) $(POLDEK_CFLAGS) $(WARNINGFLAGS_C)
+
+-include $(top_srcdir)/git.mk
diff --git a/backends/portage/.gitignore b/backends/portage/.gitignore
deleted file mode 100644
index c851833..0000000
--- a/backends/portage/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
-*.loT
-*.o
-*~
-
diff --git a/backends/portage/Makefile.am b/backends/portage/Makefile.am
index 381bcb1..cd15ce6 100644
--- a/backends/portage/Makefile.am
+++ b/backends/portage/Makefile.am
@@ -17,3 +17,5 @@ install-data-hook:
clean-local :
rm -f *~
rm -f *.pyc
+
+-include $(top_srcdir)/git.mk
diff --git a/backends/ports/.gitignore b/backends/ports/.gitignore
deleted file mode 100644
index a8be826..0000000
--- a/backends/ports/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs/
-*.la
-*.lo
-*.o
-
diff --git a/backends/ports/Makefile.am b/backends/ports/Makefile.am
index 89c9ba4..cf6bd56 100644
--- a/backends/ports/Makefile.am
+++ b/backends/ports/Makefile.am
@@ -18,3 +18,5 @@ install-data-hook:
clean-local :
rm -f *~
+
+-include $(top_srcdir)/git.mk
diff --git a/backends/ports/helpers/Makefile.am b/backends/ports/helpers/Makefile.am
index 2635ce5..829314c 100644
--- a/backends/ports/helpers/Makefile.am
+++ b/backends/ports/helpers/Makefile.am
@@ -13,3 +13,5 @@ install-data-hook:
clean-local :
rm -f *~
+
+-include $(top_srcdir)/git.mk
diff --git a/backends/ports/ruby_packagekit/Makefile.am b/backends/ports/ruby_packagekit/Makefile.am
index 87db75e..1474f60 100644
--- a/backends/ports/ruby_packagekit/Makefile.am
+++ b/backends/ports/ruby_packagekit/Makefile.am
@@ -10,3 +10,5 @@ dist_helper_DATA = \
clean-local :
rm -f *~
+
+-include $(top_srcdir)/git.mk
diff --git a/backends/razor/.gitignore b/backends/razor/.gitignore
deleted file mode 100644
index c851833..0000000
--- a/backends/razor/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
-*.loT
-*.o
-*~
-
diff --git a/backends/razor/Makefile.am b/backends/razor/Makefile.am
index 9734fb5..4a8d972 100644
--- a/backends/razor/Makefile.am
+++ b/backends/razor/Makefile.am
@@ -9,3 +9,5 @@ libpk_backend_razor_la_LIBADD = $(PK_PLUGIN_LIBS) $(RAZOR_LIBS)
libpk_backend_razor_la_LDFLAGS = -module -avoid-version
libpk_backend_razor_la_CFLAGS = $(PK_PLUGIN_CFLAGS) $(RAZOR_CFLAGS) $(WARNINGFLAGS_C)
+
+-include $(top_srcdir)/git.mk
diff --git a/backends/slapt/.gitignore b/backends/slapt/.gitignore
deleted file mode 100644
index 8a8544c..0000000
--- a/backends/slapt/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.deps
-
diff --git a/backends/slapt/Makefile.am b/backends/slapt/Makefile.am
index 4b04c3b..8a1f87f 100644
--- a/backends/slapt/Makefile.am
+++ b/backends/slapt/Makefile.am
@@ -8,3 +8,5 @@ libpk_backend_slapt_la_LIBADD = $(PK_PLUGIN_LIBS) $(SLAPT_LIBS)
libpk_backend_slapt_la_LDFLAGS = -module -avoid-version
libpk_backend_slapt_la_CFLAGS = $(PK_PLUGIN_CFLAGS) $(WARNINGFLAGS_C)
libpk_backend_slapt_la_INCLUDES = $(SLAPT_CFLAGS)
+
+-include $(top_srcdir)/git.mk
diff --git a/backends/smart/.gitignore b/backends/smart/.gitignore
deleted file mode 100644
index 0c620eb..0000000
--- a/backends/smart/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.deps
-.libs
-*.la
-*.lo
-*.o
diff --git a/backends/smart/Makefile.am b/backends/smart/Makefile.am
index a7ccce6..32fbecb 100644
--- a/backends/smart/Makefile.am
+++ b/backends/smart/Makefile.am
@@ -15,3 +15,5 @@ libpk_backend_smart_la_CFLAGS = $(PK_PLUGIN_CFLAGS) $(WARNINGFLAGS_C)
install-data-hook:
chmod a+rx $(DESTDIR)$(helperdir)/*.py
+
+-include $(top_srcdir)/git.mk
diff --git a/backends/test/.gitignore b/backends/test/.gitignore
deleted file mode 100644
index f52b70c..0000000
--- a/backends/test/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
-*.loT
-*.o
-*~
diff --git a/backends/test/Makefile.am b/backends/test/Makefile.am
index 63a1661..d2a89a7 100644
--- a/backends/test/Makefile.am
+++ b/backends/test/Makefile.am
@@ -35,3 +35,5 @@ libpk_backend_test_thread_la_LIBADD = $(PK_PLUGIN_LIBS)
libpk_backend_test_thread_la_LDFLAGS = -module -avoid-version
libpk_backend_test_thread_la_CFLAGS = $(PK_PLUGIN_CFLAGS) $(WARNINGFLAGS_C)
+
+-include $(top_srcdir)/git.mk
diff --git a/backends/test/helpers/.gitignore b/backends/test/helpers/.gitignore
deleted file mode 100644
index b3c1d25..0000000
--- a/backends/test/helpers/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-org.freedesktop.PackageKitDbus.service
-
diff --git a/backends/test/helpers/Makefile.am b/backends/test/helpers/Makefile.am
index 9083724..bb7fd81 100644
--- a/backends/test/helpers/Makefile.am
+++ b/backends/test/helpers/Makefile.am
@@ -13,3 +13,5 @@ install-data-hook:
clean-local :
rm -f *~
+
+-include $(top_srcdir)/git.mk
diff --git a/backends/urpmi/.gitignore b/backends/urpmi/.gitignore
deleted file mode 100644
index f52b70c..0000000
--- a/backends/urpmi/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
-*.loT
-*.o
-*~
diff --git a/backends/urpmi/Makefile.am b/backends/urpmi/Makefile.am
index aebf025..3c35e27 100644
--- a/backends/urpmi/Makefile.am
+++ b/backends/urpmi/Makefile.am
@@ -12,3 +12,5 @@ libpk_backend_urpmi_la_CFLAGS = $(PK_PLUGIN_CFLAGS) $(WARNINGFLAGS_C)
clean-local:
rm -f *.gcno
+
+-include $(top_srcdir)/git.mk
diff --git a/backends/urpmi/helpers/Makefile.am b/backends/urpmi/helpers/Makefile.am
index aba39ec..6c3e4d7 100644
--- a/backends/urpmi/helpers/Makefile.am
+++ b/backends/urpmi/helpers/Makefile.am
@@ -14,3 +14,5 @@ install-data-hook:
clean-local :
rm -f *~
+
+-include $(top_srcdir)/git.mk
diff --git a/backends/urpmi/helpers/perl_packagekit/Makefile.am b/backends/urpmi/helpers/perl_packagekit/Makefile.am
index 6ed63b5..e6e26cb 100644
--- a/backends/urpmi/helpers/perl_packagekit/Makefile.am
+++ b/backends/urpmi/helpers/perl_packagekit/Makefile.am
@@ -10,3 +10,5 @@ dist_helper_DATA = \
clean-local :
rm -f *~
+
+-include $(top_srcdir)/git.mk
diff --git a/backends/urpmi/helpers/urpmi_backend/Makefile.am b/backends/urpmi/helpers/urpmi_backend/Makefile.am
index 3eb8280..334f8e1 100644
--- a/backends/urpmi/helpers/urpmi_backend/Makefile.am
+++ b/backends/urpmi/helpers/urpmi_backend/Makefile.am
@@ -2,14 +2,15 @@ helperdir = $(datadir)/PackageKit/helpers/urpmi/urpmi_backend/
NULL =
-dist_helper_DATA = \
- actions.pm \
- filters.pm \
- groups.pm \
- open_db.pm \
- tools.pm \
+dist_helper_DATA = \
+ actions.pm \
+ filters.pm \
+ groups.pm \
+ open_db.pm \
+ tools.pm \
$(NULL)
clean-local :
rm -f *~
+-include $(top_srcdir)/git.mk
diff --git a/backends/yum/.gitignore b/backends/yum/.gitignore
deleted file mode 100644
index 25e0c4c..0000000
--- a/backends/yum/.gitignore
+++ /dev/null
@@ -1,12 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
-*.loT
-*.o
-*~
-*.pyc
-test
-
diff --git a/backends/yum/Makefile.am b/backends/yum/Makefile.am
index 21883b6..e484cf5 100644
--- a/backends/yum/Makefile.am
+++ b/backends/yum/Makefile.am
@@ -32,3 +32,5 @@ clean-local:
rm -f *.gcno
rm -f *~
+
+-include $(top_srcdir)/git.mk
diff --git a/backends/zif/.gitignore b/backends/zif/.gitignore
deleted file mode 100644
index 9c0e66e..0000000
--- a/backends/zif/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.libs
diff --git a/backends/zif/Makefile.am b/backends/zif/Makefile.am
index a19855f..95cf6d3 100644
--- a/backends/zif/Makefile.am
+++ b/backends/zif/Makefile.am
@@ -25,3 +25,5 @@ EXTRA_DIST = \
clean-local:
rm -f *~
+
+-include $(top_srcdir)/git.mk
diff --git a/backends/zypp/.gitignore b/backends/zypp/.gitignore
deleted file mode 100644
index c851833..0000000
--- a/backends/zypp/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
-*.loT
-*.o
-*~
-
diff --git a/backends/zypp/Makefile.am b/backends/zypp/Makefile.am
index dcf88d7..fe5fec8 100644
--- a/backends/zypp/Makefile.am
+++ b/backends/zypp/Makefile.am
@@ -16,3 +16,5 @@ EXTRA_DIST = \
zypp-utils.h \
zypp-events.h
+
+-include $(top_srcdir)/git.mk
diff --git a/client/.gitignore b/client/.gitignore
deleted file mode 100644
index 604f5d4..0000000
--- a/client/.gitignore
+++ /dev/null
@@ -1,20 +0,0 @@
-.deps
-.libs
-*.a
-*.o
-pk-marshal.h
-pk-marshal.c
-pkcon
-pkcon-test
-pkmon
-pkmon-test
-pkgenpack
-pkgenpack-test
-pk-self-test
-*.glade.bak
-*.gladep
-*.gladep.bak
-*.servicepack
-manpage.*
-*.1
-
diff --git a/client/Makefile.am b/client/Makefile.am
index fa5f526..a1bff21 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -114,7 +114,7 @@ clean-local:
rm -f manpage.*
rm -f *.out
-CLEANFILES = $(BUILT_SOURCES)
+CLEANFILES = $(BUILT_SOURCES) $(man_MANS)
DISTCLEANFILES = \
$(NULL)
@@ -124,3 +124,5 @@ MAINTAINERCLEANFILES = \
Makefile.in \
$(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index f043b25..1bcf965 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -46,3 +46,5 @@ EXTRA_DIST=$(script_SCRIPTS)
scriptdir = $(bindir)
+
+-include $(top_srcdir)/git.mk
diff --git a/contrib/browser-plugin/.gitignore b/contrib/browser-plugin/.gitignore
deleted file mode 100644
index 7ec02d6..0000000
--- a/contrib/browser-plugin/.gitignore
+++ /dev/null
@@ -1,25 +0,0 @@
-\COPYING
-INSTALL
-LIBS
-aclocal.m4
-autom4te.cache
-config.*
-configure
-depcomp
-install-sh
-intltool-*
-libtool
-ltmain.sh
-missing
-Makefile
-Makefile.in
-stamp-h1
-.deps
-.libs
-*.lo
-*.o
-*.la
-po/Makefile*
-po/POTFILES
-po/stamp-it
-
diff --git a/contrib/browser-plugin/Makefile.am b/contrib/browser-plugin/Makefile.am
index 2b469e6..bc515b9 100644
--- a/contrib/browser-plugin/Makefile.am
+++ b/contrib/browser-plugin/Makefile.am
@@ -32,3 +32,5 @@ packagekit_plugin_la_SOURCES = \
EXTRA_DIST = \
tests/test.html
+
+-include $(top_srcdir)/git.mk
diff --git a/contrib/command-not-found/.gitignore b/contrib/command-not-found/.gitignore
deleted file mode 100644
index 9888bf7..0000000
--- a/contrib/command-not-found/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-*.o
-pk-command-not-found
-pk-command-not-found-test
-PackageKit.sh
-
diff --git a/contrib/command-not-found/Makefile.am b/contrib/command-not-found/Makefile.am
index 53c5f7e..69930ff 100644
--- a/contrib/command-not-found/Makefile.am
+++ b/contrib/command-not-found/Makefile.am
@@ -49,3 +49,5 @@ dist_conf_DATA = CommandNotFound.conf
EXTRA_DIST = PackageKit.sh.in
CLEANFILES = PackageKit.sh
+
+-include $(top_srcdir)/git.mk
diff --git a/contrib/cron/.gitignore b/contrib/cron/.gitignore
deleted file mode 100644
index 8b13789..0000000
--- a/contrib/cron/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/contrib/cron/Makefile.am b/contrib/cron/Makefile.am
index a950847..43a1e73 100644
--- a/contrib/cron/Makefile.am
+++ b/contrib/cron/Makefile.am
@@ -9,3 +9,5 @@ EXTRA_DIST = \
packagekit-background.cron \
$(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/contrib/debuginfo-install/.gitignore b/contrib/debuginfo-install/.gitignore
deleted file mode 100644
index 59b3b82..0000000
--- a/contrib/debuginfo-install/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-*.o
-pk-debuginfo-install
-manpage.*
-*.1
-
diff --git a/contrib/debuginfo-install/Makefile.am b/contrib/debuginfo-install/Makefile.am
index c4b3a9f..d60a37e 100644
--- a/contrib/debuginfo-install/Makefile.am
+++ b/contrib/debuginfo-install/Makefile.am
@@ -47,9 +47,13 @@ pk_debuginfo_install_CFLAGS = \
$(WARNINGFLAGS_C) \
$(NULL)
+CLEANFILES = $(man_MANS)
+
clean-local:
rm -f *~
rm -f *.1
rm -f manpage.*
rm -f *.out
+
+-include $(top_srcdir)/git.mk
diff --git a/contrib/device-rebind/.gitignore b/contrib/device-rebind/.gitignore
deleted file mode 100644
index f69b650..0000000
--- a/contrib/device-rebind/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-*.o
-pk-device-rebind
-manpage.*
-*.1
-
diff --git a/contrib/device-rebind/Makefile.am b/contrib/device-rebind/Makefile.am
index 1bd90c5..a7e24e0 100644
--- a/contrib/device-rebind/Makefile.am
+++ b/contrib/device-rebind/Makefile.am
@@ -38,9 +38,13 @@ pk_device_rebind_CFLAGS = \
-DG_UDEV_API_IS_SUBJECT_TO_CHANGE \
$(NULL)
+CLEANFILES = $(man_MANS)
+
clean-local:
rm -f *~
rm -f *.1
rm -f manpage.*
rm -f *.out
+
+-include $(top_srcdir)/git.mk
diff --git a/contrib/gstreamer-plugin/.gitignore b/contrib/gstreamer-plugin/.gitignore
deleted file mode 100644
index 64d8ffa..0000000
--- a/contrib/gstreamer-plugin/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.deps
-.libs
-*.o
-pk-gstreamer-install
-
diff --git a/contrib/gstreamer-plugin/Makefile.am b/contrib/gstreamer-plugin/Makefile.am
index e264aaf..6b1b279 100644
--- a/contrib/gstreamer-plugin/Makefile.am
+++ b/contrib/gstreamer-plugin/Makefile.am
@@ -50,3 +50,5 @@ MAINTAINERCLEANFILES = \
Makefile.in \
$(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/contrib/gtk-module/.gitignore b/contrib/gtk-module/.gitignore
deleted file mode 100644
index 60a9816..0000000
--- a/contrib/gtk-module/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-*.o
-*.la
-*.lo
-
diff --git a/contrib/gtk-module/Makefile.am b/contrib/gtk-module/Makefile.am
index 861b761..4a264db 100644
--- a/contrib/gtk-module/Makefile.am
+++ b/contrib/gtk-module/Makefile.am
@@ -12,3 +12,5 @@ EXTRA_DIST = \
README \
GLASS.txt
+
+-include $(top_srcdir)/git.mk
diff --git a/contrib/gtk-module/gtk-2.0/Makefile.am b/contrib/gtk-module/gtk-2.0/Makefile.am
index 5397a08..6bee7c8 100644
--- a/contrib/gtk-module/gtk-2.0/Makefile.am
+++ b/contrib/gtk-module/gtk-2.0/Makefile.am
@@ -8,3 +8,5 @@ libpk_gtk_module_la_CFLAGS = $(PK_GTK_MODULE_GTK2_CFLAGS) $(WARNINGFLAGS_C)
clean-local:
rm -f *~
+
+-include $(top_srcdir)/git.mk
diff --git a/contrib/gtk-module/gtk-3.0/Makefile.am b/contrib/gtk-module/gtk-3.0/Makefile.am
index a5e1f4e..6599b5f 100644
--- a/contrib/gtk-module/gtk-3.0/Makefile.am
+++ b/contrib/gtk-module/gtk-3.0/Makefile.am
@@ -14,3 +14,5 @@ clean-local:
local: all
GTK_MODULES="$$GTK_MODULES:$$PWD/.libs/libpk-gtk-module.so" $(APP)
+
+-include $(top_srcdir)/git.mk
diff --git a/contrib/pm-utils/Makefile.am b/contrib/pm-utils/Makefile.am
index 919b135..439c6d1 100644
--- a/contrib/pm-utils/Makefile.am
+++ b/contrib/pm-utils/Makefile.am
@@ -8,3 +8,5 @@ EXTRA_DIST = \
install-data-hook:
chmod a+x $(DESTDIR)$(libdir)/pm-utils/sleep.d/95packagekit;
+
+-include $(top_srcdir)/git.mk
diff --git a/contrib/yum-packagekit/Makefile.am b/contrib/yum-packagekit/Makefile.am
index f20b2ab..8a6ad80 100644
--- a/contrib/yum-packagekit/Makefile.am
+++ b/contrib/yum-packagekit/Makefile.am
@@ -4,3 +4,5 @@ dist_yumconf_DATA = refresh-packagekit.conf
yumplugindir = ${PK_YUM_PLUGIN_DIR}
dist_yumplugin_DATA = refresh-packagekit.py
+
+-include $(top_srcdir)/git.mk
diff --git a/data/.gitignore b/data/.gitignore
deleted file mode 100644
index e16ddd1..0000000
--- a/data/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-org.freedesktop.PackageKit.service
-packagekit-*.xml
-
diff --git a/data/Makefile.am b/data/Makefile.am
index 7bd5c4c..742ed5e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -65,3 +65,5 @@ MAINTAINERCLEANFILES = \
Makefile.in \
$(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/data/tests/.gitignore b/data/tests/.gitignore
deleted file mode 100644
index 7f1b6a5..0000000
--- a/data/tests/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-.deps
-.libs
-*.o
-
diff --git a/data/tests/Makefile.am b/data/tests/Makefile.am
index cee4377..058ed3c 100644
--- a/data/tests/Makefile.am
+++ b/data/tests/Makefile.am
@@ -26,3 +26,5 @@ MAINTAINERCLEANFILES = \
Makefile.in \
$(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/docs/.gitignore b/docs/.gitignore
deleted file mode 100644
index 4289090..0000000
--- a/docs/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile.in
-Makefile
-packagekit-qt
-
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 39026b7..cc1c6dd 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -2,6 +2,9 @@ NULL =
SUBDIRS = \
api \
- html \
- $(NULL)
+ html
+MAINTAINERCLEANFILES = \
+ packagekit-qt
+
+-include $(top_srcdir)/git.mk
diff --git a/docs/api/.gitignore b/docs/api/.gitignore
deleted file mode 100644
index 3c13afb..0000000
--- a/docs/api/.gitignore
+++ /dev/null
@@ -1,25 +0,0 @@
-Makefile.in
-Makefile.libs
-.libs
-*.bak
-*.gcno
-*.out
-*.txt
-tmpl
-xml
-html
-html-build.stamp
-html.stamp
-PackageKit-docs.xml
-PackageKit.args
-PackageKit.hierarchy
-PackageKit.interfaces
-PackageKit.prerequisites
-PackageKit.signals
-PackageKit.types
-scan-build.stamp
-sgml-build.stamp
-sgml.stamp
-tmpl-build.stamp
-tmpl.stamp
-version.xml
diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am
index 35e5eb3..75d7397 100644
--- a/docs/api/Makefile.am
+++ b/docs/api/Makefile.am
@@ -61,9 +61,8 @@ HTML_IMAGES = \
# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
content_files = \
version.xml \
- dbus/org.freedesktop.PackageKit.ref.xml \
- dbus/org.freedesktop.PackageKit.Transaction.ref.xml \
- $(NULL)
+ dbus/org.freedesktop.PackageKit.ref.xml \
+ dbus/org.freedesktop.PackageKit.Transaction.ref.xml
# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
# These files must be listed here *and* in content_files
@@ -99,3 +98,19 @@ include $(top_srcdir)/gtk-doc.make
# Other files to distribute
EXTRA_DIST += version.xml.in
+CLEANFILES = \
+ *.txt \
+ *.types \
+ *.args \
+ *.hierarchy \
+ *.interfaces \
+ *.prerequisites \
+ *.signals \
+ *.stamp \
+ tmpl
+
+DISTCLEANFILES = \
+ org.freedesktop.PackageKit.ref.xml \
+ org.freedesktop.PackageKit.Transaction.ref.xml
+
+-include $(top_srcdir)/git.mk
diff --git a/docs/api/dbus/.gitignore b/docs/api/dbus/.gitignore
deleted file mode 100644
index 8a26d41..0000000
--- a/docs/api/dbus/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.ref.xml
-
diff --git a/docs/api/dbus/Makefile.am b/docs/api/dbus/Makefile.am
index 164a65e..36e4b56 100644
--- a/docs/api/dbus/Makefile.am
+++ b/docs/api/dbus/Makefile.am
@@ -11,11 +11,15 @@ org.freedesktop.PackageKit.Transaction.ref.xml : $(top_srcdir)/src/org.freedeskt
echo "<?xml version=\"1.0\"?>""<!DOCTYPE refentry PUBLIC \"-//OASIS//DTD DocBook XML V4.1.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd\">" > $@
$(XSLTPROC) $(top_srcdir)/docs/api/dbus/spec-to-docbook.xsl $< | tail -n +2 >> $@
-#$(top_srcdir)/docs/api/dbus/spec-to-docbook $(top_srcdir)/src/org.freedesktop.PackageKit.xml
-
endif
EXTRA_DIST = spec-to-docbook.xsl dbus-introspect-docs.dtd
+CLEANFILES = \
+ org.freedesktop.PackageKit.Transaction.ref.xml \
+ org.freedesktop.PackageKit.ref.xml
+
clean-local :
rm -f *~ *.ref.xml
+
+-include $(top_srcdir)/git.mk
diff --git a/docs/html/.gitignore b/docs/html/.gitignore
deleted file mode 100644
index b05de43..0000000
--- a/docs/html/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.bak
-
diff --git a/docs/html/Makefile.am b/docs/html/Makefile.am
index bbf3c4a..6e882e8 100644
--- a/docs/html/Makefile.am
+++ b/docs/html/Makefile.am
@@ -24,3 +24,5 @@ EXTRA_DIST = $(HTML_FILES)
clean-local:
rm -f *~
+
+-include $(top_srcdir)/git.mk
diff --git a/docs/html/img/Makefile.am b/docs/html/img/Makefile.am
index 0595995..c71a06b 100644
--- a/docs/html/img/Makefile.am
+++ b/docs/html/img/Makefile.am
@@ -95,3 +95,5 @@ EXTRA_DIST = $(IMAGE_FILES)
clean-local:
rm -f *~
+
+-include $(top_srcdir)/git.mk
diff --git a/docs/html/img/thumbnails/.gitignore b/docs/html/img/thumbnails/.gitignore
deleted file mode 100644
index 8b13789..0000000
--- a/docs/html/img/thumbnails/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/docs/html/img/thumbnails/Makefile.am b/docs/html/img/thumbnails/Makefile.am
index 53ac8fc..a04e287 100644
--- a/docs/html/img/thumbnails/Makefile.am
+++ b/docs/html/img/thumbnails/Makefile.am
@@ -58,3 +58,5 @@ clean-local:
rm -f *~
+
+-include $(top_srcdir)/git.mk
diff --git a/docs/html/videos/Makefile.am b/docs/html/videos/Makefile.am
index 94738d2..7553b7e 100644
--- a/docs/html/videos/Makefile.am
+++ b/docs/html/videos/Makefile.am
@@ -13,3 +13,5 @@ EXTRA_DIST = \
clean-local:
rm -f *~
+
+-include $(top_srcdir)/git.mk
diff --git a/etc/.gitignore b/etc/.gitignore
deleted file mode 100644
index 3475160..0000000
--- a/etc/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-PackageKit.conf
-
diff --git a/etc/Makefile.am b/etc/Makefile.am
index a37b789..249b604 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -25,3 +25,5 @@ EXTRA_DIST = \
DISTCLEANFILES = \
PackageKit.conf
+
+-include $(top_srcdir)/git.mk
diff --git a/git.mk b/git.mk
new file mode 100644
index 0000000..abd6c0a
--- /dev/null
+++ b/git.mk
@@ -0,0 +1,200 @@
+# git.mk
+#
+# Copyright 2009, Red Hat, Inc.
+# Written by Behdad Esfahbod
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.
+#
+# The canonical source for this file is pango/git.mk, or whereever the
+# header of pango/git.mk suggests in the future.
+#
+# To use in your project, import this file in your git repo's toplevel,
+# then do "make -f git.mk". This modifies all Makefile.am files in
+# your project to include git.mk.
+#
+# This enables automatic .gitignore generation. If you need to ignore
+# more files, add them to the GITIGNOREFILES variable in your Makefile.am.
+# But think twice before doing that. If a file has to be in .gitignore,
+# chances are very high that it's a generated file and should be in one
+# of MOSTLYCLEANFILES, CLEANFILES, DISTCLEANFILES, or MAINTAINERCLEANFILES.
+#
+# The only case that you need to manually add a file to GITIGNOREFILES is
+# when remove files in one of mostlyclean-local, clean-local, distclean-local,
+# or maintainer-clean-local.
+#
+# Note that for files like editor backup, etc, there are better places to
+# ignore them. See "man gitignore".
+#
+# If "make maintainer-clean" removes the files but they are not recognized
+# by this script (that is, if "git status" shows untracked files still), send
+# me the output of "git status" as well as your Makefile.am and Makefile for
+# the directories involved.
+#
+# For a list of toplevel files that should be in MAINTAINERCLEANFILES, see
+# pango/Makefile.am.
+#
+# Don't EXTRA_DIST this file. It is supposed to only live in git clones,
+# not tarballs. It serves no useful purpose in tarballs and clutters the
+# build dir.
+#
+# This file knows how to handle autoconf, automake, libtool, gtk-doc,
+# gnome-doc-utils, mallard, intltool, gsettings.
+#
+#
+# KNOWN ISSUES:
+#
+# - Recursive configure doesn't work as $(top_srcdir)/git.mk inside the
+# submodule doesn't find us. If you have configure.{in,ac} files in
+# subdirs, add a proxy git.mk file in those dirs that simply does:
+# "include $(top_srcdir)/../git.mk". Add more ..'s to your taste.
+# And add those files to git. See vte/gnome-pty-helper/git.mk for
+# example.
+#
+# ChangeLog
+#
+# - 2010-12-06 Add support for Mallard docs
+# - 2010-12-06 Start this change log
+
+git-all: git-mk-install
+
+git-mk-install:
+ @echo Installing git makefile
+ @any_failed=; find $(top_srcdir) -name Makefile.am | while read x; do \
+ if grep 'include .*/git.mk' $$x >/dev/null; then \
+ echo $$x already includes git.mk; \
+ else \
+ failed=; \
+ echo "Updating $$x"; \
+ { cat $$x; \
+ echo ''; \
+ echo '-include $$(top_srcdir)/git.mk'; \
+ } > $$x.tmp || failed=1; \
+ if test x$$failed = x; then \
+ mv $$x.tmp $$x || failed=1; \
+ fi; \
+ if test x$$failed = x; then : else \
+ echo Failed updating $$x; >&2 \
+ any_failed=1; \
+ fi; \
+ fi; done; test -z "$$any_failed"
+
+.PHONY: git-all git-mk-install
+
+
+### .gitignore generation
+
+$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
+ $(AM_V_GEN) \
+ { \
+ if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \
+ for x in \
+ $(DOC_MODULE)-decl-list.txt \
+ $(DOC_MODULE)-decl.txt \
+ tmpl/$(DOC_MODULE)-unused.sgml \
+ "tmpl/*.bak" \
+ xml html \
+ ; do echo /$$x; done; \
+ fi; \
+ if test "x$(DOC_MODULE)$(DOC_ID)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
+ for x in \
+ $(_DOC_C_DOCS) \
+ $(_DOC_LC_DOCS) \
+ $(_DOC_OMF_ALL) \
+ $(_DOC_DSK_ALL) \
+ $(_DOC_HTML_ALL) \
+ $(_DOC_MOFILES) \
+ $(_DOC_POFILES) \
+ $(DOC_H_FILE) \
+ "*/.xml2po.mo" \
+ "*/*.omf.out" \
+ ; do echo /$$x; done; \
+ fi; \
+ if test "x$(gsettings_SCHEMAS)" = x; then :; else \
+ for x in \
+ $(gsettings_SCHEMAS:.xml=.valid) \
+ $(gsettings__enum_file) \
+ ; do echo /$$x; done; \
+ fi; \
+ if test -f $(srcdir)/po/Makefile.in.in; then \
+ for x in \
+ po/Makefile.in.in \
+ po/Makefile.in \
+ po/Makefile \
+ po/POTFILES \
+ po/stamp-it \
+ po/.intltool-merge-cache \
+ "po/*.gmo" \
+ "po/*.mo" \
+ po/$(GETTEXT_PACKAGE).pot \
+ intltool-extract.in \
+ intltool-merge.in \
+ intltool-update.in \
+ ; do echo /$$x; done; \
+ fi; \
+ if test -f $(srcdir)/configure; then \
+ for x in \
+ autom4te.cache \
+ configure \
+ config.h \
+ stamp-h1 \
+ libtool \
+ config.lt \
+ ; do echo /$$x; done; \
+ fi; \
+ for x in \
+ .gitignore \
+ $(GITIGNOREFILES) \
+ $(CLEANFILES) \
+ $(PROGRAMS) \
+ $(check_PROGRAMS) \
+ $(EXTRA_PROGRAMS) \
+ $(LTLIBRARIES) \
+ so_locations \
+ .libs _libs \
+ $(MOSTLYCLEANFILES) \
+ "*.$(OBJEXT)" \
+ "*.lo" \
+ $(DISTCLEANFILES) \
+ $(am__CONFIG_DISTCLEAN_FILES) \
+ $(CONFIG_CLEAN_FILES) \
+ TAGS ID GTAGS GRTAGS GSYMS GPATH tags \
+ "*.tab.c" \
+ $(MAINTAINERCLEANFILES) \
+ $(BUILT_SOURCES) \
+ $(DEPDIR) \
+ Makefile \
+ Makefile.in \
+ "*.orig" \
+ "*.rej" \
+ "*.bak" \
+ "*~" \
+ ".*.sw[nop]" \
+ ".dirstamp" \
+ ; do echo /$$x; done; \
+ } | \
+ sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
+ sed 's@/[.]/@/@g' | \
+ LC_ALL=C sort | uniq > $@.tmp && \
+ mv $@.tmp $@;
+
+all: $(srcdir)/.gitignore gitignore-recurse-maybe
+gitignore-recurse-maybe:
+ @if test "x$(SUBDIRS)" = "x$(DIST_SUBDIRS)"; then :; else \
+ $(MAKE) $(AM_MAKEFLAGS) gitignore-recurse; \
+ fi;
+gitignore-recurse:
+ @for subdir in $(DIST_SUBDIRS); do \
+ case " $(SUBDIRS) " in \
+ *" $$subdir "*) :;; \
+ *) test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse || echo "Skipping $$subdir");; \
+ esac; \
+ done
+gitignore: $(srcdir)/.gitignore gitignore-recurse
+
+maintainer-clean: gitignore-clean
+gitignore-clean:
+ -rm -f $(srcdir)/.gitignore
+
+.PHONY: gitignore-clean gitignore gitignore-recurse gitignore-recurse-maybe
diff --git a/lib/.gitignore b/lib/.gitignore
deleted file mode 100644
index 36363e7..0000000
--- a/lib/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.deps
-.libs
-
diff --git a/lib/Makefile.am b/lib/Makefile.am
index abdd724..974bab7 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -7,3 +7,5 @@ endif
if PK_BUILD_QT
SUBDIRS += packagekit-qt2
endif
+
+-include $(top_srcdir)/git.mk
diff --git a/lib/packagekit-glib2/.gitignore b/lib/packagekit-glib2/.gitignore
deleted file mode 100644
index 7fb56f6..0000000
--- a/lib/packagekit-glib2/.gitignore
+++ /dev/null
@@ -1,17 +0,0 @@
-.deps
-.libs
-*.a
-*.o
-*.la
-*.lo
-*-marshal.c
-*-marshal.h
-pk-self-test
-pk-socket-example
-*.loT
-*.db
-*.sh
-pk-version.h
-*.gir
-*.typelib
-
diff --git a/lib/packagekit-glib2/Makefile.am b/lib/packagekit-glib2/Makefile.am
index 35ad6b5..d36083a 100644
--- a/lib/packagekit-glib2/Makefile.am
+++ b/lib/packagekit-glib2/Makefile.am
@@ -235,7 +235,7 @@ pk-marshal.c: pk-marshal.list
pk-marshal.h: pk-marshal.list
@GLIB_GENMARSHAL@ $< --prefix=pk_marshal --header > $@
-CLEANFILES = $(BUILT_SOURCES)
+CLEANFILES = $(BUILT_SOURCES) *.a
if HAVE_INTROSPECTION
introspection_sources = $(libpackagekit_glib2_la_SOURCES)
@@ -266,3 +266,5 @@ clean-local:
rm -f *~
rm -f $(CLEANFILES)
+
+-include $(top_srcdir)/git.mk
diff --git a/lib/packagekit-qt/.gitignore b/lib/packagekit-qt/.gitignore
deleted file mode 100644
index 82d1baf..0000000
--- a/lib/packagekit-qt/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-CMakeFiles
-*.cmake
-
diff --git a/lib/packagekit-qt/Makefile.am b/lib/packagekit-qt/Makefile.am
index e7b8b39..dc6fe8a 100644
--- a/lib/packagekit-qt/Makefile.am
+++ b/lib/packagekit-qt/Makefile.am
@@ -9,3 +9,5 @@ EXTRA_DIST = \
packagekit-qt.pc.in \
Doxyfile
+
+-include $(top_srcdir)/git.mk
diff --git a/lib/packagekit-qt/modules/.gitignore b/lib/packagekit-qt/modules/.gitignore
deleted file mode 100644
index 15af000..0000000
--- a/lib/packagekit-qt/modules/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-CMakeFiles
-
diff --git a/lib/packagekit-qt/modules/Makefile.am b/lib/packagekit-qt/modules/Makefile.am
index f3dcab7..9a10290 100644
--- a/lib/packagekit-qt/modules/Makefile.am
+++ b/lib/packagekit-qt/modules/Makefile.am
@@ -6,3 +6,5 @@ cmakemodule_DATA = \
EXTRA_DIST = \
$(cmakemodule_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/lib/packagekit-qt/src/.gitignore b/lib/packagekit-qt/src/.gitignore
deleted file mode 100644
index f4cd64b..0000000
--- a/lib/packagekit-qt/src/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-CMakeFiles
-*.cmake
-*.moc
-*.so*
-*.la
-*.o
-*.lo
-daemonproxy.cpp
-daemonproxy.h
-dbus_proxies.stamp
-transactionproxy.cpp
-transactionproxy.h
-
diff --git a/lib/packagekit-qt/src/Makefile.am b/lib/packagekit-qt/src/Makefile.am
index 19c5264..82b0df3 100644
--- a/lib/packagekit-qt/src/Makefile.am
+++ b/lib/packagekit-qt/src/Makefile.am
@@ -114,3 +114,5 @@ dbus_proxies.stamp: ${top_srcdir}/src/org.freedesktop.PackageKit.xml ${top_srcdi
qdbusxml2cpp -c TransactionProxy -p transactionproxy -m -N ${top_srcdir}/src/org.freedesktop.PackageKit.Transaction.xml
touch $@
+
+-include $(top_srcdir)/git.mk
diff --git a/lib/packagekit-qt/test/.gitignore b/lib/packagekit-qt/test/.gitignore
deleted file mode 100644
index fb1872b..0000000
--- a/lib/packagekit-qt/test/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-CMakeFiles
-*.cmake
-*.moc
-*.o
-pk-self-test
-
diff --git a/lib/packagekit-qt/test/Makefile.am b/lib/packagekit-qt/test/Makefile.am
index 6f8bfcc..e8b53c9 100644
--- a/lib/packagekit-qt/test/Makefile.am
+++ b/lib/packagekit-qt/test/Makefile.am
@@ -63,3 +63,5 @@ MAINTAINERCLEANFILES = \
Makefile.in \
$(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/lib/packagekit-qt2/.gitignore b/lib/packagekit-qt2/.gitignore
deleted file mode 100644
index 70c2c32..0000000
--- a/lib/packagekit-qt2/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-*.moc
-*.stamp
-*.so*
-*.la
-*.o
-*.lo
-daemonproxy.cpp
-daemonproxy.h
-transactionproxy.cpp
-transactionproxy.h
diff --git a/lib/packagekit-qt2/Makefile.am b/lib/packagekit-qt2/Makefile.am
index 1bb0afa..cecfa60 100644
--- a/lib/packagekit-qt2/Makefile.am
+++ b/lib/packagekit-qt2/Makefile.am
@@ -127,3 +127,5 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = \
packagekit-qt2.pc \
$(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/lib/packagekit-qt2/modules/Makefile.am b/lib/packagekit-qt2/modules/Makefile.am
index 2ba65d7..4a74f32 100644
--- a/lib/packagekit-qt2/modules/Makefile.am
+++ b/lib/packagekit-qt2/modules/Makefile.am
@@ -5,3 +5,5 @@ cmakemodule_DATA = \
EXTRA_DIST = \
$(cmakemodule_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/lib/python/.gitignore b/lib/python/.gitignore
deleted file mode 100644
index 0d20b64..0000000
--- a/lib/python/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.pyc
diff --git a/lib/python/Makefile.am b/lib/python/Makefile.am
index 3a5cc46..285f04b 100644
--- a/lib/python/Makefile.am
+++ b/lib/python/Makefile.am
@@ -1,2 +1,4 @@
SUBDIRS = packagekit
EXTRA_DIST = enum-convertor.py
+
+-include $(top_srcdir)/git.mk
diff --git a/lib/python/packagekit/.gitignore b/lib/python/packagekit/.gitignore
deleted file mode 100644
index afcab3d..0000000
--- a/lib/python/packagekit/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.pyc
-enums.py
diff --git a/lib/python/packagekit/Makefile.am b/lib/python/packagekit/Makefile.am
index 04c9a6b..09c91cb 100644
--- a/lib/python/packagekit/Makefile.am
+++ b/lib/python/packagekit/Makefile.am
@@ -20,7 +20,12 @@ packagekitpython_PYTHON = \
misc.py \
$(NULL)
+MAINTAINERCLEANFILES = \
+ *.pyc
+
clean-local :
rm -f *.pyc
rm -f *~
+
+-include $(top_srcdir)/git.mk
diff --git a/policy/.gitignore b/policy/.gitignore
deleted file mode 100644
index c04f1d1..0000000
--- a/policy/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.o
-*~
-*.policy
-
diff --git a/policy/Makefile.am b/policy/Makefile.am
index 723268d..ebb7808 100644
--- a/policy/Makefile.am
+++ b/policy/Makefile.am
@@ -17,3 +17,5 @@ endif
clean-local :
rm -f *~
+
+-include $(top_srcdir)/git.mk
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index de90ce3..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,15 +0,0 @@
-.deps
-.libs
-*.o
-*.la
-*.lo
-pk-marshal.h
-pk-marshal.c
-org.freedesktop.PackageKit*.h
-packagekitd
-pk-self-test
-debug.log
-*.txt
-*.db
-*.sh
-
diff --git a/src/Makefile.am b/src/Makefile.am
index 3c68c80..23c4728 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -220,3 +220,5 @@ clean-local:
CLEANFILES = *~ $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/tools/.gitignore b/tools/.gitignore
deleted file mode 100644
index 6aea74c..0000000
--- a/tools/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-*.wiki
-*.tmp
-*.o
-*.sh
-pk-refresh-licenses
-
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 4d45278..6751a4e 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -22,3 +22,5 @@ clean-local:
MAINTAINERCLEANFILES = \
*~ \
Makefile.in
+
+-include $(top_srcdir)/git.mk
commit 42e6c5f0d96abcc209dfb502f7c907dc0cb2f02f
Author: Daniel Nicoletti <dantti85-pk at yahoo.com.br>
Date: Sun Jun 12 19:28:14 2011 -0300
aptcc: Better put last fix in pk_backend_initialize
diff --git a/backends/aptcc/apt.cpp b/backends/aptcc/apt.cpp
index e6db763..694b098 100644
--- a/backends/aptcc/apt.cpp
+++ b/backends/aptcc/apt.cpp
@@ -84,9 +84,6 @@ bool aptcc::init()
// _config->Set("APT::Acquire::Translation", _locale);
}
- // Disable apt-listbugs as it freezes PK
- setenv("APT_LISTBUGS_FRONTEND", "none", 1);
-
// set http proxy
http_proxy = pk_backend_get_proxy_http(m_backend);
setenv("http_proxy", http_proxy, 1);
diff --git a/backends/aptcc/pk-backend-aptcc.cpp b/backends/aptcc/pk-backend-aptcc.cpp
index 9321b8a..07e3cd1 100644
--- a/backends/aptcc/pk-backend-aptcc.cpp
+++ b/backends/aptcc/pk-backend-aptcc.cpp
@@ -73,6 +73,9 @@ pk_backend_initialize (PkBackend *backend)
g_debug ("ERROR initializing backend");
}
+ // Disable apt-listbugs as it freezes PK
+ setenv("APT_LISTBUGS_FRONTEND", "none", 1);
+
spawn = pk_backend_spawn_new ();
pk_backend_spawn_set_name (spawn, "aptcc");
}
commit 374837411a99cea618fb59152eb62ae4981cc2df
Author: Daniel Nicoletti <dantti85-pk at yahoo.com.br>
Date: Sun Jun 12 19:24:49 2011 -0300
aptcc: set env var to disable apt-listbugs closes debian bug #628835
diff --git a/backends/aptcc/apt.cpp b/backends/aptcc/apt.cpp
index 694b098..e6db763 100644
--- a/backends/aptcc/apt.cpp
+++ b/backends/aptcc/apt.cpp
@@ -84,6 +84,9 @@ bool aptcc::init()
// _config->Set("APT::Acquire::Translation", _locale);
}
+ // Disable apt-listbugs as it freezes PK
+ setenv("APT_LISTBUGS_FRONTEND", "none", 1);
+
// set http proxy
http_proxy = pk_backend_get_proxy_http(m_backend);
setenv("http_proxy", http_proxy, 1);
commit 1c1e990351ddefef77e27e68b5f915e06ce30163
Author: Daniel Nicoletti <dantti85-pk at yahoo.com.br>
Date: Sun Jun 12 02:30:28 2011 -0300
aptcc: Fix bug that resolved packages were emited as installed when they were updates
diff --git a/backends/aptcc/apt.cpp b/backends/aptcc/apt.cpp
index 74d4cf9..694b098 100644
--- a/backends/aptcc/apt.cpp
+++ b/backends/aptcc/apt.cpp
@@ -256,7 +256,8 @@ void aptcc::emit_package(const pkgCache::PkgIterator &pkg,
{
// check the state enum to see if it was not set.
if (state == PK_INFO_ENUM_UNKNOWN) {
- if (pkg->CurrentState == pkgCache::State::Installed) {
+ if (pkg->CurrentState == pkgCache::State::Installed &&
+ pkg.CurrentVer() == ver) {
state = PK_INFO_ENUM_INSTALLED;
} else {
state = PK_INFO_ENUM_AVAILABLE;
commit 8a09c32f2530267a2b7969cb50521186be0be84e
Author: Daniel Nicoletti <dantti85-pk at yahoo.com.br>
Date: Sun Jun 12 02:14:49 2011 -0300
aptcc: Fix getDetails to actually use the resolved version when displaying info, fixed debian bug #606135
diff --git a/backends/aptcc/apt.cpp b/backends/aptcc/apt.cpp
index d8873f2..74d4cf9 100644
--- a/backends/aptcc/apt.cpp
+++ b/backends/aptcc/apt.cpp
@@ -180,12 +180,14 @@ void aptcc::cancel()
}
pair<pkgCache::PkgIterator, pkgCache::VerIterator>
- aptcc::find_package_id(const gchar *package_id)
+ aptcc::find_package_id(const gchar *package_id, bool &found)
{
gchar **parts;
pkgCache::VerIterator ver;
pair<pkgCache::PkgIterator, pkgCache::VerIterator> pkg_ver;
+ found = true;
+
parts = pk_package_id_split (package_id);
pkg_ver.first = packageCache->FindPkg(parts[PK_PACKAGE_ID_NAME]);
@@ -217,6 +219,7 @@ pair<pkgCache::PkgIterator, pkgCache::VerIterator>
return pkg_ver;
}
+ found = false;
g_strfreev (parts);
return pkg_ver;
}
@@ -460,9 +463,14 @@ void aptcc::povidesCodec(vector<pair<pkgCache::PkgIterator, pkgCache::VerIterato
}
// used to emit packages it collects all the needed info
-void aptcc::emit_details(const pkgCache::PkgIterator &pkg)
+void aptcc::emit_details(const pkgCache::PkgIterator &pkg, const pkgCache::VerIterator &version)
{
- pkgCache::VerIterator ver = find_ver(pkg);
+ pkgCache::VerIterator ver;
+ if (version.end() == false) {
+ ver = version;
+ } else {
+ ver = find_ver(pkg);
+ }
std::string section = ver.Section() == NULL ? "" : ver.Section();
size_t found;
@@ -487,10 +495,10 @@ void aptcc::emit_details(const pkgCache::PkgIterator &pkg)
}
// used to emit packages it collects all the needed info
-void aptcc::emit_update_detail(const pkgCache::PkgIterator &pkg)
+void aptcc::emit_update_detail(const pkgCache::PkgIterator &pkg, const pkgCache::VerIterator &version)
{
// Get the version of the current package
- pkgCache::VerIterator currver = find_ver(pkg);
+ pkgCache::VerIterator currver = find_ver(pkg);
pkgCache::VerFileIterator currvf = currver.FileList();
// Build a package_id from the current version
gchar *current_package_id;
@@ -500,7 +508,12 @@ void aptcc::emit_update_detail(const pkgCache::PkgIterator &pkg)
currvf.File().Archive() == NULL ? "" : currvf.File().Archive());
// Get the update version
- pkgCache::VerIterator candver = find_candidate_ver(pkg);
+ pkgCache::VerIterator candver;
+ if (version.end() == false) {
+ candver = version;
+ } else {
+ candver = find_candidate_ver(pkg);
+ }
pkgCache::VerFileIterator vf = candver.FileList();
string origin = vf.File().Origin() == NULL ? "" : vf.File().Origin();
diff --git a/backends/aptcc/apt.h b/backends/aptcc/apt.h
index 891bab8..02d7f91 100644
--- a/backends/aptcc/apt.h
+++ b/backends/aptcc/apt.h
@@ -62,7 +62,7 @@ public:
// Check the returned VerIterator.end()
// if it's true we could not find it
pair<pkgCache::PkgIterator, pkgCache::VerIterator>
- find_package_id(const gchar *package_id);
+ find_package_id(const gchar *package_id, bool &found);
pkgCache::VerIterator find_ver(const pkgCache::PkgIterator &pkg);
pkgCache::VerIterator find_candidate_ver(const pkgCache::PkgIterator &pkg);
@@ -110,12 +110,12 @@ public:
/**
* Emits details
*/
- void emit_details(const pkgCache::PkgIterator &pkg);
+ void emit_details(const pkgCache::PkgIterator &pkg, const pkgCache::VerIterator &ver);
/**
* Emits update detail
*/
- void emit_update_detail(const pkgCache::PkgIterator &pkg);
+ void emit_update_detail(const pkgCache::PkgIterator &pkg, const pkgCache::VerIterator &ver);
/**
* seems to install packages
diff --git a/backends/aptcc/pk-backend-aptcc.cpp b/backends/aptcc/pk-backend-aptcc.cpp
index 5ca8fab..9321b8a 100644
--- a/backends/aptcc/pk-backend-aptcc.cpp
+++ b/backends/aptcc/pk-backend-aptcc.cpp
@@ -194,8 +194,9 @@ backend_get_depends_or_requires_thread (PkBackend *backend)
}
pair<pkgCache::PkgIterator, pkgCache::VerIterator> pkg_ver;
- pkg_ver = m_apt->find_package_id(pi);
- if (pkg_ver.second.end() == true)
+ bool found;
+ pkg_ver = m_apt->find_package_id(pi, found);
+ if (!found)
{
pk_backend_error_code (backend,
PK_ERROR_ENUM_PACKAGE_NOT_FOUND,
@@ -288,8 +289,9 @@ backend_get_files_thread (PkBackend *backend)
}
pair<pkgCache::PkgIterator, pkgCache::VerIterator> pkg_ver;
- pkg_ver = m_apt->find_package_id(pi);
- if (pkg_ver.second.end() == true)
+ bool found;
+ pkg_ver = m_apt->find_package_id(pi, found);
+ if (!found)
{
pk_backend_error_code (backend, PK_ERROR_ENUM_PACKAGE_NOT_FOUND, "Couldn't find package");
delete m_apt;
@@ -358,8 +360,9 @@ backend_get_details_thread (PkBackend *backend)
}
pair<pkgCache::PkgIterator, pkgCache::VerIterator> pkg_ver;
- pkg_ver = m_apt->find_package_id(pi);
- if (pkg_ver.second.end() == true)
+ bool found;
+ pkg_ver = m_apt->find_package_id(pi, found);
+ if (!found)
{
pk_backend_error_code (backend,
PK_ERROR_ENUM_PACKAGE_NOT_FOUND,
@@ -371,9 +374,9 @@ backend_get_details_thread (PkBackend *backend)
}
if (updateDetail) {
- m_apt->emit_update_detail(pkg_ver.first);
+ m_apt->emit_update_detail(pkg_ver.first, pkg_ver.second);
} else {
- m_apt->emit_details(pkg_ver.first);
+ m_apt->emit_details(pkg_ver.first, pkg_ver.second);
}
}
@@ -672,9 +675,10 @@ pk_backend_download_packages_thread (PkBackend *backend)
}
pair<pkgCache::PkgIterator, pkgCache::VerIterator> pkg_ver;
- pkg_ver = m_apt->find_package_id(pi);
+ bool found;
+ pkg_ver = m_apt->find_package_id(pi, found);
// Ignore packages that could not be found or that exist only due to dependencies.
- if (pkg_ver.second.end() == true)
+ if (!found)
{
_error->Error("Can't find this package id \"%s\".", pi);
continue;
@@ -854,9 +858,10 @@ pk_backend_resolve_thread (PkBackend *backend)
output.push_back(pkg_ver);
}
} else {
- pkg_ver = m_apt->find_package_id(pi);
+ bool found;
+ pkg_ver = m_apt->find_package_id(pi, found);
// check to see if we found the package
- if (pkg_ver.second.end() == false)
+ if (found)
{
output.push_back(pkg_ver);
}
@@ -1209,9 +1214,10 @@ backend_manage_packages_thread (PkBackend *backend)
}
pair<pkgCache::PkgIterator, pkgCache::VerIterator> pkg_ver;
- pkg_ver = m_apt->find_package_id(pi);
+ bool found;
+ pkg_ver = m_apt->find_package_id(pi, found);
// Ignore packages that could not be found or that exist only due to dependencies.
- if (pkg_ver.second.end() == true)
+ if (!found)
{
pk_backend_error_code (backend,
PK_ERROR_ENUM_PACKAGE_NOT_FOUND,
commit c2016d35d33a03c481fd0586af26426184dfd758
Author: Alex Eftimie <alex at eftimie.ro>
Date: Fri Jun 10 16:37:33 2011 +0300
glib: Added element-type annotations for each function returning a GPtrArray*, see #652287 in gnome bugzilla
diff --git a/lib/packagekit-glib2/pk-results.c b/lib/packagekit-glib2/pk-results.c
index e7d38b9..06a9f8b 100644
--- a/lib/packagekit-glib2/pk-results.c
+++ b/lib/packagekit-glib2/pk-results.c
@@ -536,10 +536,11 @@ pk_results_get_error_code (PkResults *results)
*
* Gets the packages from the transaction.
*
- * Return value: (transfer container): A #GPtrArray array of #PkDetails's, free with g_ptr_array_unref().
+ * Return value: (element-type PkPackage) (transfer full): A #GPtrArray array of #PkPackage's, free with g_ptr_array_unref().
*
* Since: 0.5.2
**/
+
GPtrArray *
pk_results_get_package_array (PkResults *results)
{
@@ -570,7 +571,7 @@ pk_results_get_package_sack (PkResults *results)
*
* Gets the package details from the transaction.
*
- * Return value: (transfer container): A #GPtrArray array of #PkPackage's, free with g_ptr_array_unref().
+ * Return value: (element-type PkDetails) (transfer container): A #GPtrArray array of #PkDetails's, free with g_ptr_array_unref().
*
* Since: 0.5.2
**/
@@ -587,7 +588,7 @@ pk_results_get_details_array (PkResults *results)
*
* Gets the update details from the transaction.
*
- * Return value: (transfer container): A #GPtrArray array of #PkUpdateDetail's, free with g_ptr_array_unref().
+ * Return value: (element-type PkUpdateDetail) (transfer container): A #GPtrArray array of #PkUpdateDetail's, free with g_ptr_array_unref().
*
* Since: 0.5.2
**/
@@ -604,7 +605,7 @@ pk_results_get_update_detail_array (PkResults *results)
*
* Gets the categories from the transaction.
*
- * Return value: (transfer container): A #GPtrArray array of #PkCategory's, free with g_ptr_array_unref().
+ * Return value: (element-type PkCategory) (transfer container): A #GPtrArray array of #PkCategory's, free with g_ptr_array_unref().
*
* Since: 0.5.2
**/
@@ -621,7 +622,7 @@ pk_results_get_category_array (PkResults *results)
*
* Gets the distribution upgrades from the transaction.
*
- * Return value: (transfer container): A #GPtrArray array of #PkDistroUpgrade's, free with g_ptr_array_unref().
+ * Return value: (element-type PkDistroUpgrade) (transfer container): A #GPtrArray array of #PkDistroUpgrade's, free with g_ptr_array_unref().
*
* Since: 0.5.2
**/
@@ -638,7 +639,7 @@ pk_results_get_distro_upgrade_array (PkResults *results)
*
* Gets the require restarts from the transaction.
*
- * Return value: (transfer container): A #GPtrArray array of #PkRequireRestart's, free with g_ptr_array_unref().
+ * Return value: (element-type PkRequireRestart) (transfer container): A #GPtrArray array of #PkRequireRestart's, free with g_ptr_array_unref().
*
* Since: 0.5.2
**/
@@ -695,7 +696,7 @@ pk_results_get_require_restart_worst (PkResults *results)
*
* Gets the transactions from the transaction.
*
- * Return value: (transfer container): A #GPtrArray array of #PkTransactionPast's, free with g_ptr_array_unref().
+ * Return value: (element-type PkTransactionPast) (transfer container): A #GPtrArray array of #PkTransactionPast's, free with g_ptr_array_unref().
*
* Since: 0.5.2
**/
@@ -712,7 +713,7 @@ pk_results_get_transaction_array (PkResults *results)
*
* Gets the files from the transaction.
*
- * Return value: (transfer container): A #GPtrArray array of #PkFiles's, free with g_ptr_array_unref().
+ * Return value: (element-type PkFiles) (transfer container): A #GPtrArray array of #PkFiles's, free with g_ptr_array_unref().
*
* Since: 0.5.2
**/
@@ -729,7 +730,7 @@ pk_results_get_files_array (PkResults *results)
*
* Gets the repository signatures required from the transaction.
*
- * Return value: (transfer container): A #GPtrArray array of #PkRepoSignatureRequired's, free with g_ptr_array_unref().
+ * Return value: (element-type PkRepoSignatureRequired) (transfer container): A #GPtrArray array of #PkRepoSignatureRequired's, free with g_ptr_array_unref().
*
* Since: 0.5.2
**/
@@ -746,7 +747,7 @@ pk_results_get_repo_signature_required_array (PkResults *results)
*
* Gets the eulas required from the transaction.
*
- * Return value: (transfer container): A #GPtrArray array of #PkEulaRequired's, free with g_ptr_array_unref().
+ * Return value: (element-type PkEulaRequired) (transfer container): A #GPtrArray array of #PkEulaRequired's, free with g_ptr_array_unref().
*
* Since: 0.5.2
**/
@@ -763,7 +764,7 @@ pk_results_get_eula_required_array (PkResults *results)
*
* Gets the media changes required from the transaction.
*
- * Return value: (transfer container): A #GPtrArray array of #PkMediaChangeRequired's, free with g_ptr_array_unref().
+ * Return value: (element-type PkMediaChangeRequired) (transfer container): A #GPtrArray array of #PkMediaChangeRequired's, free with g_ptr_array_unref().
*
* Since: 0.5.2
**/
@@ -780,7 +781,7 @@ pk_results_get_media_change_required_array (PkResults *results)
*
* Gets the repository details from the transaction.
*
- * Return value: (transfer container): A #GPtrArray array of #PkRepoDetail's, free with g_ptr_array_unref().
+ * Return value: (element-type PkRepoDetail) (transfer container): A #GPtrArray array of #PkRepoDetail's, free with g_ptr_array_unref().
*
* Since: 0.5.2
**/
@@ -797,7 +798,7 @@ pk_results_get_repo_detail_array (PkResults *results)
*
* Gets the messages from the transaction.
*
- * Return value: (transfer container): A #GPtrArray array of #PkMessage's, free with g_ptr_array_unref().
+ * Return value: (element-type PkMessage) (transfer container): A #GPtrArray array of #PkMessage's, free with g_ptr_array_unref().
*
* Since: 0.5.2
**/
commit aaa57efb80f3bd69d45b4d489cb7c42237a95a42
Author: Daniel Nicoletti <dantti85-pk at yahoo.com.br>
Date: Thu Jun 9 01:30:54 2011 -0300
aptcc: Initial support to conffile handling still not reliable
diff --git a/backends/aptcc/Makefile.am b/backends/aptcc/Makefile.am
index b3f075c..c7b34fd 100644
--- a/backends/aptcc/Makefile.am
+++ b/backends/aptcc/Makefile.am
@@ -1,4 +1,5 @@
INCLUDES = \
+ -DDATADIR=\"$(datadir)\" \
-DG_LOG_DOMAIN=\"PackageKit-Aptcc\"
plugindir = $(PK_PLUGIN_DIR)
@@ -35,10 +36,12 @@ EXTRA_DIST = 20packagekit \
helperdir = $(datadir)/PackageKit/helpers/aptcc
dist_helper_DATA = \
get-distro-upgrade.py \
+ pkconffile \
+ pkconffile.nodiff \
$(NULL)
install-data-hook:
- chmod +x $(DESTDIR)$(helperdir)/*.py
+ chmod +x $(DESTDIR)$(helperdir)/*.py $(DESTDIR)$(helperdir)/pkconffile
clean-local :
rm -f *~
diff --git a/backends/aptcc/apt.cpp b/backends/aptcc/apt.cpp
index 302967b..d8873f2 100644
--- a/backends/aptcc/apt.cpp
+++ b/backends/aptcc/apt.cpp
@@ -1267,20 +1267,76 @@ void aptcc::updateInterface(int fd, int writeFd)
new_file.append(1, str[i]);
i++;
- gchar *confmsg;
- confmsg = g_strdup_printf("The configuration file '%s' "
- "(modified by you or a script) "
- "has a newer version '%s'.\n"
- "Please verify your changes and update it manually.",
- orig_file.c_str(),
- new_file.c_str());
- pk_backend_message(m_backend,
- PK_MESSAGE_ENUM_CONFIG_FILES_CHANGED,
- confmsg);
- if (write(writeFd, "N\n", 2) != 2) {
- // TODO we need a DPKG patch to use debconf
- g_debug("Failed to write");
- }
+ gchar *filename;
+ filename = g_build_filename(DATADIR, "PackageKit", "helpers", "aptcc", "pkconffile", NULL);
+ gint exit_code;
+ gchar **argv;
+ gchar **envp;
+ GError *error = NULL;
+ argv = (gchar **) g_malloc(5 * sizeof(gchar *));
+ argv[0] = filename;
+ argv[1] = g_strdup(m_lastPackage.c_str());
+ argv[2] = g_strdup(orig_file.c_str());
+ argv[3] = g_strdup(new_file.c_str());
+ argv[4] = NULL;
+
+ gchar *socket;
+ if (socket = pk_backend_get_frontend_socket(m_backend)) {
+ envp = (gchar **) g_malloc(3 * sizeof(gchar *));
+ envp[0] = g_strdup("DEBIAN_FRONTEND=passthrough");
+ envp[1] = g_strdup_printf("DEBCONF_PIPE=%s", socket);
+ envp[2] = NULL;
+ } else {
+ // we don't have a socket set, let's fallback to noninteractive
+ envp = (gchar **) g_malloc(2 * sizeof(gchar *));
+ envp[0] = g_strdup("DEBIAN_FRONTEND=noninteractive");
+ envp[1] = NULL;
+ }
+
+ gboolean ret;
+ ret = g_spawn_sync(NULL, // working dir
+ argv, // argv
+ envp, // envp
+ G_SPAWN_LEAVE_DESCRIPTORS_OPEN,
+ NULL, // child_setup
+ NULL, // user_data
+ NULL, // standard_output
+ NULL, // standard_error
+ &exit_code,
+ &error);
+
+ cout << filename << " " << exit_code << " ret: "<< ret << endl;
+
+ if (exit_code == 10) {
+ // 1 means the user wants the package config
+ if (write(writeFd, "Y\n", 2) != 2) {
+ // TODO we need a DPKG patch to use debconf
+ g_debug("Failed to write");
+ }
+ } else if (exit_code == 20) {
+ // 2 means the user wants to keep the current config
+ if (write(writeFd, "N\n", 2) != 2) {
+ // TODO we need a DPKG patch to use debconf
+ g_debug("Failed to write");
+ }
+ } else {
+ // either the user didn't choose an option or the front end failed'
+ gchar *confmsg;
+ confmsg = g_strdup_printf("The configuration file '%s' "
+ "(modified by you or a script) "
+ "has a newer version '%s'.\n"
+ "Please verify your changes and update it manually.",
+ orig_file.c_str(),
+ new_file.c_str());
+ pk_backend_message(m_backend,
+ PK_MESSAGE_ENUM_CONFIG_FILES_CHANGED,
+ confmsg);
+ // fall back to keep the current config file
+ if (write(writeFd, "N\n", 2) != 2) {
+ // TODO we need a DPKG patch to use debconf
+ g_debug("Failed to write");
+ }
+ }
} else if (strstr(status, "pmstatus") != NULL) {
// INSTALL & UPDATE
// - Running dpkg
diff --git a/backends/aptcc/pkconffile b/backends/aptcc/pkconffile
new file mode 100755
index 0000000..e9dcdb6
--- /dev/null
+++ b/backends/aptcc/pkconffile
@@ -0,0 +1,84 @@
+#!/usr/bin/perl
+
+use Debconf::Client::ConfModule ':all';
+use Cwd 'abs_path';
+use strict;
+
+my $template = '/tmp/pkconffile.templates';
+
+# (1) quit unless we have the correct number of command-line args
+if ($#ARGV + 1 != 3) {
+ print STDERR "Usage: ./pkconffile package original_conf new_conf\n";
+ exit;
+}
+
+## Process template so we can add the diff at the end
+## the abs_path will give us the full path where this script is so we can find the template
+open (TEMP_NODIFF, abs_path($0).'.nodiff') || die ("could not open the template");
+open (TEMPLATE, ">$template");
+
+## Adds the original template
+while (<TEMP_NODIFF>) {
+ print TEMPLATE $_;
+}
+close (TEMP_NODIFF);
+
+## get the original and new files
+my $package = $ARGV[0];
+my $forig = $ARGV[1];
+my $fnew = $ARGV[2];
+
+## Add the diff to the end of the TEMPLATE
+my @diff = `diff -u $forig $fnew`;
+foreach (@diff) {
+ if ($_ =~ /^\$/) {
+ print TEMPLATE " .\n";
+ } else {
+ chomp;
+ ## Add two spaces here so that the extended description
+ ## receives the proper line breaks.
+ print TEMPLATE " $_\n";
+ }
+}
+close (TEMPLATE);
+
+## Force the template to be loaded again
+x_loadtemplatefile($template);
+
+## set the package name in the title
+subst("pkconffile/title", "package", $package);
+settitle("pkconffile/title");
+
+my $state = 1;
+while (1) {
+ if ($state == 1) {
+ ## ask the user what to do with the conf file
+ fset("pkconffile/what_to_do", "seen", "false");
+ subst("pkconffile/what_to_do", "forig", $forig);
+ input("high", "pkconffile/what_to_do");
+ } else {
+ ## the user whants to see the diff
+ fset("pkconffile/diff", "seen", "false");
+ subst("pkconffile/diff", "forig", $forig);
+ subst("pkconffile/diff", "fnew", $fnew);
+ input("high", "pkconffile/diff");
+ }
+
+ ## get the user answer
+ if (go() == 0 && $state == 1) {
+ my @ret = get("pkconffile/what_to_do");
+ if ($ret[1] =~ "Keep the currently installed version") {
+ $state = 10;
+ last;
+ } elsif ($ret[1] =~ "Install the package maintainer's version") {
+ $state = 20;
+ last;
+ }
+ $state = 2;
+ } else {
+ $state = 1;
+ }
+}
+
+unlink($template);
+exit $state;
diff --git a/backends/aptcc/pkconffile.nodiff b/backends/aptcc/pkconffile.nodiff
new file mode 100644
index 0000000..49aa78e
--- /dev/null
+++ b/backends/aptcc/pkconffile.nodiff
@@ -0,0 +1,14 @@
+Template: pkconffile/title
+Type: title
+Description: The configuration file of ${package} has changed.
+
+Template: pkconffile/what_to_do
+Type: select
+Choices: Install the package maintainer's version, Keep the currently installed version, Show the differences between the current and new versions
+Default: Keep the currently installed version
+Description: How do you want to handle this conflic?
+ The configuration file '${forig}' (modified by you or a script) has a newer version.
+
+Template: pkconffile/diff
+Type: note
+Description: Difference between '${forig}' and '${fnew}'
\ No newline at end of file
commit 8d2b64c02d1389a520780bdf10872c5ba16fb318
Author: Richard Hughes <richard at hughsie.com>
Date: Tue Jun 7 09:17:42 2011 +0100
trivial: post release version bump
diff --git a/RELEASE b/RELEASE
index 770ab4e..22f6623 100644
--- a/RELEASE
+++ b/RELEASE
@@ -2,10 +2,10 @@ PackageKit Release Notes
1. Write NEWS entries for PackageKit in the same format as usual.
-git shortlog PACKAGEKIT_0_6_14.. | grep -i -v trivial | grep -v Merge > NEWS.new
+git shortlog PACKAGEKIT_0_6_15.. | grep -i -v trivial | grep -v Merge > NEWS.new
--------------------------------------------------------------------------------
-Version 0.6.15
+Version 0.6.16
~~~~~~~~~~~~~~
Released: 2011-xx-xx
@@ -30,8 +30,8 @@ tx pull --all
4. Commit changes in PackageKit git:
-git commit -a -m "Release version 0.6.15"
-git tag -s -f -m "Release 0.6.15" PACKAGEKIT_0_6_15
+git commit -a -m "Release version 0.6.16"
+git tag -s -f -m "Release 0.6.16" PACKAGEKIT_0_6_16
<gpg password>
git push --tags
git push
@@ -57,7 +57,7 @@ tx push --source
10. Send an email to packagekit at lists.freedesktop.org
=================================================
-Subject: PackageKit 0.6.15 released!
+PackageKit 0.6.16 released!
Tarballs available here: http://www.packagekit.org/releases/
diff --git a/configure.ac b/configure.ac
index 79e7a2d..4a1c4bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ(2.63)
m4_define([pk_major_version], [0])
m4_define([pk_minor_version], [6])
-m4_define([pk_micro_version], [15])
+m4_define([pk_micro_version], [16])
m4_define([pk_version],
[pk_major_version.pk_minor_version.pk_micro_version])
More information about the PackageKit-commit
mailing list