[PackageKit-commit] packagekit: Branch 'master' - 26 commits
Richard Hughes
hughsient at kemper.freedesktop.org
Sun Oct 19 01:11:10 PDT 2008
Makefile.am | 1
client/Makefile.am | 2
configure.ac | 21 ++
contrib/PackageKit.spec.in | 101 ++++++++++---
contrib/packagekit-plugin/Makefile.am | 2
data/Makefile.am | 8 -
data/packagekit-catalog.xml.in | 1
data/packagekit-glib.pc.in | 13 +
data/packagekit-package-list.xml.in | 1
data/packagekit-qt.pc.in | 12 +
data/packagekit-servicepack.xml.in | 1
data/packagekit.pc.in | 13 -
docs/api/Makefile.am | 2
lib/Makefile.am | 2
lib/packagekit-glib/Makefile.am | 14 -
lib/packagekit-qt/.gitignore | 3
lib/packagekit-qt/CMakeLists.txt | 26 +--
lib/packagekit-qt/Makefile.am | 8 +
lib/packagekit-qt/modules/.gitignore | 3
lib/packagekit-qt/modules/Makefile.am | 3
lib/packagekit-qt/src/.gitignore | 8 +
lib/packagekit-qt/src/CMakeLists.txt | 10 -
lib/packagekit-qt/src/Makefile.am | 91 ++++++++++++
lib/packagekit-qt/src/client.h | 7
lib/packagekit-qt/src/polkitclient.cpp | 11 +
lib/packagekit-qt/src/transaction.cpp | 1
lib/packagekit-qt/src/transaction.h | 13 +
lib/packagekit-qt/src/transactionproxy.h | 10 +
lib/packagekit-qt/test/CMakeLists.txt | 11 -
lib/packagekit-qt/test/Makefile.am | 8 +
moc.mk | 8 +
po/LINGUAS | 1
po/ca.po | 233 ++++++++-----------------------
po/zh_CN.po | 4
src/Makefile.am | 2
src/pk-post-trans.c | 57 ++++++-
src/pk-spawn.c | 2
src/pk-transaction.c | 32 ++--
38 files changed, 465 insertions(+), 281 deletions(-)
New commits:
commit 886d261ecc9277dd17a901183f9f9da5eb95d902
Author: Richard Hughes <richard at hughsie.com>
Date: Sat Oct 18 23:17:06 2008 +0100
trivial: update spec file to meet Fedora standards
diff --git a/contrib/PackageKit.spec.in b/contrib/PackageKit.spec.in
index 7697cbf..89eb5ec 100644
--- a/contrib/PackageKit.spec.in
+++ b/contrib/PackageKit.spec.in
@@ -18,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: dbus >= %{dbus_version}
Requires: dbus-glib >= %{dbus_glib_version}
-Requires: PackageKit-libs-glib = %{version}-%{release}
+Requires: PackageKit-glib = %{version}-%{release}
Requires: PackageKit-udev-helper = %{version}-%{release}
Requires: PackageKit-yum-plugin = %{version}-%{release}
Requires: PackageKit-yum = %{version}-%{release}
@@ -104,7 +104,7 @@ PackageKit-yum-plugin tells PackageKit to check for updates when yum exits.
This way, if you run 'yum update' and install all available updates, puplet
will almost instantly update itself to reflect this.
-%package libs-glib
+%package glib
Summary: GLib libraries for accessing PackageKit
Group: Development/Libraries
Requires: dbus >= %{dbus_version}
@@ -112,15 +112,15 @@ Requires: %{name} = %{version}-%{release}
Obsoletes: PackageKit-libs
Provides: PackageKit-libs
-%description libs-glib
+%description glib
GLib libraries for accessing PackageKit.
-%package libs-qt
+%package qt
Summary: QT libraries for accessing PackageKit
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-%description libs-qt
+%description qt
QT libraries for accessing PackageKit.
%package cron
@@ -166,7 +166,7 @@ Headers to compile out of tree PackageKit backends.
Summary: Browser Plugin for PackageKit
Group: Development/Libraries
Requires: gtk2
-Requires: PackageKit-libs-glib = %{version}-%{release}
+Requires: PackageKit-glib = %{version}-%{release}
%description browser-plugin
The PackageKit browser plugin allows web sites to offer the ability to
@@ -177,9 +177,9 @@ using PackageKit.
Summary: Install GStreamer codecs using PackageKit
Group: Development/Libraries
Requires: gstreamer
-Requires: PackageKit-libs-glib = %{version}-%{release}
-Obsoletes: codeina < 0.10.1
-Provides: codeina = 0.10.1
+Requires: PackageKit-glib = %{version}-%{release}
+Obsoletes: codeina < 0.10.1-10
+Provides: codeina = 0.10.1-10
%description gstreamer-plugin
The PackageKit GStreamer plugin allows any Gstreamer application to install
@@ -229,11 +229,11 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%postun
update-mime-database %{_datadir}/mime &> /dev/null || :
-%post libs-glib -p /sbin/ldconfig
-%post libs-qt -p /sbin/ldconfig
+%post glib -p /sbin/ldconfig
+%post qt -p /sbin/ldconfig
-%postun libs-glib -p /sbin/ldconfig
-%postun libs-qt -p /sbin/ldconfig
+%postun glib -p /sbin/ldconfig
+%postun qt -p /sbin/ldconfig
%files -f %{name}.lang
%defattr(-,root,root,-)
@@ -305,12 +305,12 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%{_sysconfdir}/udev/rules.d/*.rules
/lib/udev/*.sh
-%files libs-glib
+%files glib
%defattr(-,root,root,-)
%doc README AUTHORS NEWS COPYING
%{_libdir}/*packagekit-glib*.so.*
-%files libs-qt
+%files qt
%defattr(-,root,root,-)
%doc README AUTHORS NEWS COPYING
%{_libdir}/*packagekit-qt*.so.*
commit 40dd2276a0c2c26311ba8e15bc8de098c9528b33
Merge: 01dae47... 9bf44f3...
Author: Richard Hughes <richard at hughsie.com>
Date: Sat Oct 18 23:11:25 2008 +0100
Merge branch 'automake'
commit 01dae47d04069a40bec49ba2581beb82b7d13757
Author: Adrien BUSTANY <madcat at mymadcat.com>
Date: Sat Oct 18 23:17:42 2008 +0200
Apply patch from Laurent Montel <montel at kde.org> to fix the installation path on 64 bit Linux
diff --git a/lib/packagekit-qt/CMakeLists.txt b/lib/packagekit-qt/CMakeLists.txt
index a1cd1e9..0379fea 100644
--- a/lib/packagekit-qt/CMakeLists.txt
+++ b/lib/packagekit-qt/CMakeLists.txt
@@ -2,14 +2,18 @@ cmake_minimum_required(VERSION 2.4.8)
project(packagekit-qt)
-if(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
- SET(LIB_SUFFIX "64")
-ELSE(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
- SET(LIB_SUFFIX "")
-ENDIF(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
-
-add_subdirectory(src)
-if(BUILD_TESTS)
- add_subdirectory(test)
-endif(BUILD_TESTS)
-add_subdirectory(modules)
+set (LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
+
+find_package(Qt4 REQUIRED)
+add_definitions(${QT_DEFINITIONS})
+
+include(FindPkgConfig)
+pkg_check_modules(POLKIT polkit-dbus)
+
+if( POLKIT_FOUND)
+ add_subdirectory(src)
+ if(BUILD_TESTS)
+ add_subdirectory(test)
+ endif(BUILD_TESTS)
+ add_subdirectory(modules)
+endif(POLKIT_FOUND)
diff --git a/lib/packagekit-qt/src/CMakeLists.txt b/lib/packagekit-qt/src/CMakeLists.txt
index 373e208..289ebb0 100644
--- a/lib/packagekit-qt/src/CMakeLists.txt
+++ b/lib/packagekit-qt/src/CMakeLists.txt
@@ -1,15 +1,5 @@
-cmake_minimum_required(VERSION 2.4.8)
-
project(packagekit-qt)
-if(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
- SET(LIB_SUFFIX "64")
-ELSE(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
- SET(LIB_SUFFIX "")
-ENDIF(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
-
-find_package(Qt4 REQUIRED)
-add_definitions(${QT_DEFINITIONS})
include(FindPkgConfig)
pkg_check_modules(POLKIT polkit-dbus)
diff --git a/lib/packagekit-qt/test/CMakeLists.txt b/lib/packagekit-qt/test/CMakeLists.txt
index 1f0e916..5cbcd6c 100644
--- a/lib/packagekit-qt/test/CMakeLists.txt
+++ b/lib/packagekit-qt/test/CMakeLists.txt
@@ -1,16 +1,5 @@
-cmake_minimum_required(VERSION 2.4.8)
-
project(pktest)
-if(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
- SET(LIB_SUFFIX "64")
-ELSE(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
- SET(LIB_SUFFIX "")
-ENDIF(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
-
-find_package(Qt4 REQUIRED)
-add_definitions(${QT_DEFINITIONS})
-
include(FindPkgConfig)
pkg_check_modules(POLKIT polkit-dbus)
commit e1fa5cc02acc39217ac1659cfb192036d84212f7
Author: Xavier Conde <xavi.conde at gmail.com>
Date: Sat Oct 18 20:44:24 2008 +0000
Updated catalan po
Transmitted-via: Transifex (translate.fedoraproject.org)
diff --git a/po/ca.po b/po/ca.po
index 70daa44..8b003e9 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -4,6 +4,7 @@
# packagekit package.
#
# Pere Argelich <bakidok at gmail.com>, 2008
+# Xavier Conde Rueda <xavi.conde at gmail.com>
#
# This file is translated according to the glossary and style guide of
# Softcatalà . If you plan to modify this file, please read first the page
@@ -20,9 +21,9 @@ msgid ""
msgstr ""
"Project-Id-Version: packagekit\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-15 18:11+0100\n"
-"PO-Revision-Date: 2008-09-28 12:27+0100\n"
-"Last-Translator: Pere Argelich <bakidok at gmail.com>\n"
+"POT-Creation-Date: 2008-10-16 13:13+0000\n"
+"PO-Revision-Date: 2008-10-18 12:27+0100\n"
+"Last-Translator: Xavier Conde Rueda <xavi.conde at gmail.com>\n"
"Language-Team: Catalan <fedora at softcatala.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
@@ -32,49 +33,49 @@ msgstr ""
#. TRANSLATORS: this is a header for the package that can be updated
#: ../client/pk-console.c:273
msgid "Details about the update:"
-msgstr ""
+msgstr "Detalls quant a l'actualització:"
#: ../client/pk-console.c:466
msgid "Please restart the computer to complete the update."
-msgstr ""
+msgstr "Reinicieu l'ordinador per completar l'actualització."
#: ../client/pk-console.c:468
msgid "Please logout and login to complete the update."
-msgstr ""
+msgstr "Sortiu i entreu per completar l'actualització."
#: ../client/pk-console.c:470
msgid "Please restart the application as it is being used."
-msgstr ""
+msgstr "Cal que reinicieu l'aplicació perquè s'està fent servir."
#. TRANSLATORS: The package name was not found in any software sources
#: ../client/pk-console.c:555
#, c-format
msgid "The package '%s' could not be installed: %s"
-msgstr ""
+msgstr "No s'ha pogut instal·lar el paquet «%s»: %s"
#. TRANSLATORS: There was an error installing the packages. The detailed error follows
#: ../client/pk-console.c:609
#, c-format
msgid "This tool could not install the packages: %s"
-msgstr ""
+msgstr "No s'ha pogut instal·lar els paquets: %s"
#. TRANSLATORS: The package name was not found in the installed list. The detailed error follows
#: ../client/pk-console.c:665
#, c-format
msgid "This tool could not remove '%s': %s"
-msgstr ""
+msgstr "No s'ha pogut suprimir «%s»: %s"
#. TRANSLATORS: There was an error removing the packages. The detailed error follows
#: ../client/pk-console.c:688 ../client/pk-console.c:757
#, c-format
msgid "This tool could not remove the packages: %s"
-msgstr ""
+msgstr "No s'ha pogut suprimir els paquets: %s"
#. TRANSLATORS: There was an error removing the packages. The detailed error follows
#: ../client/pk-console.c:724
#, c-format
msgid "This tool could not remove the packages: '%s'"
-msgstr ""
+msgstr "No s'ha pogut suprimir els paquets: «%s»"
#. TRANSLATORS: When removing, we might have to remove other deps
#: ../client/pk-console.c:736
@@ -83,73 +84,72 @@ msgstr "Els següents paquets seran eliminats"
#. TRANSLATORS: We are checking if it's okay to remove a list of packages
#: ../client/pk-console.c:743
-#, fuzzy
msgid "Proceed removing additional packages?"
-msgstr "Esteu d'acord en eliminar els paquets adicionals?"
+msgstr "Voleu eliminar els paquets addicionals?"
#. TRANSLATORS: We did not remove any packages
#: ../client/pk-console.c:748
msgid "The package removal was cancelled!"
-msgstr ""
+msgstr "S'ha cancel·lat la supressió dels paquets"
#. TRANSLATORS: The package name was not found in any software sources
#: ../client/pk-console.c:789
-#, fuzzy, c-format
+#, c-format
msgid "This tool could not find the package '%s' to download"
-msgstr "No s'ha trobat cap paquet per a baixar"
+msgstr "No s'ha trobat el paquet «%s» per a baixar"
#. TRANSLATORS: There was an error getting the list of files for the package. The detailed error follows
#: ../client/pk-console.c:843 ../client/pk-console.c:852
#, c-format
msgid "This tool could not update '%s': %s"
-msgstr ""
+msgstr "No s'ha pogut actualitzar «%s»: %s"
#. TRANSLATORS: There was an error getting the list of files for the package. The detailed error follows
#: ../client/pk-console.c:874 ../client/pk-console.c:882
#, c-format
msgid "This tool could not get the requires for '%s': %s"
-msgstr ""
+msgstr "No s'han obtingut els requeriments per a «%s»: %s"
#. TRANSLATORS: There was an error getting the depends for the package. The detailed error follows
#: ../client/pk-console.c:904 ../client/pk-console.c:912
-#, fuzzy, c-format
+#, c-format
msgid "This tool could not get the dependancies for '%s': %s"
-msgstr "No s'han pogut obtenir les dependències per a"
+msgstr "No s'han pogut obtenir les dependències per a «%s»: %s"
#. TRANSLATORS: There was an error getting the details about the package. The detailed error follows
#: ../client/pk-console.c:934 ../client/pk-console.c:942
#, c-format
msgid "This tool could not get package details for '%s': %s"
-msgstr ""
+msgstr "No s'han pogut obtenir els detalls del paquet de «%s»: %s"
#. TRANSLATORS: The package name was not found in any software sources. The detailed error follows
#: ../client/pk-console.c:964
-#, fuzzy, c-format
+#, c-format
msgid "This tool could not find the files for '%s': %s"
-msgstr "No s'han pogut trobar els fitxers per a aquest paquet"
+msgstr "No s'han pogut trobar els fitxers per a «%s»: %s"
#. TRANSLATORS: There was an error getting the list of files for the package. The detailed error follows
#: ../client/pk-console.c:972
-#, fuzzy, c-format
+#, c-format
msgid "This tool could not get the file list for '%s': %s"
-msgstr "No s'ha pogut obtenir la llista de fitxers"
+msgstr "No s'ha pogut obtenir la llista de fitxers per a «%s»: %s"
#. TRANSLATORS: The package name was not found in any software sources. The detailed error follows
#: ../client/pk-console.c:994
-#, fuzzy, c-format
+#, c-format
msgid "This tool could not find the update details for '%s': %s"
-msgstr "No s'han trobat els detalls per a actualitzar"
+msgstr "No s'han trobat els detalls per a actualitzar «%s»: %s"
#. TRANSLATORS: There was an error getting the details about the update for the package. The detailed error follows
#: ../client/pk-console.c:1002
-#, fuzzy, c-format
+#, c-format
msgid "This tool could not get the update details for '%s': %s"
-msgstr "No s'han trobat els detalls per a actualitzar"
+msgstr "No s'han obtingut els detalls per a actualitzar «%s»: %s"
#. TRANSLATORS: This was an unhandled error, and we don't have _any_ context
#: ../client/pk-console.c:1048
msgid "Error:"
-msgstr ""
+msgstr "Error:"
#. TRANSLATORS: This a list of details about the package
#: ../client/pk-console.c:1062
@@ -169,7 +169,7 @@ msgstr "No hi ha fitxers"
#. TRANSLATORS: This a request for a GPG key signature
#: ../client/pk-console.c:1127
msgid "Repository signature required"
-msgstr ""
+msgstr "Es necessita la signatura del repositori"
#. TRANSLATORS: This a prompt asking the user to import the security key
#: ../client/pk-console.c:1137
@@ -184,7 +184,7 @@ msgstr "No importis la clau"
#. TRANSLATORS: This a request for a EULA
#: ../client/pk-console.c:1175
msgid "Eula required"
-msgstr ""
+msgstr "Es necessita l'EULA"
#. TRANSLATORS: This a prompt asking the user to agree to the licence
#: ../client/pk-console.c:1182
@@ -193,9 +193,8 @@ msgstr "Esteu d'acord?"
#. TRANSLATORS: This is where the user declined the licence
#: ../client/pk-console.c:1186
-#, fuzzy
msgid "Did not agree to licence"
-msgstr "La llicència no ha estat acceptada, la tasca fallarà "
+msgstr "La llicència no ha estat acceptada"
#. TRANSLATORS: This is when the daemon crashed, and we are up shit creek without a paddle
#: ../client/pk-console.c:1215
@@ -230,7 +229,6 @@ msgstr "Surt sense esperar que es completin les accions"
#. TRANSLATORS: This is when we could not connect to the system bus, and is fatal
#: ../client/pk-console.c:1387
-#, fuzzy
msgid "This tool could not connect to system DBUS."
msgstr "No s'ha pogut connectar al sistema DBUS."
@@ -328,37 +326,36 @@ msgstr "L'ordre ha fallat"
#. TRANSLATORS: This is the state of the transaction
#: ../client/pk-generate-pack.c:96
msgid "Downloading"
-msgstr ""
+msgstr "Baixant"
#: ../client/pk-generate-pack.c:140
-#, fuzzy
msgid "Set the filename of dependencies to be excluded"
msgstr ""
-"Establiu el camà del fitxer amb la llista de paquets/dependències a excloure"
+"Establiu el nom del fitxer amb la llista de dependències a excloure"
#: ../client/pk-generate-pack.c:142
msgid ""
"The directory to put the pack file, or the current directory if ommitted"
msgstr ""
+"El directori on deixar el fitxer de paquet, o el directori actual si s'omet"
#: ../client/pk-generate-pack.c:144
-#, fuzzy
msgid "The package to be put into the ServicePack"
-msgstr "Grup de paquets de servei del PackageKit"
+msgstr "Paquet que es ficarà en els paquets de servei"
#: ../client/pk-generate-pack.c:146
msgid "Put all updates available in the ServicePack"
-msgstr ""
+msgstr "Ficat totes les actualitzacions disponibles en els paquets de servei"
#. TRANSLATORS: This is when the user fails to supply the correct arguments
#: ../client/pk-generate-pack.c:166
msgid "Neither --package or --updates option selected."
-msgstr ""
+msgstr "No s'ha seleccionat --package o --updates."
#. TRANSLATORS: This is when the user fails to supply just one argument
#: ../client/pk-generate-pack.c:174
msgid "Both options selected."
-msgstr ""
+msgstr "S'han seleccionat ambdues."
#. TRANSLATORS: This is when file already exists
#: ../client/pk-generate-pack.c:207
@@ -368,47 +365,45 @@ msgstr "Existeix un grup de paquets amb el mateix nom, voleu sobreescriure'l?"
#. TRANSLATORS: This is when the pack was not overwritten
#: ../client/pk-generate-pack.c:210
msgid "The pack was not overwritten."
-msgstr ""
+msgstr "No s'ha sobreescrit el paquet."
#. TRANSLATORS: This is when the temporary directory cannot be created
#: ../client/pk-generate-pack.c:222
-#, fuzzy
msgid "Failed to create directory."
-msgstr "S'ha produït un error en crear el directori"
+msgstr "S'ha produït un error en crear el directori."
#. TRANSLATORS: This is when the list of packages from the remote computer cannot be opened
#: ../client/pk-generate-pack.c:231
-#, fuzzy
msgid "Failed to open package list."
-msgstr "S'ha produït un error en crear el grup de paquets"
+msgstr "S'ha produït un error en obrir la llista de paquets."
#. TRANSLATORS: This is when the user fails to supply the correct arguments
#: ../client/pk-generate-pack.c:241
msgid "Finding package name."
-msgstr ""
+msgstr "S'està cercant el nom del paquet."
#. TRANSLATORS: This is when the package cannot be foudn in any software source
#: ../client/pk-generate-pack.c:245
-#, fuzzy, c-format
+#, c-format
msgid "Failed to find package '%s': %s"
-msgstr "No s'ha trobat cap paquet per a instal·lar"
+msgstr "No s'ha trobat el paquet «%s»: %s"
#. TRANSLATORS: This is telling the user we are in the process of making the pack
#: ../client/pk-generate-pack.c:260
msgid "Creating service pack..."
-msgstr ""
+msgstr "S'està creant els paquets de servei..."
#. TRANSLATORS: we succeeded in making the file
#: ../client/pk-generate-pack.c:267
#, c-format
msgid "Service pack created '%s'"
-msgstr ""
+msgstr "Paquets de servei creats a «%s»"
#. TRANSLATORS: we failed to make te file
#: ../client/pk-generate-pack.c:271
-#, fuzzy, c-format
+#, c-format
msgid "Failed to create '%s': %s"
-msgstr "No s'ha trobat cap paquet per a instal·lar"
+msgstr "No s'ha pogut crear «%s»: %s"
#: ../client/pk-monitor.c:128
msgid "PackageKit Monitor"
@@ -418,25 +413,22 @@ msgstr "Monitorització de Packagekit"
#: ../client/pk-tools-common.c:76 ../client/pk-tools-common.c:83
#, c-format
msgid "Internal error: %s"
-msgstr ""
+msgstr "Error intern: %s"
#. TRANSLATORS: The package was not found in any software sources
#: ../client/pk-tools-common.c:109
-#, c-format
msgid "The package could not be found"
-msgstr ""
+msgstr "No s'han trobat el paquet"
#. TRANSLATORS: more than one package could be found that matched, to follow is a list of possible packages
#: ../client/pk-tools-common.c:120
-#, fuzzy
msgid "More than one package matches:"
-msgstr "Existeixen coincidències amb múltiples paquets"
+msgstr "Existeixen coincidències amb múltiples paquets:"
#. TRANSLATORS: This finds out which package in the list to use
#: ../client/pk-tools-common.c:127
-#, fuzzy
msgid "Please choose the correct package: "
-msgstr "Si us plau, introduïu el número de paquet:"
+msgstr "Si us plau, escolliu el paquet correcte:"
#: ../client/pk-tools-common.c:154
#, c-format
@@ -452,58 +444,52 @@ msgstr "S'està obtenint la informació de paquets..."
#: ../contrib/packagekit-plugin/src/contents.cpp:305
#, c-format
msgid "Run %s"
-msgstr ""
+msgstr "Executa %s"
#. TRANSLATORS: show the installed version of a package
#: ../contrib/packagekit-plugin/src/contents.cpp:311
-#, fuzzy
msgid "Installed version"
msgstr ""
-"\n"
-"<small>Versió instal·lada: %s</small>"
+"Versió instal·lada"
#. TRANSLATORS: run the application now
#: ../contrib/packagekit-plugin/src/contents.cpp:319
#, c-format
msgid "Run version %s now"
-msgstr ""
+msgstr "Executa la versió %s ara"
#: ../contrib/packagekit-plugin/src/contents.cpp:325
msgid "Run now"
-msgstr ""
+msgstr "Executa ara"
#. TRANSLATORS: update to a new version of the package
#: ../contrib/packagekit-plugin/src/contents.cpp:330
#, c-format
msgid "Upgrade to version %s"
-msgstr ""
+msgstr "Actualitza a la versió %s"
#. TRANSLATORS: To install a package
#: ../contrib/packagekit-plugin/src/contents.cpp:336
#, c-format
msgid "Install %s Now"
-msgstr ""
+msgstr "Instal·la %s ara"
#. TRANSLATORS: the version of the package
#: ../contrib/packagekit-plugin/src/contents.cpp:339
msgid "Version"
-msgstr ""
+msgstr "Versió"
#. TRANSLATORS: noting found, so can't install
#: ../contrib/packagekit-plugin/src/contents.cpp:344
-#, fuzzy
msgid "No packages found for your system"
msgstr ""
-"\n"
-"<small>No s'han trobat paquets en el vostre sistema</small>"
+"No s'han trobat paquets en el vostre sistema"
#. TRANSLATORS: package is being installed
#: ../contrib/packagekit-plugin/src/contents.cpp:349
-#, fuzzy
msgid "Installing..."
msgstr ""
-"\n"
-"<small>Instal·lant...</small>"
+"S'està instal·lant..."
#: ../data/packagekit-catalog.xml.in.h:1
msgid "PackageKit Catalog"
@@ -514,93 +500,8 @@ msgid "PackageKit Service Pack"
msgstr "Grup de paquets de servei del PackageKit"
#: ../data/packagekit-package-list.xml.in.h:1
-#, fuzzy
msgid "PackageKit Package List"
-msgstr "Catà leg del Packagekit"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:1
-msgid "Accept EULA"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:2
-msgid "Authentication is required to accept a EULA"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:3
-msgid "Authentication is required to change software source parameters"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:4
-msgid ""
-"Authentication is required to consider a key used for signing packages as "
-"trusted"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:5
-msgid "Authentication is required to install a signed package"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:6
-msgid "Authentication is required to install an untrusted package"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:7
-msgid "Authentication is required to refresh the system sources"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:8
-msgid "Authentication is required to remove packages"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:9
-msgid "Authentication is required to rollback a transaction"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:10
-msgid ""
-"Authentication is required to set the network proxy used for downloading "
-"packages"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:11
-msgid "Authentication is required to update packages"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:12
-msgid "Change software source parameters"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:13
-msgid "Install local file"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:14
-msgid "Install untrusted local file"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:15
-msgid "Refresh system sources"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:16
-msgid "Remove package"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:17
-msgid "Rollback to a previous transaction"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:18
-msgid "Set network proxy"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:19
-msgid "Trust a key used for signing packages"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:20
-msgid "Update packages"
-msgstr ""
+msgstr "Llista de paquets del Packagekit"
#: ../src/pk-main.c:85
msgid "Startup failed due to security policies on this machine."
@@ -695,10 +596,6 @@ msgstr "S'ha produït un error en intentar iniciar: %s\n"
#~ msgid "Could not find a package match"
#~ msgstr "No s'han trobat coincidències en cap paquet"
-#, fuzzy
-#~ msgid "Resolving package name to remote object"
-#~ msgstr "Els següents paquets seran eliminats"
-
#~ msgid "Could not set database readonly"
#~ msgstr "No s'ha pogut establir la base de dades a només lectura"
commit 9bf44f3fecebd07dc876527040c09826f0decc95
Author: Richard Hughes <richard at hughsie.com>
Date: Sat Oct 18 20:22:01 2008 +0100
trivial: update the fedora spec file now we install both glib and qt libs
diff --git a/contrib/PackageKit.spec.in b/contrib/PackageKit.spec.in
index 3149829..7697cbf 100644
--- a/contrib/PackageKit.spec.in
+++ b/contrib/PackageKit.spec.in
@@ -47,6 +47,7 @@ BuildRequires: xulrunner-devel
BuildRequires: libarchive-devel
BuildRequires: gstreamer-devel
BuildRequires: gstreamer-plugins-base-devel
+BuildRequires: qt-devel
%description
PackageKit is a D-Bus abstraction layer that allows the session user
@@ -114,6 +115,14 @@ Provides: PackageKit-libs
%description libs-glib
GLib libraries for accessing PackageKit.
+%package libs-qt
+Summary: QT libraries for accessing PackageKit
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description libs-qt
+QT libraries for accessing PackageKit.
+
%package cron
Summary: Cron job and related utilities for PackageKit
Group: System Environment/Base
@@ -136,6 +145,15 @@ Provides: PackageKit-devel
%description glib-devel
GLib headers and libraries for PackageKit.
+%package qt-devel
+Summary: QT Libraries and headers for PackageKit
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
+
+%description qt-devel
+QT headers and libraries for PackageKit.
+
%package backend-devel
Summary: Headers to compile out of tree PackageKit backends
Group: Development/Libraries
@@ -212,8 +230,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
update-mime-database %{_datadir}/mime &> /dev/null || :
%post libs-glib -p /sbin/ldconfig
+%post libs-qt -p /sbin/ldconfig
%postun libs-glib -p /sbin/ldconfig
+%postun libs-qt -p /sbin/ldconfig
%files -f %{name}.lang
%defattr(-,root,root,-)
@@ -290,6 +310,11 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%doc README AUTHORS NEWS COPYING
%{_libdir}/*packagekit-glib*.so.*
+%files libs-qt
+%defattr(-,root,root,-)
+%doc README AUTHORS NEWS COPYING
+%{_libdir}/*packagekit-qt*.so.*
+
%files cron
%defattr(-,root,root,-)
%doc README AUTHORS NEWS COPYING
@@ -318,6 +343,16 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%dir %{_includedir}/PackageKit/packagekit-glib
%{_includedir}/PackageKit/packagekit-glib/*.h
+%files qt-devel
+%defattr(-,root,root,-)
+%doc README AUTHORS NEWS COPYING
+%{_libdir}/libpackagekit-qt*.so
+%{_libdir}/pkgconfig/packagekit-qt.pc
+%dir %{_includedir}/PackageKit
+%dir %{_includedir}/PackageKit/packagekit-qt
+%{_includedir}/PackageKit/packagekit-qt/QPackageKit
+%{_includedir}/PackageKit/packagekit-qt/*.h
+
%files backend-devel
%defattr(-,root,root,-)
%doc README AUTHORS NEWS COPYING
commit 28c6bd1bf03c381efa6bacdc1d9f688747345239
Author: Richard Hughes <richard at hughsie.com>
Date: Sat Oct 18 20:15:31 2008 +0100
trivial: fix install directory
diff --git a/lib/packagekit-qt/src/Makefile.am b/lib/packagekit-qt/src/Makefile.am
index d1e1ba0..f0daf6c 100644
--- a/lib/packagekit-qt/src/Makefile.am
+++ b/lib/packagekit-qt/src/Makefile.am
@@ -15,7 +15,7 @@ lib_LTLIBRARIES = \
libpackagekit-qt.la \
$(NULL)
-libpackagekit_qt_includedir = $(includedir)/PackageKit/packagekit-glib
+libpackagekit_qt_includedir = $(includedir)/PackageKit/packagekit-qt
libpackagekit_qt_include_HEADERS = \
QPackageKit \
commit 08a24d5632a5f9429a02288d94158ce4ee7a9d3f
Merge: 9e3761e... b5d71a2...
Author: Richard Hughes <richard at hughsie.com>
Date: Sat Oct 18 19:12:59 2008 +0100
Merge branch 'master' into automake
commit b5d71a28e89d05f143b029954c25200b0ab0dc9a
Author: Richard Hughes <richard at hughsie.com>
Date: Sat Oct 18 19:12:49 2008 +0100
trivial: fix up the Fedora spec file
diff --git a/contrib/PackageKit.spec.in b/contrib/PackageKit.spec.in
index bc9d869..3149829 100644
--- a/contrib/PackageKit.spec.in
+++ b/contrib/PackageKit.spec.in
@@ -18,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: dbus >= %{dbus_version}
Requires: dbus-glib >= %{dbus_glib_version}
-Requires: PackageKit-libs = %{version}-%{release}
+Requires: PackageKit-libs-glib = %{version}-%{release}
Requires: PackageKit-udev-helper = %{version}-%{release}
Requires: PackageKit-yum-plugin = %{version}-%{release}
Requires: PackageKit-yum = %{version}-%{release}
@@ -103,14 +103,16 @@ PackageKit-yum-plugin tells PackageKit to check for updates when yum exits.
This way, if you run 'yum update' and install all available updates, puplet
will almost instantly update itself to reflect this.
-%package libs
-Summary: Libraries for accessing PackageKit
+%package libs-glib
+Summary: GLib libraries for accessing PackageKit
Group: Development/Libraries
Requires: dbus >= %{dbus_version}
Requires: %{name} = %{version}-%{release}
+Obsoletes: PackageKit-libs
+Provides: PackageKit-libs
-%description libs
-Libraries for accessing PackageKit.
+%description libs-glib
+GLib libraries for accessing PackageKit.
%package cron
Summary: Cron job and related utilities for PackageKit
@@ -121,22 +123,32 @@ Requires: %{name} = %{version}-%{release}
%description cron
Crontab and utilities for running PackageKit as a cron job.
-%package devel
-Summary: Libraries and headers for PackageKit
+%package glib-devel
+Summary: GLib Libraries and headers for PackageKit
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: dbus-devel >= %{dbus_version}
Requires: pkgconfig
Requires: sqlite-devel
+Obsoletes: PackageKit-devel
+Provides: PackageKit-devel
-%description devel
-Headers and libraries for PackageKit.
+%description glib-devel
+GLib headers and libraries for PackageKit.
+
+%package backend-devel
+Summary: Headers to compile out of tree PackageKit backends
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description backend-devel
+Headers to compile out of tree PackageKit backends.
%package browser-plugin
Summary: Browser Plugin for PackageKit
Group: Development/Libraries
Requires: gtk2
-Requires: PackageKit-libs = %{version}-%{release}
+Requires: PackageKit-libs-glib = %{version}-%{release}
%description browser-plugin
The PackageKit browser plugin allows web sites to offer the ability to
@@ -147,7 +159,7 @@ using PackageKit.
Summary: Install GStreamer codecs using PackageKit
Group: Development/Libraries
Requires: gstreamer
-Requires: PackageKit-libs = %{version}-%{release}
+Requires: PackageKit-libs-glib = %{version}-%{release}
Obsoletes: codeina < 0.10.1
Provides: codeina = 0.10.1
@@ -199,9 +211,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%postun
update-mime-database %{_datadir}/mime &> /dev/null || :
-%post libs -p /sbin/ldconfig
+%post libs-glib -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
+%postun libs-glib -p /sbin/ldconfig
%files -f %{name}.lang
%defattr(-,root,root,-)
@@ -217,6 +229,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%dir %{_localstatedir}/cache/PackageKit/downloads
%{python_sitelib}/packagekit/*py*
%dir %{_sysconfdir}/bash_completion.d
+%dir %{_libdir}/packagekit-backend
%config %{_sysconfdir}/bash_completion.d/pk-completion.bash
%config(noreplace) %{_sysconfdir}/PackageKit/*.conf
%config %{_sysconfdir}/dbus-1/system.d/*
@@ -272,11 +285,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%{_sysconfdir}/udev/rules.d/*.rules
/lib/udev/*.sh
-%files libs
+%files libs-glib
%defattr(-,root,root,-)
%doc README AUTHORS NEWS COPYING
-%dir %{_libdir}/packagekit-backend
-%{_libdir}/*packagekit*.so.*
+%{_libdir}/*packagekit-glib*.so.*
%files cron
%defattr(-,root,root,-)
@@ -297,13 +309,23 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%{_libexecdir}/pk-gstreamer-install
%{_libexecdir}/gst-install-plugins-helper
-%files devel
+%files glib-devel
%defattr(-,root,root,-)
%doc README AUTHORS NEWS COPYING
-%{_libdir}/lib*.so
-%{_libdir}/pkgconfig/*
-%{_includedir}/*
+%{_libdir}/libpackagekit-glib*.so
+%{_libdir}/pkgconfig/packagekit-glib.pc
+%dir %{_includedir}/PackageKit
+%dir %{_includedir}/PackageKit/packagekit-glib
+%{_includedir}/PackageKit/packagekit-glib/*.h
+
+%files backend-devel
+%defattr(-,root,root,-)
+%doc README AUTHORS NEWS COPYING
+%dir %{_includedir}/PackageKit
+%dir %{_includedir}/PackageKit/backend
+%{_includedir}/PackageKit/backend/*.h
%changelog
* #LONGDATE# Richard Hughes <richard at hughsie.com> #VERSION#-0.#BUILD##ALPHATAG#
- Update from git
+
commit 8df3d35bc7dcaeb5cc07cb2c3efd562fd21fd18d
Author: Richard Hughes <richard at hughsie.com>
Date: Sat Oct 18 18:41:49 2008 +0100
trivial: fix make check
diff --git a/client/Makefile.am b/client/Makefile.am
index 928b567..51aecaa 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -22,7 +22,7 @@ INCLUDES = \
$(NULL)
PK_LIBS = \
- $(top_builddir)/lib/packagekit-glib/libpackagekit.la \
+ $(top_builddir)/lib/packagekit-glib/libpackagekit-glib.la \
$(NULL)
bin_PROGRAMS = \
diff --git a/contrib/packagekit-plugin/Makefile.am b/contrib/packagekit-plugin/Makefile.am
index 78d9f84..40fdd09 100644
--- a/contrib/packagekit-plugin/Makefile.am
+++ b/contrib/packagekit-plugin/Makefile.am
@@ -10,7 +10,7 @@ packagekit_plugin_la_CPPFLAGS = \
packagekit_plugin_la_LIBADD = \
$(PK_BROWSER_PLUGIN_LIBS) \
- $(top_builddir)/lib/packagekit-glib/libpackagekit.la
+ $(top_builddir)/lib/packagekit-glib/libpackagekit-glib.la
packagekit_plugin_la_SOURCES = \
sdk/np_entry.cpp \
diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am
index 2ad3bd7..3c09029 100644
--- a/docs/api/Makefile.am
+++ b/docs/api/Makefile.am
@@ -83,7 +83,7 @@ INCLUDES = \
-I$(top_srcdir)/libselftest \
$(NULL)
-PK_LIBS = $(top_builddir)/lib/packagekit-glib/libpackagekit.la
+PK_LIBS = $(top_builddir)/lib/packagekit-glib/libpackagekit-glib.la
GTKDOC_LIBS = \
$(GLIB_LIBS) \
diff --git a/src/Makefile.am b/src/Makefile.am
index 0533745..f75f7c1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = 1.7
NULL =
PK_LIBS = \
- $(top_builddir)/lib/packagekit-glib/libpackagekit.la \
+ $(top_builddir)/lib/packagekit-glib/libpackagekit-glib.la \
$(NULL)
INCLUDES = \
commit 9e3761e5f41fc53b16bda8e14257aebb10d7984b
Author: Richard Hughes <richard at hughsie.com>
Date: Sat Oct 18 18:32:33 2008 +0100
feature: use a seporate .pc file for packagekit-qt
diff --git a/configure.ac b/configure.ac
index 77d93c1..048f6c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -582,6 +582,7 @@ backends/poldek/Makefile
backends/zypp/Makefile
data/Makefile
data/packagekit-glib.pc
+data/packagekit-qt.pc
data/org.freedesktop.PackageKit.conf
data/org.freedesktop.PackageKitTestBackend.conf
data/org.freedesktop.PackageKitAptBackend.conf
diff --git a/data/Makefile.am b/data/Makefile.am
index 6892732..bbe77d5 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -8,7 +8,10 @@ SUBDIRS = \
$(NULL)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = packagekit-glib.pc
+pkgconfig_DATA = \
+ packagekit-glib.pc \
+ packagekit-qt.pc \
+ $(NULL)
cronfiledir = ${SYSCONFDIR}/cron.daily
cronfile_SCRIPTS = packagekit-background.cron
@@ -79,6 +82,7 @@ EXTRA_DIST = \
org.freedesktop.PackageKitTestBackend.conf.in \
org.freedesktop.PackageKitAptBackend.conf.in \
packagekit-glib.pc.in \
+ packagekit-qt.pc.in \
20packagekit \
$(servicemain_in_files) \
$(servicetest_in_files) \
diff --git a/data/packagekit-qt.pc.in b/data/packagekit-qt.pc.in
new file mode 100644
index 0000000..b7830f7
--- /dev/null
+++ b/data/packagekit-qt.pc.in
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: packagekit-qt
+Description: PackageKit is a system daemon for installing stuff.
+Version: @VERSION@
+Requires: QtCore, QtDBus
+Libs: -L${libdir} -lpackagekit-qt
+Cflags: -I${includedir}/PackageKit
+
commit 08077687e162d3d363f8a9309b544795fde94aad
Author: Richard Hughes <richard at hughsie.com>
Date: Sat Oct 18 18:30:51 2008 +0100
trivial: add missing build helper
diff --git a/moc.mk b/moc.mk
new file mode 100644
index 0000000..37a27e6
--- /dev/null
+++ b/moc.mk
@@ -0,0 +1,8 @@
+%.moc : %.h
+ $(MOC) -i -o "$@" "$<"
+
+clean-moc-extra:
+ rm -vf *.moc
+
+clean-am: clean-moc-extra
+
commit 08ecc3e0af50184ddb997d765d1022879cedd247
Merge: fb9ab9e... 6c8c79c...
Author: Richard Hughes <richard at hughsie.com>
Date: Sat Oct 18 18:22:49 2008 +0100
Merge branch 'master' into automake
commit 6c8c79c6c10e23d150634fba933fbc8243168507
Author: Richard Hughes <richard at hughsie.com>
Date: Sat Oct 18 18:22:26 2008 +0100
feature: rename the packagekit library to packagekit-glib
diff --git a/configure.ac b/configure.ac
index fd819a7..4f82752 100644
--- a/configure.ac
+++ b/configure.ac
@@ -567,7 +567,7 @@ backends/pisi/Makefile
backends/poldek/Makefile
backends/zypp/Makefile
data/Makefile
-data/packagekit.pc
+data/packagekit-glib.pc
data/org.freedesktop.PackageKit.conf
data/org.freedesktop.PackageKitTestBackend.conf
data/org.freedesktop.PackageKitAptBackend.conf
diff --git a/data/Makefile.am b/data/Makefile.am
index c38682a..6892732 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -8,7 +8,7 @@ SUBDIRS = \
$(NULL)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = packagekit.pc
+pkgconfig_DATA = packagekit-glib.pc
cronfiledir = ${SYSCONFDIR}/cron.daily
cronfile_SCRIPTS = packagekit-background.cron
@@ -78,7 +78,7 @@ EXTRA_DIST = \
org.freedesktop.PackageKit.conf.in \
org.freedesktop.PackageKitTestBackend.conf.in \
org.freedesktop.PackageKitAptBackend.conf.in \
- packagekit.pc.in \
+ packagekit-glib.pc.in \
20packagekit \
$(servicemain_in_files) \
$(servicetest_in_files) \
diff --git a/data/packagekit-glib.pc.in b/data/packagekit-glib.pc.in
new file mode 100644
index 0000000..4857ed2
--- /dev/null
+++ b/data/packagekit-glib.pc.in
@@ -0,0 +1,13 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: packagekit-glib
+Description: PackageKit is a system daemon for installing stuff.
+Version: @VERSION@
+Requires.private: dbus-1, gthread-2.0
+Requires: glib-2.0, gobject-2.0, sqlite3
+Libs: -L${libdir} -lpackagekit-glib
+Cflags: -I${includedir}/PackageKit
+
diff --git a/data/packagekit.pc.in b/data/packagekit.pc.in
deleted file mode 100644
index 5920535..0000000
--- a/data/packagekit.pc.in
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: packagekit
-Description: PackageKit is a system daemon for installing stuff.
-Version: @VERSION@
-Requires.private: dbus-1, gthread-2.0
-Requires: glib-2.0, gobject-2.0, sqlite3
-Libs: -L${libdir} -lpackagekit
-Cflags: -I${includedir}/PackageKit
-
diff --git a/lib/packagekit-glib/Makefile.am b/lib/packagekit-glib/Makefile.am
index f74a76c..d901413 100644
--- a/lib/packagekit-glib/Makefile.am
+++ b/lib/packagekit-glib/Makefile.am
@@ -17,12 +17,12 @@ INCLUDES = \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
lib_LTLIBRARIES = \
- libpackagekit.la \
+ libpackagekit-glib.la \
$(NULL)
-libpackagekit_includedir = $(includedir)/PackageKit/packagekit-glib
+libpackagekit_glib_includedir = $(includedir)/PackageKit/packagekit-glib
-libpackagekit_include_HEADERS = \
+libpackagekit_glib_include_HEADERS = \
packagekit.h \
pk-extra.h \
pk-connection.h \
@@ -46,7 +46,7 @@ libpackagekit_include_HEADERS = \
pk-service-pack.h \
$(NULL)
-libpackagekit_la_SOURCES = \
+libpackagekit_glib_la_SOURCES = \
packagekit.h \
egg-debug.c \
egg-debug.h \
@@ -96,7 +96,7 @@ libpackagekit_la_SOURCES = \
pk-task-list.h \
$(NULL)
-libpackagekit_la_LIBADD = \
+libpackagekit_glib_la_LIBADD = \
$(GLIB_LIBS) \
$(DBUS_LIBS) \
$(POLKIT_LIBS) \
@@ -104,7 +104,7 @@ libpackagekit_la_LIBADD = \
$(ARCHIVE_LIBS) \
$(NULL)
-libpackagekit_la_LDFLAGS = \
+libpackagekit_glib_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-export-dynamic \
-no-undefined \
@@ -116,7 +116,7 @@ check_PROGRAMS = \
pk-self-test
pk_self_test_SOURCES = \
- $(libpackagekit_la_SOURCES) \
+ $(libpackagekit_glib_la_SOURCES) \
egg-test.h \
egg-test.c \
pk-self-test.c \
commit fb9ab9e13e4579065285b1b8b36b99f91931bc23
Author: Richard Hughes <richard at hughsie.com>
Date: Sat Oct 18 18:12:13 2008 +0100
feature: convert the CMake buildsystem into native automake for packagekit-qt
diff --git a/Makefile.am b/Makefile.am
index 72c4ba0..b47ed6c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -88,6 +88,7 @@ EXTRA_DIST = \
autogen.sh \
config.h \
ChangeLog \
+ moc.mk \
intltool-extract.in \
intltool-merge.in \
intltool-update.in \
diff --git a/configure.ac b/configure.ac
index fd819a7..3719e65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,6 +82,8 @@ DBUS_GLIB_REQUIRED=0.74
LIBNM_GLIB_REQUIRED=0.6.4
POLKIT_DBUS_REQUIRED=0.8
POLKIT_GRANT_REQUIRED=0.8
+QTCORE_REQUIRED=4.4.0
+QTDBUS_REQUIRED=4.4.0
dnl ---------------------------------------------------------------------------
dnl - Make above strings available for packaging files (e.g. rpm spec files)
@@ -112,6 +114,13 @@ PKG_CHECK_MODULES(DBUS, \
AC_SUBST(DBUS_CFLAGS)
AC_SUBST(DBUS_LIBS)
+PKG_CHECK_MODULES(QTCORE, QtCore >= $QTCORE_REQUIRED)
+AC_SUBST(QTCORE_CFLAGS)
+AC_SUBST(QTCORE_LIBS)
+
+PKG_CHECK_MODULES(QTDBUS, QtDBus >= $QTDBUS_REQUIRED)
+AC_SUBST(QTDBUS_CFLAGS)
+AC_SUBST(QTDBUS_LIBS)
dnl ---------------------------------------------------------------------------
dnl - libarchive
@@ -134,6 +143,11 @@ dnl ---------------------------------------------------------------------------
AC_PATH_PROG([XSLTPROC], [xsltproc])
dnl ---------------------------------------------------------------------------
+dnl - moc (for packagekit-qt)
+dnl ---------------------------------------------------------------------------
+AC_PATH_PROG([MOC], [moc-qt4])
+
+dnl ---------------------------------------------------------------------------
dnl - Is GIO available?
dnl ---------------------------------------------------------------------------
PKG_CHECK_MODULES(GIO, gio-2.0 >= $GIO_REQUIRED, PK_BUILD_GIO="yes", PK_BUILD_GIO="no")
diff --git a/lib/packagekit-qt/src/Makefile.am b/lib/packagekit-qt/src/Makefile.am
index 50e4d43..d1e1ba0 100644
--- a/lib/packagekit-qt/src/Makefile.am
+++ b/lib/packagekit-qt/src/Makefile.am
@@ -1,23 +1,91 @@
-EXTRA_DIST = \
- util.h \
- util.cpp \
- polkitclient.cpp \
- client.h \
- CMakeLists.txt \
- transactionprivate.h \
- transactionprivate.cpp \
- common.h \
- package.h \
- clientprivate.h \
- package.cpp \
- daemonproxy.cpp \
- client.cpp \
- transaction.h \
- transactionproxy.h \
- transaction.cpp \
- transactionproxy.cpp \
- QPackageKit \
- daemonproxy.h \
- polkitclient.h \
- clientprivate.cpp
+include ${top_srcdir}/moc.mk
+
+NULL =
+
+INCLUDES = \
+ $(QT_CFLAGS) \
+ $(QTCORE_CFLAGS) \
+ $(QTDBUS_CFLAGS) \
+ $(POLKIT_CFLAGS) \
+ -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
+
+METASOURCES = AUTO
+
+lib_LTLIBRARIES = \
+ libpackagekit-qt.la \
+ $(NULL)
+
+libpackagekit_qt_includedir = $(includedir)/PackageKit/packagekit-glib
+
+libpackagekit_qt_include_HEADERS = \
+ QPackageKit \
+ client.h \
+ transaction.h \
+ package.h \
+ $(NULL)
+
+$(libpackagekit_qt_la_OBJECTS) : \
+ client.moc \
+ clientprivate.moc \
+ daemonproxy.moc \
+ package.moc \
+ polkitclient.moc \
+ transaction.moc \
+ transactionprivate.moc \
+ transactionproxy.moc \
+ $(NULL)
+
+libpackagekit_qt_la_SOURCES = \
+ client.cpp \
+ clientprivate.cpp \
+ daemonproxy.cpp \
+ transaction.cpp \
+ transactionprivate.cpp \
+ transactionproxy.cpp \
+ package.cpp \
+ polkitclient.cpp \
+ util.cpp \
+ $(NULL)
+
+libpackagekit_qt_la_LIBADD = \
+ $(QTCORE_LIBS) \
+ $(QTDBUS_LIBS) \
+ $(POLKIT_LIBS) \
+ $(NULL)
+
+libpackagekit_qt_la_LDFLAGS = \
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+ -export-dynamic \
+ -no-undefined \
+ $(NULL)
+
+CLEANFILES = $(BUILT_SOURCES)
+
+clean-local:
+ rm -f *~
+ rm -f $(CLEANFILES)
+
+EXTRA_DIST = \
+ util.h \
+ util.cpp \
+ polkitclient.cpp \
+ client.h \
+ CMakeLists.txt \
+ transactionprivate.h \
+ transactionprivate.cpp \
+ common.h \
+ package.h \
+ clientprivate.h \
+ package.cpp \
+ daemonproxy.cpp \
+ client.cpp \
+ transaction.h \
+ transactionproxy.h \
+ transaction.cpp \
+ transactionproxy.cpp \
+ QPackageKit \
+ daemonproxy.h \
+ polkitclient.h \
+ clientprivate.cpp \
+ $(NULL)
commit dbdae02bb93f70bc34c6f61c5151464e5ae2ecfc
Author: Richard Hughes <richard at hughsie.com>
Date: Sat Oct 18 18:09:32 2008 +0100
trivial: add some files to gitignore
diff --git a/lib/packagekit-qt/src/.gitignore b/lib/packagekit-qt/src/.gitignore
index f10858a..aa52be2 100644
--- a/lib/packagekit-qt/src/.gitignore
+++ b/lib/packagekit-qt/src/.gitignore
@@ -2,3 +2,7 @@ CMakeFiles
*.cmake
*.moc
*.so*
+*.la
+*.o
+*.lo
+
commit ccd729c7682bed7fcce4fd8483acfeffdfe13db9
Author: Richard Hughes <richard at hughsie.com>
Date: Sat Oct 18 18:08:19 2008 +0100
bugfix: allow to build packagekit-qt without PolicyKit installed
diff --git a/lib/packagekit-qt/src/polkitclient.cpp b/lib/packagekit-qt/src/polkitclient.cpp
index 375229b..9ebb5db 100644
--- a/lib/packagekit-qt/src/polkitclient.cpp
+++ b/lib/packagekit-qt/src/polkitclient.cpp
@@ -18,7 +18,9 @@
* Boston, MA 02110-1301, USA.
*/
-#include <polkit-dbus/polkit-dbus.h>
+#ifdef USE_SECURITY_POLKIT
+ #include <polkit-dbus/polkit-dbus.h>
+#endif
#include "polkitclient.h"
@@ -35,6 +37,7 @@ PolkitClient* PolkitClient::instance()
PolkitClient::PolkitClient(QObject *parent) : QObject(parent) {
}
+#ifdef USE_SECURITY_POLKIT
bool PolkitClient::getAuth(const QString &action) {
DBusError e;
dbus_error_init(&e);
@@ -49,6 +52,12 @@ bool PolkitClient::getAuth(const QString &action) {
return auth;
}
+#else
+bool PolkitClient::getAuth(const QString &action) {
+ qDebug() << "Not configured with PolicyKit support";
+ return false;
+}
+#endif
#include "polkitclient.moc"
commit 3f32cec8ef78a094a3206a7fefa144fc823a0b82
Merge: 767bbcb... 6984b0c...
Author: Richard Hughes <richard at hughsie.com>
Date: Sat Oct 18 13:21:50 2008 +0100
Merge branch 'master' of git+ssh://hughsie@git.packagekit.org/srv/git/PackageKit
commit 767bbcbeec0520be6b0c3920e6b0a6a98275ecac
Author: Richard Hughes <richard at hughsie.com>
Date: Sat Oct 18 13:21:32 2008 +0100
trivial: dist the packagekit-qt files so that they are in the release tarball
diff --git a/configure.ac b/configure.ac
index 6a84507..fd819a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -574,6 +574,10 @@ data/org.freedesktop.PackageKitAptBackend.conf
data/tests/Makefile
lib/Makefile
lib/packagekit-glib/Makefile
+lib/packagekit-qt/Makefile
+lib/packagekit-qt/modules/Makefile
+lib/packagekit-qt/src/Makefile
+lib/packagekit-qt/test/Makefile
lib/python/Makefile
lib/python/packagekit/Makefile
policy/Makefile
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 8acec7d..a7eb205 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,2 +1,2 @@
-SUBDIRS = packagekit-glib python
+SUBDIRS = packagekit-glib packagekit-qt python
diff --git a/lib/packagekit-qt/.gitignore b/lib/packagekit-qt/.gitignore
new file mode 100644
index 0000000..82d1baf
--- /dev/null
+++ b/lib/packagekit-qt/.gitignore
@@ -0,0 +1,3 @@
+CMakeFiles
+*.cmake
+
diff --git a/lib/packagekit-qt/Makefile.am b/lib/packagekit-qt/Makefile.am
new file mode 100644
index 0000000..e4cbc6e
--- /dev/null
+++ b/lib/packagekit-qt/Makefile.am
@@ -0,0 +1,8 @@
+SUBDIRS = modules src test
+
+EXTRA_DIST = \
+ CMakeLists.txt \
+ Doxyfile \
+ Makefile.am \
+ README
+
diff --git a/lib/packagekit-qt/modules/.gitignore b/lib/packagekit-qt/modules/.gitignore
new file mode 100644
index 0000000..82d1baf
--- /dev/null
+++ b/lib/packagekit-qt/modules/.gitignore
@@ -0,0 +1,3 @@
+CMakeFiles
+*.cmake
+
diff --git a/lib/packagekit-qt/modules/Makefile.am b/lib/packagekit-qt/modules/Makefile.am
new file mode 100644
index 0000000..cd3b443
--- /dev/null
+++ b/lib/packagekit-qt/modules/Makefile.am
@@ -0,0 +1,3 @@
+EXTRA_DIST = \
+ CMakeLists.txt \
+ FindQPackageKit.cmake
diff --git a/lib/packagekit-qt/src/.gitignore b/lib/packagekit-qt/src/.gitignore
new file mode 100644
index 0000000..f10858a
--- /dev/null
+++ b/lib/packagekit-qt/src/.gitignore
@@ -0,0 +1,4 @@
+CMakeFiles
+*.cmake
+*.moc
+*.so*
diff --git a/lib/packagekit-qt/src/Makefile.am b/lib/packagekit-qt/src/Makefile.am
new file mode 100644
index 0000000..50e4d43
--- /dev/null
+++ b/lib/packagekit-qt/src/Makefile.am
@@ -0,0 +1,23 @@
+EXTRA_DIST = \
+ util.h \
+ util.cpp \
+ polkitclient.cpp \
+ client.h \
+ CMakeLists.txt \
+ transactionprivate.h \
+ transactionprivate.cpp \
+ common.h \
+ package.h \
+ clientprivate.h \
+ package.cpp \
+ daemonproxy.cpp \
+ client.cpp \
+ transaction.h \
+ transactionproxy.h \
+ transaction.cpp \
+ transactionproxy.cpp \
+ QPackageKit \
+ daemonproxy.h \
+ polkitclient.h \
+ clientprivate.cpp
+
diff --git a/lib/packagekit-qt/test/Makefile.am b/lib/packagekit-qt/test/Makefile.am
new file mode 100644
index 0000000..36cd748
--- /dev/null
+++ b/lib/packagekit-qt/test/Makefile.am
@@ -0,0 +1,8 @@
+EXTRA_DIST = \
+ daemontest.h \
+ CMakeLists.txt \
+ main.cpp \
+ daemontest.cpp \
+ transactiontest.h \
+ transactiontest.cpp
+
commit 6984b0c3ba3699445f5bfe2902a678c394128c69
Author: 甘露(Lu Gan) <rhythm.gan at gmail.com>
Date: Sat Oct 18 11:43:33 2008 +0000
Update zh_CN.po
Transmitted-via: Transifex (translate.fedoraproject.org)
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b3604fb..5826837 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-10-16 13:13+0000\n"
-"PO-Revision-Date: 2008-10-16 22:34+0700\n"
+"PO-Revision-Date: 2008-10-18 19:39+0700\n"
"Last-Translator: 甘露(Gan Lu) <rhythm.gan at gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -545,5 +545,5 @@ msgstr "æ— æ³•è¿žæŽ¥åˆ°ç³»ç»Ÿæ€»çº¿"
#: ../src/pk-main.c:295
#, c-format
msgid "Error trying to start: %s\n"
-msgstr "出现错误当å°è¯•å¯åŠ¨ %s\n"
+msgstr "出现错误当å°è¯•å¯åŠ¨ï¼š %s\n"
commit ef1f0df802d2458f59d17e0ba82a7b3cb67be2b4
Author: Adrien BUSTANY <madcat at mymadcat.com>
Date: Fri Oct 17 22:32:48 2008 +0200
Add categories to PackageKit-Qt
diff --git a/lib/packagekit-qt/src/client.h b/lib/packagekit-qt/src/client.h
index cc420da..c6e4b15 100644
--- a/lib/packagekit-qt/src/client.h
+++ b/lib/packagekit-qt/src/client.h
@@ -451,6 +451,13 @@ public:
Transaction* downloadPackage(Package* package);
/**
+ * Returns the collection categories
+ *
+ * \sa Transaction::category
+ */
+ Transaction* getCategories();
+
+ /**
* \brief Gets the list of dependencies for the given \p packages
*
* You can use the \p filters to limit the results to certain packages. The
diff --git a/lib/packagekit-qt/src/transaction.cpp b/lib/packagekit-qt/src/transaction.cpp
index 880a98e..49d5a50 100644
--- a/lib/packagekit-qt/src/transaction.cpp
+++ b/lib/packagekit-qt/src/transaction.cpp
@@ -40,6 +40,7 @@ Transaction::Transaction(const QString& tid, Client* parent) : QObject(parent)
qDebug("Error, cannot create transaction proxy");
connect(d->p, SIGNAL(AllowCancel(bool)), this, SIGNAL(allowCancelChanged(bool)));
+ connect(d->p, SIGNAL(Category(const QString&, const QString&, const QString&, const QString&, const QString&)), this, SIGNAL(category(const QString&, const QString&, const QString&, const QString&, const QString&)));
connect(d->p, SIGNAL(Details(const QString&, const QString&, const QString&, const QString&, const QString&, qulonglong)), d, SLOT(details(const QString&, const QString&, const QString&, const QString&, const QString&, qulonglong)));
connect(d->p, SIGNAL(DistroUpgrade(const QString&, const QString&, const QString&)), d, SLOT(distroUpgrade(const QString&, const QString&, const QString&)));
connect(d->p, SIGNAL(ErrorCode(const QString&, const QString&)), d, SLOT(errorCode(const QString&, const QString&)));
diff --git a/lib/packagekit-qt/src/transaction.h b/lib/packagekit-qt/src/transaction.h
index f9c04e1..41f3511 100644
--- a/lib/packagekit-qt/src/transaction.h
+++ b/lib/packagekit-qt/src/transaction.h
@@ -203,7 +203,7 @@ public:
/**
* Returns the time the transaction took to finish
- * \return the number of seconds the transaction took to finish
+ * \return the number of milliseconds the transaction took to finish
* \note This function only returns a real value for old transactions returned by getOldTransactions
*/
uint duration();
@@ -241,6 +241,17 @@ Q_SIGNALS:
void callerActiveChanged(bool isActive);
/**
+ * \brief Sends a category
+ *
+ * \li \p parent_id is the id of the parent category. A blank parent means a root category
+ * \li \p cat_id is the id of the category
+ * \li \p name is the category's name. This name is localized.
+ * \li \p summary is the category's summary. It is localized.
+ * \li \p icon is the icon identifier eg. server-cfg. If unknown, it is set to icon-missing.
+ */
+ void category(const QString &parent_id, const QString &cat_id, const QString &name, const QString &summary, const QString &icon);
+
+ /**
* Sends additional details about the \p package
* \sa Client::getDetails
*/
diff --git a/lib/packagekit-qt/src/transactionproxy.h b/lib/packagekit-qt/src/transactionproxy.h
index 843a7cc..19f2627 100644
--- a/lib/packagekit-qt/src/transactionproxy.h
+++ b/lib/packagekit-qt/src/transactionproxy.h
@@ -2,7 +2,7 @@
* This file was generated by dbusxml2cpp version 0.6
* Command line was: dbusxml2cpp -c TransactionProxy -p transactionproxy.h /home/madcat/code/packagekit/src/pk-interface-transaction.xml org.freedesktop.PackageKit.Transaction
*
- * dbusxml2cpp is Copyright (C) 2006 Trolltech ASA. All rights reserved.
+ * dbusxml2cpp is Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
*
* This is an auto-generated file.
* Do not edit! All changes made to it will be lost.
@@ -64,6 +64,12 @@ public Q_SLOTS: // METHODS
return callWithArgumentList(QDBus::Block, QLatin1String("GetAllowCancel"), argumentList);
}
+ inline QDBusReply<void> GetCategories()
+ {
+ QList<QVariant> argumentList;
+ return callWithArgumentList(QDBus::Block, QLatin1String("GetCategories"), argumentList);
+ }
+
inline QDBusReply<void> GetDepends(const QString &filter, const QStringList &package_ids, bool recursive)
{
QList<QVariant> argumentList;
@@ -294,6 +300,8 @@ public Q_SLOTS: // METHODS
Q_SIGNALS: // SIGNALS
void AllowCancel(bool allow_cancel);
void CallerActiveChanged(bool is_active);
+ void Category(const QString &parent_id, const QString &cat_id, const QString &name, const QString &summary, const QString &icon);
+ void Destroy();
void Details(const QString &package_id, const QString &license, const QString &group, const QString &detail, const QString &url, qulonglong size);
void DistroUpgrade(const QString &type, const QString &name, const QString &summary);
void ErrorCode(const QString &code, const QString &details);
commit 81150fbe0a9f906385a834f7be2c90906ea33ddb
Author: Piotr DrÄ…g <piotrdrag at gmail.com>
Date: Fri Oct 17 19:49:07 2008 +0000
Fixed LINGUAS
Transmitted-via: Transifex (translate.fedoraproject.org)
diff --git a/po/LINGUAS b/po/LINGUAS
index 9595673..48eb114 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -17,4 +17,5 @@ ru
sk
sr
sr at latin
+sv
zh_CN
commit 97234b83c8abb992a706ff470e19913c3f69a1a6
Author: Richard Hughes <richard at hughsie.com>
Date: Fri Oct 17 18:58:47 2008 +0100
trivial: I was wrong to rip out the PkPostTrans logic as we don't want a million status reports from the daemon when iterating the list. Revert the patch that removed it.
diff --git a/src/pk-post-trans.c b/src/pk-post-trans.c
index 46ac6e1..e94eae3 100644
--- a/src/pk-post-trans.c
+++ b/src/pk-post-trans.c
@@ -58,6 +58,13 @@ struct PkPostTransPrivate
guint package_id;
};
+enum {
+ PK_POST_TRANS_STATUS_CHANGED,
+ PK_POST_TRANS_PROGRESS_CHANGED,
+ PK_POST_TRANS_LAST_SIGNAL
+};
+
+static guint signals [PK_POST_TRANS_LAST_SIGNAL] = { 0 };
G_DEFINE_TYPE (PkPostTrans, pk_post_trans, G_TYPE_OBJECT)
/**
@@ -80,6 +87,26 @@ pk_post_trans_package_cb (PkBackend *backend, const PkPackageObj *obj, PkPostTra
}
/**
+ * pk_post_trans_set_status_changed:
+ **/
+static void
+pk_post_trans_set_status_changed (PkPostTrans *post, PkStatusEnum status)
+{
+ egg_debug ("emiting status-changed %s", pk_status_enum_to_text (status));
+ g_signal_emit (post, signals [PK_POST_TRANS_STATUS_CHANGED], 0, status);
+}
+
+/**
+ * pk_post_trans_set_progress_changed:
+ **/
+static void
+pk_post_trans_set_progress_changed (PkPostTrans *post, guint percentage)
+{
+ egg_debug ("emiting progress-changed %i", percentage);
+ g_signal_emit (post, signals [PK_POST_TRANS_PROGRESS_CHANGED], 0, percentage, 0, 0, 0);
+}
+
+/**
* pk_import_get_locale:
**/
static gchar *
@@ -371,7 +398,7 @@ pk_post_trans_import_desktop_files (PkPostTrans *post)
/* use a local backend instance */
pk_backend_reset (post->priv->backend);
- pk_backend_set_status (post->priv->backend, PK_STATUS_ENUM_SCAN_APPLICATIONS);
+ pk_post_trans_set_status_changed (post, PK_STATUS_ENUM_SCAN_APPLICATIONS);
egg_debug ("getting old desktop mtimes");
mtimes_old = pk_post_trans_string_list_new ();
@@ -395,7 +422,7 @@ pk_post_trans_import_desktop_files (PkPostTrans *post)
}
/* update UI */
- pk_backend_set_percentage (post->priv->backend, 0);
+ pk_post_trans_set_progress_changed (post, 0);
step = 100.0f / PK_OBJ_LIST(mtimes)->len;
/* for each new package, process the desktop file */
@@ -417,7 +444,7 @@ pk_post_trans_import_desktop_files (PkPostTrans *post)
g_free (filename);
/* update UI */
- pk_backend_set_percentage (post->priv->backend, i * step);
+ pk_post_trans_set_progress_changed (post, i * step);
}
/* save new mtimes data */
@@ -427,8 +454,8 @@ pk_post_trans_import_desktop_files (PkPostTrans *post)
no_changes:
/* update UI */
- pk_backend_set_percentage (post->priv->backend, 100);
- pk_backend_set_status (post->priv->backend, PK_STATUS_ENUM_FINISHED);
+ pk_post_trans_set_progress_changed (post, 100);
+ pk_post_trans_set_status_changed (post, PK_STATUS_ENUM_FINISHED);
g_object_unref (files);
g_object_unref (mtimes);
@@ -457,8 +484,8 @@ pk_post_trans_update_package_list (PkPostTrans *post)
pk_obj_list_clear (PK_OBJ_LIST(post->priv->list));
/* update UI */
- pk_backend_set_status (post->priv->backend, PK_STATUS_ENUM_GENERATE_PACKAGE_LIST);
- pk_backend_set_percentage (post->priv->backend, 101);
+ pk_post_trans_set_status_changed (post, PK_STATUS_ENUM_GENERATE_PACKAGE_LIST);
+ pk_post_trans_set_progress_changed (post, 101);
/* get the new package list */
pk_backend_reset (post->priv->backend);
@@ -469,7 +496,7 @@ pk_post_trans_update_package_list (PkPostTrans *post)
g_main_loop_run (post->priv->loop);
/* update UI */
- pk_backend_set_percentage (post->priv->backend, 90);
+ pk_post_trans_set_progress_changed (post, 90);
/* convert to a file */
ret = pk_obj_list_to_file (PK_OBJ_LIST(post->priv->list), PK_SYSTEM_PACKAGE_LIST_FILENAME);
@@ -477,8 +504,8 @@ pk_post_trans_update_package_list (PkPostTrans *post)
egg_warning ("failed to save to file");
/* update UI */
- pk_backend_set_percentage (post->priv->backend, 100);
- pk_backend_set_status (post->priv->backend, PK_STATUS_ENUM_FINISHED);
+ pk_post_trans_set_progress_changed (post, 100);
+ pk_post_trans_set_status_changed (post, PK_STATUS_ENUM_FINISHED);
return ret;
}
@@ -672,6 +699,16 @@ pk_post_trans_class_init (PkPostTransClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->finalize = pk_post_trans_finalize;
+ signals [PK_POST_TRANS_STATUS_CHANGED] =
+ g_signal_new ("status-changed",
+ G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST,
+ 0, NULL, NULL, g_cclosure_marshal_VOID__UINT,
+ G_TYPE_NONE, 1, G_TYPE_UINT);
+ signals [PK_POST_TRANS_PROGRESS_CHANGED] =
+ g_signal_new ("progress-changed",
+ G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST,
+ 0, NULL, NULL, pk_marshal_VOID__UINT_UINT_UINT_UINT,
+ G_TYPE_NONE, 4, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT);
g_type_class_add_private (klass, sizeof (PkPostTransPrivate));
}
diff --git a/src/pk-transaction.c b/src/pk-transaction.c
index 4ad4c61..f304c22 100644
--- a/src/pk-transaction.c
+++ b/src/pk-transaction.c
@@ -602,6 +602,13 @@ pk_transaction_finished_cb (PkBackend *backend, PkExitEnum exit, PkTransaction *
}
}
+ /* signals we are not allowed to send from the second phase post transaction */
+ g_signal_handler_disconnect (transaction->priv->backend, transaction->priv->signal_allow_cancel);
+ g_signal_handler_disconnect (transaction->priv->backend, transaction->priv->signal_message);
+ g_signal_handler_disconnect (transaction->priv->backend, transaction->priv->signal_status_changed);
+ g_signal_handler_disconnect (transaction->priv->backend, transaction->priv->signal_progress_changed);
+ g_signal_handler_disconnect (transaction->priv->backend, transaction->priv->signal_require_restart);
+
/* do some optional extra actions when we've finished refreshing the cache */
if (exit == PK_EXIT_ENUM_SUCCESS &&
transaction->priv->role == PK_ROLE_ENUM_REFRESH_CACHE) {
@@ -620,13 +627,6 @@ pk_transaction_finished_cb (PkBackend *backend, PkExitEnum exit, PkTransaction *
pk_post_trans_clear_firmware_requests (transaction->priv->post_trans);
}
- /* signals we are allowed to send from a post transaction */
- g_signal_handler_disconnect (transaction->priv->backend, transaction->priv->signal_allow_cancel);
- g_signal_handler_disconnect (transaction->priv->backend, transaction->priv->signal_message);
- g_signal_handler_disconnect (transaction->priv->backend, transaction->priv->signal_status_changed);
- g_signal_handler_disconnect (transaction->priv->backend, transaction->priv->signal_progress_changed);
- g_signal_handler_disconnect (transaction->priv->backend, transaction->priv->signal_require_restart);
-
/* if we did not send this, ensure the GUI has the right state */
if (transaction->priv->allow_cancel)
pk_transaction_allow_cancel_emit (transaction, FALSE);
@@ -3685,7 +3685,12 @@ pk_transaction_init (PkTransaction *transaction)
transaction->priv->inhibit = pk_inhibit_new ();
transaction->priv->package_list = pk_package_list_new ();
transaction->priv->transaction_list = pk_transaction_list_new ();
+
transaction->priv->post_trans = pk_post_trans_new ();
+ g_signal_connect (transaction->priv->post_trans, "status-changed",
+ G_CALLBACK (pk_transaction_status_changed_cb), transaction);
+ g_signal_connect (transaction->priv->post_trans, "progress-changed",
+ G_CALLBACK (pk_transaction_progress_changed_cb), transaction);
transaction->priv->transaction_db = pk_transaction_db_new ();
g_signal_connect (transaction->priv->transaction_db, "transaction",
commit a24817cfac7e52a32c873759846fe0605cc96318
Author: Richard Hughes <richard at hughsie.com>
Date: Fri Oct 17 18:39:29 2008 +0100
trivial: reduce warning level when the script exits
diff --git a/src/pk-spawn.c b/src/pk-spawn.c
index 4c79ed4..f121419 100644
--- a/src/pk-spawn.c
+++ b/src/pk-spawn.c
@@ -181,7 +181,7 @@ pk_spawn_check_child (PkSpawn *spawn)
spawn->priv->child_pid = -1;
if (WEXITSTATUS (status) > 0) {
- egg_warning ("Running fork failed with return value %d", WEXITSTATUS (status));
+ egg_debug ("Running fork failed with return value %d", WEXITSTATUS (status));
if (spawn->priv->exit == PK_SPAWN_EXIT_TYPE_UNKNOWN)
spawn->priv->exit = PK_SPAWN_EXIT_TYPE_FAILED;
} else {
commit 840e7cf03689c5d7b091f965742c8a4ec78a494d
Author: Richard Hughes <richard at hughsie.com>
Date: Fri Oct 17 18:39:00 2008 +0100
bugfix: if the transaction failed then don't try to get the file lists
diff --git a/src/pk-transaction.c b/src/pk-transaction.c
index 7a35d73..4ad4c61 100644
--- a/src/pk-transaction.c
+++ b/src/pk-transaction.c
@@ -575,8 +575,9 @@ pk_transaction_finished_cb (PkBackend *backend, PkExitEnum exit, PkTransaction *
g_signal_handler_disconnect (transaction->priv->backend, transaction->priv->signal_category);
/* check for session restarts */
- if (transaction->priv->role == PK_ROLE_ENUM_UPDATE_SYSTEM ||
- transaction->priv->role == PK_ROLE_ENUM_UPDATE_PACKAGES) {
+ if (exit == PK_EXIT_ENUM_SUCCESS &&
+ (transaction->priv->role == PK_ROLE_ENUM_UPDATE_SYSTEM ||
+ transaction->priv->role == PK_ROLE_ENUM_UPDATE_PACKAGES)) {
/* check updated packages file lists and running processes */
ret = pk_conf_get_bool (transaction->priv->conf, "UpdateCheckProcesses");
commit adb4231b711a8a0691834b13b09e61d30d204eda
Author: Richard Hughes <richard at hughsie.com>
Date: Fri Oct 17 18:36:55 2008 +0100
bugfix: if no packages were updated then don't try to get the file lists
diff --git a/src/pk-transaction.c b/src/pk-transaction.c
index bc3d376..7a35d73 100644
--- a/src/pk-transaction.c
+++ b/src/pk-transaction.c
@@ -592,9 +592,11 @@ pk_transaction_finished_cb (PkBackend *backend, PkExitEnum exit, PkTransaction *
}
/* process file lists on these packages */
- package_ids = pk_package_list_to_strv (list);
- pk_post_trans_check_process_filelists (transaction->priv->post_trans, package_ids);
- g_strfreev (package_ids);
+ if (PK_OBJ_LIST(list)->len > 0) {
+ package_ids = pk_package_list_to_strv (list);
+ pk_post_trans_check_process_filelists (transaction->priv->post_trans, package_ids);
+ g_strfreev (package_ids);
+ }
g_object_unref (list);
}
}
commit fc0349b8fefbabb07844e49794751cc5b1a1ea01
Author: Richard Hughes <richard at hughsie.com>
Date: Fri Oct 17 17:32:26 2008 +0100
trivial: according to the shared-mime-info-spec, generic icon is not valid
diff --git a/data/packagekit-catalog.xml.in b/data/packagekit-catalog.xml.in
index 399b0fa..d25210f 100644
--- a/data/packagekit-catalog.xml.in
+++ b/data/packagekit-catalog.xml.in
@@ -3,7 +3,6 @@
<mime-type type="application/x-catalog">
<_comment>PackageKit Catalog</_comment>
<glob pattern="*.catalog"/>
- <generic-icon name="package-x-generic"/>
</mime-type>
</mime-info>
diff --git a/data/packagekit-package-list.xml.in b/data/packagekit-package-list.xml.in
index d2c6cbd..f08d411 100644
--- a/data/packagekit-package-list.xml.in
+++ b/data/packagekit-package-list.xml.in
@@ -3,7 +3,6 @@
<mime-type type="application/x-package-list">
<_comment>PackageKit Package List</_comment>
<glob pattern="*.package-list"/>
- <generic-icon name="package-x-generic"/>
</mime-type>
</mime-info>
diff --git a/data/packagekit-servicepack.xml.in b/data/packagekit-servicepack.xml.in
index dc9a3cb..65b5d12 100644
--- a/data/packagekit-servicepack.xml.in
+++ b/data/packagekit-servicepack.xml.in
@@ -3,7 +3,6 @@
<mime-type type="application/x-servicepack">
<_comment>PackageKit Service Pack</_comment>
<glob pattern="*.servicepack"/>
- <generic-icon name="package-x-generic"/>
</mime-type>
</mime-info>
More information about the PackageKit-commit
mailing list