[PackageKit-commit] packagekit: Branch 'master' - 10 commits
Richard Hughes
hughsient at kemper.freedesktop.org
Fri Jan 29 03:53:26 PST 2010
HACKING | 2
backends/alpm/pk-backend-alpm.c | 2
backends/apt/pk-backend-apt.c | 2
backends/apt/profiler.py | 2
backends/apt/tests.py | 2
backends/aptcc/apt-utils.cpp | 2
backends/aptcc/apt-utils.h | 2
backends/aptcc/pk-backend-aptcc.cpp | 2
backends/box/pk-backend-box.c | 2
backends/conary/conaryBackend.py | 2
backends/conary/conaryCallback.py | 2
backends/conary/conaryFilter.py | 2
backends/conary/conaryProgress.py | 2
backends/conary/pk-backend-conary.c | 2
backends/dummy/pk-backend-dummy.c | 2
backends/opkg/pk-backend-opkg.c | 2
backends/pisi/pisiBackend.py | 2
backends/pisi/pk-backend-pisi.c | 2
backends/poldek/pk-backend-poldek.c | 2
backends/portage/pk-backend-portage.c | 2
backends/portage/portageBackend.py | 2
backends/ports/pk-backend-ports.c | 34 ++++--
backends/ports/portsBackend.rb | 2
backends/razor/pk-backend-razor.c | 2
backends/slapt/pk-backend-slapt.c | 2
backends/smart/pk-backend-smart.c | 2
backends/smart/smartBackend.py | 2
backends/test/pk-backend-test-fail.c | 2
backends/test/pk-backend-test-nop.c | 2
backends/test/pk-backend-test-spawn.c | 2
backends/test/pk-backend-test-succeed.c | 2
backends/test/pk-backend-test-thread.c | 2
backends/urpmi/pk-backend-urpmi.c | 2
backends/yum/pk-backend-yum.c | 2
backends/yum/yumBackend.py | 2
backends/yum/yumComps.py | 2
backends/yum/yumCompsTest.py | 2
backends/yum/yumFilter.py | 2
backends/yum/yumMediaManager.py | 2
backends/yum/yumMediaManagerDeviceKit.py | 2
backends/yum/yumMediaManagerGIO.py | 2
backends/yum/yumMediaManagerHAL.py | 2
backends/yum/yumMediaManagerOS.py | 2
backends/zypp/pk-backend-zypp.cpp | 30 +++--
backends/zypp/zypp-events.h | 2
backends/zypp/zypp-utils.cpp | 2
backends/zypp/zypp-utils.h | 2
client/pk-console.c | 10 +
client/pk-generate-pack.c | 2
client/pk-monitor.c | 2
client/pk-self-test.c | 2
configure.ac | 42 +++-----
contrib/browser-plugin/pk-main.c | 2
contrib/browser-plugin/pk-main.h | 2
contrib/browser-plugin/pk-plugin-install.c | 2
contrib/browser-plugin/pk-plugin-install.h | 2
contrib/browser-plugin/pk-plugin.c | 2
contrib/browser-plugin/pk-plugin.h | 2
contrib/command-not-found/pk-command-not-found.c | 2
contrib/debuginfo-install/pk-debuginfo-install.c | 2
contrib/device-rebind/pk-device-rebind.c | 2
contrib/gstreamer-plugin/pk-gstreamer-install.c | 2
contrib/gtk-module/pk-gtk-module.c | 2
data/pk-upgrade-distro.sh | 17 ++-
data/tests/pk-spawn-dispatcher.py | 2
lib/packagekit-glib2/packagekit-private.h | 2
lib/packagekit-glib2/packagekit.h | 2
lib/packagekit-glib2/pk-bitfield.c | 2
lib/packagekit-glib2/pk-bitfield.h | 2
lib/packagekit-glib2/pk-catalog.c | 2
lib/packagekit-glib2/pk-catalog.h | 2
lib/packagekit-glib2/pk-category.c | 2
lib/packagekit-glib2/pk-category.h | 2
lib/packagekit-glib2/pk-client-sync.c | 2
lib/packagekit-glib2/pk-client-sync.h | 2
lib/packagekit-glib2/pk-client.c | 2
lib/packagekit-glib2/pk-client.h | 4
lib/packagekit-glib2/pk-common.c | 2
lib/packagekit-glib2/pk-common.h | 2
lib/packagekit-glib2/pk-console-shared.c | 2
lib/packagekit-glib2/pk-console-shared.h | 2
lib/packagekit-glib2/pk-control-sync.c | 2
lib/packagekit-glib2/pk-control-sync.h | 2
lib/packagekit-glib2/pk-control.c | 2
lib/packagekit-glib2/pk-control.h | 2
lib/packagekit-glib2/pk-desktop.c | 2
lib/packagekit-glib2/pk-desktop.h | 2
lib/packagekit-glib2/pk-details.c | 2
lib/packagekit-glib2/pk-details.h | 2
lib/packagekit-glib2/pk-distro-upgrade.c | 2
lib/packagekit-glib2/pk-distro-upgrade.h | 2
lib/packagekit-glib2/pk-enum.c | 2
lib/packagekit-glib2/pk-enum.h | 2
lib/packagekit-glib2/pk-error.c | 2
lib/packagekit-glib2/pk-error.h | 2
lib/packagekit-glib2/pk-eula-required.c | 2
lib/packagekit-glib2/pk-eula-required.h | 2
lib/packagekit-glib2/pk-files.c | 2
lib/packagekit-glib2/pk-files.h | 2
lib/packagekit-glib2/pk-media-change-required.c | 2
lib/packagekit-glib2/pk-media-change-required.h | 2
lib/packagekit-glib2/pk-message.c | 2
lib/packagekit-glib2/pk-message.h | 2
lib/packagekit-glib2/pk-package-id.c | 2
lib/packagekit-glib2/pk-package-id.h | 2
lib/packagekit-glib2/pk-package-ids.c | 2
lib/packagekit-glib2/pk-package-ids.h | 2
lib/packagekit-glib2/pk-package-sack-sync.c | 2
lib/packagekit-glib2/pk-package-sack-sync.h | 2
lib/packagekit-glib2/pk-package-sack.c | 114 ++++++++--------------
lib/packagekit-glib2/pk-package-sack.h | 19 ++-
lib/packagekit-glib2/pk-package.c | 2
lib/packagekit-glib2/pk-package.h | 2
lib/packagekit-glib2/pk-progress-bar.c | 2
lib/packagekit-glib2/pk-progress-bar.h | 2
lib/packagekit-glib2/pk-progress.c | 2
lib/packagekit-glib2/pk-progress.h | 2
lib/packagekit-glib2/pk-repo-detail.c | 2
lib/packagekit-glib2/pk-repo-detail.h | 2
lib/packagekit-glib2/pk-repo-signature-required.c | 2
lib/packagekit-glib2/pk-repo-signature-required.h | 2
lib/packagekit-glib2/pk-require-restart.c | 2
lib/packagekit-glib2/pk-require-restart.h | 2
lib/packagekit-glib2/pk-results.c | 2
lib/packagekit-glib2/pk-results.h | 2
lib/packagekit-glib2/pk-self-test.c | 2
lib/packagekit-glib2/pk-service-pack.c | 2
lib/packagekit-glib2/pk-service-pack.h | 2
lib/packagekit-glib2/pk-source.c | 2
lib/packagekit-glib2/pk-source.h | 2
lib/packagekit-glib2/pk-task-sync.c | 2
lib/packagekit-glib2/pk-task-sync.h | 2
lib/packagekit-glib2/pk-task-text.c | 2
lib/packagekit-glib2/pk-task-text.h | 2
lib/packagekit-glib2/pk-task-wrapper.c | 12 +-
lib/packagekit-glib2/pk-task-wrapper.h | 2
lib/packagekit-glib2/pk-task.c | 4
lib/packagekit-glib2/pk-task.h | 2
lib/packagekit-glib2/pk-transaction-list.c | 2
lib/packagekit-glib2/pk-transaction-list.h | 2
lib/packagekit-glib2/pk-transaction-past.c | 2
lib/packagekit-glib2/pk-transaction-past.h | 2
lib/packagekit-glib2/pk-update-detail.c | 2
lib/packagekit-glib2/pk-update-detail.h | 2
lib/packagekit-glib2/pk-version.h.in | 2
lib/python/packagekit/backend.py | 2
lib/python/packagekit/client.py | 2
lib/python/packagekit/filter.py | 2
lib/python/packagekit/frontend.py | 2
lib/python/packagekit/misc.py | 2
lib/python/packagekit/package.py | 2
lib/python/packagekit/pkdbus.py | 2
lib/python/packagekit/pkexceptions.py | 2
lib/python/packagekit/progress.py | 2
lib/python/pk-frontend-test.py | 2
lib/python/wrapper-test.py | 2
src/egg-dbus-monitor.c | 2
src/egg-dbus-monitor.h | 2
src/egg-debug.c | 2
src/egg-debug.h | 2
src/egg-string.c | 2
src/egg-string.h | 2
src/egg-test.c | 2
src/egg-test.h | 2
src/pk-backend-internal.h | 2
src/pk-backend-spawn.c | 2
src/pk-backend-spawn.h | 2
src/pk-backend.c | 2
src/pk-backend.h | 2
src/pk-cache.c | 2
src/pk-cache.h | 2
src/pk-conf.c | 2
src/pk-conf.h | 2
src/pk-dbus.c | 2
src/pk-dbus.h | 2
src/pk-engine.c | 2
src/pk-engine.h | 2
src/pk-file-monitor.c | 2
src/pk-file-monitor.h | 2
src/pk-inhibit.c | 2
src/pk-inhibit.h | 2
src/pk-lsof.c | 2
src/pk-lsof.h | 2
src/pk-main.c | 2
src/pk-network.c | 2
src/pk-network.h | 2
src/pk-notify.c | 2
src/pk-notify.h | 2
src/pk-polkit-action-lookup.c | 2
src/pk-proc.c | 2
src/pk-proc.h | 2
src/pk-self-test.c | 2
src/pk-shared.c | 2
src/pk-shared.h | 2
src/pk-spawn.c | 2
src/pk-spawn.h | 2
src/pk-store.c | 2
src/pk-store.h | 2
src/pk-sysdep.c | 2
src/pk-sysdep.h | 2
src/pk-syslog.c | 2
src/pk-syslog.h | 2
src/pk-time.c | 2
src/pk-time.h | 2
src/pk-transaction-db.c | 2
src/pk-transaction-db.h | 2
src/pk-transaction-extra.c | 2
src/pk-transaction-extra.h | 2
src/pk-transaction-list.c | 2
src/pk-transaction-list.h | 2
src/pk-transaction.c | 2
src/pk-transaction.h | 2
tools/pk-refresh-licenses.c | 2
213 files changed, 345 insertions(+), 347 deletions(-)
New commits:
commit 898fdce65df77d6380eba5b17fa4c0f3a85dd573
Author: Richard Hughes <richard at hughsie.com>
Date: Fri Jan 29 11:52:47 2010 +0000
trivial: correct the email address in HACKING
diff --git a/HACKING b/HACKING
index 1cfa0a9..8da9025 100644
--- a/HACKING
+++ b/HACKING
@@ -80,5 +80,5 @@ For Example:
0002-My-second-commit.patch
Send these patches in an introductory email as attachments to
-packagekit-list at lists.freedesktop.org
+packagekit at lists.freedesktop.org
commit 4137be32d14188cf4fadea55a88fd575385fde63
Author: Richard Hughes <richard at hughsie.com>
Date: Thu Jan 28 10:47:08 2010 +0000
trivial: Remove the compatibility defines for pk_package_sack() -- nothing outside of PackageKit uses them
diff --git a/lib/packagekit-glib2/pk-package-sack.c b/lib/packagekit-glib2/pk-package-sack.c
index 9ae04d5..8af4e7f 100644
--- a/lib/packagekit-glib2/pk-package-sack.c
+++ b/lib/packagekit-glib2/pk-package-sack.c
@@ -371,11 +371,11 @@ pk_package_sack_sort (PkPackageSack *sack, PkPackageSackSortType type)
g_return_if_fail (PK_IS_PACKAGE_SACK (sack));
if (type == PK_PACKAGE_SACK_SORT_TYPE_NAME)
g_ptr_array_sort (sack->priv->array, (GCompareFunc) pk_package_sack_sort_compare_name_func);
- if (type == PK_PACKAGE_SACK_SORT_TYPE_PACKAGE_ID)
+ else if (type == PK_PACKAGE_SACK_SORT_TYPE_PACKAGE_ID)
g_ptr_array_sort (sack->priv->array, (GCompareFunc) pk_package_sack_sort_compare_package_id_func);
- if (type == PK_PACKAGE_SACK_SORT_TYPE_SUMMARY)
+ else if (type == PK_PACKAGE_SACK_SORT_TYPE_SUMMARY)
g_ptr_array_sort (sack->priv->array, (GCompareFunc) pk_package_sack_sort_compare_summary_func);
- if (type == PK_PACKAGE_SACK_SORT_TYPE_INFO)
+ else if (type == PK_PACKAGE_SACK_SORT_TYPE_INFO)
g_ptr_array_sort (sack->priv->array, (GCompareFunc) pk_package_sack_sort_compare_info_func);
}
diff --git a/lib/packagekit-glib2/pk-package-sack.h b/lib/packagekit-glib2/pk-package-sack.h
index bc23dfb..12e56ce 100644
--- a/lib/packagekit-glib2/pk-package-sack.h
+++ b/lib/packagekit-glib2/pk-package-sack.h
@@ -80,11 +80,6 @@ GType pk_package_sack_get_type (void);
PkPackageSack *pk_package_sack_new (void);
void pk_package_sack_test (gpointer user_data);
-/* for compatibility */
-#define pk_package_sack_sort_info(a) (pk_package_sack_sort(a,PK_PACKAGE_SACK_SORT_TYPE_INFO))
-#define pk_package_sack_sort_summary(a) (pk_package_sack_sort(a,PK_PACKAGE_SACK_SORT_TYPE_SUMMARY))
-#define pk_package_sack_sort_package_id(a) (pk_package_sack_sort(a,PK_PACKAGE_SACK_SORT_TYPE_PACKAGE_ID))
-
/* managing the array */
void pk_package_sack_clear (PkPackageSack *sack);
gchar **pk_package_sack_get_ids (PkPackageSack *sack);
diff --git a/lib/packagekit-glib2/pk-task.c b/lib/packagekit-glib2/pk-task.c
index 09e67f3..864435c 100644
--- a/lib/packagekit-glib2/pk-task.c
+++ b/lib/packagekit-glib2/pk-task.c
@@ -302,7 +302,7 @@ pk_task_simulate_ready_cb (GObject *source_object, GAsyncResult *res, PkTaskStat
}
/* sort the list, as clients will mostly want this */
- pk_package_sack_sort_info (sack);
+ pk_package_sack_sort (sack, PK_PACKAGE_SACK_SORT_TYPE_INFO);
/* run the callback */
klass->simulate_question (state->task, state->request, state->results);
commit 8ac67b10c33287814465a2a2ae67cc1d76061ca3
Author: Richard Hughes <richard at hughsie.com>
Date: Thu Jan 28 10:42:56 2010 +0000
Remove the glib2 functions pk_package_sack_get_size() and pk_package_sack_get_index() as they are horribly inefficient for just getting items from the sack. Just use pk_package_sack_get_array() instead
diff --git a/lib/packagekit-glib2/pk-package-sack.c b/lib/packagekit-glib2/pk-package-sack.c
index f761219..9ae04d5 100644
--- a/lib/packagekit-glib2/pk-package-sack.c
+++ b/lib/packagekit-glib2/pk-package-sack.c
@@ -65,24 +65,6 @@ enum {
G_DEFINE_TYPE (PkPackageSack, pk_package_sack, G_TYPE_OBJECT)
/**
- * pk_package_sack_get_size:
- * @sack: a valid #PkPackageSack instance
- *
- * Gets the number of packages in the sack
- *
- * Return value: the number of packages in the sack
- *
- * Since: 0.5.2
- **/
-guint
-pk_package_sack_get_size (PkPackageSack *sack)
-{
- g_return_val_if_fail (PK_IS_PACKAGE_SACK (sack), 0);
-
- return sack->priv->array->len;
-}
-
-/**
* pk_package_sack_clear:
* @sack: a valid #PkPackageSack instance
*
@@ -127,34 +109,6 @@ pk_package_sack_get_ids (PkPackageSack *sack)
}
/**
- * pk_package_sack_get_index:
- * @sack: a valid #PkPackageSack instance
- * @i: the instance to get
- *
- * Gets a packages from the sack
- *
- * Return value: a %PkPackage instance
- *
- * Since: 0.5.2
- **/
-PkPackage *
-pk_package_sack_get_index (PkPackageSack *sack, guint i)
-{
- PkPackage *package = NULL;
-
- g_return_val_if_fail (PK_IS_PACKAGE_SACK (sack), NULL);
-
- /* index invalid */
- if (i >= sack->priv->array->len)
- goto out;
-
- /* get object */
- package = g_object_ref (g_ptr_array_index (sack->priv->array, i));
-out:
- return package;
-}
-
-/**
* pk_package_sack_get_array:
* @sack: a valid #PkPackageSack instance
*
diff --git a/lib/packagekit-glib2/pk-package-sack.h b/lib/packagekit-glib2/pk-package-sack.h
index 3fad936..bc23dfb 100644
--- a/lib/packagekit-glib2/pk-package-sack.h
+++ b/lib/packagekit-glib2/pk-package-sack.h
@@ -86,9 +86,6 @@ void pk_package_sack_test (gpointer user_data);
#define pk_package_sack_sort_package_id(a) (pk_package_sack_sort(a,PK_PACKAGE_SACK_SORT_TYPE_PACKAGE_ID))
/* managing the array */
-guint pk_package_sack_get_size (PkPackageSack *sack);
-PkPackage *pk_package_sack_get_index (PkPackageSack *sack,
- guint i);
void pk_package_sack_clear (PkPackageSack *sack);
gchar **pk_package_sack_get_ids (PkPackageSack *sack);
GPtrArray *pk_package_sack_get_array (PkPackageSack *sack);
diff --git a/lib/packagekit-glib2/pk-task-wrapper.c b/lib/packagekit-glib2/pk-task-wrapper.c
index d9c7bdb..732e621 100644
--- a/lib/packagekit-glib2/pk-task-wrapper.c
+++ b/lib/packagekit-glib2/pk-task-wrapper.c
@@ -114,7 +114,7 @@ static void
pk_task_wrapper_simulate_question (PkTask *task, guint request, PkResults *results)
{
guint i;
- guint len;
+ GPtrArray *array;
const gchar *package_id;
gchar *printable;
gchar *summary;
@@ -130,9 +130,9 @@ pk_task_wrapper_simulate_question (PkTask *task, guint request, PkResults *resul
sack = pk_results_get_package_sack (results);
/* print data */
- len = pk_package_sack_get_size (sack);
- for (i=0; i<len; i++) {
- package = pk_package_sack_get_index (sack, i);
+ array = pk_package_sack_get_array (sack);
+ for (i=0; i<array->len; i++) {
+ package = g_ptr_array_index (array, i);
g_object_get (package,
"info", &info,
"summary", &summary,
@@ -143,13 +143,13 @@ pk_task_wrapper_simulate_question (PkTask *task, guint request, PkResults *resul
g_free (summary);
g_free (printable);
- g_object_unref (package);
}
/* just accept without asking */
pk_task_user_accepted (task, request);
g_object_unref (sack);
+ g_ptr_array_unref (array);
}
/**
commit b9894bff5a271d87dc571d41a4c371054f298756
Author: Richard Hughes <richard at hughsie.com>
Date: Thu Jan 28 10:32:40 2010 +0000
Sort the packages by name in all pkcon results
diff --git a/client/pk-console.c b/client/pk-console.c
index 2f77a16..136439d 100644
--- a/client/pk-console.c
+++ b/client/pk-console.c
@@ -667,6 +667,7 @@ pk_console_finished_cb (GObject *object, GAsyncResult *res, gpointer data)
PkResults *results;
GError *error = NULL;
GPtrArray *array;
+ PkPackageSack *sack;
PkRestartEnum restart;
PkRoleEnum role;
@@ -702,8 +703,12 @@ pk_console_finished_cb (GObject *object, GAsyncResult *res, gpointer data)
/* get the role */
g_object_get (G_OBJECT(results), "role", &role, NULL);
+ /* get the sack */
+ sack = pk_results_get_package_sack (results);
+ pk_package_sack_sort (sack, PK_PACKAGE_SACK_SORT_TYPE_NAME);
+ array = pk_package_sack_get_array (sack);
+
/* package */
- array = pk_results_get_package_array (results);
if (!is_console ||
(role != PK_ROLE_ENUM_INSTALL_PACKAGES &&
role != PK_ROLE_ENUM_UPDATE_PACKAGES &&
@@ -723,6 +728,7 @@ pk_console_finished_cb (GObject *object, GAsyncResult *res, gpointer data)
}
g_ptr_array_unref (array);
+ g_object_unref (sack);
/* transaction */
array = pk_results_get_transaction_array (results);
diff --git a/lib/packagekit-glib2/pk-package-sack.c b/lib/packagekit-glib2/pk-package-sack.c
index 8697faf..f761219 100644
--- a/lib/packagekit-glib2/pk-package-sack.c
+++ b/lib/packagekit-glib2/pk-package-sack.c
@@ -38,6 +38,7 @@
#include <packagekit-glib2/pk-common.h>
#include <packagekit-glib2/pk-enum.h>
#include <packagekit-glib2/pk-results.h>
+#include <packagekit-glib2/pk-package-id.h>
#include "egg-debug.h"
@@ -154,6 +155,23 @@ out:
}
/**
+ * pk_package_sack_get_array:
+ * @sack: a valid #PkPackageSack instance
+ *
+ * Gets the package array from the sack
+ *
+ * Return value: a #GPtrArray, free with g_ptr_array_unref()
+ *
+ * Since: 0.6.1
+ **/
+GPtrArray *
+pk_package_sack_get_array (PkPackageSack *sack)
+{
+ g_return_val_if_fail (PK_IS_PACKAGE_SACK (sack), NULL);
+ return g_ptr_array_ref (sack->priv->array);
+}
+
+/**
* pk_package_sack_add_package:
* @sack: a valid #PkPackageSack instance
* @package: a valid #PkPackage instance
@@ -312,6 +330,28 @@ pk_package_sack_find_by_id (PkPackageSack *sack, const gchar *package_id)
}
/**
+ * pk_package_sack_sort_compare_name_func:
+ **/
+static gint
+pk_package_sack_sort_compare_name_func (PkPackage **a, PkPackage **b)
+{
+ const gchar *package_id1;
+ const gchar *package_id2;
+ gchar **split1;
+ gchar **split2;
+ gint retval;
+
+ package_id1 = pk_package_get_id (*a);
+ package_id2 = pk_package_get_id (*b);
+ split1 = pk_package_id_split (package_id1);
+ split2 = pk_package_id_split (package_id2);
+ retval = g_strcmp0 (split1[PK_PACKAGE_ID_NAME], split2[PK_PACKAGE_ID_NAME]);
+ g_strfreev (split1);
+ g_strfreev (split2);
+ return retval;
+}
+
+/**
* pk_package_sack_sort_compare_package_id_func:
**/
static gint
@@ -365,46 +405,24 @@ pk_package_sack_sort_compare_info_func (PkPackage **a, PkPackage **b)
/**
* pk_package_sack_sort_package_id:
* @sack: a valid #PkPackageSack instance
+ * @type: the type of sorting, e.g. #PK_PACKAGE_SACK_SORT_TYPE_NAME
*
- * Sorts by Package ID
+ * Sorts the package sack
*
- * Since: 0.5.2
- **/
-void
-pk_package_sack_sort_package_id (PkPackageSack *sack)
-{
- g_return_if_fail (PK_IS_PACKAGE_SACK (sack));
- g_ptr_array_sort (sack->priv->array, (GCompareFunc) pk_package_sack_sort_compare_package_id_func);
-}
-
-/**
- * pk_package_sack_sort_summary:
- * @sack: a valid #PkPackageSack instance
- *
- * Sorts by summary
- *
- * Since: 0.5.2
- **/
-void
-pk_package_sack_sort_summary (PkPackageSack *sack)
-{
- g_return_if_fail (PK_IS_PACKAGE_SACK (sack));
- g_ptr_array_sort (sack->priv->array, (GCompareFunc) pk_package_sack_sort_compare_summary_func);
-}
-
-/**
- * pk_package_sack_sort_info:
- * @sack: a valid #PkPackageSack instance
- *
- * Sorts by PkInfoEnum
- *
- * Since: 0.5.2
+ * Since: 0.6.1
**/
void
-pk_package_sack_sort_info (PkPackageSack *sack)
+pk_package_sack_sort (PkPackageSack *sack, PkPackageSackSortType type)
{
g_return_if_fail (PK_IS_PACKAGE_SACK (sack));
- g_ptr_array_sort (sack->priv->array, (GCompareFunc) pk_package_sack_sort_compare_info_func);
+ if (type == PK_PACKAGE_SACK_SORT_TYPE_NAME)
+ g_ptr_array_sort (sack->priv->array, (GCompareFunc) pk_package_sack_sort_compare_name_func);
+ if (type == PK_PACKAGE_SACK_SORT_TYPE_PACKAGE_ID)
+ g_ptr_array_sort (sack->priv->array, (GCompareFunc) pk_package_sack_sort_compare_package_id_func);
+ if (type == PK_PACKAGE_SACK_SORT_TYPE_SUMMARY)
+ g_ptr_array_sort (sack->priv->array, (GCompareFunc) pk_package_sack_sort_compare_summary_func);
+ if (type == PK_PACKAGE_SACK_SORT_TYPE_INFO)
+ g_ptr_array_sort (sack->priv->array, (GCompareFunc) pk_package_sack_sort_compare_info_func);
}
/**
diff --git a/lib/packagekit-glib2/pk-package-sack.h b/lib/packagekit-glib2/pk-package-sack.h
index ff0cae0..3fad936 100644
--- a/lib/packagekit-glib2/pk-package-sack.h
+++ b/lib/packagekit-glib2/pk-package-sack.h
@@ -67,20 +67,33 @@ struct _PkPackageSackClass
void (*_pk_reserved5) (void);
};
+typedef enum {
+ PK_PACKAGE_SACK_SORT_TYPE_NAME,
+ PK_PACKAGE_SACK_SORT_TYPE_INFO,
+ PK_PACKAGE_SACK_SORT_TYPE_PACKAGE_ID,
+ PK_PACKAGE_SACK_SORT_TYPE_SUMMARY,
+ PK_PACKAGE_SACK_SORT_TYPE_LAST
+} PkPackageSackSortType;
+
GQuark pk_package_sack_error_quark (void);
GType pk_package_sack_get_type (void);
PkPackageSack *pk_package_sack_new (void);
void pk_package_sack_test (gpointer user_data);
+/* for compatibility */
+#define pk_package_sack_sort_info(a) (pk_package_sack_sort(a,PK_PACKAGE_SACK_SORT_TYPE_INFO))
+#define pk_package_sack_sort_summary(a) (pk_package_sack_sort(a,PK_PACKAGE_SACK_SORT_TYPE_SUMMARY))
+#define pk_package_sack_sort_package_id(a) (pk_package_sack_sort(a,PK_PACKAGE_SACK_SORT_TYPE_PACKAGE_ID))
+
/* managing the array */
guint pk_package_sack_get_size (PkPackageSack *sack);
PkPackage *pk_package_sack_get_index (PkPackageSack *sack,
guint i);
void pk_package_sack_clear (PkPackageSack *sack);
gchar **pk_package_sack_get_ids (PkPackageSack *sack);
-void pk_package_sack_sort_package_id (PkPackageSack *sack);
-void pk_package_sack_sort_info (PkPackageSack *sack);
-void pk_package_sack_sort_summary (PkPackageSack *sack);
+GPtrArray *pk_package_sack_get_array (PkPackageSack *sack);
+void pk_package_sack_sort (PkPackageSack *sack,
+ PkPackageSackSortType type);
gboolean pk_package_sack_add_package (PkPackageSack *sack,
PkPackage *package);
gboolean pk_package_sack_add_package_by_id (PkPackageSack *sack,
commit 2138430b21c71bf4ddb538db3fdc5843725f64d8
Author: Richard Hughes <richard at hughsie.com>
Date: Wed Jan 27 16:32:11 2010 +0000
Update the Free Software Foundation address
diff --git a/backends/alpm/pk-backend-alpm.c b/backends/alpm/pk-backend-alpm.c
index 48b5587..ade9c4a 100644
--- a/backends/alpm/pk-backend-alpm.c
+++ b/backends/alpm/pk-backend-alpm.c
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#define _GNU_SOURCE
diff --git a/backends/apt/pk-backend-apt.c b/backends/apt/pk-backend-apt.c
index f010b78..8d6cd80 100644
--- a/backends/apt/pk-backend-apt.c
+++ b/backends/apt/pk-backend-apt.c
@@ -19,7 +19,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "config.h"
diff --git a/backends/apt/profiler.py b/backends/apt/profiler.py
index 1b5d30f..bc09f9e 100644
--- a/backends/apt/profiler.py
+++ b/backends/apt/profiler.py
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Copyright (C) 2008
# Sebastian Heinlein <sebi at glatzor.de>
diff --git a/backends/apt/tests.py b/backends/apt/tests.py
index 79c74a2..70accd1 100755
--- a/backends/apt/tests.py
+++ b/backends/apt/tests.py
@@ -19,7 +19,7 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Licensed under the GNU General Public License Version 2
"""
diff --git a/backends/aptcc/apt-utils.cpp b/backends/aptcc/apt-utils.cpp
index 1d2782a..b830f71 100644
--- a/backends/aptcc/apt-utils.cpp
+++ b/backends/aptcc/apt-utils.cpp
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "apt-utils.h"
diff --git a/backends/aptcc/apt-utils.h b/backends/aptcc/apt-utils.h
index 925c0de..92f6e1a 100644
--- a/backends/aptcc/apt-utils.h
+++ b/backends/aptcc/apt-utils.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef APT_UTILS_H
diff --git a/backends/aptcc/pk-backend-aptcc.cpp b/backends/aptcc/pk-backend-aptcc.cpp
index 6b09ff0..97083d3 100644
--- a/backends/aptcc/pk-backend-aptcc.cpp
+++ b/backends/aptcc/pk-backend-aptcc.cpp
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <apt-pkg/init.h>
diff --git a/backends/box/pk-backend-box.c b/backends/box/pk-backend-box.c
index e4e5d16..9759e69 100644
--- a/backends/box/pk-backend-box.c
+++ b/backends/box/pk-backend-box.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <gmodule.h>
diff --git a/backends/conary/conaryBackend.py b/backends/conary/conaryBackend.py
index 4089680..9bf022d 100755
--- a/backends/conary/conaryBackend.py
+++ b/backends/conary/conaryBackend.py
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Copyright (C) 2007 Ken VanDine <ken at vandine.org>
# Copyright (C) 2008 Richard Hughes <richard at hughsie.com>
diff --git a/backends/conary/conaryCallback.py b/backends/conary/conaryCallback.py
index 772870b..7dc9ffc 100644
--- a/backends/conary/conaryCallback.py
+++ b/backends/conary/conaryCallback.py
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Copyright (C) 2007 Elliot Peele <elliot at bentlogic.net>
# Copyright (C) 2008 Richard Hughes <richard at hughsie.com>
diff --git a/backends/conary/conaryFilter.py b/backends/conary/conaryFilter.py
index b587322..b92bd04 100644
--- a/backends/conary/conaryFilter.py
+++ b/backends/conary/conaryFilter.py
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Copyright (C) 2008
# Richard Hughes <richard at hughsie.com>
diff --git a/backends/conary/conaryProgress.py b/backends/conary/conaryProgress.py
index 644ba98..17d4543 100644
--- a/backends/conary/conaryProgress.py
+++ b/backends/conary/conaryProgress.py
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Copyright (C) 2008
# Richard Hughes <richard at hughsie.com>
diff --git a/backends/conary/pk-backend-conary.c b/backends/conary/pk-backend-conary.c
index d86f767..c97dbc1 100644
--- a/backends/conary/pk-backend-conary.c
+++ b/backends/conary/pk-backend-conary.c
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <pk-backend.h>
diff --git a/backends/dummy/pk-backend-dummy.c b/backends/dummy/pk-backend-dummy.c
index dd5b85e..439923d 100644
--- a/backends/dummy/pk-backend-dummy.c
+++ b/backends/dummy/pk-backend-dummy.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <gmodule.h>
diff --git a/backends/opkg/pk-backend-opkg.c b/backends/opkg/pk-backend-opkg.c
index a624437..46e366d 100644
--- a/backends/opkg/pk-backend-opkg.c
+++ b/backends/opkg/pk-backend-opkg.c
@@ -18,7 +18,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <gmodule.h>
diff --git a/backends/pisi/pisiBackend.py b/backends/pisi/pisiBackend.py
index f4faee6..bf4c3fb 100755
--- a/backends/pisi/pisiBackend.py
+++ b/backends/pisi/pisiBackend.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Copyright (C) 2007 S.Çağlar Onur <caglar at pardus.org.tr>
diff --git a/backends/pisi/pk-backend-pisi.c b/backends/pisi/pk-backend-pisi.c
index b634389..5d861d7 100644
--- a/backends/pisi/pk-backend-pisi.c
+++ b/backends/pisi/pk-backend-pisi.c
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <pk-backend.h>
diff --git a/backends/poldek/pk-backend-poldek.c b/backends/poldek/pk-backend-poldek.c
index 645c2da..252362a 100644
--- a/backends/poldek/pk-backend-poldek.c
+++ b/backends/poldek/pk-backend-poldek.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <pk-backend.h>
diff --git a/backends/portage/pk-backend-portage.c b/backends/portage/pk-backend-portage.c
index 200ddc3..d8291ba 100644
--- a/backends/portage/pk-backend-portage.c
+++ b/backends/portage/pk-backend-portage.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <pk-backend.h>
diff --git a/backends/portage/portageBackend.py b/backends/portage/portageBackend.py
index 0788ec7..b316bdd 100755
--- a/backends/portage/portageBackend.py
+++ b/backends/portage/portageBackend.py
@@ -17,7 +17,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# packagekit imports
from packagekit.backend import *
diff --git a/backends/ports/pk-backend-ports.c b/backends/ports/pk-backend-ports.c
index 2aa7791..11e2973 100644
--- a/backends/ports/pk-backend-ports.c
+++ b/backends/ports/pk-backend-ports.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <pk-backend.h>
diff --git a/backends/ports/portsBackend.rb b/backends/ports/portsBackend.rb
index d7d894e..7e92026 100755
--- a/backends/ports/portsBackend.rb
+++ b/backends/ports/portsBackend.rb
@@ -17,7 +17,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
require 'pkgtools'
require 'open3' # ignores exitcodes
diff --git a/backends/razor/pk-backend-razor.c b/backends/razor/pk-backend-razor.c
index c704da3..24bf07b 100644
--- a/backends/razor/pk-backend-razor.c
+++ b/backends/razor/pk-backend-razor.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <gmodule.h>
diff --git a/backends/slapt/pk-backend-slapt.c b/backends/slapt/pk-backend-slapt.c
index ae2ca17..490a8ad 100644
--- a/backends/slapt/pk-backend-slapt.c
+++ b/backends/slapt/pk-backend-slapt.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#define _GNU_SOURCE
diff --git a/backends/smart/pk-backend-smart.c b/backends/smart/pk-backend-smart.c
index 108abb1..45a4c4f 100644
--- a/backends/smart/pk-backend-smart.c
+++ b/backends/smart/pk-backend-smart.c
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <pk-backend.h>
diff --git a/backends/smart/smartBackend.py b/backends/smart/smartBackend.py
index 3a89e94..f519204 100755
--- a/backends/smart/smartBackend.py
+++ b/backends/smart/smartBackend.py
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Copyright (C) 2007 James Bowes <jbowes at dangerouslyinc.com>
# Copyright (C) 2008 Anders F Bjorklund <afb at users.sourceforge.net>
diff --git a/backends/test/pk-backend-test-fail.c b/backends/test/pk-backend-test-fail.c
index ade398f..ff85b65 100644
--- a/backends/test/pk-backend-test-fail.c
+++ b/backends/test/pk-backend-test-fail.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <gmodule.h>
diff --git a/backends/test/pk-backend-test-nop.c b/backends/test/pk-backend-test-nop.c
index 2a49aaa..d0167e0 100644
--- a/backends/test/pk-backend-test-nop.c
+++ b/backends/test/pk-backend-test-nop.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <gmodule.h>
diff --git a/backends/test/pk-backend-test-spawn.c b/backends/test/pk-backend-test-spawn.c
index c416862..82444ee 100644
--- a/backends/test/pk-backend-test-spawn.c
+++ b/backends/test/pk-backend-test-spawn.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <gmodule.h>
diff --git a/backends/test/pk-backend-test-succeed.c b/backends/test/pk-backend-test-succeed.c
index b8bfb6a..9ec164b 100644
--- a/backends/test/pk-backend-test-succeed.c
+++ b/backends/test/pk-backend-test-succeed.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <gmodule.h>
diff --git a/backends/test/pk-backend-test-thread.c b/backends/test/pk-backend-test-thread.c
index f967e70..01ff437 100644
--- a/backends/test/pk-backend-test-thread.c
+++ b/backends/test/pk-backend-test-thread.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <gmodule.h>
diff --git a/backends/urpmi/pk-backend-urpmi.c b/backends/urpmi/pk-backend-urpmi.c
index 73eefed..3d1a468 100644
--- a/backends/urpmi/pk-backend-urpmi.c
+++ b/backends/urpmi/pk-backend-urpmi.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <pk-backend.h>
diff --git a/backends/yum/pk-backend-yum.c b/backends/yum/pk-backend-yum.c
index 06a1729..fc3defa 100644
--- a/backends/yum/pk-backend-yum.c
+++ b/backends/yum/pk-backend-yum.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <gio/gio.h>
diff --git a/backends/yum/yumBackend.py b/backends/yum/yumBackend.py
index 91edcf4..3592347 100755
--- a/backends/yum/yumBackend.py
+++ b/backends/yum/yumBackend.py
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Copyright (C) 2007-2009
# Tim Lauridsen <timlau at fedoraproject.org>
diff --git a/backends/yum/yumComps.py b/backends/yum/yumComps.py
index 9611d2f..2c918bf 100644
--- a/backends/yum/yumComps.py
+++ b/backends/yum/yumComps.py
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Copyright (C) 2008
# Richard Hughes <richard at hughsie.com>
diff --git a/backends/yum/yumCompsTest.py b/backends/yum/yumCompsTest.py
index 34de8e1..3af512f 100755
--- a/backends/yum/yumCompsTest.py
+++ b/backends/yum/yumCompsTest.py
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Copyright (C) 2008
# Richard Hughes <richard at hughsie.com>
diff --git a/backends/yum/yumFilter.py b/backends/yum/yumFilter.py
index 47ed24f..11e48b6 100644
--- a/backends/yum/yumFilter.py
+++ b/backends/yum/yumFilter.py
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Copyright (C) 2008
# Richard Hughes <richard at hughsie.com>
diff --git a/backends/yum/yumMediaManager.py b/backends/yum/yumMediaManager.py
index 9147621..735edc1 100644
--- a/backends/yum/yumMediaManager.py
+++ b/backends/yum/yumMediaManager.py
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Copyright (C) 2009
# Muayyad Saleh Alsadi <alsadi at ojuba.org>
diff --git a/backends/yum/yumMediaManagerDeviceKit.py b/backends/yum/yumMediaManagerDeviceKit.py
index a32766b..690c84b 100644
--- a/backends/yum/yumMediaManagerDeviceKit.py
+++ b/backends/yum/yumMediaManagerDeviceKit.py
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Copyright (C) 2009
# Muayyad Saleh Alsadi <alsadi at ojuba.org>
diff --git a/backends/yum/yumMediaManagerGIO.py b/backends/yum/yumMediaManagerGIO.py
index 772e6bd..e71e8f3 100644
--- a/backends/yum/yumMediaManagerGIO.py
+++ b/backends/yum/yumMediaManagerGIO.py
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Copyright (C) 2009
# Muayyad Saleh Alsadi <alsadi at ojuba.org>
diff --git a/backends/yum/yumMediaManagerHAL.py b/backends/yum/yumMediaManagerHAL.py
index 6230ee3..a249e1d 100644
--- a/backends/yum/yumMediaManagerHAL.py
+++ b/backends/yum/yumMediaManagerHAL.py
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Copyright (C) 2009
# Muayyad Saleh Alsadi <alsadi at ojuba.org>
diff --git a/backends/yum/yumMediaManagerOS.py b/backends/yum/yumMediaManagerOS.py
index 2c13873..0a5a4c5 100644
--- a/backends/yum/yumMediaManagerOS.py
+++ b/backends/yum/yumMediaManagerOS.py
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Copyright (C) 2009
# Muayyad Saleh Alsadi <alsadi at ojuba.org>
diff --git a/backends/zypp/pk-backend-zypp.cpp b/backends/zypp/pk-backend-zypp.cpp
index 7e82fc0..c22878b 100644
--- a/backends/zypp/pk-backend-zypp.cpp
+++ b/backends/zypp/pk-backend-zypp.cpp
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <gmodule.h>
diff --git a/backends/zypp/zypp-events.h b/backends/zypp/zypp-events.h
index 1c7973e..b651b00 100644
--- a/backends/zypp/zypp-events.h
+++ b/backends/zypp/zypp-events.h
@@ -19,7 +19,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef _ZYPP_EVENTS_H_
diff --git a/backends/zypp/zypp-utils.cpp b/backends/zypp/zypp-utils.cpp
index 85a362d..1adf9cb 100644
--- a/backends/zypp/zypp-utils.cpp
+++ b/backends/zypp/zypp-utils.cpp
@@ -19,7 +19,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <sstream>
diff --git a/backends/zypp/zypp-utils.h b/backends/zypp/zypp-utils.h
index c79a07d..450be80 100644
--- a/backends/zypp/zypp-utils.h
+++ b/backends/zypp/zypp-utils.h
@@ -19,7 +19,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef _ZYPP_UTILS_H_
diff --git a/client/pk-console.c b/client/pk-console.c
index be10db8..2f77a16 100644
--- a/client/pk-console.c
+++ b/client/pk-console.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "config.h"
diff --git a/client/pk-generate-pack.c b/client/pk-generate-pack.c
index 5cba199..4959428 100644
--- a/client/pk-generate-pack.c
+++ b/client/pk-generate-pack.c
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "config.h"
diff --git a/client/pk-monitor.c b/client/pk-monitor.c
index ded71fd..ca2b10f 100644
--- a/client/pk-monitor.c
+++ b/client/pk-monitor.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "config.h"
diff --git a/client/pk-self-test.c b/client/pk-self-test.c
index 3214675..8ace1a5 100644
--- a/client/pk-self-test.c
+++ b/client/pk-self-test.c
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "config.h"
diff --git a/contrib/browser-plugin/pk-main.c b/contrib/browser-plugin/pk-main.c
index a40cd4c..62914e0 100644
--- a/contrib/browser-plugin/pk-main.c
+++ b/contrib/browser-plugin/pk-main.c
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/contrib/browser-plugin/pk-main.h b/contrib/browser-plugin/pk-main.h
index 9529811..c4d8914 100644
--- a/contrib/browser-plugin/pk-main.h
+++ b/contrib/browser-plugin/pk-main.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __PK_MAIN_H
diff --git a/contrib/browser-plugin/pk-plugin-install.c b/contrib/browser-plugin/pk-plugin-install.c
index f5ba03e..e91132d 100644
--- a/contrib/browser-plugin/pk-plugin-install.c
+++ b/contrib/browser-plugin/pk-plugin-install.c
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/contrib/browser-plugin/pk-plugin-install.h b/contrib/browser-plugin/pk-plugin-install.h
index 9f7c191..17a7327 100644
--- a/contrib/browser-plugin/pk-plugin-install.h
+++ b/contrib/browser-plugin/pk-plugin-install.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __PK_PLUGIN_INSTALL_H
diff --git a/contrib/browser-plugin/pk-plugin.c b/contrib/browser-plugin/pk-plugin.c
index 45c7f1b..6a913ba 100644
--- a/contrib/browser-plugin/pk-plugin.c
+++ b/contrib/browser-plugin/pk-plugin.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
diff --git a/contrib/browser-plugin/pk-plugin.h b/contrib/browser-plugin/pk-plugin.h
index e97f0ee..b9019f9 100644
--- a/contrib/browser-plugin/pk-plugin.h
+++ b/contrib/browser-plugin/pk-plugin.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __PK_PLUGIN_H
diff --git a/contrib/command-not-found/pk-command-not-found.c b/contrib/command-not-found/pk-command-not-found.c
index 75da0c9..931ef19 100644
--- a/contrib/command-not-found/pk-command-not-found.c
+++ b/contrib/command-not-found/pk-command-not-found.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "config.h"
diff --git a/contrib/debuginfo-install/pk-debuginfo-install.c b/contrib/debuginfo-install/pk-debuginfo-install.c
index affb8e9..8e2e41a 100644
--- a/contrib/debuginfo-install/pk-debuginfo-install.c
+++ b/contrib/debuginfo-install/pk-debuginfo-install.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/* Test with ./pk-debuginfo-install bzip2-libs-1.0.5-5.fc11.i586 glib2-2.20.3-1.fc11.i586 */
diff --git a/contrib/device-rebind/pk-device-rebind.c b/contrib/device-rebind/pk-device-rebind.c
index 54d7458..d14746e 100644
--- a/contrib/device-rebind/pk-device-rebind.c
+++ b/contrib/device-rebind/pk-device-rebind.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "config.h"
diff --git a/contrib/gstreamer-plugin/pk-gstreamer-install.c b/contrib/gstreamer-plugin/pk-gstreamer-install.c
index 643164e..2381ff5 100644
--- a/contrib/gstreamer-plugin/pk-gstreamer-install.c
+++ b/contrib/gstreamer-plugin/pk-gstreamer-install.c
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <gst/gst.h>
diff --git a/contrib/gtk-module/pk-gtk-module.c b/contrib/gtk-module/pk-gtk-module.c
index 57de8b6..78fa350 100644
--- a/contrib/gtk-module/pk-gtk-module.c
+++ b/contrib/gtk-module/pk-gtk-module.c
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#define G_LOG_DOMAIN "PkGtkModule"
diff --git a/data/tests/pk-spawn-dispatcher.py b/data/tests/pk-spawn-dispatcher.py
index e34cbe6..c7cd2ac 100755
--- a/data/tests/pk-spawn-dispatcher.py
+++ b/data/tests/pk-spawn-dispatcher.py
@@ -7,7 +7,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Copyright (C) 2008 Tim Lauridsen <timlau at fedoraproject.org>
# Copyright (C) 2008 Richard Hughes <richard at hughsie.com>
diff --git a/lib/packagekit-glib2/packagekit-private.h b/lib/packagekit-glib2/packagekit-private.h
index 42aa245..183650e 100644
--- a/lib/packagekit-glib2/packagekit-private.h
+++ b/lib/packagekit-glib2/packagekit-private.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __PACKAGEKIT_PRIVATE_H__
diff --git a/lib/packagekit-glib2/packagekit.h b/lib/packagekit-glib2/packagekit.h
index 4d6cf66..5d094f4 100644
--- a/lib/packagekit-glib2/packagekit.h
+++ b/lib/packagekit-glib2/packagekit.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __PACKAGEKIT_H__
diff --git a/lib/packagekit-glib2/pk-bitfield.c b/lib/packagekit-glib2/pk-bitfield.c
index 3580b7f..38f8b70 100644
--- a/lib/packagekit-glib2/pk-bitfield.c
+++ b/lib/packagekit-glib2/pk-bitfield.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
diff --git a/lib/packagekit-glib2/pk-bitfield.h b/lib/packagekit-glib2/pk-bitfield.h
index 6035818..195c9a1 100644
--- a/lib/packagekit-glib2/pk-bitfield.h
+++ b/lib/packagekit-glib2/pk-bitfield.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#if !defined (__PACKAGEKIT_H_INSIDE__) && !defined (PK_COMPILATION)
diff --git a/lib/packagekit-glib2/pk-catalog.c b/lib/packagekit-glib2/pk-catalog.c
index 1964c6a..0bc2c4a 100644
--- a/lib/packagekit-glib2/pk-catalog.c
+++ b/lib/packagekit-glib2/pk-catalog.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
diff --git a/lib/packagekit-glib2/pk-catalog.h b/lib/packagekit-glib2/pk-catalog.h
index 47d7a53..3501112 100644
--- a/lib/packagekit-glib2/pk-catalog.h
+++ b/lib/packagekit-glib2/pk-catalog.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#if !defined (__PACKAGEKIT_H_INSIDE__) && !defined (PK_COMPILATION)
diff --git a/lib/packagekit-glib2/pk-category.c b/lib/packagekit-glib2/pk-category.c
index 6dd0b68..f633969 100644
--- a/lib/packagekit-glib2/pk-category.c
+++ b/lib/packagekit-glib2/pk-category.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
diff --git a/lib/packagekit-glib2/pk-category.h b/lib/packagekit-glib2/pk-category.h
index 0fb27e3..d099db4 100644
--- a/lib/packagekit-glib2/pk-category.h
+++ b/lib/packagekit-glib2/pk-category.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#if !defined (__PACKAGEKIT_H_INSIDE__) && !defined (PK_COMPILATION)
diff --git a/lib/packagekit-glib2/pk-client-sync.c b/lib/packagekit-glib2/pk-client-sync.c
index 0563d4a..0889fdd 100644
--- a/lib/packagekit-glib2/pk-client-sync.c
+++ b/lib/packagekit-glib2/pk-client-sync.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "config.h"
diff --git a/lib/packagekit-glib2/pk-client-sync.h b/lib/packagekit-glib2/pk-client-sync.h
index a613796..2cebffb 100644
--- a/lib/packagekit-glib2/pk-client-sync.h
+++ b/lib/packagekit-glib2/pk-client-sync.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __PK_CLIENT_SYNC_H
diff --git a/lib/packagekit-glib2/pk-client.c b/lib/packagekit-glib2/pk-client.c
index 13dd1b2..8fa0883 100644
--- a/lib/packagekit-glib2/pk-client.c
+++ b/lib/packagekit-glib2/pk-client.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
diff --git a/lib/packagekit-glib2/pk-client.h b/lib/packagekit-glib2/pk-client.h
index ecbcdef..6ce7811 100644
--- a/lib/packagekit-glib2/pk-client.h
+++ b/lib/packagekit-glib2/pk-client.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#if !defined (__PACKAGEKIT_H_INSIDE__) && !defined (PK_COMPILATION)
diff --git a/lib/packagekit-glib2/pk-common.c b/lib/packagekit-glib2/pk-common.c
index a6a5adf..d07b103 100644
--- a/lib/packagekit-glib2/pk-common.c
+++ b/lib/packagekit-glib2/pk-common.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
diff --git a/lib/packagekit-glib2/pk-common.h b/lib/packagekit-glib2/pk-common.h
index 38c6954..b93188e 100644
--- a/lib/packagekit-glib2/pk-common.h
+++ b/lib/packagekit-glib2/pk-common.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#if !defined (__PACKAGEKIT_H_INSIDE__) && !defined (PK_COMPILATION)
diff --git a/lib/packagekit-glib2/pk-console-shared.c b/lib/packagekit-glib2/pk-console-shared.c
index 216e16f..76cd562 100644
--- a/lib/packagekit-glib2/pk-console-shared.c
+++ b/lib/packagekit-glib2/pk-console-shared.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "config.h"
diff --git a/lib/packagekit-glib2/pk-console-shared.h b/lib/packagekit-glib2/pk-console-shared.h
index 6dbd8e6..618b869 100644
--- a/lib/packagekit-glib2/pk-console-shared.h
+++ b/lib/packagekit-glib2/pk-console-shared.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __PK_CONSOLE_SHARED_H
diff --git a/lib/packagekit-glib2/pk-control-sync.c b/lib/packagekit-glib2/pk-control-sync.c
index 3bd4a39..feff991 100644
--- a/lib/packagekit-glib2/pk-control-sync.c
+++ b/lib/packagekit-glib2/pk-control-sync.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "config.h"
diff --git a/lib/packagekit-glib2/pk-control-sync.h b/lib/packagekit-glib2/pk-control-sync.h
index 719812a..3b507d3 100644
--- a/lib/packagekit-glib2/pk-control-sync.h
+++ b/lib/packagekit-glib2/pk-control-sync.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __PK_CONTROL_SYNC_H
diff --git a/lib/packagekit-glib2/pk-control.c b/lib/packagekit-glib2/pk-control.c
index 1a00905..1d3c288 100644
--- a/lib/packagekit-glib2/pk-control.c
+++ b/lib/packagekit-glib2/pk-control.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
diff --git a/lib/packagekit-glib2/pk-control.h b/lib/packagekit-glib2/pk-control.h
index eee5714..562477d 100644
--- a/lib/packagekit-glib2/pk-control.h
+++ b/lib/packagekit-glib2/pk-control.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#if !defined (__PACKAGEKIT_H_INSIDE__) && !defined (PK_COMPILATION)
diff --git a/lib/packagekit-glib2/pk-desktop.c b/lib/packagekit-glib2/pk-desktop.c
index 329798d..80af9dd 100644
--- a/lib/packagekit-glib2/pk-desktop.c
+++ b/lib/packagekit-glib2/pk-desktop.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
diff --git a/lib/packagekit-glib2/pk-desktop.h b/lib/packagekit-glib2/pk-desktop.h
index 2892b31..d3292a1 100644
--- a/lib/packagekit-glib2/pk-desktop.h
+++ b/lib/packagekit-glib2/pk-desktop.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#if !defined (__PACKAGEKIT_H_INSIDE__) && !defined (PK_COMPILATION)
diff --git a/lib/packagekit-glib2/pk-details.c b/lib/packagekit-glib2/pk-details.c
index 7baed79..2f1f3b3 100644
--- a/lib/packagekit-glib2/pk-details.c
+++ b/lib/packagekit-glib2/pk-details.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
diff --git a/lib/packagekit-glib2/pk-details.h b/lib/packagekit-glib2/pk-details.h
index 6ae6ec4..423754d 100644
--- a/lib/packagekit-glib2/pk-details.h
+++ b/lib/packagekit-glib2/pk-details.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#if !defined (__PACKAGEKIT_H_INSIDE__) && !defined (PK_COMPILATION)
diff --git a/lib/packagekit-glib2/pk-distro-upgrade.c b/lib/packagekit-glib2/pk-distro-upgrade.c
index 18cb483..7728b32 100644
--- a/lib/packagekit-glib2/pk-distro-upgrade.c
+++ b/lib/packagekit-glib2/pk-distro-upgrade.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
diff --git a/lib/packagekit-glib2/pk-distro-upgrade.h b/lib/packagekit-glib2/pk-distro-upgrade.h
index 9f5c42a..5d6cd33 100644
--- a/lib/packagekit-glib2/pk-distro-upgrade.h
+++ b/lib/packagekit-glib2/pk-distro-upgrade.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#if !defined (__PACKAGEKIT_H_INSIDE__) && !defined (PK_COMPILATION)
diff --git a/lib/packagekit-glib2/pk-enum.c b/lib/packagekit-glib2/pk-enum.c
index 158e65a..2fa16fa 100644
--- a/lib/packagekit-glib2/pk-enum.c
+++ b/lib/packagekit-glib2/pk-enum.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
diff --git a/lib/packagekit-glib2/pk-enum.h b/lib/packagekit-glib2/pk-enum.h
index e8dcf4e..056b308 100644
--- a/lib/packagekit-glib2/pk-enum.h
+++ b/lib/packagekit-glib2/pk-enum.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#if !defined (__PACKAGEKIT_H_INSIDE__) && !defined (PK_COMPILATION)
diff --git a/lib/packagekit-glib2/pk-error.c b/lib/packagekit-glib2/pk-error.c
index c64252f..4d2b86b 100644
--- a/lib/packagekit-glib2/pk-error.c
+++ b/lib/packagekit-glib2/pk-error.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
diff --git a/lib/packagekit-glib2/pk-error.h b/lib/packagekit-glib2/pk-error.h
index 96357be..44f5472 100644
--- a/lib/packagekit-glib2/pk-error.h
+++ b/lib/packagekit-glib2/pk-error.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#if !defined (__PACKAGEKIT_H_INSIDE__) && !defined (PK_COMPILATION)
diff --git a/lib/packagekit-glib2/pk-eula-required.c b/lib/packagekit-glib2/pk-eula-required.c
index 518aeee..0525af4 100644
--- a/lib/packagekit-glib2/pk-eula-required.c
+++ b/lib/packagekit-glib2/pk-eula-required.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
diff --git a/lib/packagekit-glib2/pk-eula-required.h b/lib/packagekit-glib2/pk-eula-required.h
index c3bb9e5..bba8877 100644
--- a/lib/packagekit-glib2/pk-eula-required.h
+++ b/lib/packagekit-glib2/pk-eula-required.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#if !defined (__PACKAGEKIT_H_INSIDE__) && !defined (PK_COMPILATION)
diff --git a/lib/packagekit-glib2/pk-files.c b/lib/packagekit-glib2/pk-files.c
index ebf4a2f..6243a14 100644
--- a/lib/packagekit-glib2/pk-files.c
+++ b/lib/packagekit-glib2/pk-files.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
diff --git a/lib/packagekit-glib2/pk-files.h b/lib/packagekit-glib2/pk-files.h
index e00e3e2..a2a9d07 100644
--- a/lib/packagekit-glib2/pk-files.h
+++ b/lib/packagekit-glib2/pk-files.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#if !defined (__PACKAGEKIT_H_INSIDE__) && !defined (PK_COMPILATION)
diff --git a/lib/packagekit-glib2/pk-media-change-required.c b/lib/packagekit-glib2/pk-media-change-required.c
index 88a7e09..be69131 100644
--- a/lib/packagekit-glib2/pk-media-change-required.c
+++ b/lib/packagekit-glib2/pk-media-change-required.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
diff --git a/lib/packagekit-glib2/pk-media-change-required.h b/lib/packagekit-glib2/pk-media-change-required.h
index 5f18ee3..b7b4b01 100644
--- a/lib/packagekit-glib2/pk-media-change-required.h
+++ b/lib/packagekit-glib2/pk-media-change-required.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#if !defined (__PACKAGEKIT_H_INSIDE__) && !defined (PK_COMPILATION)
diff --git a/lib/packagekit-glib2/pk-message.c b/lib/packagekit-glib2/pk-message.c
index a8ce700..c9c12f6 100644
--- a/lib/packagekit-glib2/pk-message.c
+++ b/lib/packagekit-glib2/pk-message.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
diff --git a/lib/packagekit-glib2/pk-message.h b/lib/packagekit-glib2/pk-message.h
index 1500882..53cd8ab 100644
--- a/lib/packagekit-glib2/pk-message.h
+++ b/lib/packagekit-glib2/pk-message.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#if !defined (__PACKAGEKIT_H_INSIDE__) && !defined (PK_COMPILATION)
diff --git a/lib/packagekit-glib2/pk-package-id.c b/lib/packagekit-glib2/pk-package-id.c
index d4a734f..425e722 100644
--- a/lib/packagekit-glib2/pk-package-id.c
+++ b/lib/packagekit-glib2/pk-package-id.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
diff --git a/lib/packagekit-glib2/pk-package-id.h b/lib/packagekit-glib2/pk-package-id.h
index b2286e0..63b6402 100644
--- a/lib/packagekit-glib2/pk-package-id.h
+++ b/lib/packagekit-glib2/pk-package-id.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#if !defined (__PACKAGEKIT_H_INSIDE__) && !defined (PK_COMPILATION)
diff --git a/lib/packagekit-glib2/pk-package-ids.c b/lib/packagekit-glib2/pk-package-ids.c
index 46e3201..b9c05dc 100644
--- a/lib/packagekit-glib2/pk-package-ids.c
+++ b/lib/packagekit-glib2/pk-package-ids.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
diff --git a/lib/packagekit-glib2/pk-package-ids.h b/lib/packagekit-glib2/pk-package-ids.h
index b6fd3aa..09b74f9 100644
--- a/lib/packagekit-glib2/pk-package-ids.h
+++ b/lib/packagekit-glib2/pk-package-ids.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#if !defined (__PACKAGEKIT_H_INSIDE__) && !defined (PK_COMPILATION)
diff --git a/lib/packagekit-glib2/pk-package-sack-sync.c b/lib/packagekit-glib2/pk-package-sack-sync.c
index 35b80d0..6ba6102 100644
--- a/lib/packagekit-glib2/pk-package-sack-sync.c
+++ b/lib/packagekit-glib2/pk-package-sack-sync.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "config.h"
diff --git a/lib/packagekit-glib2/pk-package-sack-sync.h b/lib/packagekit-glib2/pk-package-sack-sync.h
index 802f54c..9445644 100644
--- a/lib/packagekit-glib2/pk-package-sack-sync.h
+++ b/lib/packagekit-glib2/pk-package-sack-sync.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __PK_PACKAGE_SACK_SYNC_H
diff --git a/lib/packagekit-glib2/pk-package-sack.c b/lib/packagekit-glib2/pk-package-sack.c
index a7aea95..8697faf 100644
--- a/lib/packagekit-glib2/pk-package-sack.c
+++ b/lib/packagekit-glib2/pk-package-sack.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
diff --git a/lib/packagekit-glib2/pk-package-sack.h b/lib/packagekit-glib2/pk-package-sack.h
index 06b7c7f..ff0cae0 100644
--- a/lib/packagekit-glib2/pk-package-sack.h
+++ b/lib/packagekit-glib2/pk-package-sack.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#if !defined (__PACKAGEKIT_H_INSIDE__) && !defined (PK_COMPILATION)
diff --git a/lib/packagekit-glib2/pk-package.c b/lib/packagekit-glib2/pk-package.c
index 4a47c6d..cf90caa 100644
--- a/lib/packagekit-glib2/pk-package.c
+++ b/lib/packagekit-glib2/pk-package.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
diff --git a/lib/packagekit-glib2/pk-package.h b/lib/packagekit-glib2/pk-package.h
index a812c8e..e0cc3ec 100644
--- a/lib/packagekit-glib2/pk-package.h
+++ b/lib/packagekit-glib2/pk-package.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#if !defined (__PACKAGEKIT_H_INSIDE__) && !defined (PK_COMPILATION)
diff --git a/lib/packagekit-glib2/pk-progress-bar.c b/lib/packagekit-glib2/pk-progress-bar.c
index 6a54e3f..e14389c 100644
--- a/lib/packagekit-glib2/pk-progress-bar.c
+++ b/lib/packagekit-glib2/pk-progress-bar.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <glib.h>
diff --git a/lib/packagekit-glib2/pk-progress-bar.h b/lib/packagekit-glib2/pk-progress-bar.h
index 4d74a92..7b534e1 100644
--- a/lib/packagekit-glib2/pk-progress-bar.h
+++ b/lib/packagekit-glib2/pk-progress-bar.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __PK_PROGRESS_BAR_H
diff --git a/lib/packagekit-glib2/pk-progress.c b/lib/packagekit-glib2/pk-progress.c
index be2df85..19a0693 100644
--- a/lib/packagekit-glib2/pk-progress.c
+++ b/lib/packagekit-glib2/pk-progress.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
diff --git a/lib/packagekit-glib2/pk-progress.h b/lib/packagekit-glib2/pk-progress.h
index d305085..51aa698 100644
--- a/lib/packagekit-glib2/pk-progress.h
+++ b/lib/packagekit-glib2/pk-progress.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#if !defined (__PACKAGEKIT_H_INSIDE__) && !defined (PK_COMPILATION)
diff --git a/lib/packagekit-glib2/pk-repo-detail.c b/lib/packagekit-glib2/pk-repo-detail.c
index 8192ba0..a729b66 100644
--- a/lib/packagekit-glib2/pk-repo-detail.c
+++ b/lib/packagekit-glib2/pk-repo-detail.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
diff --git a/lib/packagekit-glib2/pk-repo-detail.h b/lib/packagekit-glib2/pk-repo-detail.h
index 23b8f4c..4d8aebb 100644
--- a/lib/packagekit-glib2/pk-repo-detail.h
+++ b/lib/packagekit-glib2/pk-repo-detail.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#if !defined (__PACKAGEKIT_H_INSIDE__) && !defined (PK_COMPILATION)
diff --git a/lib/packagekit-glib2/pk-repo-signature-required.c b/lib/packagekit-glib2/pk-repo-signature-required.c
index 57b3bad..24a81e4 100644
--- a/lib/packagekit-glib2/pk-repo-signature-required.c
+++ b/lib/packagekit-glib2/pk-repo-signature-required.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
diff --git a/lib/packagekit-glib2/pk-repo-signature-required.h b/lib/packagekit-glib2/pk-repo-signature-required.h
index ff58f03..78752e5 100644
--- a/lib/packagekit-glib2/pk-repo-signature-required.h
+++ b/lib/packagekit-glib2/pk-repo-signature-required.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#if !defined (__PACKAGEKIT_H_INSIDE__) && !defined (PK_COMPILATION)
diff --git a/lib/packagekit-glib2/pk-require-restart.c b/lib/packagekit-glib2/pk-require-restart.c
index 617c76d..2fb9eb6 100644
--- a/lib/packagekit-glib2/pk-require-restart.c
+++ b/lib/packagekit-glib2/pk-require-restart.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
diff --git a/lib/packagekit-glib2/pk-require-restart.h b/lib/packagekit-glib2/pk-require-restart.h
index 7730414..daed242 100644
--- a/lib/packagekit-glib2/pk-require-restart.h
+++ b/lib/packagekit-glib2/pk-require-restart.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#if !defined (__PACKAGEKIT_H_INSIDE__) && !defined (PK_COMPILATION)
diff --git a/lib/packagekit-glib2/pk-results.c b/lib/packagekit-glib2/pk-results.c
index a4544ef..dcff6bb 100644
--- a/lib/packagekit-glib2/pk-results.c
+++ b/lib/packagekit-glib2/pk-results.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
diff --git a/lib/packagekit-glib2/pk-results.h b/lib/packagekit-glib2/pk-results.h
index 9b18d07..82f08dc 100644
--- a/lib/packagekit-glib2/pk-results.h
+++ b/lib/packagekit-glib2/pk-results.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#if !defined (__PACKAGEKIT_H_INSIDE__) && !defined (PK_COMPILATION)
diff --git a/lib/packagekit-glib2/pk-self-test.c b/lib/packagekit-glib2/pk-self-test.c
index c926756..97e1240 100644
--- a/lib/packagekit-glib2/pk-self-test.c
+++ b/lib/packagekit-glib2/pk-self-test.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "config.h"
diff --git a/lib/packagekit-glib2/pk-service-pack.c b/lib/packagekit-glib2/pk-service-pack.c
index 501028c..3a70105 100644
--- a/lib/packagekit-glib2/pk-service-pack.c
+++ b/lib/packagekit-glib2/pk-service-pack.c
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
diff --git a/lib/packagekit-glib2/pk-service-pack.h b/lib/packagekit-glib2/pk-service-pack.h
index 73d8a64..e52726a 100644
--- a/lib/packagekit-glib2/pk-service-pack.h
+++ b/lib/packagekit-glib2/pk-service-pack.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#if !defined (__PACKAGEKIT_H_INSIDE__) && !defined (PK_COMPILATION)
diff --git a/lib/packagekit-glib2/pk-source.c b/lib/packagekit-glib2/pk-source.c
index e533aec..7bc2f9b 100644
--- a/lib/packagekit-glib2/pk-source.c
+++ b/lib/packagekit-glib2/pk-source.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
diff --git a/lib/packagekit-glib2/pk-source.h b/lib/packagekit-glib2/pk-source.h
index 6e307a7..5230af9 100644
--- a/lib/packagekit-glib2/pk-source.h
+++ b/lib/packagekit-glib2/pk-source.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#if !defined (__PACKAGEKIT_H_INSIDE__) && !defined (PK_COMPILATION)
diff --git a/lib/packagekit-glib2/pk-task-sync.c b/lib/packagekit-glib2/pk-task-sync.c
index c36fdf4..8da09d2 100644
--- a/lib/packagekit-glib2/pk-task-sync.c
+++ b/lib/packagekit-glib2/pk-task-sync.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "config.h"
diff --git a/lib/packagekit-glib2/pk-task-sync.h b/lib/packagekit-glib2/pk-task-sync.h
index ad77221..8d80a8a 100644
--- a/lib/packagekit-glib2/pk-task-sync.h
+++ b/lib/packagekit-glib2/pk-task-sync.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __PK_TASK_SYNC_H
diff --git a/lib/packagekit-glib2/pk-task-text.c b/lib/packagekit-glib2/pk-task-text.c
index ad76e99..bd37c85 100644
--- a/lib/packagekit-glib2/pk-task-text.c
+++ b/lib/packagekit-glib2/pk-task-text.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "config.h"
diff --git a/lib/packagekit-glib2/pk-task-text.h b/lib/packagekit-glib2/pk-task-text.h
index 20bcd99..697ccc9 100644
--- a/lib/packagekit-glib2/pk-task-text.h
+++ b/lib/packagekit-glib2/pk-task-text.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __PK_TASK_TEXT_H
diff --git a/lib/packagekit-glib2/pk-task-wrapper.c b/lib/packagekit-glib2/pk-task-wrapper.c
index 5f21c0b..d9c7bdb 100644
--- a/lib/packagekit-glib2/pk-task-wrapper.c
+++ b/lib/packagekit-glib2/pk-task-wrapper.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "config.h"
diff --git a/lib/packagekit-glib2/pk-task-wrapper.h b/lib/packagekit-glib2/pk-task-wrapper.h
index 9d0887d..13d1356 100644
--- a/lib/packagekit-glib2/pk-task-wrapper.h
+++ b/lib/packagekit-glib2/pk-task-wrapper.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __PK_TASK_WRAPPER_H
diff --git a/lib/packagekit-glib2/pk-task.c b/lib/packagekit-glib2/pk-task.c
index 88b6666..09e67f3 100644
--- a/lib/packagekit-glib2/pk-task.c
+++ b/lib/packagekit-glib2/pk-task.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
diff --git a/lib/packagekit-glib2/pk-task.h b/lib/packagekit-glib2/pk-task.h
index d153ea8..de62c66 100644
--- a/lib/packagekit-glib2/pk-task.h
+++ b/lib/packagekit-glib2/pk-task.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#if !defined (__PACKAGEKIT_H_INSIDE__) && !defined (PK_COMPILATION)
diff --git a/lib/packagekit-glib2/pk-transaction-list.c b/lib/packagekit-glib2/pk-transaction-list.c
index 751ccb5..47b8edb 100644
--- a/lib/packagekit-glib2/pk-transaction-list.c
+++ b/lib/packagekit-glib2/pk-transaction-list.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
diff --git a/lib/packagekit-glib2/pk-transaction-list.h b/lib/packagekit-glib2/pk-transaction-list.h
index 7c9b8ac..b1990f0 100644
--- a/lib/packagekit-glib2/pk-transaction-list.h
+++ b/lib/packagekit-glib2/pk-transaction-list.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#if !defined (__PACKAGEKIT_H_INSIDE__) && !defined (PK_COMPILATION)
diff --git a/lib/packagekit-glib2/pk-transaction-past.c b/lib/packagekit-glib2/pk-transaction-past.c
index c49aa60..a680e25 100644
--- a/lib/packagekit-glib2/pk-transaction-past.c
+++ b/lib/packagekit-glib2/pk-transaction-past.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
diff --git a/lib/packagekit-glib2/pk-transaction-past.h b/lib/packagekit-glib2/pk-transaction-past.h
index 0463ee0..a9a9518 100644
--- a/lib/packagekit-glib2/pk-transaction-past.h
+++ b/lib/packagekit-glib2/pk-transaction-past.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#if !defined (__PACKAGEKIT_H_INSIDE__) && !defined (PK_COMPILATION)
diff --git a/lib/packagekit-glib2/pk-update-detail.c b/lib/packagekit-glib2/pk-update-detail.c
index b3cfcfb..ab80a69 100644
--- a/lib/packagekit-glib2/pk-update-detail.c
+++ b/lib/packagekit-glib2/pk-update-detail.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
diff --git a/lib/packagekit-glib2/pk-update-detail.h b/lib/packagekit-glib2/pk-update-detail.h
index 0529fda..d1f01b9 100644
--- a/lib/packagekit-glib2/pk-update-detail.h
+++ b/lib/packagekit-glib2/pk-update-detail.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#if !defined (__PACKAGEKIT_H_INSIDE__) && !defined (PK_COMPILATION)
diff --git a/lib/packagekit-glib2/pk-version.h.in b/lib/packagekit-glib2/pk-version.h.in
index 8153d1e..1d72217 100644
--- a/lib/packagekit-glib2/pk-version.h.in
+++ b/lib/packagekit-glib2/pk-version.h.in
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#if !defined (__PACKAGEKIT_H_INSIDE__) && !defined (PK_COMPILATION)
diff --git a/lib/python/packagekit/backend.py b/lib/python/packagekit/backend.py
index 123a778..9496bda 100644
--- a/lib/python/packagekit/backend.py
+++ b/lib/python/packagekit/backend.py
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Copyright (C) 2007 Tim Lauridsen <timlau at fedoraproject.org>
diff --git a/lib/python/packagekit/client.py b/lib/python/packagekit/client.py
index 91f74c7..dabc859 100644
--- a/lib/python/packagekit/client.py
+++ b/lib/python/packagekit/client.py
@@ -18,7 +18,7 @@ to search for packages, install packages or codecs.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# (c) 2008
# Canonical Ltd.
diff --git a/lib/python/packagekit/filter.py b/lib/python/packagekit/filter.py
index a6b312b..f247526 100644
--- a/lib/python/packagekit/filter.py
+++ b/lib/python/packagekit/filter.py
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Copyright (C) 2008
# Richard Hughes <richard at hughsie.com>
diff --git a/lib/python/packagekit/frontend.py b/lib/python/packagekit/frontend.py
index 945464b..3af0aa5 100644
--- a/lib/python/packagekit/frontend.py
+++ b/lib/python/packagekit/frontend.py
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Copyright (C) 2007
# Tim Lauridsen <timlau at fedoraproject.org>
diff --git a/lib/python/packagekit/misc.py b/lib/python/packagekit/misc.py
index a2c511a..213aacc 100644
--- a/lib/python/packagekit/misc.py
+++ b/lib/python/packagekit/misc.py
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# (c) 2008
# Tim Lauridsen <timlau at fedoraproject.org>
diff --git a/lib/python/packagekit/package.py b/lib/python/packagekit/package.py
index 057af17..89faf41 100644
--- a/lib/python/packagekit/package.py
+++ b/lib/python/packagekit/package.py
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Copyright (C) 2008
# Richard Hughes <richard at hughsie.com>
diff --git a/lib/python/packagekit/pkdbus.py b/lib/python/packagekit/pkdbus.py
index 3e70bea..7568d0f 100644
--- a/lib/python/packagekit/pkdbus.py
+++ b/lib/python/packagekit/pkdbus.py
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Copyright (C) 2007
# Tim Lauridsen <timlau at fedoraproject.org>
diff --git a/lib/python/packagekit/pkexceptions.py b/lib/python/packagekit/pkexceptions.py
index 0ef7308..b444a23 100644
--- a/lib/python/packagekit/pkexceptions.py
+++ b/lib/python/packagekit/pkexceptions.py
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Copyright (C) 2007
# Tim Lauridsen <timlau at fedoraproject.org>
diff --git a/lib/python/packagekit/progress.py b/lib/python/packagekit/progress.py
index d0f33f4..8b0d570 100644
--- a/lib/python/packagekit/progress.py
+++ b/lib/python/packagekit/progress.py
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Copyright (C) 2008
# Richard Hughes <richard at hughsie.com>
diff --git a/lib/python/pk-frontend-test.py b/lib/python/pk-frontend-test.py
index 378e829..7916c3e 100755
--- a/lib/python/pk-frontend-test.py
+++ b/lib/python/pk-frontend-test.py
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Copyright (C) 2007 Tom Parker <palfrey at tevp.net>
diff --git a/lib/python/wrapper-test.py b/lib/python/wrapper-test.py
index bab51ad..f3371d0 100755
--- a/lib/python/wrapper-test.py
+++ b/lib/python/wrapper-test.py
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Copyright (C) 2008
# Tim Lauridsen <timlau at fedoraproject.org>
diff --git a/src/egg-dbus-monitor.c b/src/egg-dbus-monitor.c
index d2cc151..02f3774 100644
--- a/src/egg-dbus-monitor.c
+++ b/src/egg-dbus-monitor.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "config.h"
diff --git a/src/egg-dbus-monitor.h b/src/egg-dbus-monitor.h
index c03816d..4e78a76 100644
--- a/src/egg-dbus-monitor.h
+++ b/src/egg-dbus-monitor.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __EGG_DBUS_MONITOR_H
diff --git a/src/egg-debug.c b/src/egg-debug.c
index f734ee2..64655a2 100644
--- a/src/egg-debug.c
+++ b/src/egg-debug.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
diff --git a/src/egg-debug.h b/src/egg-debug.h
index ac6728b..dcafaca 100644
--- a/src/egg-debug.h
+++ b/src/egg-debug.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __EGG_DEBUG_H
diff --git a/src/egg-string.c b/src/egg-string.c
index 054b0cc..5542e46 100644
--- a/src/egg-string.c
+++ b/src/egg-string.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
diff --git a/src/egg-string.h b/src/egg-string.h
index 5c7cf32..ce59169 100644
--- a/src/egg-string.h
+++ b/src/egg-string.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __EGG_STRING_H
diff --git a/src/egg-test.c b/src/egg-test.c
index ef4eef3..1f62d64 100644
--- a/src/egg-test.c
+++ b/src/egg-test.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <stdlib.h>
diff --git a/src/egg-test.h b/src/egg-test.h
index ea4b94b..1b05092 100644
--- a/src/egg-test.h
+++ b/src/egg-test.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __EGG_TEST_H
diff --git a/src/pk-backend-internal.h b/src/pk-backend-internal.h
index 038d3ca..9b5fa77 100644
--- a/src/pk-backend-internal.h
+++ b/src/pk-backend-internal.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __PK_BACKEND_INTERNAL_H
diff --git a/src/pk-backend-spawn.c b/src/pk-backend-spawn.c
index ebbfbdb..38a6daa 100644
--- a/src/pk-backend-spawn.c
+++ b/src/pk-backend-spawn.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/pk-backend-spawn.h b/src/pk-backend-spawn.h
index b55e7ad..cab02f5 100644
--- a/src/pk-backend-spawn.h
+++ b/src/pk-backend-spawn.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __PK_BACKEND_SPAWN_H
diff --git a/src/pk-backend.c b/src/pk-backend.c
index a9004f9..8415d97 100644
--- a/src/pk-backend.c
+++ b/src/pk-backend.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/pk-backend.h b/src/pk-backend.h
index 4e66dca..71d2e4c 100644
--- a/src/pk-backend.h
+++ b/src/pk-backend.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __PK_BACKEND_H
diff --git a/src/pk-cache.c b/src/pk-cache.c
index 9393c78..207c8f8 100644
--- a/src/pk-cache.c
+++ b/src/pk-cache.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <stdlib.h>
diff --git a/src/pk-cache.h b/src/pk-cache.h
index 03aa8e8..f5366a5 100644
--- a/src/pk-cache.h
+++ b/src/pk-cache.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __PK_CACHE_H
diff --git a/src/pk-conf.c b/src/pk-conf.c
index d771351..3441e25 100644
--- a/src/pk-conf.c
+++ b/src/pk-conf.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/pk-conf.h b/src/pk-conf.h
index 0d57e81..46bc133 100644
--- a/src/pk-conf.h
+++ b/src/pk-conf.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __PK_CONF_H
diff --git a/src/pk-dbus.c b/src/pk-dbus.c
index d8854b8..758298b 100644
--- a/src/pk-dbus.c
+++ b/src/pk-dbus.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/pk-dbus.h b/src/pk-dbus.h
index 61155ca..309aa56 100644
--- a/src/pk-dbus.h
+++ b/src/pk-dbus.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __PK_DBUS_H
diff --git a/src/pk-engine.c b/src/pk-engine.c
index 1385522..fcd8c87 100644
--- a/src/pk-engine.c
+++ b/src/pk-engine.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "config.h"
diff --git a/src/pk-engine.h b/src/pk-engine.h
index 5a8a002..9f5fa6f 100644
--- a/src/pk-engine.h
+++ b/src/pk-engine.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __PK_ENGINE_H
diff --git a/src/pk-file-monitor.c b/src/pk-file-monitor.c
index ed9b23b..8036657 100644
--- a/src/pk-file-monitor.c
+++ b/src/pk-file-monitor.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "config.h"
diff --git a/src/pk-file-monitor.h b/src/pk-file-monitor.h
index 0cafaf9..f8b6044 100644
--- a/src/pk-file-monitor.h
+++ b/src/pk-file-monitor.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __PK_FILE_MONITOR_H
diff --git a/src/pk-inhibit.c b/src/pk-inhibit.c
index 5038aec..8aa7286 100644
--- a/src/pk-inhibit.c
+++ b/src/pk-inhibit.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/pk-inhibit.h b/src/pk-inhibit.h
index 535cd32..45f0b5c 100644
--- a/src/pk-inhibit.h
+++ b/src/pk-inhibit.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __PK_INHIBIT_H
diff --git a/src/pk-lsof.c b/src/pk-lsof.c
index 9aa46bb..e9945fd 100644
--- a/src/pk-lsof.c
+++ b/src/pk-lsof.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/pk-lsof.h b/src/pk-lsof.h
index d6de46f..98cf798 100644
--- a/src/pk-lsof.h
+++ b/src/pk-lsof.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __PK_LSOF_H
diff --git a/src/pk-main.c b/src/pk-main.c
index 4c758cd..c1494c7 100644
--- a/src/pk-main.c
+++ b/src/pk-main.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "config.h"
diff --git a/src/pk-network.c b/src/pk-network.c
index 925cf1a..3e66b7f 100644
--- a/src/pk-network.c
+++ b/src/pk-network.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "config.h"
diff --git a/src/pk-network.h b/src/pk-network.h
index 8722a2a..e446524 100644
--- a/src/pk-network.h
+++ b/src/pk-network.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
diff --git a/src/pk-notify.c b/src/pk-notify.c
index 2ff39be..76f302f 100644
--- a/src/pk-notify.c
+++ b/src/pk-notify.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/pk-notify.h b/src/pk-notify.h
index 52661cd..ad26899 100644
--- a/src/pk-notify.h
+++ b/src/pk-notify.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __PK_NOTIFY_H
diff --git a/src/pk-polkit-action-lookup.c b/src/pk-polkit-action-lookup.c
index 01ea7ad..4f19b67 100644
--- a/src/pk-polkit-action-lookup.c
+++ b/src/pk-polkit-action-lookup.c
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "config.h"
diff --git a/src/pk-proc.c b/src/pk-proc.c
index 2c470a7..ba4aa69 100644
--- a/src/pk-proc.c
+++ b/src/pk-proc.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/pk-proc.h b/src/pk-proc.h
index 1c1ba59..9bb7f42 100644
--- a/src/pk-proc.h
+++ b/src/pk-proc.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __PK_PROC_H
diff --git a/src/pk-self-test.c b/src/pk-self-test.c
index 57c8f74..7035ee8 100644
--- a/src/pk-self-test.c
+++ b/src/pk-self-test.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <glib.h>
diff --git a/src/pk-shared.c b/src/pk-shared.c
index 30fa25d..9b833e5 100644
--- a/src/pk-shared.c
+++ b/src/pk-shared.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
diff --git a/src/pk-shared.h b/src/pk-shared.h
index 5048ee7..4048580 100644
--- a/src/pk-shared.h
+++ b/src/pk-shared.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __PK_SHARED_H
diff --git a/src/pk-spawn.c b/src/pk-spawn.c
index d21e281..16356a9 100644
--- a/src/pk-spawn.c
+++ b/src/pk-spawn.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "config.h"
diff --git a/src/pk-spawn.h b/src/pk-spawn.h
index 6d81bab..308f2e8 100644
--- a/src/pk-spawn.h
+++ b/src/pk-spawn.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __PK_SPAWN_H
diff --git a/src/pk-store.c b/src/pk-store.c
index f2b4a2e..e460732 100644
--- a/src/pk-store.c
+++ b/src/pk-store.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/pk-store.h b/src/pk-store.h
index 161a64a..d2d9434 100644
--- a/src/pk-store.h
+++ b/src/pk-store.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __PK_STORE_H
diff --git a/src/pk-sysdep.c b/src/pk-sysdep.c
index 7ccd769..6e5df60 100644
--- a/src/pk-sysdep.c
+++ b/src/pk-sysdep.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <glib.h>
diff --git a/src/pk-sysdep.h b/src/pk-sysdep.h
index dd6f5ed..36a983d 100644
--- a/src/pk-sysdep.h
+++ b/src/pk-sysdep.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __PK_SYSDEP_H
diff --git a/src/pk-syslog.c b/src/pk-syslog.c
index 4b503a2..1a322f5 100644
--- a/src/pk-syslog.c
+++ b/src/pk-syslog.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <syslog.h>
diff --git a/src/pk-syslog.h b/src/pk-syslog.h
index ae1ab5e..a614f1a 100644
--- a/src/pk-syslog.h
+++ b/src/pk-syslog.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __PK_SYSLOG_H
diff --git a/src/pk-time.c b/src/pk-time.c
index ad7ab1b..40a0061 100644
--- a/src/pk-time.c
+++ b/src/pk-time.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "config.h"
diff --git a/src/pk-time.h b/src/pk-time.h
index f39f125..76085ef 100644
--- a/src/pk-time.h
+++ b/src/pk-time.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __PK_TIME_H
diff --git a/src/pk-transaction-db.c b/src/pk-transaction-db.c
index 4760f52..4fa41e9 100644
--- a/src/pk-transaction-db.c
+++ b/src/pk-transaction-db.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "config.h"
diff --git a/src/pk-transaction-db.h b/src/pk-transaction-db.h
index 451c451..78d2998 100644
--- a/src/pk-transaction-db.h
+++ b/src/pk-transaction-db.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __PK_TRANSACTION_DB_H
diff --git a/src/pk-transaction-extra.c b/src/pk-transaction-extra.c
index 17c63df..3099edc 100644
--- a/src/pk-transaction-extra.c
+++ b/src/pk-transaction-extra.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/pk-transaction-extra.h b/src/pk-transaction-extra.h
index 0312c52..ebab8f0 100644
--- a/src/pk-transaction-extra.h
+++ b/src/pk-transaction-extra.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __PK_POST_TRANS_H
diff --git a/src/pk-transaction-list.c b/src/pk-transaction-list.c
index ce6f860..70cebdb 100644
--- a/src/pk-transaction-list.c
+++ b/src/pk-transaction-list.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "config.h"
diff --git a/src/pk-transaction-list.h b/src/pk-transaction-list.h
index 1a7e8f1..25bd62b 100644
--- a/src/pk-transaction-list.h
+++ b/src/pk-transaction-list.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __PK_TRANSACTION_LIST_H
diff --git a/src/pk-transaction.c b/src/pk-transaction.c
index 357b5f8..cab7ab9 100644
--- a/src/pk-transaction.c
+++ b/src/pk-transaction.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "config.h"
diff --git a/src/pk-transaction.h b/src/pk-transaction.h
index 2b6f291..1966b70 100644
--- a/src/pk-transaction.h
+++ b/src/pk-transaction.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __PK_TRANSACTION_H
diff --git a/tools/pk-refresh-licenses.c b/tools/pk-refresh-licenses.c
index b0345e7..f5d2e5c 100644
--- a/tools/pk-refresh-licenses.c
+++ b/tools/pk-refresh-licenses.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <stdlib.h>
commit 5b83b0e04fdcfc65457f92aa686659bd960b94b9
Author: Richard Hughes <richard at hughsie.com>
Date: Tue Jan 26 18:16:37 2010 +0000
trivial: Modernize the configure.ac file
diff --git a/configure.ac b/configure.ac
index 6429c2d..9f80b3c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
# Copyright (C) 2007-2009 Richard Hughes <richard at hughsie.com>
-AC_PREREQ(2.62)
+AC_PREREQ(2.65)
m4_define([pk_major_version], [0])
m4_define([pk_minor_version], [6])
@@ -7,10 +7,10 @@ m4_define([pk_micro_version], [1])
m4_define([pk_version],
[pk_major_version.pk_minor_version.pk_micro_version])
-AC_INIT(PackageKit, [pk_version], [richard at hughsie.com], [PackageKit])
+AC_INIT([PackageKit],[pk_version],[richard at hughsie.com],[PackageKit])
AC_CONFIG_SRCDIR(src)
AM_INIT_AUTOMAKE([1.9 tar-ustar dist-bzip2])
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
GOBJECT_INTROSPECTION_CHECK([0.6.7])
@@ -46,9 +46,9 @@ AC_SUBST(LT_AGE)
AC_PROG_CC
AC_PROG_CXX
AC_PROG_INSTALL
-AC_ISC_POSIX
+AC_SEARCH_LIBS([strerror],[cposix])
AC_HEADER_STDC
-AC_PROG_LIBTOOL
+LT_INIT
AM_PROG_CC_C_O
# Internationalisation
@@ -86,8 +86,7 @@ else
default_strict=no
fi
-AC_ARG_ENABLE(strict, AC_HELP_STRING([--enable-strict],
- [Enable strict compilation options]), enable_strict=$enableval,
+AC_ARG_ENABLE(strict, AS_HELP_STRING([--enable-strict],[Enable strict compilation options]), enable_strict=$enableval,
enable_strict=$default_strict)
if test x$enable_strict != xno; then
if test "$GCC" = "yes"; then
@@ -223,7 +222,7 @@ AM_CONDITIONAL(PK_BUILD_QT, test $build_qt = "yes")
dnl ---------------------------------------------------------------------------
dnl - Build packageKit-sharp
dnl ---------------------------------------------------------------------------
-AC_ARG_ENABLE(managed, AC_HELP_STRING([--enable-managed],[Build PackageKit-Sharp]),
+AC_ARG_ENABLE(managed, AS_HELP_STRING([--enable-managed],[Build PackageKit-Sharp]),
enable_managed=$enableval,enable_managed=false)
if test x$enable_managed = xyes; then
PKG_CHECK_MODULES(GLIBSHARP, glib-sharp-2.0)
@@ -251,8 +250,7 @@ AM_CONDITIONAL(PK_BUILD_MANAGED, test $build_managed = "yes")
dnl ---------------------------------------------------------------------------
dnl - Service Packs (default enabled)
dnl ---------------------------------------------------------------------------
-AC_ARG_ENABLE(service-packs, AC_HELP_STRING([--disable-service-packs],
- [Disable Service Packs support]), enable_servicepacks=$enableval)
+AC_ARG_ENABLE(service-packs, AS_HELP_STRING([--disable-service-packs],[Disable Service Packs support]), enable_servicepacks=$enableval)
if test x$enable_servicepacks != xno; then
AC_CHECK_HEADERS(archive.h,
HAVE_ARCHIVE_H="yes",
@@ -285,8 +283,7 @@ networking_apis="unix"
dnl ---------------------------------------------------------------------------
dnl - NetworkManager (default enabled)
dnl ---------------------------------------------------------------------------
-AC_ARG_ENABLE(networkmanager, AC_HELP_STRING([--disable-networkmanager],
- [Disable NetworkManager support]),
+AC_ARG_ENABLE(networkmanager, AS_HELP_STRING([--disable-networkmanager],[Disable NetworkManager support]),
enable_networkmanager=$enableval)
if test x$enable_networkmanager != xno; then
PKG_CHECK_MODULES(LIBNM, libnm-glib >= $LIBNM_GLIB_REQUIRED, PK_BUILD_NETWORKMANAGER="yes", PK_BUILD_NETWORKMANAGER="no")
@@ -313,8 +310,7 @@ AC_SUBST(LIBNM_LIBS)
dnl ---------------------------------------------------------------------------
dnl - ConnMan (default enabled)
dnl ---------------------------------------------------------------------------
-AC_ARG_ENABLE(connman, AC_HELP_STRING([--disable-connman],
- [Disable ConnMan support]), enable_connman=$enableval)
+AC_ARG_ENABLE(connman, AS_HELP_STRING([--disable-connman],[Disable ConnMan support]), enable_connman=$enableval)
if test x$enable_connman != xno; then
PKG_CHECK_MODULES(CONNMAN, connman, PK_BUILD_CONNMAN="yes", PK_BUILD_CONNMAN="no")
if test "x$PK_BUILD_CONNMAN" = "xyes"; then
@@ -341,8 +337,7 @@ AC_PATH_PROG(CONSOLEKIT_DAEMON, console-kit-daemon, [], [/usr/sbin$PATH_SEPARATO
dnl ---------------------------------------------------------------------------
dnl - Generate man pages ? (default enabled)
dnl ---------------------------------------------------------------------------
-AC_ARG_ENABLE(man_pages, AC_HELP_STRING([--disable-man-pages],
- [Disable man pages generation]), enable_man_pages=$enableval)
+AC_ARG_ENABLE(man_pages, AS_HELP_STRING([--disable-man-pages],[Disable man pages generation]), enable_man_pages=$enableval)
if test x$enable_man_pages != xno; then
AC_PATH_PROG(XSLTPROC, xsltproc, no)
if test x$enable_man_pages = xyes; then
@@ -437,7 +432,7 @@ if test x$enable_browser_plugin = xyes; then
LDFLAGS="$packagekit_save_LDFLAGS"
# Are we specifying a different mozilla plugin directory?
- AC_ARG_WITH(mozilla-plugin-dir, [AC_HELP_STRING([--with-mozilla-plugin-dir=<dir>], [where to put the mozilla plugin])])
+ AC_ARG_WITH(mozilla-plugin-dir, [AS_HELP_STRING([--with-mozilla-plugin-dir=<dir>],[where to put the mozilla plugin])])
if ! test -z "$with_mozilla_plugin_dir" ; then
MOZILLA_PLUGIN_DIR="$with_mozilla_plugin_dir"
else
@@ -581,11 +576,9 @@ dnl ---------------------------------------------------------------------------
dnl - Are we specifying a different dbus root ?
dnl ---------------------------------------------------------------------------
AC_ARG_WITH(dbus-sys,
- [AC_HELP_STRING([--with-dbus-sys=<dir>],
- [where D-BUS system.d directory is])])
+ [AS_HELP_STRING([--with-dbus-sys=<dir>],[where D-BUS system.d directory is])])
AC_ARG_WITH(dbus-services,
- [AC_HELP_STRING([--with-dbus-services=<dir>],
- [where D-BUS system-services directory is])])
+ [AS_HELP_STRING([--with-dbus-services=<dir>],[where D-BUS system-services directory is])])
if ! test -z "$with_dbus_sys" ; then
DBUS_SYS_DIR="$with_dbus_sys"
else
@@ -787,7 +780,7 @@ AC_SUBST(PK_PLUGIN_LIBS, "$GLIB_LIBS $DBUS_LIBS $GMODULE_LIBS")
dnl ---------------------------------------------------------------------------
dnl - Makefiles, etc.
dnl ---------------------------------------------------------------------------
-AC_OUTPUT([
+AC_CONFIG_FILES([
Makefile
etc/Makefile
docs/Makefile
@@ -856,6 +849,7 @@ client/Makefile
tools/Makefile
po/Makefile.in
])
+AC_OUTPUT
dnl ==========================================================================
echo "
commit deb7b6d28284ccfc62760877699af2def50f01cf
Author: Richard Hughes <richard at hughsie.com>
Date: Tue Jan 26 09:02:25 2010 +0000
Fix some trivial whitespace issues
diff --git a/configure.ac b/configure.ac
index d7dc6d7..6429c2d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,7 +79,6 @@ CPPFLAGS="$CPPFLAGS -DGSEAL_ENABLE"
dnl ---------------------------------------------------------------------------
dnl - Use strict options (default enabled for devs, disabled in releases)
dnl ---------------------------------------------------------------------------
-
dnl if .git directory is present, considering we are working in the repository
if test -d ".git"; then
default_strict=yes
@@ -882,7 +881,7 @@ echo "
pm-utils scripts: ${build_pm_utils}
RUCK client: ${build_ruck}
QT library: ${build_qt}
- Managed bindings: ${build_managed}
+ Managed bindings: ${build_managed}
Backends:
ALPM backend: ${enable_alpm}
@@ -914,7 +913,6 @@ if test ! -x "$CONSOLEKIT_DAEMON"; then
echo ""
fi
-
# warn that dummy is basically broken
if test x$with_security_framework = xdummy; then
echo "*******************************************************************"
diff --git a/lib/packagekit-glib2/pk-client.h b/lib/packagekit-glib2/pk-client.h
index d6a043a..ecbcdef 100644
--- a/lib/packagekit-glib2/pk-client.h
+++ b/lib/packagekit-glib2/pk-client.h
@@ -70,7 +70,7 @@ typedef enum
PK_CLIENT_ERROR_NOT_SUPPORTED
} PkClientError;
-typedef struct _PkClientPrivate PkClientPrivate;
+typedef struct _PkClientPrivate PkClientPrivate;
typedef struct _PkClient PkClient;
typedef struct _PkClientClass PkClientClass;
commit 171bc15a9228b4bc90725e4b17ef6a57edc8cbb0
Author: Daniel Nicoletti <dantti85-pk at yahoo.com.br>
Date: Tue Jan 26 17:37:46 2010 -0200
* Add Kubuntu support for upgrade (using env var exported by KPackageKit)
* Add KDialog support as alternative to zenity and xmessage for the "system not recognized" message (also using env var exported by KPackageKit)
Patch by (Harald Sitter <sitter.harald at gmail.com>)
diff --git a/data/pk-upgrade-distro.sh b/data/pk-upgrade-distro.sh
index b173c43..7236e97 100755
--- a/data/pk-upgrade-distro.sh
+++ b/data/pk-upgrade-distro.sh
@@ -25,7 +25,13 @@ if [ -e /etc/fedora-release ]; then
fi
elif [ "$DISTRO" = "Ubuntu" ]; then
if [ -e /usr/bin/do-release-upgrade ]; then
- gksu "/usr/bin/do-release-upgrade -m desktop -f gtk -p"
+ if [ "$DESKTOP" = "kde" ]; then
+ PATH=`kde4-config --path exe` kdesu -- "/usr/bin/do-release-upgrade -d -m desktop -f kde -p"
+ else
+ gksu "/usr/bin/do-release-upgrade -m desktop -f gtk -p"
+ fi
+ elif [ "$DESKTOP" = "kde" ]; then
+ xdg-open http://www.kubuntu.org/getkubuntu
else
xdg-open http://www.ubuntu.com/getubuntu
fi
@@ -34,12 +40,13 @@ elif [ -e /etc/SuSE-release ] && [ -x /usr/sbin/wagon ]; then
else
TITLE="System is not recognised"
TEXT="Your distribution was not recognised by the upgrade script.\nPlease file a but in your distribution bug tracker under the component PackageKit."
+ if [ "$DESKTOP" = "kde" ]; then
+ PATH=`kde4-config --path exe` kdialog --title "$TITLE" --sorry "$TEXT"
# do not dep on zenity in build scripts
- which zenity 2> /dev/null > /dev/null
- if [ "$?" -eq 0 ]; then
- zenity --warning --title $TITLE --text $TEXT
+ elif [ "`which zenity 2> /dev/null > /dev/null; echo $?`" -eq 0 ]; then
+ zenity --warning --title $TITLE --text $TEXT
else
- xmessage $TEXT
+ xmessage $TEXT
fi
fi
commit 36ebf6ba02f249a6d1642a2353d0275db211689e
Author: Scott Reeves <sreeves at novell.com>
Date: Mon Jan 25 10:54:16 2010 -0700
zypp: partial support of multiple values for search params
diff --git a/backends/zypp/pk-backend-zypp.cpp b/backends/zypp/pk-backend-zypp.cpp
index e7edeb6..7e82fc0 100644
--- a/backends/zypp/pk-backend-zypp.cpp
+++ b/backends/zypp/pk-backend-zypp.cpp
@@ -1279,12 +1279,14 @@ backend_resolve (PkBackend *backend, PkBitfield filters, gchar **package_ids)
static gboolean
backend_find_packages_thread (PkBackend *backend)
{
+ gchar **values;
const gchar *search;
PkBitfield filters;
guint mode;
//GList *list = NULL;
- search = pk_backend_get_string (backend, "search");
+ values = pk_backend_get_strv (backend, "search");
+ search = values[0]; //Fixme - support the possible multiple values (logical OR search)
filters = (PkBitfield) pk_backend_get_uint (backend, "filters");
mode = pk_backend_get_uint (backend, "mode");
@@ -1321,7 +1323,7 @@ backend_find_packages_thread (PkBackend *backend)
* backend_search_name:
*/
static void
-backend_search_name (PkBackend *backend, PkBitfield filters, const gchar *search)
+backend_search_names (PkBackend *backend, PkBitfield filters, gchar **values)
{
pk_backend_set_uint (backend, "mode", SEARCH_TYPE_NAME);
pk_backend_thread_create (backend, backend_find_packages_thread);
@@ -1331,7 +1333,7 @@ backend_search_name (PkBackend *backend, PkBitfield filters, const gchar *search
* backend_search_details:
*/
static void
-backend_search_details (PkBackend *backend, PkBitfield filters, const gchar *search)
+backend_search_details (PkBackend *backend, PkBitfield filters, gchar **values)
{
pk_backend_set_uint (backend, "mode", SEARCH_TYPE_DETAILS);
pk_backend_thread_create (backend, backend_find_packages_thread);
@@ -1340,10 +1342,12 @@ backend_search_details (PkBackend *backend, PkBitfield filters, const gchar *sea
static gboolean
backend_search_group_thread (PkBackend *backend)
{
+ gchar **values;
const gchar *group;
PkBitfield filters;
- group = pk_backend_get_string (backend, "search");
+ values = pk_backend_get_strv (backend, "search");
+ group = values[0]; //Fixme - add support for possible multiple values.
filters = (PkBitfield) pk_backend_get_uint (backend, "filters");
if (group == NULL) {
@@ -1384,7 +1388,7 @@ backend_search_group_thread (PkBackend *backend)
* backend_search_group:
*/
static void
-backend_search_group (PkBackend *backend, PkBitfield filters, const gchar *pkGroup)
+backend_search_groups (PkBackend *backend, PkBitfield filters, gchar **values)
{
pk_backend_thread_create (backend, backend_search_group_thread);
}
@@ -1393,7 +1397,7 @@ backend_search_group (PkBackend *backend, PkBitfield filters, const gchar *pkGro
* backend_search_file:
*/
static void
-backend_search_file (PkBackend *backend, PkBitfield filters, const gchar *search)
+backend_search_files (PkBackend *backend, PkBitfield filters, gchar **values)
{
pk_backend_set_uint (backend, "mode", SEARCH_TYPE_FILE);
pk_backend_thread_create (backend, backend_find_packages_thread);
@@ -1737,8 +1741,8 @@ static gboolean
backend_what_provides_thread (PkBackend *backend)
{
pk_backend_set_status (backend, PK_STATUS_ENUM_QUERY);
- const gchar *search;
- search = pk_backend_get_string (backend, "search");
+ gchar **values = pk_backend_get_strv (backend, "search");
+ const gchar *search = values[0]; //Fixme - support possible multiple search values (logical OR)
PkProvidesEnum provides = (PkProvidesEnum) pk_backend_get_uint (backend, "provides");
PkBitfield filters_field = (PkBitfield) pk_backend_get_uint (backend, "filters");
gchar *filters = pk_filter_bitfield_to_string(filters_field);
@@ -1818,7 +1822,7 @@ backend_what_provides_thread (PkBackend *backend)
* backend_what_provides
*/
static void
-backend_what_provides (PkBackend *backend, PkBitfield filters, PkProvidesEnum provide, const gchar *search)
+backend_what_provides (PkBackend *backend, PkBitfield filters, PkProvidesEnum provide, gchar **values)
{
pk_backend_thread_create (backend, backend_what_provides_thread);
}
@@ -1862,9 +1866,9 @@ extern "C" PK_BACKEND_OPTIONS (
backend_resolve, /* resolve */
NULL, /* rollback */
backend_search_details, /* search_details */
- backend_search_file, /* search_file */
- backend_search_group, /* search_group */
- backend_search_name, /* search_name */
+ backend_search_files, /* search_files */
+ backend_search_groups, /* search_groups */
+ backend_search_names, /* search_names */
backend_update_packages, /* update_packages */
backend_update_system, /* update_system */
backend_what_provides, /* what_provides */
commit 251ce613af9c6e862e7999c735798723cd8c88e2
Author: Anders F Bjorklund <afb at users.sourceforge.net>
Date: Mon Jan 25 12:02:23 2010 +0100
ports: convert search params to array values
diff --git a/backends/ports/pk-backend-ports.c b/backends/ports/pk-backend-ports.c
index 54a86a2..2aa7791 100644
--- a/backends/ports/pk-backend-ports.c
+++ b/backends/ports/pk-backend-ports.c
@@ -284,52 +284,64 @@ backend_resolve (PkBackend *backend, PkBitfield filters, gchar **package_ids)
* pk_backend_search_details:
*/
static void
-backend_search_details (PkBackend *backend, PkBitfield filters, const gchar *search)
+backend_search_details (PkBackend *backend, PkBitfield filters, gchar **values)
{
gchar *filters_text;
+ gchar *search;
filters_text = pk_filter_bitfield_to_string (filters);
+ search = g_strjoinv ("&", values);
pk_backend_spawn_helper (spawn, BACKEND_FILE, "search-details", filters_text, search, NULL);
g_free (filters_text);
+ g_free (search);
}
/**
- * backend_search_file:
+ * backend_search_files:
*/
static void
-backend_search_file (PkBackend *backend, PkBitfield filters, const gchar *search)
+backend_search_files (PkBackend *backend, PkBitfield filters, gchar **values)
{
gchar *filters_text;
+ gchar *search;
filters_text = pk_filter_bitfield_to_string (filters);
+ search = g_strjoinv ("&", values);
pk_backend_spawn_helper (spawn, BACKEND_FILE, "search-file", filters_text, search, NULL);
g_free (filters_text);
+ g_free (search);
}
/**
- * pk_backend_search_group:
+ * pk_backend_search_groups:
*/
static void
-backend_search_group (PkBackend *backend, PkBitfield filters, const gchar *search)
+backend_search_groups (PkBackend *backend, PkBitfield filters, gchar **values)
{
gchar *filters_text;
+ gchar *search;
filters_text = pk_filter_bitfield_to_string (filters);
+ search = g_strjoinv ("&", values);
pk_backend_spawn_helper (spawn, BACKEND_FILE, "search-group", filters_text, search, NULL);
g_free (filters_text);
+ g_free (search);
}
/**
- * backend_search_name:
+ * backend_search_names:
*/
static void
-backend_search_name (PkBackend *backend, PkBitfield filters, const gchar *search)
+backend_search_names (PkBackend *backend, PkBitfield filters, gchar **values)
{
gchar *filters_text;
+ gchar *search;
filters_text = pk_filter_bitfield_to_string (filters);
+ search = g_strjoinv ("&", values);
pk_backend_spawn_helper (spawn, BACKEND_FILE, "search-name", filters_text, search, NULL);
g_free (filters_text);
+ g_free (search);
}
/**
@@ -428,9 +440,9 @@ PK_BACKEND_OPTIONS (
backend_resolve, /* resolve */
NULL, /* rollback */
backend_search_details, /* search_details */
- backend_search_file, /* search_file */
- backend_search_group, /* search_group */
- backend_search_name, /* search_name */
+ backend_search_files, /* search_files */
+ backend_search_groups, /* search_groups */
+ backend_search_names, /* search_names */
backend_update_packages, /* update_packages */
backend_update_system, /* update_system */
NULL, /* what_provides */
More information about the PackageKit-commit
mailing list