[PackageKit-commit] packagekit: Branch 'master' - 12 commits

Richard Hughes hughsient at kemper.freedesktop.org
Wed Oct 1 08:52:09 PDT 2008


 backends/alpm/pk-backend-alpm.c                 |    1 
 backends/apt.deprecated/pk-backend-apt.c        |    1 
 backends/apt/pk-backend-apt.c                   |    1 
 backends/box/pk-backend-box.c                   |    1 
 backends/conary/pk-backend-conary.c             |    1 
 backends/dummy/pk-backend-dummy.c               |   10 
 backends/opkg/pk-backend-opkg.c                 |    1 
 backends/pisi/pisiBackend.py                    |   38 +-
 backends/pisi/pk-backend-pisi.c                 |    5 
 backends/poldek/pk-backend-poldek.c             |    1 
 backends/razor/pk-backend-razor.c               |    1 
 backends/smart/pk-backend-smart.c               |    1 
 backends/test/pk-backend-test-dbus.c            |    1 
 backends/test/pk-backend-test-fail.c            |    1 
 backends/test/pk-backend-test-nop.c             |    1 
 backends/test/pk-backend-test-spawn.c           |    1 
 backends/test/pk-backend-test-succeed.c         |    1 
 backends/test/pk-backend-test-thread.c          |    1 
 backends/urpmi/pk-backend-urpmi.c               |    1 
 backends/yum/pk-backend-yum.c                   |   10 
 backends/zypp/pk-backend-zypp.cpp               |    1 
 contrib/PackageKit.spec.in                      |   22 -
 contrib/gstreamer-plugin/pk-gstreamer-install.c |    3 
 etc/PackageKit.conf.in                          |    9 
 libpackagekit/pk-control.c                      |   45 ++
 libpackagekit/pk-control.h                      |    2 
 po/LINGUAS                                      |    2 
 po/nb.po                                        |  400 ++++++++++++++++++++++++
 po/no_nb.po                                     |  400 ------------------------
 src/pk-backend-internal.h                       |    1 
 src/pk-backend.c                                |   15 
 src/pk-backend.h                                |    6 
 src/pk-engine.c                                 |   28 +
 src/pk-engine.h                                 |    4 
 src/pk-interface.xml                            |   20 +
 src/pk-spawn.c                                  |   16 
 36 files changed, 620 insertions(+), 433 deletions(-)

New commits:
commit 4ca73410e064248c86150ef2820ff823b3419268
Merge: 4d14c01... cf5babf...
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Oct 1 16:46:48 2008 +0100

    Merge branch 'GetMimeTypes'

commit 4d14c01d81462f151fdd2f819f529a7ee9b70405
Merge: caf005c... d02057b...
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Oct 1 16:46:29 2008 +0100

    Merge branch 'renice'

commit caf005c61c20a9e1ca9ff9b3ce284ab6ff41d3f1
Author: Richard Hughes <hughsie at localhost.localdomain>
Date:   Wed Oct 1 14:20:01 2008 +0100

    trivial: add some debugging about the XID set in the gstreamer helper

diff --git a/contrib/gstreamer-plugin/pk-gstreamer-install.c b/contrib/gstreamer-plugin/pk-gstreamer-install.c
index 23131ec..c3a3b54 100644
--- a/contrib/gstreamer-plugin/pk-gstreamer-install.c
+++ b/contrib/gstreamer-plugin/pk-gstreamer-install.c
@@ -311,6 +311,9 @@ main (int argc, char **argv)
 		goto out;
 	}
 
+	/* this is our parent window */
+	g_message ("PackageKit: xid = %i", xid);
+
 	/* get bus */
 	connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
 	if (connection == NULL) {
commit d02057b2d5c1b8e752bf8466604466b9a523a75a
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Oct 1 10:40:30 2008 +0100

    trivial: get the nice value of the spawned process from BackendSpawnNiceValue in the config file

diff --git a/etc/PackageKit.conf.in b/etc/PackageKit.conf.in
index fae5ad4..d206d43 100644
--- a/etc/PackageKit.conf.in
+++ b/etc/PackageKit.conf.in
@@ -30,6 +30,15 @@ ShutdownTimeout=300
 # default=5
 BackendShutdownTimeout=5
 
+# Set the priority of the spawned backend to this priority.
+# This ensures the process does not hog the system when performing actions.
+#
+# Values range from -20 (most favorable) to 19 (least favorable)
+# A niceness value of 0 will not attempt to set any priority.
+#
+# default=10
+BackendSpawnNiceValue=10
+
 # Default backend, as chosen in the configure script. This will be used where
 # no --backend="foo" option is given to the daemon.
 #
diff --git a/src/pk-spawn.c b/src/pk-spawn.c
index dcad833..ed07107 100644
--- a/src/pk-spawn.c
+++ b/src/pk-spawn.c
@@ -49,6 +49,7 @@
 
 #include "pk-spawn.h"
 #include "pk-marshal.h"
+#include "pk-conf.h"
 
 static void     pk_spawn_class_init	(PkSpawnClass *klass);
 static void     pk_spawn_init		(PkSpawn      *spawn);
@@ -72,6 +73,7 @@ struct PkSpawnPrivate
 	GString			*stdout_buf;
 	gchar			*last_argv0;
 	gchar			**last_envp;
+	PkConf			*conf;
 };
 
 enum {
@@ -364,6 +366,7 @@ pk_spawn_argv (PkSpawn *spawn, gchar **argv, gchar **envp)
 	gboolean ret;
 	guint i;
 	guint len;
+	gint nice;
 	gchar *command;
 
 	g_return_val_if_fail (PK_IS_SPAWN (spawn), FALSE);
@@ -427,8 +430,15 @@ pk_spawn_argv (PkSpawn *spawn, gchar **argv, gchar **envp)
 				 NULL,
 				 NULL);
 
+	/* get the nice value and ensure we are in the valid range */
+	nice = pk_conf_get_int (spawn->priv->conf, "BackendSpawnNiceValue");
+	nice = CLAMP(nice, -20, 19);
+
 	/* don't completely bog the system down */
-	setpriority (PRIO_PROCESS, spawn->priv->child_pid, PRIO_MIN);
+	if (nice != 0) {
+		egg_debug ("renice to %i", nice);
+		setpriority (PRIO_PROCESS, spawn->priv->child_pid, nice);
+	}
 
 	/* we failed to invoke the helper */
 	if (!ret) {
@@ -504,6 +514,7 @@ pk_spawn_init (PkSpawn *spawn)
 
 	spawn->priv->stdout_buf = g_string_new ("");
 	spawn->priv->exit_loop = g_main_loop_new (NULL, FALSE);
+	spawn->priv->conf = pk_conf_new ();
 }
 
 /**
@@ -539,6 +550,7 @@ pk_spawn_finalize (GObject *object)
 	g_free (spawn->priv->last_argv0);
 	g_strfreev (spawn->priv->last_envp);
 	g_main_loop_unref (spawn->priv->exit_loop);
+	g_object_unref (spawn->priv->conf);
 
 	G_OBJECT_CLASS (pk_spawn_parent_class)->finalize (object);
 }
commit ff0a24221f9cbb500a5c960935240b5e50b6693b
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Oct 1 10:23:50 2008 +0100

    feature: renice the spawned process so that we don't hog the system when doing automatic updates

diff --git a/src/pk-spawn.c b/src/pk-spawn.c
index a7b71ca..dcad833 100644
--- a/src/pk-spawn.c
+++ b/src/pk-spawn.c
@@ -30,6 +30,7 @@
 #include <string.h>
 #include <sys/time.h>
 #include <sys/types.h>
+#include <sys/resource.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif /* HAVE_UNISTD_H */
@@ -426,6 +427,9 @@ pk_spawn_argv (PkSpawn *spawn, gchar **argv, gchar **envp)
 				 NULL,
 				 NULL);
 
+	/* don't completely bog the system down */
+	setpriority (PRIO_PROCESS, spawn->priv->child_pid, PRIO_MIN);
+
 	/* we failed to invoke the helper */
 	if (!ret) {
 		egg_warning ("failed to spawn '%s'", argv[0]);
commit cf5babff2100856b6c622da586f89ad299e5c2f7
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Oct 1 10:06:02 2008 +0100

    feature, API addition: Add the GetMimeTypes method that can be used to get the MIME types of packages supported

diff --git a/backends/alpm/pk-backend-alpm.c b/backends/alpm/pk-backend-alpm.c
index 25fbda6..70d4e0a 100644
--- a/backends/alpm/pk-backend-alpm.c
+++ b/backends/alpm/pk-backend-alpm.c
@@ -1463,6 +1463,7 @@ PK_BACKEND_OPTIONS (
 	backend_destroy,				/* destroy */
 	backend_get_groups,				/* get_groups */
 	backend_get_filters,				/* get_filters */
+	NULL,						/* get_mime_types */
 	backend_cancel,					/* cancel */
 	NULL,						/* download_packages */
 	backend_get_depends,				/* get_depends */
diff --git a/backends/apt.deprecated/pk-backend-apt.c b/backends/apt.deprecated/pk-backend-apt.c
index 7efcc6e..de41f91 100644
--- a/backends/apt.deprecated/pk-backend-apt.c
+++ b/backends/apt.deprecated/pk-backend-apt.c
@@ -243,6 +243,7 @@ PK_BACKEND_OPTIONS (
 	backend_destroy,			/* destroy */
 	backend_get_groups,			/* get_groups */
 	backend_get_filters,			/* get_filters */
+	NULL,					/* get_mime_types */
 	NULL,					/* cancel */
 	NULL,					/* download_packages */
 	backend_get_depends,			/* get_depends */
diff --git a/backends/apt/pk-backend-apt.c b/backends/apt/pk-backend-apt.c
index 901c59c..d90a75b 100644
--- a/backends/apt/pk-backend-apt.c
+++ b/backends/apt/pk-backend-apt.c
@@ -341,6 +341,7 @@ PK_BACKEND_OPTIONS (
 	backend_destroy,			/* destroy */
 	backend_get_groups,			/* get_groups */
 	backend_get_filters,			/* get_filters */
+	NULL,					/* get_mime_types */
 	backend_cancel,				/* cancel */
 	backend_download_packages,		/* download_packages */
 	backend_get_depends,			/* get_depends */
diff --git a/backends/box/pk-backend-box.c b/backends/box/pk-backend-box.c
index 952f235..6000324 100644
--- a/backends/box/pk-backend-box.c
+++ b/backends/box/pk-backend-box.c
@@ -667,6 +667,7 @@ PK_BACKEND_OPTIONS (
 	backend_destroy,			/* destroy */
 	NULL,					/* get_groups */
 	backend_get_filters,			/* get_filters */
+	NULL,					/* get_mime_types */
 	NULL,					/* cancel */
 	NULL,					/* download_packages */
 	backend_get_depends,			/* get_depends */
diff --git a/backends/conary/pk-backend-conary.c b/backends/conary/pk-backend-conary.c
index 2ed14d5..1b01102 100644
--- a/backends/conary/pk-backend-conary.c
+++ b/backends/conary/pk-backend-conary.c
@@ -277,6 +277,7 @@ PK_BACKEND_OPTIONS (
 	backend_destroy,			/* destroy */
 	backend_get_groups,			/* get_groups */
 	backend_get_filters,			/* get_filters */
+	NULL,					/* get_mime_types */
 	backend_cancel,				/* cancel */
 	NULL,					/* download_packages */
 	NULL,					/* get_depends */
diff --git a/backends/dummy/pk-backend-dummy.c b/backends/dummy/pk-backend-dummy.c
index 0632770..11bc33b 100644
--- a/backends/dummy/pk-backend-dummy.c
+++ b/backends/dummy/pk-backend-dummy.c
@@ -84,6 +84,15 @@ backend_get_filters (PkBackend *backend)
 }
 
 /**
+ * backend_get_mime_types:
+ */
+static gchar *
+backend_get_mime_types (PkBackend *backend)
+{
+	return g_strdup ("application/x-rpm;application/x-deb");
+}
+
+/**
  * backend_cancel_timeout:
  */
 static gboolean
@@ -929,6 +938,7 @@ PK_BACKEND_OPTIONS (
 	backend_destroy,			/* destroy */
 	backend_get_groups,			/* get_groups */
 	backend_get_filters,			/* get_filters */
+	backend_get_mime_types,			/* get_mime_types */
 	backend_cancel,				/* cancel */
 	backend_download_packages,		/* download_packages */
 	backend_get_depends,			/* get_depends */
diff --git a/backends/opkg/pk-backend-opkg.c b/backends/opkg/pk-backend-opkg.c
index ff184f2..ffd5cfb 100644
--- a/backends/opkg/pk-backend-opkg.c
+++ b/backends/opkg/pk-backend-opkg.c
@@ -721,6 +721,7 @@ PK_BACKEND_OPTIONS (
 	backend_destroy,			/* destroy */
 	backend_get_groups,			/* get_groups */
 	backend_get_filters,			/* get_filters */
+	NULL,					/* get_mime_types */
 	NULL,					/* cancel */
 	NULL,					/* download_packages */
 	NULL,					/* get_depends */
diff --git a/backends/pisi/pk-backend-pisi.c b/backends/pisi/pk-backend-pisi.c
index 0bb1d45..3480485 100644
--- a/backends/pisi/pk-backend-pisi.c
+++ b/backends/pisi/pk-backend-pisi.c
@@ -366,6 +366,7 @@ PK_BACKEND_OPTIONS (
 	backend_destroy,			/* destroy */
 	backend_get_groups,			/* get_groups */
 	backend_get_filters,			/* get_filters */
+	NULL,					/* get_mime_types */
 	backend_cancel,				/* cancel */
 	NULL,					/* download_packages */
 	backend_get_depends,			/* get_depends */
diff --git a/backends/poldek/pk-backend-poldek.c b/backends/poldek/pk-backend-poldek.c
index eebf6bb..89a30f3 100644
--- a/backends/poldek/pk-backend-poldek.c
+++ b/backends/poldek/pk-backend-poldek.c
@@ -2847,6 +2847,7 @@ PK_BACKEND_OPTIONS (
 	backend_destroy,				/* destroy */
 	backend_get_groups,				/* get_groups */
 	backend_get_filters,				/* get_filters */
+	NULL,						/* get_mime_types */
 	backend_get_cancel,				/* cancel */
 	backend_download_packages,			/* download_packages */
 	backend_get_depends,				/* get_depends */
diff --git a/backends/razor/pk-backend-razor.c b/backends/razor/pk-backend-razor.c
index ac2d3ca..455c28d 100644
--- a/backends/razor/pk-backend-razor.c
+++ b/backends/razor/pk-backend-razor.c
@@ -401,6 +401,7 @@ PK_BACKEND_OPTIONS (
 	backend_destroy,			/* destroy */
 	NULL,					/* get_groups */
 	backend_get_filters,			/* get_filters */
+	NULL,					/* get_mime_types */
 	NULL,					/* cancel */
 	NULL,					/* download_packages */
 	NULL,					/* get_depends */
diff --git a/backends/smart/pk-backend-smart.c b/backends/smart/pk-backend-smart.c
index 16da9fe..d443816 100644
--- a/backends/smart/pk-backend-smart.c
+++ b/backends/smart/pk-backend-smart.c
@@ -450,6 +450,7 @@ PK_BACKEND_OPTIONS (
 	backend_destroy,				/* destroy */
 	backend_get_groups,				/* get_groups */
 	backend_get_filters,				/* get_filters */
+	NULL,						/* get_mime_types */
 	backend_cancel,					/* cancel */
 	backend_download_packages,			/* download_packages */
 	backend_get_depends,				/* get_depends */
diff --git a/backends/test/pk-backend-test-dbus.c b/backends/test/pk-backend-test-dbus.c
index 5d3ee53..49771b0 100644
--- a/backends/test/pk-backend-test-dbus.c
+++ b/backends/test/pk-backend-test-dbus.c
@@ -80,6 +80,7 @@ PK_BACKEND_OPTIONS (
 	backend_destroy,			/* destroy */
 	NULL,					/* get_groups */
 	NULL,					/* get_filters */
+	NULL,					/* get_mime_types */
 	backend_cancel,				/* cancel */
 	NULL,					/* download_packages */
 	NULL,					/* get_depends */
diff --git a/backends/test/pk-backend-test-fail.c b/backends/test/pk-backend-test-fail.c
index 3003f9a..1fa1edd 100644
--- a/backends/test/pk-backend-test-fail.c
+++ b/backends/test/pk-backend-test-fail.c
@@ -254,6 +254,7 @@ PK_BACKEND_OPTIONS (
 	backend_destroy,			/* destroy */
 	backend_get_groups,			/* get_groups */
 	backend_get_filters,			/* get_filters */
+	NULL,					/* get_mime_types */
 	backend_cancel,				/* cancel */
 	NULL,					/* download_packages */
 	backend_get_depends,			/* get_depends */
diff --git a/backends/test/pk-backend-test-nop.c b/backends/test/pk-backend-test-nop.c
index 89a6408..7f1cde5 100644
--- a/backends/test/pk-backend-test-nop.c
+++ b/backends/test/pk-backend-test-nop.c
@@ -30,6 +30,7 @@ PK_BACKEND_OPTIONS (
 	NULL,					/* destroy */
 	NULL,					/* get_groups */
 	NULL,					/* get_filters */
+	NULL,					/* get_mime_types */
 	NULL,					/* cancel */
 	NULL,					/* download_packages */
 	NULL,					/* get_depends */
diff --git a/backends/test/pk-backend-test-spawn.c b/backends/test/pk-backend-test-spawn.c
index a49a773..14242e1 100644
--- a/backends/test/pk-backend-test-spawn.c
+++ b/backends/test/pk-backend-test-spawn.c
@@ -71,6 +71,7 @@ PK_BACKEND_OPTIONS (
 	backend_destroy,			/* destroy */
 	NULL,					/* get_groups */
 	NULL,					/* get_filters */
+	NULL,					/* get_mime_types */
 	NULL,					/* cancel */
 	NULL,					/* download_packages */
 	NULL,					/* get_depends */
diff --git a/backends/test/pk-backend-test-succeed.c b/backends/test/pk-backend-test-succeed.c
index 833ef57..3d43af1 100644
--- a/backends/test/pk-backend-test-succeed.c
+++ b/backends/test/pk-backend-test-succeed.c
@@ -323,6 +323,7 @@ PK_BACKEND_OPTIONS (
 	backend_destroy,			/* destroy */
 	backend_get_groups,			/* get_groups */
 	backend_get_filters,			/* get_filters */
+	NULL,					/* get_mime_types */
 	backend_cancel,				/* cancel */
 	NULL,					/* download_packages */
 	backend_get_depends,			/* get_depends */
diff --git a/backends/test/pk-backend-test-thread.c b/backends/test/pk-backend-test-thread.c
index 9a4bfde..17eac1f 100644
--- a/backends/test/pk-backend-test-thread.c
+++ b/backends/test/pk-backend-test-thread.c
@@ -143,6 +143,7 @@ PK_BACKEND_OPTIONS (
 	backend_destroy,			/* destroy */
 	NULL,					/* get_groups */
 	NULL,					/* get_filters */
+	NULL,					/* get_mime_types */
 	backend_cancel,				/* cancel */
 	NULL,					/* download_packages */
 	NULL,					/* get_depends */
diff --git a/backends/urpmi/pk-backend-urpmi.c b/backends/urpmi/pk-backend-urpmi.c
index 0ae8e8f..3f3e7d0 100644
--- a/backends/urpmi/pk-backend-urpmi.c
+++ b/backends/urpmi/pk-backend-urpmi.c
@@ -364,6 +364,7 @@ PK_BACKEND_OPTIONS (
 	backend_destroy,			/* destroy */
 	backend_get_groups,			/* get_groups */
 	backend_get_filters,			/* get_filters */
+	NULL,					/* get_mime_types */
 	NULL,					/* cancel */
 	NULL,					/* download_packages */
 	backend_get_depends,			/* get_depends */
diff --git a/backends/yum/pk-backend-yum.c b/backends/yum/pk-backend-yum.c
index ff70758..5acb06e 100644
--- a/backends/yum/pk-backend-yum.c
+++ b/backends/yum/pk-backend-yum.c
@@ -97,6 +97,15 @@ backend_get_filters (PkBackend *backend)
 }
 
 /**
+ * backend_get_mime_types:
+ */
+static gchar *
+backend_get_mime_types (PkBackend *backend)
+{
+	return g_strdup ("application/x-rpm");
+}
+
+/**
  * pk_backend_bool_to_text:
  */
 static const gchar *
@@ -457,6 +466,7 @@ PK_BACKEND_OPTIONS (
 	backend_destroy,			/* destroy */
 	backend_get_groups,			/* get_groups */
 	backend_get_filters,			/* get_filters */
+	backend_get_mime_types,			/* get_mime_types */
 	backend_cancel,				/* cancel */
 	backend_download_packages,		/* download_packages */
 	backend_get_depends,			/* get_depends */
diff --git a/backends/zypp/pk-backend-zypp.cpp b/backends/zypp/pk-backend-zypp.cpp
index c8e355d..719fc70 100644
--- a/backends/zypp/pk-backend-zypp.cpp
+++ b/backends/zypp/pk-backend-zypp.cpp
@@ -1841,6 +1841,7 @@ extern "C" PK_BACKEND_OPTIONS (
 	backend_destroy,			/* destroy */
 	backend_get_groups,			/* get_groups */
 	backend_get_filters,			/* get_filters */
+	NULL,					/* get_mime_types */
 	NULL,					/* cancel */
 	NULL,					/* download_packages */
 	backend_get_depends,			/* get_depends */
diff --git a/libpackagekit/pk-control.c b/libpackagekit/pk-control.c
index 71ae2f1..aee7160 100644
--- a/libpackagekit/pk-control.c
+++ b/libpackagekit/pk-control.c
@@ -270,6 +270,51 @@ out:
 }
 
 /**
+ * pk_control_get_mime_types:
+ * @control: a valid #PkControl instance
+ * @error: a %GError to put the error code and message in, or %NULL
+ *
+ * The MIME list is the supported package formats.
+ *
+ * Return value: an strv list of the formats the backend supports,
+ * or %NULL if unknown
+ **/
+gchar **
+pk_control_get_mime_types (PkControl *control, GError **error)
+{
+	gboolean ret;
+	GError *error_local = NULL;
+	gchar *type_str = NULL;
+	gchar **types = NULL;
+
+	g_return_val_if_fail (PK_IS_CONTROL (control), NULL);
+	g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+	/* check to see if we have a valid proxy */
+	if (control->priv->proxy == NULL) {
+		egg_warning ("No proxy for manager");
+		goto out;
+	}
+	ret = dbus_g_proxy_call (control->priv->proxy, "GetMimeTypes", &error_local,
+				 G_TYPE_INVALID,
+				 G_TYPE_STRING, &type_str,
+				 G_TYPE_INVALID);
+	if (!ret) {
+		/* abort as the DBUS method failed */
+		egg_warning ("GetMimeTypes failed :%s", error_local->message);
+		pk_control_error_set (error, PK_CONTROL_ERROR_FAILED, error_local->message);
+		g_error_free (error_local);
+		goto out;
+	}
+
+	/* convert to enumerated types */
+	types = g_strsplit (type_str, ";", 0);
+	g_free (type_str);
+out:
+	return types;
+}
+
+/**
  * pk_control_get_network_state:
  * @control: a valid #PkControl instance
  * @error: a %GError to put the error code and message in, or %NULL
diff --git a/libpackagekit/pk-control.h b/libpackagekit/pk-control.h
index f2fd0c0..4e9acda 100644
--- a/libpackagekit/pk-control.h
+++ b/libpackagekit/pk-control.h
@@ -100,6 +100,8 @@ PkBitfield	 pk_control_get_filters			(PkControl	*control,
 							 GError		**error);
 PkBitfield	 pk_control_get_groups			(PkControl	*control,
 							 GError		**error);
+gchar		**pk_control_get_mime_types		(PkControl	*control,
+							 GError		**error);
 PkNetworkEnum	 pk_control_get_network_state		(PkControl	*control,
 							 GError		**error);
 gboolean	 pk_control_get_backend_detail		(PkControl	*control,
diff --git a/src/pk-backend-internal.h b/src/pk-backend-internal.h
index 44e22c7..badbcb0 100644
--- a/src/pk-backend-internal.h
+++ b/src/pk-backend-internal.h
@@ -74,6 +74,7 @@ PkBitfield	 pk_backend_get_groups			(PkBackend	*backend);
 PkBitfield	 pk_backend_get_filters			(PkBackend	*backend);
 PkBitfield	 pk_backend_get_actions			(PkBackend	*backend);
 PkStore		*pk_backend_get_store			(PkBackend	*backend);
+gchar		*pk_backend_get_mime_types		(PkBackend	*backend);
 
 G_END_DECLS
 
diff --git a/src/pk-backend.c b/src/pk-backend.c
index 71c92c1..0befc22 100644
--- a/src/pk-backend.c
+++ b/src/pk-backend.c
@@ -152,6 +152,21 @@ pk_backend_get_groups (PkBackend *backend)
 }
 
 /**
+ * pk_backend_get_mime_types:
+ **/
+gchar *
+pk_backend_get_mime_types (PkBackend *backend)
+{
+	g_return_val_if_fail (PK_IS_BACKEND (backend), NULL);
+	g_return_val_if_fail (backend->priv->locked != FALSE, NULL);
+
+	/* not compulsory */
+	if (backend->desc->get_mime_types == NULL)
+		return g_strdup ("");
+	return backend->desc->get_mime_types (backend);
+}
+
+/**
  * pk_backend_get_filters:
  **/
 PkBitfield
diff --git a/src/pk-backend.h b/src/pk-backend.h
index 5c635ef..4cec320 100644
--- a/src/pk-backend.h
+++ b/src/pk-backend.h
@@ -202,6 +202,7 @@ typedef struct {
 	void		(*destroy)			(PkBackend	*backend);
 	PkBitfield	(*get_groups)			(PkBackend	*backend);
 	PkBitfield	(*get_filters)			(PkBackend	*backend);
+	gchar		*(*get_mime_types)		(PkBackend	*backend);
 	void		(*cancel)			(PkBackend	*backend);
 	void		(*download_packages)		(PkBackend	*backend,
 							 gchar		**package_ids,
@@ -279,7 +280,7 @@ typedef struct {
 	gpointer	padding[10];
 } PkBackendDesc;
 
-#define PK_BACKEND_OPTIONS(description, author, initialize, destroy, get_groups, get_filters, cancel, download_packages, \
+#define PK_BACKEND_OPTIONS(description, author, initialize, destroy, get_groups, get_filters, get_mime_types, cancel, download_packages, \
 			   get_depends, get_details, get_distro_upgrades, get_files, get_packages, get_repo_list, get_requires,	\
 			   get_update_detail, get_updates, install_files, install_packages,		\
 			   install_signature, refresh_cache, remove_packages, repo_enable,		\
@@ -292,6 +293,7 @@ typedef struct {
 		destroy,		\
 		get_groups,		\
 		get_filters,		\
+		get_mime_types,		\
 		cancel,			\
 		download_packages,	\
 		get_depends,		\
diff --git a/src/pk-engine.c b/src/pk-engine.c
index eae4ed2..8210954 100644
--- a/src/pk-engine.c
+++ b/src/pk-engine.c
@@ -111,6 +111,7 @@ struct PkEnginePrivate
 	PkBitfield		 actions;
 	PkBitfield		 groups;
 	PkBitfield		 filters;
+	gchar			*mime_types;
 	guint			 signal_state_priority_timeout;
 	guint			 signal_state_normal_timeout;
 };
@@ -160,6 +161,7 @@ pk_engine_error_get_type (void)
 			ENUM_ENTRY (PK_ENGINE_ERROR_INVALID_STATE, "InvalidState"),
 			ENUM_ENTRY (PK_ENGINE_ERROR_REFUSED_BY_POLICY, "RefusedByPolicy"),
 			ENUM_ENTRY (PK_ENGINE_ERROR_CANNOT_SET_PROXY, "CannotSetProxy"),
+			ENUM_ENTRY (PK_ENGINE_ERROR_NOT_SUPPORTED, "NotSupported"),
 			{ 0, NULL, NULL }
 		};
 		etype = g_enum_register_static ("PkEngineError", values);
@@ -432,6 +434,29 @@ pk_engine_get_groups (PkEngine *engine, gchar **groups, GError **error)
 }
 
 /**
+ * pk_engine_get_mime_types:
+ **/
+gboolean
+pk_engine_get_mime_types (PkEngine *engine, gchar **types, GError **error)
+{
+	g_return_val_if_fail (PK_IS_ENGINE (engine), FALSE);
+
+	/* not compulsory for backends */
+	if (engine->priv->mime_types == NULL) {
+		g_set_error (error, PK_ENGINE_ERROR, PK_ENGINE_ERROR_NOT_SUPPORTED,
+			     "Backend does not provide this information");
+		return FALSE;
+	}
+
+	*types = g_strdup (engine->priv->mime_types);
+
+	/* reset the timer */
+	pk_engine_reset_timer (engine);
+
+	return TRUE;
+}
+
+/**
  * pk_engine_get_filters:
  **/
 gboolean
@@ -668,6 +693,7 @@ pk_engine_init (PkEngine *engine)
 
 	engine->priv = PK_ENGINE_GET_PRIVATE (engine);
 	engine->priv->restart_schedule = FALSE;
+	engine->priv->mime_types = NULL;
 
 	/* use the config file */
 	engine->priv->conf = pk_conf_new ();
@@ -700,6 +726,7 @@ pk_engine_init (PkEngine *engine)
 	engine->priv->actions = pk_backend_get_actions (engine->priv->backend);
 	engine->priv->groups = pk_backend_get_groups (engine->priv->backend);
 	engine->priv->filters = pk_backend_get_filters (engine->priv->backend);
+	engine->priv->mime_types = pk_backend_get_mime_types (engine->priv->backend);
 
 	engine->priv->timer = g_timer_new ();
 
@@ -797,6 +824,7 @@ pk_engine_finalize (GObject *object)
 	g_object_unref (engine->priv->cache);
 	g_object_unref (engine->priv->update_detail_cache);
 	g_object_unref (engine->priv->conf);
+	g_free (engine->priv->mime_types);
 
 	G_OBJECT_CLASS (pk_engine_parent_class)->finalize (object);
 }
diff --git a/src/pk-engine.h b/src/pk-engine.h
index 668451f..b4ebce2 100644
--- a/src/pk-engine.h
+++ b/src/pk-engine.h
@@ -59,6 +59,7 @@ typedef enum
 	PK_ENGINE_ERROR_INVALID_STATE,
 	PK_ENGINE_ERROR_REFUSED_BY_POLICY,
 	PK_ENGINE_ERROR_CANNOT_SET_PROXY,
+	PK_ENGINE_ERROR_NOT_SUPPORTED,
 	PK_ENGINE_ERROR_LAST
 } PkEngineError;
 
@@ -85,6 +86,9 @@ gboolean	 pk_engine_get_filters			(PkEngine	*engine,
 gboolean	 pk_engine_get_groups			(PkEngine	*engine,
 							 gchar		**groups,
 							 GError		**error);
+gboolean	 pk_engine_get_mime_types		(PkEngine	*engine,
+							 gchar		**types,
+							 GError		**error);
 gboolean	 pk_engine_get_tid			(PkEngine	*engine,
 							 gchar		**tid,
 							 GError		**error);
diff --git a/src/pk-interface.xml b/src/pk-interface.xml
index 6de59b2..6aa07d3 100644
--- a/src/pk-interface.xml
+++ b/src/pk-interface.xml
@@ -103,6 +103,26 @@
     </method>
 
     <!--*****************************************************************************************-->
+    <method name="GetMimeTypes">
+      <doc:doc>
+        <doc:description>
+          <doc:para>
+            Gets the MIME types of packages that are supported
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+      <arg type="s" name="types" direction="out">
+        <doc:doc>
+          <doc:summary>
+            <doc:para>
+              The MIME list, e.g. <doc:tt>application/x-rpm;application/x-deb</doc:tt>
+            </doc:para>
+          </doc:summary>
+        </doc:doc>
+      </arg>
+    </method>
+
+    <!--*****************************************************************************************-->
     <method name="GetTid">
       <doc:doc>
         <doc:description>
commit b6b5194e3de3b7222709f0c7875f99f3910827bb
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Oct 1 10:04:24 2008 +0100

    trivial: use get_groups, get_filters order in the prototype, this is what every backend does...

diff --git a/src/pk-backend.h b/src/pk-backend.h
index bc026d7..5c635ef 100644
--- a/src/pk-backend.h
+++ b/src/pk-backend.h
@@ -279,7 +279,7 @@ typedef struct {
 	gpointer	padding[10];
 } PkBackendDesc;
 
-#define PK_BACKEND_OPTIONS(description, author, initialize, destroy, get_filters, get_groups, cancel, download_packages, \
+#define PK_BACKEND_OPTIONS(description, author, initialize, destroy, get_groups, get_filters, cancel, download_packages, \
 			   get_depends, get_details, get_distro_upgrades, get_files, get_packages, get_repo_list, get_requires,	\
 			   get_update_detail, get_updates, install_files, install_packages,		\
 			   install_signature, refresh_cache, remove_packages, repo_enable,		\
@@ -290,8 +290,8 @@ typedef struct {
 		author,			\
 		initialize,		\
 		destroy,		\
-		get_filters,		\
 		get_groups,		\
+		get_filters,		\
 		cancel,			\
 		download_packages,	\
 		get_depends,		\
commit 76f75d1aa8ebb2b30a4895efc0b6e106ee368560
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Oct 1 09:19:13 2008 +0100

    trivial: rename the no_nb translation to nb on advice of Kjartan Maraas

diff --git a/po/no_nb.po b/po/no_nb.po
deleted file mode 100644
index eb4278c..0000000
--- a/po/no_nb.po
+++ /dev/null
@@ -1,400 +0,0 @@
-# Norwegian/Bokmaal translation of PackageKit.
-# Copyright (C) 2008 THE PackageKit'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PackageKit package.
-# Mats Taraldsvik <mats.taraldsvik at gmail.com>, 2008.
-# 
-# 
-msgid ""
-msgstr ""
-"Project-Id-Version: PackageKit\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-18 16:49+0100\n"
-"PO-Revision-Date: 2008-04-27 14:28+0200\n"
-"Last-Translator: Mats Taraldsvik <mats.taraldsvik at gmail.com>\n"
-"Language-Team: Norwegian/Bokmaal <i18n-nb at lister.ping.uio.no>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:1
-msgid "Accept EULA"
-msgstr "Godkjenn EULA"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:2
-msgid "Authentication is required to accept a EULA"
-msgstr "Kan ikke godkjenne en EULA uten identitetsbekreftelse"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:3
-msgid "Authentication is required to change software source parameters"
-msgstr "Kan ikke endre parametre for pakkebrønn uten identitetsbekreftelse"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:4
-msgid "Authentication is required to install a local file"
-msgstr "Kan ikke installere en lokal fil uten identitetsbekreftelse"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:5
-msgid "Authentication is required to install a package"
-msgstr "Kan ikke installere en programpakke uten identitetsbekreftelse"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:6
-msgid "Authentication is required to install a security signature"
-msgstr "Kan ikke legge til en sikkerhetsklarering uten identitetsbekreftelse"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:7
-msgid "Authentication is required to refresh the package lists"
-msgstr "Kan ikke oppdatere pakkebrønnene uten identitetsbekreftelse"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:8
-msgid "Authentication is required to remove packages"
-msgstr "Kan ikke fjerne programpakker uten identitetsbekreftelse"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:9
-msgid "Authentication is required to rollback a transaction"
-msgstr "Kan ikke gå tilbake til en tidligere tilstand uten identitetsbekreftelse"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:10
-msgid "Authentication is required to update all packages"
-msgstr "Kan ikke oppdatere programpakker uten identitetsbekreftelse"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:11
-msgid "Authentication is required to update packages"
-msgstr "Kunne ikke oppdatere programpakker uten identitetsbekreftelse"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:12
-msgid "Change software source parameters"
-msgstr "Endre parametre for pakkebrønnene"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:13
-msgid "Install local file"
-msgstr "Installér lokal fil"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:14
-msgid "Install package"
-msgstr "Installér programpakke"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:15
-msgid "Install security signature"
-msgstr "Legg til sikkerhetsklarering"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:16
-msgid "Refresh package lists"
-msgstr "Oppdater pakkebrønnen"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:17
-msgid "Remove package"
-msgstr "Fjern programpakke"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:18
-msgid "Rollback to a previous transaction"
-msgstr "GÃ¥ tilbake til en tidligere tilstand"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:19
-msgid "Update all packages"
-msgstr "Oppdater alle programpakker"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:20
-msgid "Update package"
-msgstr "Oppdater programpakke"
-
-#: ../client/pk-console.c:208
-msgid "Update detail"
-msgstr "Oppdateringsdetaljer"
-
-#: ../client/pk-console.c:400
-msgid "A system restart is required"
-msgstr "Datamaskinen må startes på nytt"
-
-#: ../client/pk-console.c:402
-msgid "A logout and login is required"
-msgstr "For å fullføre må du logge ut og inn."
-
-#: ../client/pk-console.c:404
-msgid "An application restart is required"
-msgstr "Du må starte et program på nytt"
-
-#: ../client/pk-console.c:443
-#, c-format
-msgid "Please enter a number from 1 to %i: "
-msgstr "Skriv inn ett tall fra 1 til %i: "
-
-#: ../client/pk-console.c:493
-msgid "Could not find a package match"
-msgstr "Fant ingen programpakke som samsvarte"
-
-#: ../client/pk-console.c:507
-msgid "There are multiple package matches"
-msgstr "Fant flere samsvarende programpakker"
-
-#. find out what package the user wants to use
-#: ../client/pk-console.c:514
-msgid "Please enter the package number: "
-msgstr "Skriv inn nummeret til programpakken: "
-
-#: ../client/pk-console.c:530
-msgid ""
-"Could not find a package with that name to install, or package already "
-"installed"
-msgstr "Fant ingen programpakke som samsvarte. Den kan allerede være installert"
-
-#: ../client/pk-console.c:612
-msgid "Could not find a package with that name to remove"
-msgstr "Fant ingen pakke med det navnet som kunne fjernes"
-
-#: ../client/pk-console.c:652
-msgid "The following packages have to be removed"
-msgstr "Følgende pakker må fjernes"
-
-#. get user input
-#: ../client/pk-console.c:661
-msgid "Okay to remove additional packages?"
-msgstr "Fjerne flere pakker?"
-
-#: ../client/pk-console.c:665
-msgid "Cancelled!"
-msgstr "Avbrutt!"
-
-#: ../client/pk-console.c:687
-msgid "Could not find a package with that name to update"
-msgstr "Fant ingen programpakke med det navnet som kunne oppdateres"
-
-#: ../client/pk-console.c:705
-msgid "Could not find what packages require this package"
-msgstr "Ingen programpakker som avhenger av denne programpakken ble funnet"
-
-#: ../client/pk-console.c:723
-msgid "Could not get dependencies for this package"
-msgstr "Klarte ikke å hente avhengigheter for denne programpakken"
-
-#: ../client/pk-console.c:741
-msgid "Could not find a description for this package"
-msgstr "Fant ingen beskrivelse til denne programpakken"
-
-#: ../client/pk-console.c:759
-#, c-format
-msgid "Could not find the files for this package"
-msgstr "Fant ikke filene som hører til denne programpakken"
-
-#: ../client/pk-console.c:819
-msgid "Package description"
-msgstr "Programpakkebeskrivelse"
-
-#: ../client/pk-console.c:842
-msgid "Package files"
-msgstr "Programpakkens filer"
-
-#: ../client/pk-console.c:850
-msgid "No files"
-msgstr "Ingen filer"
-
-#. get user input
-#: ../client/pk-console.c:882
-msgid "Okay to import key?"
-msgstr "Forsøke å hente nøkkel?"
-
-#: ../client/pk-console.c:885
-msgid "Did not import key"
-msgstr "Kunne ikke hente nøkkel"
-
-#. get user input
-#: ../client/pk-console.c:925
-msgid "Do you agree?"
-msgstr "Godkjent?"
-
-#: ../client/pk-console.c:928
-msgid "Did not agree to licence, task will fail"
-msgstr "Klarte ikke fullføre oppgaven, fordi lisensen ikke ble godkjent"
-
-#: ../client/pk-console.c:957
-msgid "The daemon crashed mid-transaction!"
-msgstr "Nissen (daemon) krasjet under operasjonen!"
-
-#. header
-#: ../client/pk-console.c:1010
-msgid "PackageKit Console Interface"
-msgstr "PackageKit Konsollgrensesnitt"
-
-#: ../client/pk-console.c:1010
-msgid "Subcommands:"
-msgstr "Underkommandoer:"
-
-#: ../client/pk-console.c:1114 ../client/pk-monitor.c:100 ../src/pk-main.c:189
-msgid "Show extra debugging information"
-msgstr "Vis ekstra feilsøkingsinformasjon"
-
-#: ../client/pk-console.c:1116 ../client/pk-monitor.c:102
-msgid "Show the program version and exit"
-msgstr "Vis versjonsnummer og avslutt"
-
-#: ../client/pk-console.c:1118
-msgid "Set the filter, e.g. installed"
-msgstr "Bruk filteret, f.eks installerte (programpakker)"
-
-#: ../client/pk-console.c:1120
-msgid "Exit without waiting for actions to complete"
-msgstr "Avslutt uten å vente til alle operasjoner har gjort seg ferdige"
-
-#: ../client/pk-console.c:1143
-msgid "Could not connect to system DBUS."
-msgstr "Klarte ikke å koble til DBUS"
-
-#: ../client/pk-console.c:1231
-#, c-format
-msgid "You need to specify a search type"
-msgstr "Trenger en søketype for å fortsette"
-
-#: ../client/pk-console.c:1236 ../client/pk-console.c:1243
-#: ../client/pk-console.c:1250 ../client/pk-console.c:1257
-#: ../client/pk-console.c:1361 ../client/pk-console.c:1368
-#: ../client/pk-console.c:1375 ../client/pk-console.c:1382
-#, c-format
-msgid "You need to specify a search term"
-msgstr "Trenger et søkeord for å fortsette"
-
-#: ../client/pk-console.c:1262
-#, c-format
-msgid "Invalid search type"
-msgstr "Søketypen ble ikke gjenkjent"
-
-#: ../client/pk-console.c:1267
-#, c-format
-msgid "You need to specify a package or file to install"
-msgstr "Kan ikke fortsette uten en programpakke eller fil som skal installeres"
-
-#: ../client/pk-console.c:1280
-#, c-format
-msgid "You need to specify a type, key_id and package_id"
-msgstr "Trenger en type, en nøkkelid og programpakkeid for å fortsette"
-
-#: ../client/pk-console.c:1287
-#, c-format
-msgid "You need to specify a package to remove"
-msgstr "Kan ikke fortsette uten en programpakke som skal fjernes"
-
-#: ../client/pk-console.c:1294
-#, c-format
-msgid "You need to specify a eula-id"
-msgstr "Trenger en EULA-id for å fortsette"
-
-#: ../client/pk-console.c:1309
-#, c-format
-msgid "You need to specify a package name to resolve"
-msgstr "Du må oppgi et programpakkenavn for å løse konflikten"
-
-#: ../client/pk-console.c:1316 ../client/pk-console.c:1323
-#, c-format
-msgid "You need to specify a repo name"
-msgstr "Trenger et navn på pakkebrønnen for å fortsette"
-
-#: ../client/pk-console.c:1330
-#, c-format
-msgid "You need to specify a repo name/parameter and value"
-msgstr "Trenger et parameter/navn og verdi for pakkebrønnen"
-
-#: ../client/pk-console.c:1343
-#, c-format
-msgid "You need to specify a time term"
-msgstr "Trenger en tidsverdi for å fortsette"
-
-#: ../client/pk-console.c:1348
-#, c-format
-msgid "You need to specify a correct role"
-msgstr "Du må oppgi gyldig handling for å fortsette"
-
-#: ../client/pk-console.c:1353
-#, c-format
-msgid "Failed to get last time"
-msgstr "Kunne ikke hentes forrige gang"
-
-#: ../client/pk-console.c:1389
-#, c-format
-msgid "You need to specify a package to find the description for"
-msgstr "Du·kan·ikke·vise·beskrivelse uten·først·å·oppgi·programpakken"
-
-#: ../client/pk-console.c:1396
-#, c-format
-msgid "You need to specify a package to find the files for"
-msgstr "Du kan ikke vise tilhørende filer uten først å oppgi programpakken"
-
-#: ../client/pk-console.c:1441
-#, c-format
-msgid "Option '%s' not supported"
-msgstr "Følgende valg er ikke støttet: '%s' "
-
-#: ../client/pk-console.c:1452
-msgid "Command failed"
-msgstr "Klarte ikke å kjøre kommandoen"
-
-#: ../client/pk-console.c:1456
-msgid "You don't have the necessary privileges for this operation"
-msgstr "Denne handlingen krever superbrukerrettigheter (root)"
-
-#: ../client/pk-monitor.c:113
-msgid "PackageKit Monitor"
-msgstr "PackageKit Monitor"
-
-#: ../client/pk-import-desktop.c:283 ../client/pk-import-specspo.c:169
-#, c-format
-msgid "Could not open database: %s"
-msgstr "Kunne ikke åpne databasen: %s"
-
-#: ../client/pk-import-desktop.c:284 ../client/pk-import-specspo.c:170
-msgid "You probably need to run this program as the root user"
-msgstr "Dette programmet må kjøres av superbruker (root)"
-
-#: ../src/pk-main.c:83
-msgid "Startup failed due to security policies on this machine."
-msgstr "Sikkerhetspolitikk på denne maskinen hindret oppstart"
-
-#: ../src/pk-main.c:84
-msgid "This can happen for two reasons:"
-msgstr "Dette kan skje av to grunner: "
-
-#: ../src/pk-main.c:85
-msgid "The correct user is not launching the executable (usually root)"
-msgstr "Programfilen ble ikke kjørt av forventet bruker (vanligvis superbruker (root) )"
-
-#: ../src/pk-main.c:86
-msgid ""
-"The org.freedesktop.PackageKit.conf file is not installed in the system /etc/"
-"dbus-1/system.d directory"
-msgstr "Finner ikke konfigurasjonsfilen org.freedesktop.PackageKit.conf i /etc/"
-"dbus-1/system.d/"
-
-#: ../src/pk-main.c:185
-msgid "Packaging backend to use, e.g. dummy"
-msgstr "Velg backend for programpakkene, f.eks foobar"
-
-#: ../src/pk-main.c:187
-msgid "Daemonize and detach from the terminal"
-msgstr "Gjør nissen (daemon) selvstendig, og uavhengig av terminalen"
-
-#: ../src/pk-main.c:191
-msgid "Disable the idle timer"
-msgstr "Deaktiver inaktivitetskontrollen"
-
-#: ../src/pk-main.c:193
-msgid "Show version and exit"
-msgstr "Vis versjonsnummer og avslutt"
-
-#: ../src/pk-main.c:195
-msgid "Exit after a small delay"
-msgstr "Avslutt etter en liten forsinkelse"
-
-#: ../src/pk-main.c:197
-msgid "Exit after the engine has loaded"
-msgstr "Avslutt etter maskinen har lastet"
-
-#: ../src/pk-main.c:207
-msgid "PackageKit service"
-msgstr "PackageKit-tjeneste"
-
-#: ../src/pk-main.c:233
-msgid "Cannot connect to the system bus"
-msgstr "Fikk ikke kontakt med systembussen"
-
-#: ../src/pk-main.c:273
-#, c-format
-msgid "Error trying to start: %s\n"
-msgstr "Det skjedde en feil under oppstart av: %s\n"
-
-
commit c3ad7ac9823cc49db6f8f1e86893985f2d4b889e
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Oct 1 09:18:25 2008 +0100

    trivial: rename the no_nb translation to nb on advice of Kjartan Maraas

diff --git a/po/LINGUAS b/po/LINGUAS
index 6551653..67b49d9 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -9,7 +9,7 @@ he
 hu
 it
 nl
-no_nb
+nb
 pl
 pt_BR
 ru
diff --git a/po/nb.po b/po/nb.po
new file mode 100644
index 0000000..eb4278c
--- /dev/null
+++ b/po/nb.po
@@ -0,0 +1,400 @@
+# Norwegian/Bokmaal translation of PackageKit.
+# Copyright (C) 2008 THE PackageKit'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PackageKit package.
+# Mats Taraldsvik <mats.taraldsvik at gmail.com>, 2008.
+# 
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: PackageKit\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-04-18 16:49+0100\n"
+"PO-Revision-Date: 2008-04-27 14:28+0200\n"
+"Last-Translator: Mats Taraldsvik <mats.taraldsvik at gmail.com>\n"
+"Language-Team: Norwegian/Bokmaal <i18n-nb at lister.ping.uio.no>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit"
+
+#: ../policy/org.freedesktop.packagekit.policy.in.h:1
+msgid "Accept EULA"
+msgstr "Godkjenn EULA"
+
+#: ../policy/org.freedesktop.packagekit.policy.in.h:2
+msgid "Authentication is required to accept a EULA"
+msgstr "Kan ikke godkjenne en EULA uten identitetsbekreftelse"
+
+#: ../policy/org.freedesktop.packagekit.policy.in.h:3
+msgid "Authentication is required to change software source parameters"
+msgstr "Kan ikke endre parametre for pakkebrønn uten identitetsbekreftelse"
+
+#: ../policy/org.freedesktop.packagekit.policy.in.h:4
+msgid "Authentication is required to install a local file"
+msgstr "Kan ikke installere en lokal fil uten identitetsbekreftelse"
+
+#: ../policy/org.freedesktop.packagekit.policy.in.h:5
+msgid "Authentication is required to install a package"
+msgstr "Kan ikke installere en programpakke uten identitetsbekreftelse"
+
+#: ../policy/org.freedesktop.packagekit.policy.in.h:6
+msgid "Authentication is required to install a security signature"
+msgstr "Kan ikke legge til en sikkerhetsklarering uten identitetsbekreftelse"
+
+#: ../policy/org.freedesktop.packagekit.policy.in.h:7
+msgid "Authentication is required to refresh the package lists"
+msgstr "Kan ikke oppdatere pakkebrønnene uten identitetsbekreftelse"
+
+#: ../policy/org.freedesktop.packagekit.policy.in.h:8
+msgid "Authentication is required to remove packages"
+msgstr "Kan ikke fjerne programpakker uten identitetsbekreftelse"
+
+#: ../policy/org.freedesktop.packagekit.policy.in.h:9
+msgid "Authentication is required to rollback a transaction"
+msgstr "Kan ikke gå tilbake til en tidligere tilstand uten identitetsbekreftelse"
+
+#: ../policy/org.freedesktop.packagekit.policy.in.h:10
+msgid "Authentication is required to update all packages"
+msgstr "Kan ikke oppdatere programpakker uten identitetsbekreftelse"
+
+#: ../policy/org.freedesktop.packagekit.policy.in.h:11
+msgid "Authentication is required to update packages"
+msgstr "Kunne ikke oppdatere programpakker uten identitetsbekreftelse"
+
+#: ../policy/org.freedesktop.packagekit.policy.in.h:12
+msgid "Change software source parameters"
+msgstr "Endre parametre for pakkebrønnene"
+
+#: ../policy/org.freedesktop.packagekit.policy.in.h:13
+msgid "Install local file"
+msgstr "Installér lokal fil"
+
+#: ../policy/org.freedesktop.packagekit.policy.in.h:14
+msgid "Install package"
+msgstr "Installér programpakke"
+
+#: ../policy/org.freedesktop.packagekit.policy.in.h:15
+msgid "Install security signature"
+msgstr "Legg til sikkerhetsklarering"
+
+#: ../policy/org.freedesktop.packagekit.policy.in.h:16
+msgid "Refresh package lists"
+msgstr "Oppdater pakkebrønnen"
+
+#: ../policy/org.freedesktop.packagekit.policy.in.h:17
+msgid "Remove package"
+msgstr "Fjern programpakke"
+
+#: ../policy/org.freedesktop.packagekit.policy.in.h:18
+msgid "Rollback to a previous transaction"
+msgstr "GÃ¥ tilbake til en tidligere tilstand"
+
+#: ../policy/org.freedesktop.packagekit.policy.in.h:19
+msgid "Update all packages"
+msgstr "Oppdater alle programpakker"
+
+#: ../policy/org.freedesktop.packagekit.policy.in.h:20
+msgid "Update package"
+msgstr "Oppdater programpakke"
+
+#: ../client/pk-console.c:208
+msgid "Update detail"
+msgstr "Oppdateringsdetaljer"
+
+#: ../client/pk-console.c:400
+msgid "A system restart is required"
+msgstr "Datamaskinen må startes på nytt"
+
+#: ../client/pk-console.c:402
+msgid "A logout and login is required"
+msgstr "For å fullføre må du logge ut og inn."
+
+#: ../client/pk-console.c:404
+msgid "An application restart is required"
+msgstr "Du må starte et program på nytt"
+
+#: ../client/pk-console.c:443
+#, c-format
+msgid "Please enter a number from 1 to %i: "
+msgstr "Skriv inn ett tall fra 1 til %i: "
+
+#: ../client/pk-console.c:493
+msgid "Could not find a package match"
+msgstr "Fant ingen programpakke som samsvarte"
+
+#: ../client/pk-console.c:507
+msgid "There are multiple package matches"
+msgstr "Fant flere samsvarende programpakker"
+
+#. find out what package the user wants to use
+#: ../client/pk-console.c:514
+msgid "Please enter the package number: "
+msgstr "Skriv inn nummeret til programpakken: "
+
+#: ../client/pk-console.c:530
+msgid ""
+"Could not find a package with that name to install, or package already "
+"installed"
+msgstr "Fant ingen programpakke som samsvarte. Den kan allerede være installert"
+
+#: ../client/pk-console.c:612
+msgid "Could not find a package with that name to remove"
+msgstr "Fant ingen pakke med det navnet som kunne fjernes"
+
+#: ../client/pk-console.c:652
+msgid "The following packages have to be removed"
+msgstr "Følgende pakker må fjernes"
+
+#. get user input
+#: ../client/pk-console.c:661
+msgid "Okay to remove additional packages?"
+msgstr "Fjerne flere pakker?"
+
+#: ../client/pk-console.c:665
+msgid "Cancelled!"
+msgstr "Avbrutt!"
+
+#: ../client/pk-console.c:687
+msgid "Could not find a package with that name to update"
+msgstr "Fant ingen programpakke med det navnet som kunne oppdateres"
+
+#: ../client/pk-console.c:705
+msgid "Could not find what packages require this package"
+msgstr "Ingen programpakker som avhenger av denne programpakken ble funnet"
+
+#: ../client/pk-console.c:723
+msgid "Could not get dependencies for this package"
+msgstr "Klarte ikke å hente avhengigheter for denne programpakken"
+
+#: ../client/pk-console.c:741
+msgid "Could not find a description for this package"
+msgstr "Fant ingen beskrivelse til denne programpakken"
+
+#: ../client/pk-console.c:759
+#, c-format
+msgid "Could not find the files for this package"
+msgstr "Fant ikke filene som hører til denne programpakken"
+
+#: ../client/pk-console.c:819
+msgid "Package description"
+msgstr "Programpakkebeskrivelse"
+
+#: ../client/pk-console.c:842
+msgid "Package files"
+msgstr "Programpakkens filer"
+
+#: ../client/pk-console.c:850
+msgid "No files"
+msgstr "Ingen filer"
+
+#. get user input
+#: ../client/pk-console.c:882
+msgid "Okay to import key?"
+msgstr "Forsøke å hente nøkkel?"
+
+#: ../client/pk-console.c:885
+msgid "Did not import key"
+msgstr "Kunne ikke hente nøkkel"
+
+#. get user input
+#: ../client/pk-console.c:925
+msgid "Do you agree?"
+msgstr "Godkjent?"
+
+#: ../client/pk-console.c:928
+msgid "Did not agree to licence, task will fail"
+msgstr "Klarte ikke fullføre oppgaven, fordi lisensen ikke ble godkjent"
+
+#: ../client/pk-console.c:957
+msgid "The daemon crashed mid-transaction!"
+msgstr "Nissen (daemon) krasjet under operasjonen!"
+
+#. header
+#: ../client/pk-console.c:1010
+msgid "PackageKit Console Interface"
+msgstr "PackageKit Konsollgrensesnitt"
+
+#: ../client/pk-console.c:1010
+msgid "Subcommands:"
+msgstr "Underkommandoer:"
+
+#: ../client/pk-console.c:1114 ../client/pk-monitor.c:100 ../src/pk-main.c:189
+msgid "Show extra debugging information"
+msgstr "Vis ekstra feilsøkingsinformasjon"
+
+#: ../client/pk-console.c:1116 ../client/pk-monitor.c:102
+msgid "Show the program version and exit"
+msgstr "Vis versjonsnummer og avslutt"
+
+#: ../client/pk-console.c:1118
+msgid "Set the filter, e.g. installed"
+msgstr "Bruk filteret, f.eks installerte (programpakker)"
+
+#: ../client/pk-console.c:1120
+msgid "Exit without waiting for actions to complete"
+msgstr "Avslutt uten å vente til alle operasjoner har gjort seg ferdige"
+
+#: ../client/pk-console.c:1143
+msgid "Could not connect to system DBUS."
+msgstr "Klarte ikke å koble til DBUS"
+
+#: ../client/pk-console.c:1231
+#, c-format
+msgid "You need to specify a search type"
+msgstr "Trenger en søketype for å fortsette"
+
+#: ../client/pk-console.c:1236 ../client/pk-console.c:1243
+#: ../client/pk-console.c:1250 ../client/pk-console.c:1257
+#: ../client/pk-console.c:1361 ../client/pk-console.c:1368
+#: ../client/pk-console.c:1375 ../client/pk-console.c:1382
+#, c-format
+msgid "You need to specify a search term"
+msgstr "Trenger et søkeord for å fortsette"
+
+#: ../client/pk-console.c:1262
+#, c-format
+msgid "Invalid search type"
+msgstr "Søketypen ble ikke gjenkjent"
+
+#: ../client/pk-console.c:1267
+#, c-format
+msgid "You need to specify a package or file to install"
+msgstr "Kan ikke fortsette uten en programpakke eller fil som skal installeres"
+
+#: ../client/pk-console.c:1280
+#, c-format
+msgid "You need to specify a type, key_id and package_id"
+msgstr "Trenger en type, en nøkkelid og programpakkeid for å fortsette"
+
+#: ../client/pk-console.c:1287
+#, c-format
+msgid "You need to specify a package to remove"
+msgstr "Kan ikke fortsette uten en programpakke som skal fjernes"
+
+#: ../client/pk-console.c:1294
+#, c-format
+msgid "You need to specify a eula-id"
+msgstr "Trenger en EULA-id for å fortsette"
+
+#: ../client/pk-console.c:1309
+#, c-format
+msgid "You need to specify a package name to resolve"
+msgstr "Du må oppgi et programpakkenavn for å løse konflikten"
+
+#: ../client/pk-console.c:1316 ../client/pk-console.c:1323
+#, c-format
+msgid "You need to specify a repo name"
+msgstr "Trenger et navn på pakkebrønnen for å fortsette"
+
+#: ../client/pk-console.c:1330
+#, c-format
+msgid "You need to specify a repo name/parameter and value"
+msgstr "Trenger et parameter/navn og verdi for pakkebrønnen"
+
+#: ../client/pk-console.c:1343
+#, c-format
+msgid "You need to specify a time term"
+msgstr "Trenger en tidsverdi for å fortsette"
+
+#: ../client/pk-console.c:1348
+#, c-format
+msgid "You need to specify a correct role"
+msgstr "Du må oppgi gyldig handling for å fortsette"
+
+#: ../client/pk-console.c:1353
+#, c-format
+msgid "Failed to get last time"
+msgstr "Kunne ikke hentes forrige gang"
+
+#: ../client/pk-console.c:1389
+#, c-format
+msgid "You need to specify a package to find the description for"
+msgstr "Du·kan·ikke·vise·beskrivelse uten·først·å·oppgi·programpakken"
+
+#: ../client/pk-console.c:1396
+#, c-format
+msgid "You need to specify a package to find the files for"
+msgstr "Du kan ikke vise tilhørende filer uten først å oppgi programpakken"
+
+#: ../client/pk-console.c:1441
+#, c-format
+msgid "Option '%s' not supported"
+msgstr "Følgende valg er ikke støttet: '%s' "
+
+#: ../client/pk-console.c:1452
+msgid "Command failed"
+msgstr "Klarte ikke å kjøre kommandoen"
+
+#: ../client/pk-console.c:1456
+msgid "You don't have the necessary privileges for this operation"
+msgstr "Denne handlingen krever superbrukerrettigheter (root)"
+
+#: ../client/pk-monitor.c:113
+msgid "PackageKit Monitor"
+msgstr "PackageKit Monitor"
+
+#: ../client/pk-import-desktop.c:283 ../client/pk-import-specspo.c:169
+#, c-format
+msgid "Could not open database: %s"
+msgstr "Kunne ikke åpne databasen: %s"
+
+#: ../client/pk-import-desktop.c:284 ../client/pk-import-specspo.c:170
+msgid "You probably need to run this program as the root user"
+msgstr "Dette programmet må kjøres av superbruker (root)"
+
+#: ../src/pk-main.c:83
+msgid "Startup failed due to security policies on this machine."
+msgstr "Sikkerhetspolitikk på denne maskinen hindret oppstart"
+
+#: ../src/pk-main.c:84
+msgid "This can happen for two reasons:"
+msgstr "Dette kan skje av to grunner: "
+
+#: ../src/pk-main.c:85
+msgid "The correct user is not launching the executable (usually root)"
+msgstr "Programfilen ble ikke kjørt av forventet bruker (vanligvis superbruker (root) )"
+
+#: ../src/pk-main.c:86
+msgid ""
+"The org.freedesktop.PackageKit.conf file is not installed in the system /etc/"
+"dbus-1/system.d directory"
+msgstr "Finner ikke konfigurasjonsfilen org.freedesktop.PackageKit.conf i /etc/"
+"dbus-1/system.d/"
+
+#: ../src/pk-main.c:185
+msgid "Packaging backend to use, e.g. dummy"
+msgstr "Velg backend for programpakkene, f.eks foobar"
+
+#: ../src/pk-main.c:187
+msgid "Daemonize and detach from the terminal"
+msgstr "Gjør nissen (daemon) selvstendig, og uavhengig av terminalen"
+
+#: ../src/pk-main.c:191
+msgid "Disable the idle timer"
+msgstr "Deaktiver inaktivitetskontrollen"
+
+#: ../src/pk-main.c:193
+msgid "Show version and exit"
+msgstr "Vis versjonsnummer og avslutt"
+
+#: ../src/pk-main.c:195
+msgid "Exit after a small delay"
+msgstr "Avslutt etter en liten forsinkelse"
+
+#: ../src/pk-main.c:197
+msgid "Exit after the engine has loaded"
+msgstr "Avslutt etter maskinen har lastet"
+
+#: ../src/pk-main.c:207
+msgid "PackageKit service"
+msgstr "PackageKit-tjeneste"
+
+#: ../src/pk-main.c:233
+msgid "Cannot connect to the system bus"
+msgstr "Fikk ikke kontakt med systembussen"
+
+#: ../src/pk-main.c:273
+#, c-format
+msgid "Error trying to start: %s\n"
+msgstr "Det skjedde en feil under oppstart av: %s\n"
+
+
commit 4262fcf08b2a1960b6835bebd7d2b13ca19bf47e
Merge: 0b1b455... 0bfdf73...
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Oct 1 07:23:42 2008 +0100

    Merge branch 'master' of git+ssh://hughsie@git.packagekit.org/srv/git/PackageKit

commit 0bfdf73d0212fc251580b7cc0aae53c5d807f24b
Author: S.Çağlar Onur <caglar at pardus.org.tr>
Date:   Tue Sep 30 22:09:38 2008 +0300

    PiSi: Trivial changes for pisi-dispatcher work

diff --git a/backends/pisi/pisiBackend.py b/backends/pisi/pisiBackend.py
index 36cf792..73ae300 100755
--- a/backends/pisi/pisiBackend.py
+++ b/backends/pisi/pisiBackend.py
@@ -1,3 +1,4 @@
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 #
 # Licensed under the GNU General Public License Version 2
@@ -20,8 +21,9 @@
 
 import pisi
 from packagekit.backend import *
+from packagekit.package import PackagekitPackage
 
-class PackageKitPisiBackend(PackageKitBaseBackend):
+class PackageKitPisiBackend(PackageKitBaseBackend, PackagekitPackage):
 
     # It's an ugly way to sync with PK Groups and PiSi Components
     # Maybe we can provide these with our index?
@@ -150,23 +152,23 @@ class PackageKitPisiBackend(PackageKitBaseBackend):
 
         return self.package(id, status, pkg.summary)
 
-    def get_depends(self, filters, package_id, recursive):
+    def get_depends(self, filters, package_ids, recursive):
         """ Prints a list of depends for a given package """
         self.allow_cancel(True)
         self.percentage(None)
 
-        package = self.get_package_from_id(package_id)[0]
+        package = self.get_package_from_id(package_ids[0])[0]
 
         for pkg in self.packagedb.get_package(package).runtimeDependencies():
             # Internal FIXME: PiSi API has really inconsistent for return types and arguments!
             self.__get_package(pkg.package)
 
-    def get_details(self, package_id):
+    def get_details(self, package_ids):
         """ Prints a detailed description for a given package """
         self.allow_cancel(True)
         self.percentage(None)
 
-        package = self.get_package_from_id(package_id)[0]
+        package = self.get_package_from_id(package_ids[0])[0]
 
         if self.packagedb.has_package(package):
             pkg = self.packagedb.get_package(package)
@@ -185,12 +187,12 @@ class PackageKitPisiBackend(PackageKitBaseBackend):
         else:
             self.error(ERROR_PACKAGE_NOT_FOUND, "Package was not found")
 
-    def get_files(self, package_id):
+    def get_files(self, package_ids):
         """ Prints a file list for a given package """
         self.allow_cancel(True)
         self.percentage(None)
 
-        package = self.get_package_from_id(package_id)[0]
+        package = self.get_package_from_id(package_ids[0])[0]
 
         if self.installdb.has_package(package):
             pkg = self.installdb.get_files(package)
@@ -202,7 +204,7 @@ class PackageKitPisiBackend(PackageKitBaseBackend):
 
             self.files(package, file_list)
 
-    def get_repo_list(self):
+    def get_repo_list(self, filters):
         """ Prints available repositories """
         self.allow_cancel(True)
         self.percentage(None)
@@ -212,12 +214,12 @@ class PackageKitPisiBackend(PackageKitBaseBackend):
             # FIXME: Use repository enabled/disabled state
             self.repo_detail(repo, self.repodb.get_repo(repo).indexuri.get_uri(), "true")
 
-    def get_requires(self, filters, package_id, recursive):
+    def get_requires(self, filters, package_ids, recursive):
         """ Prints a list of requires for a given package """
         self.allow_cancel(True)
         self.percentage(None)
 
-        package = self.get_package_from_id(package_id)[0]
+        package = self.get_package_from_id(package_ids[0])[0]
 
         # FIXME: Handle packages which is not installed from repository
         for pkg in self.packagedb.get_rev_deps(package):
@@ -257,13 +259,13 @@ class PackageKitPisiBackend(PackageKitBaseBackend):
             # Force needed?
             self.error(ERROR_PACKAGE_ALREADY_INSTALLED, e)
 
-    def install(self, package_id):
+    def install_packages(self, package_ids):
         """ Installs given package into system"""
         # FIXME: fetch/install progress
         self.allow_cancel(False)
         self.percentage(None)
 
-        package = self.get_package_from_id(package_id)[0]
+        package = self.get_package_from_id(package_ids[0])[0]
 
         if self.packagedb.has_package(package):
             self.status(STATUS_INSTALL)
@@ -290,12 +292,12 @@ class PackageKitPisiBackend(PackageKitBaseBackend):
 
         self.percentage(100)
 
-    def remove(self, deps, package_id):
+    def remove_packages(self, deps, package_ids):
         """ Removes given package from system"""
         self.allow_cancel(False)
         self.percentage(None)
 
-        package = self.get_package_from_id(package_id)[0]
+        package = self.get_package_from_id(package_ids[0])[0]
 
         if self.installdb.has_package(package):
             self.status(STATUS_REMOVE)
@@ -336,7 +338,7 @@ class PackageKitPisiBackend(PackageKitBaseBackend):
         self.allow_cancel(True)
         self.percentage(None)
 
-        self.__get_package(package, filters)
+        self.__get_package(package[0], filters)
 
     def search_details(self, filters, key):
         """ Prints a detailed list of packages contains search term """
@@ -383,13 +385,13 @@ class PackageKitPisiBackend(PackageKitBaseBackend):
         for pkg in pisi.api.search_package([package]):
             self.__get_package(pkg, filters)
 
-    def update(self, package_id):
+    def update_packages(self, package_ids):
         """ Updates given package to its latest version """
         # FIXME: fetch/install progress
         self.allow_cancel(False)
         self.percentage(None)
 
-        package = self.get_package_from_id(package_id)[0]
+        package = self.get_package_from_id(package_ids[0])[0]
 
         if self.installdb.has_package(package):
             try:
@@ -414,7 +416,7 @@ class PackageKitPisiBackend(PackageKitBaseBackend):
             self.error(ERROR_UNKNOWN, e)
 
 def main():
-    backend = PackageKitPisiBackend('', lock=True)
+    backend = PackageKitPisiBackend('')
     backend.dispatcher(sys.argv[1:])
 
 if __name__ == "__main__":
diff --git a/backends/pisi/pk-backend-pisi.c b/backends/pisi/pk-backend-pisi.c
index edf4bcb..0bb1d45 100644
--- a/backends/pisi/pk-backend-pisi.c
+++ b/backends/pisi/pk-backend-pisi.c
@@ -23,6 +23,7 @@
 #include <pk-backend.h>
 #include <pk-backend-spawn.h>
 #include <pk-package-ids.h>
+#include <pk-common.h>
 
 static PkBackendSpawn *spawn;
 
@@ -300,7 +301,6 @@ backend_update_packages (PkBackend *backend, gchar **package_ids)
 {
 	gchar *package_ids_temp;
 
-
 	/* check network state */
 	if (!pk_backend_is_online (backend)) {
 		pk_backend_error_code (backend, PK_ERROR_ENUM_NO_NETWORK, "Cannot install when offline");
@@ -310,7 +310,7 @@ backend_update_packages (PkBackend *backend, gchar **package_ids)
 
 	/* send the complete list as stdin */
 	package_ids_temp = pk_package_ids_to_text (package_ids);
-	pk_backend_spawn_helper (spawn, "pisiBackend.py", "update", package_ids_temp, NULL);
+	pk_backend_spawn_helper (spawn, "pisiBackend.py", "update-packages", package_ids_temp, NULL);
 	g_free (package_ids_temp);
 }
 
commit 0b1b455c9b8a21d8a5967fc8f73863970d13d4ad
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Sep 30 16:17:06 2008 +0100

    trivial: rename some of the sub packages for fedora to better match the naming specification

diff --git a/contrib/PackageKit.spec.in b/contrib/PackageKit.spec.in
index 28e5642..eae58dc 100644
--- a/contrib/PackageKit.spec.in
+++ b/contrib/PackageKit.spec.in
@@ -19,8 +19,8 @@ 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: yum-packagekit = %{version}-%{release}
-Requires: udev-packagekit = %{version}-%{release}
+Requires: PackageKit-udev-helper = %{version}-%{release}
+Requires: PackageKit-yum-plugin = %{version}-%{release}
 Requires: PackageKit-yum = %{version}-%{release}
 Requires: shared-mime-info
 Requires: python-sqlite2
@@ -78,25 +78,27 @@ Requires: %{name} = %{version}-%{release}
 %description docs
 API docs for PackageKit.
 
-%package -n udev-packagekit
+%package udev-helper
 Summary: Tell PackageKit to install firmware that udev requires
 Group: System Environment/Base
 Requires: udev
 Requires: PackageKit
+Obsoletes: udev-packagekit
 
-%description -n udev-packagekit
-udev-packagekit tells PackageKit that firmware was not available and was
+%description udev-helper
+PackageKit-udev-helper tells PackageKit that firmware was not available and was
 needed. This allows PackageKit to do the right thing and prompt for
 the firmware to be installed.
 
-%package -n yum-packagekit
+%package yum-plugin
 Summary: Tell PackageKit to check for updates when yum exits
 Group: System Environment/Base
 Requires: yum >= 3.0
 Requires: PackageKit
+Obsoletes: yum-packagekit
 
-%description -n yum-packagekit
-yum-packagekit tells PackageKit to check for updates when yum exits.
+%description yum-plugin
+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.
 
@@ -249,13 +251,13 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %dir %{_datadir}/PackageKit/helpers/yum
 %{_datadir}/PackageKit/helpers/yum/*
 
-%files -n yum-packagekit
+%files yum-plugin
 %defattr(-, root, root)
 %doc README AUTHORS NEWS COPYING
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/refresh-packagekit.conf
 /usr/lib/yum-plugins/refresh-packagekit.*
 
-%files -n udev-packagekit
+%files udev-helper
 %defattr(-, root, root)
 %doc README AUTHORS NEWS COPYING
 %{_sysconfdir}/udev/rules.d/*.rules


More information about the PackageKit-commit mailing list