Merge lp:~noskcaj/ubuntu/trusty/gnome-packagekit/merge into lp:ubuntu/trusty/gnome-packagekit

[Jackson Doak]

Merge from debian

[Michael Terry (mterry)]

- You didn't make this mistake, but it should be fixed. Update the XSBC-Original-Maintainer line to use the right email (<email address hidden>).
- You should drop the update-notifier changes. Debian is dropping it in favor of gnome-packagekit, but Ubuntu isn't.

review: Needs Fixing

[lp:~noskcaj/ubuntu/trusty/gnome-packagekit/merge]

21. By Jackson Doak on 2014-01-19

Fix debian maintainers email

22. By Jackson Doak on 2014-01-19

Revert update-notifier transition change from debian

Unmerged revisions

22. By Jackson Doak on 2014-01-19

Revert update-notifier transition change from debian

21. By Jackson Doak on 2014-01-19

Fix debian maintainers email

20. By Jackson Doak on 2013-12-20

* Merge from debian. Remaining changes:
  - Drop build dependency on obsoleted gtk-doc-utils and libapt-pkg-dev
  - Raise version of the libglib2.0-dev build dependency
  - Alternatively depend on aptdaemon's PackageKit compatibility layer

=== modified file 'ChangeLog'
--- ChangeLog	2013-06-04 14:16:12 +0000
+++ ChangeLog	2014-01-19 08:23:49 +0000
@@ -1,28 +1,806 @@
-commit 2eb2c5959aac93b49c0a52573f7923fc8224cb6e
-Author: Richard Hughes <[e-mail]>
-Date:   2013-05-13
-
-    Release version 3.8.2
-
-M	NEWS
-
-commit d35446f21082b6a84cb93bd825000a013a04b032
-Author: Kjartan Maraas <[e-mail]>
-Date:	2013-05-13
-
-    Updated Norwegian bokmål translation
-
-M	po/nb.po
-
-commit 31da7223089f027a8345ab654e5dd6af0f00fc22
-Author: Jiro Matsuzawa <[e-mail]>
-Date:	2013-05-13
-
-    l10n: Update Japanese translation
-
-M	po/ja.po
-
-commit 5da3c353638edcaffffccae90ef3fcbbba58a31a
+commit dece5f2bb39cc45f069f97cf9d5ec0258eaca7e2
+Author: Richard Hughes <[e-mail]>
+Date:   2013-10-14
+
+    Release version 3.10.1
+
+M	NEWS
+
+commit 18fa364a57774c472834ab94f9f452aa86672e5f
+Author: Richard Hughes <[e-mail]>
+Date:	2013-10-14
+
+    Add Copyright information to the AppData files
+
+M	data/gpk-application.appdata.xml
+M	data/gpk-update-viewer.appdata.xml
+
+commit a25b247f5884522ed76048e3c939ed71bec70a7a
+Author: Richard Hughes <[e-mail]>
+Date:	2013-10-14
+
+    trivial: Fix make distcheck
+
+M	data/icons/Makefile.am
+
+commit 557aa788558afc62614cc93ce31b7716e75a9b3e
+Author: Richard Hughes <[e-mail]>
+Date:	2013-10-14
+
+    Use the new 16:9 AppData screenshots
+
+M	data/gpk-application.appdata.xml
+M	data/gpk-update-viewer.appdata.xml
+
+commit 4ba9bfa93aecf8320aab9a60b16fd3ad578afba4
+Author: Carles Ferrando <[e-mail]>
+Date:	2013-10-06
+
+    [l10n] Updated Catalan (Valencian) translation
+
+M	po/[e-mail]
+
+commit 1ff269bb0660c28a4f16011e682318f02c244a46
+Author: Rafael Ferreira <[e-mail]>
+Date:	2013-10-03
+
+    Enabled Brazilian Portuguese translation for help files
+
+M	help/Makefile.am
+
+commit 5b97d9b2bd6c4467d27470484493c6d945930b29
+Author: Rafael Ferreira <[e-mail]>
+Date:	2013-10-03
+
+    Added Brazilian Portuguese translation for help files
+
+A	help/pt_BR/figures/gpk-added-deps.png
+A	help/pt_BR/figures/gpk-application-groups.png
+A	help/pt_BR/figures/gpk-log.png
+A	help/pt_BR/figures/gpk-prefs.png
+A	help/pt_BR/figures/gpk-repo.png
+A	help/pt_BR/figures/gpk-updates-overview.png
+A	help/pt_BR/figures/gpk-updates.png
+A	help/pt_BR/pt_BR.po
+
+commit 1926a8b48584761bda7abe52c00d417f4431209b
+Author: Мирослав Николић <[e-mail]>
+Date:	2013-10-01
+
+    Updated Serbian translation
+
+M	po/sr.po
+M	po/[e-mail]
+
+commit a9b6fcfb7f658b253f6eec470ee4902a9364820f
+Author: Cheng-Chia Tseng <[e-mail]>
+Date:	2013-09-30
+
+    Updated Traditional Chinese translation(Hong Kong and Taiwan)
+
+M	po/zh_HK.po
+M	po/zh_TW.po
+
+commit 84b93bb941b71c32b54c606668246d80f65ac81e
+Author: Muhammet Kara <[e-mail]>
+Date:	2013-09-28
+
+    [l10n]Updated Turkish translation
+
+M	po/tr.po
+
+commit f721a99e2d71573bf45b41682d3c5781b7180ff6
+Author: Muhammet Kara <[e-mail]>
+Date:	2013-09-28
+
+    [l10n]Updated Turkish translation
+
+M	po/tr.po
+
+commit a5a58e7ab917f61347a613985ba2c7b2dd50eadb
+Author: Gianvito Cavasoli <[e-mail]>
+Date:	2013-09-25
+
+    [l10n] Updated Italian translation.
+
+M	po/it.po
+
+commit 3fa53df94d17597bf333abc27dc08cb9c462d7a4
+Author: Kjartan Maraas <[e-mail]>
+Date:	2013-09-24
+
+    Updated Norwegian bokmål translation
+
+M	po/nb.po
+
+commit edb974e1cd3b9132118c8ac85dae0bbff4e5291b
+Author: Marek Černocký <[e-mail]>
+Date:	2013-09-24
+
+    Updated Czech translation
+
+M	po/cs.po
+
+commit a10ec9f9f5201d31797db65bd09c0311aeb07562
+Author: Richard Hughes <[e-mail]>
+Date:	2013-09-24
+
+    trivial: Post release version bump
+
+M	RELEASE
+M	configure.ac
+
+commit 2421005dcdb66dfab102689d10fa1a68816e66a2
+Author: Richard Hughes <[e-mail]>
+Date:	2013-09-24
+
+    Release version 3.10.0
+
+M	NEWS
+M	RELEASE
+M	configure.ac
+
+commit b2c8c061b9df7d8fe8abe7dbe94f841df2b901cc
+Author: Dmitriy S. Seregin <[e-mail]>
+Date:	2013-09-22
+
+    Updated Russian translation
+
+M	po/ru.po
+
+commit 605e3281cf30355cd4b2b59729eff9255c64b991
+Author: Daniel Korostil <[e-mail]>
+Date:	2013-09-21
+
+    Updated Ukrainian
+
+M	po/uk.po
+
+commit 3d33ff0f9d11d4a1d0e238c3e86ba62c6d7f47e7
+Author: Daniel Korostil <[e-mail]>
+Date:	2013-09-21
+
+    Updated Ukrainian
+
+M	po/uk.po
+
+commit 879b4721b4f34e7dc20873c93324bc8bd299d9b7
+Author: Jiro Matsuzawa <[e-mail]>
+Date:	2013-09-20
+
+    l10n: Update Japanese translation
+
+M	po/ja.po
+
+commit 96e06f05adbb4b3a18959d18a7e744975a52882a
+Author: Chao-Hsiung Liao <[e-mail]>
+Date:	2013-09-20
+
+    Updated Traditional Chinese translation(Hong Kong and Taiwan)
+
+M	po/zh_HK.po
+M	po/zh_TW.po
+
+commit 69fa295015c551981e6eeac85002c81837c410e1
+Author: Seán de Búrca <[e-mail]>
+Date:	2013-09-19
+
+    Updated Irish translation
+
+M	po/ga.po
+
+commit 435e5da058530e693a242e17f65ab1603b7bb4c1
+Author: António Lima <[e-mail]>
+Date:	2013-09-18
+
+    Updated Portuguese translation
+
+M	po/pt.po
+
+commit c3168d01ef954fe75bf0d392339036bc658f1f10
+Author: Josep Sànchez <[e-mail]>
+Date:	2013-09-18
+
+    [l10n] Update Catalan translation
+
+M	po/ca.po
+
+commit 262362a4e309e9adc5dcdd78269acbef5fc37ace
+Author: Akom Chotiphantawanon <[e-mail]>
+Date:	2013-09-18
+
+    Updated Thai translation.
+
+M	po/th.po
+
+commit cfa9b243dc231f73785ee95b141110b12090e379
+Author: A S Alam <[e-mail]>
+Date:	2013-09-17
+
+    Punjabi Translation updated by Aman
+
+M	po/pa.po
+
+commit 75c8f55e5f521f14921bedc54dd0e56021707115
+Author: Inaki Larranaga Murgoitio <[e-mail]>
+Date:	2013-09-17
+
+    Updated Basque language
+
+M	po/eu.po
+
+commit 639f41e5c9a38ba0f4008b15d1e8c02b0db1475c
+Author: Ville-Pekka Vainio <[e-mail]>
+Date:	2013-09-14
+
+    Finnish translation update by Jiri Grönroos
+
+M	po/fi.po
+
+commit 7b3a1ee0b42324929163a02eff1d139cf768678b
+Author: Kris Thomsen <[e-mail]>
+Date:	2013-09-14
+
+    Updated Danish translation
+
+M	po/da.po
+
+commit 7cef476238f177deb85bef212667c9ea0f20de1f
+Author: Pavol Klačanský <[e-mail]>
+Date:	2013-09-14
+
+    Updated slovak translation
+
+M	po/sk.po
+
+commit d760c60493ad79285d65910f0351d45d05f10fda
+Author: Changwoo Ryu <[e-mail]>
+Date:	2013-09-14
+
+    Updated Korean translation
+
+M	po/ko.po
+
+commit 372b853a7930636ad496e16481333a2decadc2b6
+Author: Kris Thomsen <[e-mail]>
+Date:	2013-09-13
+
+    Updated Danish translation
+
+M	po/da.po
+
+commit 4d4310174845f1aba125aa1178fa0dac047d0b37
+Author: Benjamin Steinwender <[e-mail]>
+Date:	2013-09-13
+
+    Updated German translation
+
+M	po/de.po
+
+commit 0fe8160e7dca0fe106aa0bd4f1926d9872a66603
+Author: Richard Hughes <[e-mail]>
+Date:	2013-09-13
+
+    Release version 3.9.92
+
+M	NEWS
+M	RELEASE
+M	configure.ac
+
+commit f59f57d4b6624f5c3f7aade55087beb294371963
+Author: Gabor Kelemen <[e-mail]>
+Date:	2013-09-13
+
+    Updated Hungarian translation
+
+M	po/hu.po
+
+commit e70f4ab8b2926bdaf3d2d1f774e25e995629cbcd
+Author: Enrico Nicoletto <[e-mail]>
+Date:	2013-09-12
+
+    Updated Brazilian Portuguese translation
+
+M	po/pt_BR.po
+
+commit b0987f02e09c0c3fefb8fa75f092e568d8b5afe5
+Author: Aurimas Černius <[e-mail]>
+Date:	2013-09-12
+
+    Updated Lithuanian translation
+
+M	po/lt.po
+
+commit b939a910f901e76708b31e5b312ae0adbb6990a7
+Author: Ihar Hrachyshka <[e-mail]>
+Date:	2013-09-12
+
+    Updated Belarusian translation.
+
+M	po/be.po
+
+commit 68c1e3f79300a12b8ddaf40e07cd78225e51ca86
+Author: Victor Ibragimov <[e-mail]>
+Date:	2013-09-12
+
+    Tajik translation updated
+
+M	po/tg.po
+
+commit 153d787523a5797cc97e8a3b59dfed226fa9e2e5
+Author: Mattias Põldaru <[e-mail]>
+Date:	2013-09-12
+
+    [l10n] Updated Estonian translation
+
+M	po/et.po
+
+commit 43ff917a724f7a568d7d8e1c0c540ee2f6391346
+Author: Piotr Drąg <[e-mail]>
+Date:	2013-09-12
+
+    Updated Polish translation
+
+M	po/pl.po
+
+commit 71feb5194d4f583c511a7f1f20d9985e41fb3097
+Author: Rūdolfs Mazurs <[e-mail]>
+Date:	2013-09-12
+
+    Updated Latvian translation
+
+M	po/lv.po
+
+commit 7697bc47ab15517bf8b52e1b1479f1493bd3e261
+Author: Fran Diéguez <[e-mail]>
+Date:	2013-09-11
+
+    Updated Galician translations
+
+M	po/gl.po
+
+commit ce594582de727b51e7ff756f709e54af8e4133c8
+Author: Matej Urbančič <[e-mail]>
+Date:	2013-09-11
+
+    Updated Slovenian translation
+
+M	po/sl.po
+
+commit 1aac2d6a6d6c373208e56d9fef633bb141805abc
+Author: Daniel Mustieles <[e-mail]>
+Date:	2013-09-11
+
+    Updated Spanish translation
+
+M	po/es.po
+
+commit 85f7bf866827a1642b73be066f939c9b010e092b
+Author: Nilamdyuti Goswami <[e-mail]>
+Date:	2013-09-11
+
+    Assamese Translation Updated
+
+M	po/as.po
+
+commit adf72ccdb1ce35fb10f3e2ecbbae7506f3316969
+Author: Gianvito Cavasoli <[e-mail]>
+Date:	2013-09-11
+
+    [l10n] Updated Italian translation.
+
+M	po/it.po
+
+commit f779f35efb0a91402798033c83f84a919a8baa11
+Author: Andika Triwidada <[e-mail]>
+Date:	2013-09-11
+
+    Updated Indonesian translation
+
+M	po/id.po
+
+commit 93459e9d69ff67d1c6112f4619a28bf352af1a99
+Author: Marek Černocký <[e-mail]>
+Date:	2013-09-11
+
+    Updated Czech translation
+
+M	po/cs.po
+
+commit e8419a96696cf6e3411ae660ed71bd6503c0747d
+Author: Richard Hughes <[e-mail]>
+Date:	2013-09-11
+
+    Add two AppData files for gnome-software
+
+M	data/Makefile.am
+A	data/gpk-application.appdata.xml
+A	data/gpk-update-viewer.appdata.xml
+
+commit 7da3b1ddadd180380928986d3b89789722c694e5
+Author: Richard Hughes <[e-mail]>
+Date:	2013-09-11
+
+    Change the name of the package installer from 'Software' to 'Packages'
+
+    Now that GNOME Software exists, we don't want two things in the
+    overview called 'Software'.
+
+    String freeze exception acked by:
+
+    1/2 Piotr Drąg <[e-mail]>
+    2/2 Petr Kovar <[e-mail]>
+
+M	data/gpk-application.desktop.in
+
+commit 4387b732dd29773b8f6f835afc9e3f173b4f0158
+Author: Ihar Hrachyshka <[e-mail]>
+Date:	2013-09-08
+
+    Updated Belarusian translation.
+
+M	po/be.po
+
+commit 3bde385eb9f85a08366ce3fee5c4831e5bd25b22
+Author: Seán de Búrca <[e-mail]>
+Date:	2013-09-07
+
+    Updated Irish translation
+
+M	po/ga.po
+
+commit 6d901dc36938e12f5eba4992dddd8739c57d3e06
+Author: Мирослав Николић <[e-mail]>
+Date:	2013-09-05
+
+    Updated Serbian translation
+
+M	po/sr.po
+M	po/[e-mail]
+
+commit 9dde8f0c5929bd4951ed85dfc10500a9d381aba4
+Author: Elad Alfassa <[e-mail]>
+Date:	2013-09-04
+
+    Add some desktop file categories
+
+    We need the Settings category and the PackageManager category if
+    we want
+    gpk-application to appear in the right place in gnome-software
+
+M	data/gpk-application.desktop.in
+
+commit b4443a6d97e26498e472c41dc46aa0521a3fa888
+Author: Gianvito Cavasoli <[e-mail]>
+Date:	2013-09-04
+
+    [l10n] Updated Italian translation.
+
+M	po/it.po
+
+commit 9663ac6b70bad5d9240d5d6893a0a68d246f142e
+Author: Timo Jyrinki <[e-mail]>
+Date:	2013-09-04
+
+    Finnish translation update
+
+M	po/fi.po
+
+commit 2a67640318c5adc406752c5b55bdb3f472c20550
+Author: Seán de Búrca <[e-mail]>
+Date:	2013-09-02
+
+    Updated Irish translation
+
+M	po/ga.po
+
+commit 2c2d0c9f7ee7272235cc082569ba82bc6c7d3f16
+Author: Seán de Búrca <[e-mail]>
+Date:	2013-09-02
+
+    Updated Irish translation
+
+M	po/ga.po
+
+commit 58e5e85b710583ac38d021e73014d544c542db6b
+Author: Aurimas Černius <[e-mail]>
+Date:	2013-08-26
+
+    Updated Lithuanian translation
+
+M	po/lt.po
+
+commit 19d66f0587d5a81fcf96ac27167a666ff8075b87
+Author: Balázs Úr <[e-mail]>
+Date:	2013-08-25
+
+    Updated Hungarian translation
+
+M	po/hu.po
+
+commit aa17402adddb1b16eb1753a1c09687966b659098
+Author: Piotr Drąg <[e-mail]>
+Date:	2013-08-24
+
+    Updated Polish translation
+
+M	po/pl.po
+
+commit c17cf32f3ee05daaab180119dcae5aa0b7b95cca
+Author: Richard Hughes <[e-mail]>
+Date:	2013-07-16
+
+    Do not use the deprecated gtk_icon_size_lookup_for_settings()
+
+M	src/gpk-animated-icon.c
+
+commit 5c50d2a6fb6d565019388e231cd711d4aa8d1277
+Author: Ignaker <[e-mail]>
+Date:	2013-08-22
+
+    Swapped "Required packages" and "Dependent packages" button
+    functionality.
+
+    Button's functionality were reversed.
+    Swapped pk_client_get_requires_async with pk_client_get_depends_async
+    function call. Added prototypes for callbacks that now are swapped
+    too.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=692629
+
+M	src/gpk-application.c
+
+commit d730a37552b0e8976a603cbef1bc7af36df3e2fc
+Author: Gil Forcada <[e-mail]>
+Date:	2013-08-18
+
+    [l10n] Update Catalan translation
+
+M	po/ca.po
+
+commit e4f5932e9282bdbd0a2243c0037431267b2d2eaa
+Author: Marek Černocký <[e-mail]>
+Date:	2013-08-09
+
+    Updated Czech translation
+
+M	po/cs.po
+
+commit 36e6fc329d85907fb6ce9926efe9711fe098c368
+Author: Rafael Ferreira <[e-mail]>
+Date:	2013-08-05
+
+    Updated Brazilian Portuguese translation
+
+M	po/pt_BR.po
+
+commit a18820ad53868744c8935f2796a145d1a1f83972
+Author: Yaron Shahrabani <[e-mail]>
+Date:	2013-07-31
+
+    Updated Hebrew translation.
+
+M	po/he.po
+
+commit 0bf25c05171842b49864cbbe8e55eb2f5697159a
+Author: Matthias Klumpp <[e-mail]>
+Date:	2013-07-26
+
+    Don't pass relative file-paths to the session-service
+
+    This is required if gpk-install-local-file is executed from the
+    command-
+    line using relative paths.
+    (The session-service can never know the current working-directory, so
+    only absolute paths are permitted)
+
+M	src/gpk-install-local-file.c
+
+commit 18985ecda866cc85b4717efcc99500b97a0b34c2
+Author: Victor Ibragimov <[e-mail]>
+Date:	2013-07-18
+
+    Tajik translation updated
+
+M	po/tg.po
+
+commit 0f0bd0395a4ab1efcb25f5a8d974d59a7e795912
+Author: Victor Ibragimov <[e-mail]>
+Date:	2013-07-18
+
+    Tajik translation updated
+
+M	po/tg.po
+
+commit 960c2d4c3947152eef2d52cb39e3556253fc693b
+Author: Victor Ibragimov <[e-mail]>
+Date:	2013-07-17
+
+    Tajik translation updated
+
+M	po/tg.po
+
+commit 6b5c175742108c36e43627032649035b5377eb0f
+Author: Gary Ching-Pang Lin <[e-mail]>
+Date:	2011-12-21
+
+    Set the default height of the details expander
+
+    This commit sets a reasonable height for the details expander, so
+    that the user can read the description easily.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=666635
+
+M	data/gpk-update-viewer.ui
+
+commit 08ea37a2e74fdfa4497d24c16460f187186d5063
+Author: Michael Catanzaro <[e-mail]>
+Date:	2013-06-02
+
+    Use a reasonable default window size
+
+    The insanely small previous default was probably from the days of
+    low-res displays. Since gpk-application currently always opens
+    with the default window size, you currently have to resize the
+    window every single time you open it, which sucks.
+
+    Nowadays gnome-shell handles low-res displays just fine. If you're
+    using an 800x600 resolution, this change causes the application
+    to open
+    maximized (which is desirable for very small screens).
+
+    We additionally ought to remember our current size in gsettings when
+    we quit, but that does not excuse a poor default.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=701464
+
+M	src/gpk-application.c
+
+commit 2ef4d641eaf2e725ca07ca128cda636727118e0e
+Author: Michael Catanzaro <[e-mail]>
+Date:	2013-06-01
+
+    Show a meaningful name in the about dialog
+
+    Fix the property name so that the name actually displays
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=663692
+
+M	src/gpk-application.c
+
+commit fd048d0bb4207341ff017d3d4d0ff0b6e954068f
+Author: Jiro Matsuzawa <[e-mail]>
+Date:	2013-07-15
+
+    l10n: Update Japanese translation
+
+M	po/ja.po
+
+commit 4077ba3ea30354ef070d640a5af4b6a913e97f4b
+Author: Richard Hughes <[e-mail]>
+Date:	2013-06-18
+
+    Ignore package progress updates when the transaction is being
+    simulated
+
+    PackageKit backends do not have to issue INFO_FINISHED when
+    simulating, and most
+    don't bother. As we didn't special-case simulation, we set up the
+    activity
+    spinner on the Package(INFO_UPDATING) event and do not cancel
+    the signal.
+
+    This leaves every row in the update viewer with a spinning cursor,
+    which due to
+    the way the code was structured lead to an O(n*n) exposion of updates
+    to the
+    cell renderers for each update. For a dozen or so updates it was
+    not noticable,
+    and nobody noticed the slight increase of CPU usage.
+
+    Now that TeX Live has officially jumped the shark and has many
+    hundreds of
+    sub-packages, it's quite plausible to have *thousands* of small
+    packages to
+    update. This means that the O(n*n) bug stops being a minor increase
+    in CPU and
+    starts to use the CPU at 100% for many hours before completing.
+
+    Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=969852
+
+M	src/gpk-update-viewer.c
+
+commit 5d755446ddd6daa9eebd8986d8f07f61e99741f7
+Author: Richard Hughes <[e-mail]>
+Date:	2013-06-18
+
+    trivial: Fix up a tiny memory leak when getting updates
+
+M	src/gpk-update-viewer.c
+
+commit c26b6869c1aee628d57bf082c41e7bbe40870834
+Author: Sandeep Sheshrao Shedmake <[e-mail]>
+Date:	2013-06-05
+
+    Updated Marathi Translations
+
+M	po/mr.po
+
+commit c4a3b2f0a7c7e411f15304bccfbedaea40a444b3
+Author: Cheng-Chia Tseng <[e-mail]>
+Date:	2013-06-04
+
+    Updated Traditional Chinese translation(Hong Kong and Taiwan)
+
+M	po/zh_HK.po
+M	po/zh_TW.po
+
+commit 571f02037b84edf6d99f54b144a73b2d814966e3
+Author: Akom Chotiphantawanon <[e-mail]>
+Date:	2013-06-02
+
+    Updated Thai translation
+
+M	po/th.po
+
+commit d1ac55ea8945160d2bc231199f30c617961b73ff
+Author: Fran Diéguez <[e-mail]>
+Date:	2013-05-31
+
+    Updated Galician translations
+
+M	po/gl.po
+
+commit 4a5f08eb4fbde11a5595795cf7d8205e027edd22
+Author: Victor Ibragimov <[e-mail]>
+Date:	2013-05-28
+
+    Tajik updated
+
+M	po/tg.po
+
+commit 8b7a1fed5c4187a79d6b447fbb0934b7db887333
+Author: Dušan Kazik <[e-mail]>
+Date:	2013-05-24
+
+    Updated slovak translation
+
+M	po/sk.po
+
+commit b8169051a1cb0a339c4e1c2177e6145059328d26
+Author: Yuri Myasoedov <[e-mail]>
+Date:	2013-05-18
+
+    Updated Russian translation
+
+M	help/Makefile.am
+A	help/ru/ru.po
+
+commit 0d7aa0dc8ac6fde107d130f4f0184659f6ec2a06
+Author: Kjartan Maraas <[e-mail]>
+Date:	2013-05-16
+
+    Updated Norwegian bokmål translation
+
+M	po/nb.po
+
+commit 6db44e544f27f501f791a8e95720a48125974d94
+Author: Shankar Prasad <[e-mail]>
+Date:	2013-05-14
+
+    updated kn translations
+
+M	po/kn.po
+
+commit e89c71fcde52f1c5588d0d4963d76896c9ece775
+Author: Jiro Matsuzawa <[e-mail]>
+Date:	2013-05-13
+
+    l10n: Update Japanese translation
+
+M	po/ja.po
+
+commit ea7275aec81f92a70d7b75e50c67c46e987e3f1d
 Author: Yuri Myasoedov <[e-mail]>
 Date:	2013-05-12
 
@@ -30,7 +808,7 @@
 
 M	po/ru.po
 
-commit 37f41ccb795318174093c80b50e3b266bdab018e
+commit d6dc0015f06d3f891b300a4d1fa47ea0e3da7636
 Author: Ask H. Larsen <[e-mail]>
 Date:	2013-05-10
 
@@ -38,7 +816,7 @@
 
 M	po/da.po
 
-commit 55f0fb075a23eedb4c48f723a8dc5281279bdc70
+commit 8999b04108979918a8ce60af4f7cff85fd89f52a
 Author: ManojKumar Giri <[e-mail]>
 Date:	2013-05-09
 
@@ -46,7 +824,23 @@
 
 M	po/or.po
 
-commit 6a8e6e0d71c9aa685c1a96dde8e46301f98bc6cc
+commit 7b8e5ea4b657a87f91c5daf956307e20c313a347
+Author: Krishnababu Krothapalli <[e-mail]>
+Date:	2013-05-09
+
+    Updated Telugu Translations
+
+M	po/te.po
+
+commit 9e863ebb29613ed0250b901eae50d76c8831e05d
+Author: Jiro Matsuzawa <[e-mail]>
+Date:	2013-05-08
+
+    l10n: Update Japanese translation
+
+M	po/ja.po
+
+commit 316df494c1f3c5e89146239167697bf69be09239
 Author: Matthias Clasen <[e-mail]>
 Date:	2013-05-07
 
@@ -60,7 +854,7 @@
 
 M	src/gpk-application.c
 
-commit 9859fa946915562a389d0fff8aa96bb54a82ab9e
+commit bf5a8e78a5f99b737f284444397395c1b6b23bfe
 Author: Richard Hughes <[e-mail]>
 Date:	2013-05-07
 
@@ -80,7 +874,60 @@
 R082	man/gpk-repo.sgml	man/gpk-service-pack.sgml
 M	man/gpk-update-viewer.sgml
 
-commit 7acda5c62c06259e8d3479819ebc7759c34e6182
+commit 78e8442265b5b029383392d355fedf1cba86f748
+Author: Matej Urbančič <[e-mail]>
+Date:	2013-05-02
+
+    Updated Slovenian translation
+
+M	po/sl.po
+
+commit ef50fd85f5fb8a1f4dd4da451692ad62480e7c55
+Author: Shantha kumar <[e-mail]>
+Date:	2013-04-26
+
+    Tamil Translation Updated
+
+M	po/ta.po
+
+commit 0c504068c6135560f933a9246567889ffcc36592
+Author: Anish A <[e-mail]>
+Date:	2013-04-25
+
+    Updated Malayalam Translation
+
+M	po/ml.po
+
+commit cf7fe24cb59faadef415d691228142a1ddd827a2
+Author: Dimitris Spingos <[e-mail]>
+Date:	2013-04-25
+
+    Updated Greek translation
+
+M	po/el.po
+
+commit 0eb7c6ceb8467c200df7496f74e133ea847362bc
+Author: Matthias Klumpp <[e-mail]>
+Date:	2013-04-24
+
+    Remove redundant calls to g_type_init()
+
+    This removes some compiler warnings.
+
+M	src/gpk-dbus-service.c
+M	src/gpk-distro-upgrade.c
+M	src/gpk-install-catalog.c
+M	src/gpk-install-local-file.c
+M	src/gpk-install-mime-type.c
+M	src/gpk-install-package-name.c
+M	src/gpk-install-provide-file.c
+M	src/gpk-log.c
+M	src/gpk-prefs.c
+M	src/gpk-self-test.c
+M	src/gpk-service-pack.c
+M	src/gpk-update-viewer.c
+
+commit 7256ce3bb7d8da7de35e31fcb22c7b63e9650413
 Author: Matthias Klumpp <[e-mail]>
 Date:	2013-04-24
 
@@ -93,47 +940,15 @@
 
 M	data/gpk-install-local-file.desktop.in
 
-commit b39da213164bae4cfbb0c571eb5e7d9e3636b8cb
-Author: Krishnababu Krothapalli <[e-mail]>
-Date:	2013-05-09
-
-    Updated Telugu Translations
-
-M	po/te.po
-
-commit 94a505d34dc8a6178f17ea5894f511ccf2a08eae
-Author: Jiro Matsuzawa <[e-mail]>
-Date:	2013-05-08
-
-    l10n: Update Japanese translation
-
-M	po/ja.po
-
-commit 53ab9136f39b879b7f98d3befedab63f1632b667
-Author: Rajesh Ranjan <[e-mail]>
-Date:	2013-05-02
-
-    hindi update
-
-M	po/hi.po
-
-commit 842660a233335507dd0cc7a47f8bc31baede4da5
-Author: Shantha kumar <[e-mail]>
-Date:	2013-04-26
-
-    Tamil Translation Updated
-
-M	po/ta.po
-
-commit 308cf654852391e6304721b99b4f4a12fcf17cf1
-Author: Andika Triwidada <[e-mail]>
-Date:	2013-04-25
-
-    Updated Indonesian translation
-
-M	po/id.po
-
-commit 59cd3649d2288f36269a0a9d9a6556622b114603
+commit 386e3bed60d14418bbe833ecee43115cc3deb096
+Author: Daniel Mustieles <[e-mail]>
+Date:	2013-04-22
+
+    Updated Spanish translation
+
+M	po/es.po
+
+commit 5ef70385b65f5a0e990a38d1fd17c6e82db42a35
 Author: Sweta Kothari <[e-mail]>
 Date:	2013-04-22
 
@@ -141,7 +956,7 @@
 
 M	po/gu.po
 
-commit 7e655cc5d152a8b5fabc16c5a51db3d6f428c80b
+commit ffde2d52378c5ffcc7c1e54b77d0bf0393f5d3e9
 Author: Christian Kirbach <[e-mail]>
 Date:	2013-04-20
 
@@ -149,16 +964,7 @@
 
 M	po/de.po
 
-commit ff4903f20dbb7a5693607f2fdb9bacc73402d82e
-Author: Мирослав Николић <[e-mail]>
-Date:	2013-04-20
-
-    Updated Serbian translation
-
-M	po/sr.po
-M	po/[e-mail]
-
-commit 70995acc725240fc5dd648c9ca744a2581a7d75b
+commit 1595b60831c72b0d223fef76585d63eb272b2b89
 Author: Wylmer Wang <[e-mail]>
 Date:	2013-04-20
 
@@ -166,7 +972,7 @@
 
 M	po/zh_CN.po
 
-commit a79040833d5fe0613b9ea035053e55401fa41964
+commit ae69fd49386bfa37544715d06174694bb4cbe710
 Author: Gianvito Cavasoli <[e-mail]>
 Date:	2013-04-19
 
@@ -174,7 +980,7 @@
 
 M	po/it.po
 
-commit b93012ed1445902616f9fdfd36388524e4f38ffd
+commit 4db7215eee438c5510c92d649a15fbc55d00d9ab
 Author: Nilamdyuti Goswami <[e-mail]>
 Date:	2013-04-18
 
@@ -182,15 +988,7 @@
 
 M	po/as.po
 
-commit 3651ae4916522fdab358219c546346f0a5e04ca5
-Author: A S Alam <[e-mail]>
-Date:	2013-04-17
-
-    update Punjabi Translation
-
-M	po/pa.po
-
-commit cad0083b6cf26a61a370ec282ba71be5b5bf9fd8
+commit df37622f7f39f0bb8a45acad758408b1349c1647
 Author: Matej Urbančič <[e-mail]>
 Date:	2013-04-16
 
@@ -198,7 +996,15 @@
 
 M	po/sl.po
 
-commit cde511a7bf425d2927d692c96b44f48b88eae3f4
+commit 81ab2640ce60874eda9c6f6cc7c29b4ab4da2871
+Author: Sílvia Miranda <[e-mail]>
+Date:	2013-04-16
+
+    [l10n] Fix Catalan translation
+
+M	po/ca.po
+
+commit c2bceadacb90c697306bdcf634e51433eb1e20a9
 Author: Daniel Mustieles <[e-mail]>
 Date:	2013-04-16
 
@@ -206,34 +1012,93 @@
 
 M	po/es.po
 
-commit 61227d139142e91c340f807c902364c14220d77e
-Author: Aurimas Černius <[e-mail]>
-Date:	2013-04-15
-
-    Updated Lithuanian translation
-
-M	po/lt.po
-
-commit d874acf1e06958bbe2672064323954d29663d52d
-Author: Richard Hughes <[e-mail]>
-Date:	2013-04-15
-
-    trivial: Post release version bump
-
-M	RELEASE
-M	configure.ac
-
-commit 99dba8439f99195caa7b0876369160aa687b469c
-Author: Richard Hughes <[e-mail]>
-Date:	2013-04-15
-
-    Release version 3.8.1
-
-M	NEWS
-M	RELEASE
-M	configure.ac
-
-commit 2d3c08335fe9c3dcff9f41b5b27d02a4d7304a99
+commit 64012d1a81cd6eb0e98f654300277a5733bb4e8e
+Author: Rafael Ferreira <[e-mail]>
+Date:	2013-04-14
+
+    Updated Brazilian Portuguese translation
+
+M	po/pt_BR.po
+
+commit 013c068974b65fa90d7d7cefcd9f1add7e9869c7
+Author: Akom Chotiphantawanon <[e-mail]>
+Date:	2013-04-14
+
+    Updated Thai translation
+
+M	po/th.po
+
+commit a618a17a43396b984cd75881f6cb74f98ffc5016
+Author: Carles Ferrando <[e-mail]>
+Date:	2013-04-14
+
+    [l10n] Updated Catalan (Valencian) translation
+
+M	po/[e-mail]
+
+commit a2632e5bba5beb96d4c0c27ae99001b96dc04f5b
+Author: Gil Forcada <[e-mail]>
+Date:	2013-04-14
+
+    [l10n] Update Catalan translation
+
+M	po/ca.po
+
+commit be0eced211610203041663d9d320b2c13f17c56e
+Author: Marek Černocký <[e-mail]>
+Date:	2013-04-13
+
+    Updated Czech translation
+
+M	po/cs.po
+
+commit 652849ce112c250f614265d3c3600239f060b9e0
+Author: Piotr Drąg <[e-mail]>
+Date:	2013-04-13
+
+    Updated Polish translation
+
+M	po/pl.po
+
+commit bd6145e165564a9dd3aa6efdef8a2c4ce40195b0
+Author: Matthias Clasen <[e-mail]>
+Date:	2013-04-10
+
+    Fix a string
+
+    No space before :
+    https://bugzilla.gnome.org/show_bug.cgi?id=695546
+
+    Signed-off-by: Richard Hughes <[e-mail]>
+
+M	src/gpk-modal-dialog.c
+
+commit ac6dca1984db855abd844062b30506cfed4dd8c7
+Author: Matthias Clasen <[e-mail]>
+Date:	2013-04-10
+
+    Add some translator comments
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=687484
+
+    Signed-off-by: Richard Hughes <[e-mail]>
+
+M	src/gpk-common.c
+
+commit 5842cd16317fdf322699fa265b8e0e72682ff11d
+Author: Matthias Clasen <[e-mail]>
+Date:	2013-04-10
+
+    Fix a spelling
+
+    The C locale uses US English.
+    https://bugzilla.gnome.org/show_bug.cgi?id=687484
+
+    Signed-off-by: Richard Hughes <[e-mail]>
+
+M	data/gpk-application.ui
+
+commit abdbaadc2632c86968581a43784b416569f155cb
 Author: Matthias Clasen <[e-mail]>
 Date:	2013-04-10
 
@@ -248,7 +1113,51 @@
 
 M	src/gpk-application.c
 
-commit 28d2027b96716611d5138407c3771a307720da51
+commit 1976972530e9f4526d952a243978d3ea5a7cf00a
+Author: Matthias Clasen <[e-mail]>
+Date:	2013-04-10
+
+    Mark strings as translatable
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=692987
+
+    Signed-off-by: Richard Hughes <[e-mail]>
+
+M	data/gpk-application.ui
+
+commit 0eb8d01f5b2c8ada706702f61f189aaccf1849c5
+Author: Richard Hughes <[e-mail]>
+Date:	2013-04-11
+
+    Port from a homegrown EggTest to GTest
+
+M	src/.gitignore
+M	src/Makefile.am
+M	src/egg-console-kit.c
+M	src/egg-markdown.c
+M	src/egg-string.c
+D	src/egg-test.c
+D	src/egg-test.h
+M	src/gpk-animated-icon.c
+M	src/gpk-application.c
+M	src/gpk-common.c
+M	src/gpk-common.h
+M	src/gpk-dbus-service.c
+M	src/gpk-dbus-task.c
+M	src/gpk-dbus-task.h
+M	src/gpk-dbus.c
+M	src/gpk-desktop.c
+M	src/gpk-enum.c
+M	src/gpk-enum.h
+M	src/gpk-error.c
+M	src/gpk-gnome.c
+M	src/gpk-language.c
+M	src/gpk-modal-dialog.c
+M	src/gpk-self-test.c
+M	src/gpk-task.c
+M	src/gpk-task.h
+
+commit f341c65a7967c1a8c276cdfc4e66cf2c9a20c171
 Author: Richard Hughes <[e-mail]>
 Date:	2013-04-11
 
@@ -268,7 +1177,7 @@
 M	src/gpk-dbus.c
 M	src/gpk-dbus.h
 
-commit 15731a36c5d750421181276705a54e122328b056
+commit c627554a91a044991700dcf28b25f54eaa6d383f
 Author: Richard Hughes <[e-mail]>
 Date:	2013-04-11
 
@@ -282,7 +1191,7 @@
 M	src/gpk-install-package-name.c
 M	src/gpk-install-provide-file.c
 
-commit 06e5bcea3fb2488befef2b1fc18725a5a34ce105
+commit b08c1ff3f924b085acb9a01ee7bf9e4d2b20fcff
 Author: Richard Hughes <[e-mail]>
 Date:	2013-04-11
 
@@ -290,103 +1199,7 @@
 
 M	contrib/gnome-packagekit.spec.in
 
-commit a9d5b9e8592499f0e3163c2ce347304d9c0f70cf
-Author: Fran Diéguez <[e-mail]>
-Date:	2013-04-15
-
-    Updated Galician translations
-
-M	po/gl.po
-
-commit 3e55481a925047c9594e8b949599143463d760c2
-Author: Rafael Ferreira <[e-mail]>
-Date:	2013-04-14
-
-    Updated Brazilian Portuguese translation
-
-M	po/pt_BR.po
-
-commit 4c235cecf281b434da305f3479bbfb2a5f9d4bfa
-Author: Dimitris Spingos <[e-mail]>
-Date:	2013-04-14
-
-    Updated Greek translation
-
-M	po/el.po
-
-commit 19cea5d550e39654d600656c20b3161d52f889ca
-Author: Akom Chotiphantawanon <[e-mail]>
-Date:	2013-04-14
-
-    Updated Thai translation
-
-M	po/th.po
-
-commit 6b30e5ef2b6f0eeb8fe75b28f191a5d7b51b8355
-Author: Carles Ferrando <[e-mail]>
-Date:	2013-04-14
-
-    [l10n] Updated Catalan (Valencian) translation
-
-M	po/[e-mail]
-
-commit eddea49b70a22c33181ac16c41437c1658774864
-Author: Gil Forcada <[e-mail]>
-Date:	2013-04-14
-
-    [l10n] Update Catalan translation
-
-M	po/ca.po
-
-commit 883768fe2d67c910d7e9247a7970256a295e4c04
-Author: Gabor Kelemen <[e-mail]>
-Date:	2013-04-14
-
-    Updated Hungarian translation
-
-M	po/hu.po
-
-commit 2b28828fe5c4a63368d14cc09c40e94e7ecbc81e
-Author: Marek Černocký <[e-mail]>
-Date:	2013-04-13
-
-    Updated Czech translation
-
-M	po/cs.po
-
-commit a1ba7f6f95b37f137aeb2a7ec3ac6e77f1fcf770
-Author: Piotr Drąg <[e-mail]>
-Date:	2013-04-13
-
-    Updated Polish translation
-
-M	po/pl.po
-
-commit 37f5aff434355a2bb583cd8176615e6dd6cc977f
-Author: Matthias Clasen <[e-mail]>
-Date:	2013-04-10
-
-    Add some translator comments
-
-    https://bugzilla.gnome.org/show_bug.cgi?id=687484
-
-    Signed-off-by: Richard Hughes <[e-mail]>
-
-M	src/gpk-common.c
-
-commit 66b18a13413bc392a86f837ff6398c02a73a2911
-Author: Matthias Clasen <[e-mail]>
-Date:	2013-04-10
-
-    Mark strings as translatable
-
-    https://bugzilla.gnome.org/show_bug.cgi?id=692987
-
-    Signed-off-by: Richard Hughes <[e-mail]>
-
-M	data/gpk-application.ui
-
-commit c3f4dc4ddf6243faf39213f8841b473d0b5b7c96
+commit b6c42e4417b9e8c6cbad69910f2c6eccc8f1c3f4
 Author: Richard Hughes <[e-mail]>
 Date:	2013-04-10
 
@@ -396,7 +1209,7 @@
 
 M	data/gpk-update-viewer.desktop.in
 
-commit f1a856aa1cca22f957eda28a0fdb6acc63368f5d
+commit b095f82e36152a75844f4fa2cf51a2a39978a7fe
 Author: Richard Hughes <[e-mail]>
 Date:	2013-04-09
 
@@ -404,7 +1217,16 @@
 
 M	src/gpk-application.c
 
-commit a7a34d92657ccad2f58964dbe0c2fc025fd96204
+commit 78b6aa1b036e19b389a28e4e24568bd9b233133b
+Author: Richard Hughes <[e-mail]>
+Date:	2013-04-09
+
+    trivial: Post branch version update
+
+M	RELEASE
+M	configure.ac
+
+commit 16e9f6870d0c13dfe18cba1b542440873422845a
 Author: Bruce Cowan <[e-mail]>
 Date:	2013-04-06
 
@@ -412,7 +1234,7 @@
 
 M	po/en_GB.po
 
-commit 426677a5c5325a86a6d4dbb8941f72521e1da361
+commit 61e6393aca4579bac3bc79d8f559adebd780bff4
 Author: Wojciech Szczęsny <[e-mail]>
 Date:	2013-04-05
 
@@ -420,23 +1242,7 @@
 
 M	po/pl.po
 
-commit 965fe26b329413d1f1477ed8f2268d40751d7e60
-Author: Kjartan Maraas <[e-mail]>
-Date:	2013-04-03
-
-    Updated Norwegian bokmål translation
-
-M	po/nb.po
-
-commit eb64c220d7d5748d95cd19ed7c32e7524e7aae30
-Author: Inaki Larranaga Murgoitio <[e-mail]>
-Date:	2013-04-02
-
-    Updated Basque language
-
-M	po/eu.po
-
-commit 01f506fd0c3fcdb8a89a4c36084d09d76cf89445
+commit 39dac32176e42ebd29cbfb1942c84b8e9e8f1a8b
 Author: OKANO Takayoshi <[e-mail]>
 Date:	2013-04-01
 
@@ -444,7 +1250,7 @@
 
 M	po/ja.po
 
-commit d52639218ee9b144e3d9bb224ce19ef251ffd15a
+commit 7930c5cd0655d58f1eed5ed3d48f0dcadaba137c
 Author: Fran Diéguez <[e-mail]>
 Date:	2013-03-27
 
 
=== modified file 'INSTALL'
--- INSTALL	2013-06-04 14:16:12 +0000
+++ INSTALL	2014-01-19 08:23:49 +0000
@@ -1,7 +1,7 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation,
+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
 Inc.
 
    Copying and distribution of this file, with or without modification,
 
=== modified file 'Makefile.in'
--- Makefile.in	2013-06-04 14:16:12 +0000
+++ Makefile.in	2014-01-19 08:23:49 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14,23 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -211,6 +239,7 @@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -455,13 +484,12 @@
 #     (which will cause the Makefiles to be regenerated when you run 'make');
 # (2) otherwise, pass the desired values on the 'make' command line.
 $(am__recursive_targets):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	case "$@" in \
 
=== modified file 'NEWS'
--- NEWS	2013-06-04 14:16:12 +0000
+++ NEWS	2014-01-19 08:23:49 +0000
@@ -1,63 +1,116 @@
-Version 3.8.2
-~~~~~~~~~~~~~
-Released: 2013-05-13
-
-* Translations
+Version 3.10.1
+~~~~~~~~~~~~~~
+Released: 2013-10-14
+
+* Translations
+ - Added Brazilian Portuguese translation for help files (Rafael Ferreira)
+ - Updated Catalan (Valencian) translation (Carles Ferrando)
+ - Updated Czech translation (Marek Černocký)
+ - Updated Italian translation (Gianvito Cavasoli)
+ - Updated Norwegian bokmål translation (Kjartan Maraas)
+ - Updated Serbian translation (Мирослав Николић)
+ - Updated Traditional Chinese translation (Cheng-Chia Tseng)
+ - Updated Turkish translation (Muhammet Kara)
+
+* New Features:
+ - Use the new 16:9 AppData screenshots (Richard Hughes)
+
+* Bugfix:
+ - Add Copyright information to the AppData files (Richard Hughes)
+
+Version 3.10.0
+~~~~~~~~~~~~~~
+Released: 2013-09-24
+
+* Translations
+ - Updated Basque translation (Inaki Larranaga Murgoitio)
+ - Updated Catalan translation (Josep Sànchez)
+ - Updated Danish translation (Kris Thomsen)
+ - Updated Finnish translation (Jiri Grönroos)
+ - Updated German translation (Benjamin Steinwender)
+ - Updated Irish translation (Seán de Búrca)
+ - Updated Japanese translation (Jiro Matsuzawa)
+ - Updated Korean translation (Changwoo Ryu)
+ - Updated Portuguese translation (António Lima)
+ - Updated Punjabi translation (A S Alam)
+ - Updated Russian translation (Dmitriy S. Seregin)
+ - Updated Slovak translation (Pavol Klačanský)
+ - Updated Thai translation (Akom Chotiphantawanon)
+ - Updated Traditional Chinese translation (Chao-Hsiung Liao)
+ - Updated Ukrainian translation (Daniel Korostil)
+
+Version 3.9.92
+~~~~~~~~~~~~~~
+Released: 2013-09-13
+
+* Translations
+ - Updated Catalan translation (Gil Forcada)
  - Updated Assamese translation (Nilamdyuti Goswami)
+ - Updated Belarusian translation (Ihar Hrachyshka)
+ - Updated Brazilian Portuguese translation (Enrico Nicoletto)
+ - Updated Brazilian Portuguese translation (Rafael Ferreira)
+ - Updated British English translation (Bruce Cowan)
+ - Updated Catalan translation (Sílvia Miranda)
+ - Updated Catalan (Valencian) translation (Carles Ferrando)
+ - Updated Czech translation (Marek Černocký)
  - Updated Danish translation (Ask H. Larsen)
+ - Updated Estonian translation (Mattias Põldaru)
+ - Updated Finnish translation (Timo Jyrinki)
+ - Updated Galician translation (Fran Diéguez)
  - Updated German translation (Christian Kirbach)
+ - Updated Greek translation (Dimitris Spingos)
  - Updated Gujarati translation (Sweta Kothari)
- - Updated Hindi translation (Rajesh Ranjan)
+ - Updated Hebrew translation (Yaron Shahrabani)
+ - Updated Hungarian translation (Balázs Úr)
+ - Updated Hungarian translation (Gabor Kelemen)
  - Updated Indonesian translation (Andika Triwidada)
+ - Updated Irish translation (Seán de Búrca)
  - Updated Italian translation (Gianvito Cavasoli)
- - Updated Japanese translation (Jiro Matsuzawa)
+ - Updated kn translation (Shankar Prasad)
+ - Updated Latvian translation (Rūdolfs Mazurs)
  - Updated Lithuanian translation (Aurimas Černius)
+ - Updated Malayalam translation (Anish A)
+ - Updated Marathi translation (Sandeep Sheshrao Shedmake)
  - Updated Norwegian bokmål translation (Kjartan Maraas)
  - Updated Odia translation (ManojKumar Giri)
- - Updated Punjabi translation (A S Alam)
+ - Updated Polish translation (Piotr Drąg)
+ - Updated Polish translation (Wojciech Szczęsny)
  - Updated Russian translation (Yuri Myasoedov)
  - Updated Serbian translation (Мирослав Николић)
+ - Updated slovak translation (Dušan Kazik)
+ - Updated Slovenian translation (Matej Urbančič)
+ - Updated Spanish translation (Daniel Mustieles)
+ - Updated Tajik translation (Victor Ibragimov)
+ - Updated Tamil translation (Shantha kumar)
+ - Updated Telugu translation (Krishnababu Krothapalli)
+ - Updated Thai translation (Akom Chotiphantawanon)
+ - Updated Traditional Chinese translation (Cheng-Chia Tseng)
+ - Updated Japanese translation (Jiro Matsuzawa)
+ - Updated Japanese translation (OKANO Takayoshi)
  - Updated Simplified Chinese translation (Wylmer Wang)
- - Updated Slovenian translation (Matej Urbančič)
- - Updated Spanish translation (Daniel Mustieles)
- - Updated Tamil translation (Shantha kumar)
- - Updated Telugu translations (Krishnababu Krothapalli)
 
-* Bugfix:
- - Fix the search menu (Matthias Clasen)
+* New Features:
+ - Add some desktop file categories (Elad Alfassa)
+ - Add two AppData files for gnome-software (Richard Hughes)
  - Open Listaller packages with gpk-install-local-file (Matthias Klumpp)
- - Update the man pages to reflect reality (Richard Hughes)
-
-Version 3.8.1
-~~~~~~~~~~~~~
-Released: 2013-04-15
-
-* Translations
- - Updated Basque language (Inaki Larranaga Murgoitio)
- - Updated Brazilian Portuguese translation (Rafael Ferreira)
- - Updated British English translation (Bruce Cowan)
- - Updated Catalan translation (Gil Forcada)
- - Updated Catalan (Valencian) translation (Carles Ferrando)
- - Updated Czech translation (Marek Černocký)
- - Updated Galician translation (Fran Diéguez)
- - Updated Greek translation (Dimitris Spingos)
- - Updated Hungarian translation (Gabor Kelemen)
- - Updated Japanese translation (OKANO Takayoshi)
- - Updated Norwegian bokmål translation (Kjartan Maraas)
- - Updated Polish translation (Piotr Drąg)
- - Updated Polish translation (Wojciech Szczęsny)
- - Updated Thai translation (Akom Chotiphantawanon)
-
-* New Features:
- - Show the update viewer in the app overview (Richard Hughes)
 
 * Bugfix:
- - Add some translator comments (Matthias Clasen)
+ - Change the name of the package installer from 'Software' to 'Packages' (Richard Hughes)
  - Do not maximize by default as we do not have a draggable header yet (Richard Hughes)
  - Do not try and duplicate all the PackageKit errors in the session helper (Richard Hughes)
- - Mark strings as translatable (Matthias Clasen)
+ - Do not use the deprecated gtk_icon_size_lookup_for_settings() (Richard Hughes)
+ - Don't pass relative file-paths to the session-service (Matthias Klumpp)
+ - Ignore package progress updates when the transaction is being simulated (Richard Hughes)
+ - Mark some strings as translatable (Matthias Clasen)
  - Never show two modal dialog boxes when using the install helpers (Richard Hughes)
- - Show a meaningful name in the about dialog (Matthias Clasen)
+ - Port from a homegrown EggTest to GTest (Richard Hughes)
+ - Remove redundant calls to g_type_init (Matthias Klumpp)
+ - Set the default height of the details expander (Gary Ching-Pang Lin)
+ - Show a meaningful name in the about dialog (Michael Catanzaro, Matthias Clasen)
+ - Show the update viewer in the app overview (Richard Hughes)
+ - Swapped "Required packages" and "Dependent packages" button functionality (Ignaker)
+ - Updated the man pages to reflect reality (Richard Hughes)
+ - Use a reasonable default window size (Michael Catanzaro)
 
 Version 3.8.0
 ~~~~~~~~~~~~~
 
=== modified file 'aclocal.m4'
--- aclocal.m4	2013-06-04 14:16:12 +0000
+++ aclocal.m4	2014-01-19 08:23:49 +0000
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.13.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.13.4 -*- Autoconf -*-
 
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -35,7 +35,7 @@
 [am__api_version='1.13'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.13.1], [],
+m4_if([$1], [1.13.4], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -51,7 +51,7 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.13.1])dnl
+[AM_AUTOMAKE_VERSION([1.13.4])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -373,7 +373,7 @@
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
+    test -z "$am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
@@ -1209,76 +1209,114 @@
 # Substitute a variable $(am__untar) that extract such
 # a tarball read from stdin.
 #     $(am__untar) < result.tar
+#
 AC_DEFUN([_AM_PROG_TAR],
 [# Always define AMTAR for backward compatibility.  Yes, it's still used
 # in the wild :-(  We should find a proper way to deprecate it ...
 AC_SUBST([AMTAR], ['$${TAR-tar}'])
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+
 m4_if([$1], [v7],
-     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of '-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
-
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
-
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-  rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
-
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+
+  [m4_case([$1],
+    [ustar],
+     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+      # There is notably a 21 bits limit for the UID and the GID.  In fact,
+      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+      # and bug#13588).
+      am_max_uid=2097151 # 2^21 - 1
+      am_max_gid=$am_max_uid
+      # The $UID and $GID variables are not portable, so we need to resort
+      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
+      # below are definitely unexpected, so allow the users to see them
+      # (that is, avoid stderr redirection).
+      am_uid=`id -u || echo unknown`
+      am_gid=`id -g || echo unknown`
+      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
+      if test $am_uid -le $am_max_uid; then
+         AC_MSG_RESULT([yes])
+      else
+         AC_MSG_RESULT([no])
+         _am_tools=none
+      fi
+      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
+      if test $am_gid -le $am_max_gid; then
+         AC_MSG_RESULT([yes])
+      else
+        AC_MSG_RESULT([no])
+        _am_tools=none
+      fi],
+
+  [pax],
+    [],
+
+  [m4_fatal([Unknown tar format])])
+
+  AC_MSG_CHECKING([how to create a $1 tar archive])
+
+  # Go ahead even if we have the value already cached.  We do so because we
+  # need to set the values for the 'am__tar' and 'am__untar' variables.
+  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+
+  for _am_tool in $_am_tools; do
+    case $_am_tool in
+    gnutar)
+      for _am_tar in tar gnutar gtar; do
+        AM_RUN_LOG([$_am_tar --version]) && break
+      done
+      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+      am__untar="$_am_tar -xf -"
+      ;;
+    plaintar)
+      # Must skip GNU tar: if it does not support --format= it doesn't create
+      # ustar tarball either.
+      (tar --version) >/dev/null 2>&1 && continue
+      am__tar='tar chf - "$$tardir"'
+      am__tar_='tar chf - "$tardir"'
+      am__untar='tar xf -'
+      ;;
+    pax)
+      am__tar='pax -L -x $1 -w "$$tardir"'
+      am__tar_='pax -L -x $1 -w "$tardir"'
+      am__untar='pax -r'
+      ;;
+    cpio)
+      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+      am__untar='cpio -i -H $1 -d'
+      ;;
+    none)
+      am__tar=false
+      am__tar_=false
+      am__untar=false
+      ;;
+    esac
+
+    # If the value was cached, stop now.  We just wanted to have am__tar
+    # and am__untar set.
+    test -n "${am_cv_prog_tar_$1}" && break
+
+    # tar/untar a dummy directory, and stop if the command works.
+    rm -rf conftest.dir
+    mkdir conftest.dir
+    echo GrepMe > conftest.dir/file
+    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+    rm -rf conftest.dir
+    if test -s conftest.tar; then
+      AM_RUN_LOG([$am__untar <conftest.tar])
+      AM_RUN_LOG([cat conftest.dir/file])
+      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+    fi
+  done
+  rm -rf conftest.dir
+
+  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+
 AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
@@ -10322,6 +10360,21 @@
 m4_popdef([pkg_description])
 ]) dnl PKG_NOARCH_INSTALLDIR
 
+
+# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# -------------------------------------------
+# Retrieves the value of the pkg-config variable for the given module.
+AC_DEFUN([PKG_CHECK_VAR],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
+
+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
+AS_VAR_COPY([$1], [pkg_cv_][$1])
+
+AS_VAR_IF([$1], [""], [$5], [$4])dnl
+])# PKG_CHECK_VAR
+
 # Copyright (C) 1995-2002 Free Software Foundation, Inc.
 # Copyright (C) 2001-2003,2004 Red Hat, Inc.
 #
@@ -10639,7 +10692,6 @@
 dnl
 glib_DEFUN([GLIB_GNU_GETTEXT],
   [AC_REQUIRE([AC_PROG_CC])dnl
-   AC_REQUIRE([AC_HEADER_STDC])dnl
    
    GLIB_LC_MESSAGES
    GLIB_WITH_NLS
@@ -10759,10 +10811,20 @@
 fi])
 
 
+# gnome-compiler-flags.m4
+#
+# serial 2
+#
+
 dnl GNOME_COMPILE_WARNINGS
 dnl Turn on many useful compiler warnings and substitute the result into
 dnl WARN_CFLAGS
 dnl For now, only works on GCC
+dnl Pass the default value of the --enable-compile-warnings configure option as
+dnl the first argument to the macro, defaulting to 'yes'.
+dnl Additional warning/error flags can be passed as an optional second argument.
+dnl
+dnl For example: GNOME_COMPILE_WARNINGS([maximum],[-Werror=some-flag -Wfoobar])
 AC_DEFUN([GNOME_COMPILE_WARNINGS],[
     dnl ******************************
     dnl More compiler warnings
@@ -10802,6 +10864,11 @@
         -Werror=missing-include-dirs \
     "
 
+    dnl Additional warning or error flags provided by the module author to
+    dnl allow stricter standards to be imposed on a per-module basis.
+    dnl The author can pass -W or -Werror flags here as they see fit.
+    additional_flags="m4_default([$2],[])"
+
     case "$enable_compile_warnings" in
     no)
         warning_flags=
@@ -10810,10 +10877,10 @@
         warning_flags="-Wall"
         ;;
     yes)
-        warning_flags="$base_warn_flags $base_error_flags"
+        warning_flags="$base_warn_flags $base_error_flags $additional_flags"
         ;;
     maximum|error)
-        warning_flags="$base_warn_flags $base_error_flags"
+        warning_flags="$base_warn_flags $base_error_flags $additional_flags"
         ;;
     *)
         AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
@@ -11022,7 +11089,12 @@
   AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
 
   dnl check for tools we added during development
-  AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
+  dnl Use AC_CHECK_PROG to avoid the check target using an absolute path that
+  dnl may not be writable by the user. Currently, automake requires that the
+  dnl test name must end in '.test'.
+  dnl https://bugzilla.gnome.org/show_bug.cgi?id=701638
+  AC_CHECK_PROG([GTKDOC_CHECK],[gtkdoc-check],[gtkdoc-check.test])
+  AC_PATH_PROG([GTKDOC_CHECK_PATH],[gtkdoc-check])
   AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
   AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
 
@@ -11135,7 +11207,8 @@
 .PHONY: pot
 pot: $(_HELP_POTFILE)
 $(_HELP_POTFILE): $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA)
-	$(AM_V_GEN)$(ITSTOOL) -o "[$]@" $(_HELP_C_FILES)
+	$(AM_V_GEN)if test -d "C"; then d=; else d="$(srcdir)/"; fi; \
+	$(ITSTOOL) -o "[$]@" $(foreach f,$(_HELP_C_FILES),"$${d}$(f)")
 
 .PHONY: repo
 repo: $(_HELP_POTFILE)
 
=== modified file 'configure'
--- configure	2013-06-04 14:16:12 +0000
+++ configure	2014-01-19 08:23:49 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gnome-packagekit 3.8.2.
+# Generated by GNU Autoconf 2.69 for gnome-packagekit 3.10.1.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@
 # Identity of this package.
 PACKAGE_NAME='gnome-packagekit'
 PACKAGE_TARNAME='gnome-packagekit'
-PACKAGE_VERSION='3.8.2'
-PACKAGE_STRING='gnome-packagekit 3.8.2'
+PACKAGE_VERSION='3.10.1'
+PACKAGE_STRING='gnome-packagekit 3.10.1'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -712,6 +712,7 @@
 HTML_DIR
 GTKDOC_MKPDF
 GTKDOC_REBASE
+GTKDOC_CHECK_PATH
 GTKDOC_CHECK
 PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
@@ -1474,7 +1475,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures gnome-packagekit 3.8.2 to adapt to many kinds of systems.
+\`configure' configures gnome-packagekit 3.10.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1545,7 +1546,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gnome-packagekit 3.8.2:";;
+     short | recursive ) echo "Configuration of gnome-packagekit 3.10.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1709,7 +1710,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gnome-packagekit configure 3.8.2
+gnome-packagekit configure 3.10.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2074,7 +2075,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gnome-packagekit $as_me 3.8.2, which was
+It was created by gnome-packagekit $as_me 3.10.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2938,7 +2939,7 @@
 
 # Define the identity of the package.
  PACKAGE='gnome-packagekit'
- VERSION='3.8.2'
+ VERSION='3.10.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2979,92 +2980,132 @@
 AMTAR='$${TAR-tar}'
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar plaintar pax cpio none'
+
+# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+      # There is notably a 21 bits limit for the UID and the GID.  In fact,
+      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+      # and bug#13588).
+      am_max_uid=2097151 # 2^21 - 1
+      am_max_gid=$am_max_uid
+      # The $UID and $GID variables are not portable, so we need to resort
+      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
+      # below are definitely unexpected, so allow the users to see them
+      # (that is, avoid stderr redirection).
+      am_uid=`id -u || echo unknown`
+      am_gid=`id -g || echo unknown`
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5
+$as_echo_n "checking whether UID '$am_uid' is supported by ustar format... " >&6; }
+      if test $am_uid -le $am_max_uid; then
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      else
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+         _am_tools=none
+      fi
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5
+$as_echo_n "checking whether GID '$am_gid' is supported by ustar format... " >&6; }
+      if test $am_gid -le $am_max_gid; then
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        _am_tools=none
+      fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
 $as_echo_n "checking how to create a ustar tar archive... " >&6; }
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar plaintar pax cpio none'
-_am_tools=${am_cv_prog_tar_ustar-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of '-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      { echo "$as_me:$LINENO: $_am_tar --version" >&5
+
+  # Go ahead even if we have the value already cached.  We do so because we
+  # need to set the values for the 'am__tar' and 'am__untar' variables.
+  _am_tools=${am_cv_prog_tar_ustar-$_am_tools}
+
+  for _am_tool in $_am_tools; do
+    case $_am_tool in
+    gnutar)
+      for _am_tar in tar gnutar gtar; do
+        { echo "$as_me:$LINENO: $_am_tar --version" >&5
    ($_am_tar --version) >&5 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && break
-    done
-    am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x ustar -w "$$tardir"'
-    am__tar_='pax -L -x ustar -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H ustar -L'
-    am__tar_='find "$tardir" -print | cpio -o -H ustar -L'
-    am__untar='cpio -i -H ustar -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
-
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_ustar}" && break
-
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5
+      done
+      am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"'
+      am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"'
+      am__untar="$_am_tar -xf -"
+      ;;
+    plaintar)
+      # Must skip GNU tar: if it does not support --format= it doesn't create
+      # ustar tarball either.
+      (tar --version) >/dev/null 2>&1 && continue
+      am__tar='tar chf - "$$tardir"'
+      am__tar_='tar chf - "$tardir"'
+      am__untar='tar xf -'
+      ;;
+    pax)
+      am__tar='pax -L -x ustar -w "$$tardir"'
+      am__tar_='pax -L -x ustar -w "$tardir"'
+      am__untar='pax -r'
+      ;;
+    cpio)
+      am__tar='find "$$tardir" -print | cpio -o -H ustar -L'
+      am__tar_='find "$tardir" -print | cpio -o -H ustar -L'
+      am__untar='cpio -i -H ustar -d'
+      ;;
+    none)
+      am__tar=false
+      am__tar_=false
+      am__untar=false
+      ;;
+    esac
+
+    # If the value was cached, stop now.  We just wanted to have am__tar
+    # and am__untar set.
+    test -n "${am_cv_prog_tar_ustar}" && break
+
+    # tar/untar a dummy directory, and stop if the command works.
+    rm -rf conftest.dir
+    mkdir conftest.dir
+    echo GrepMe > conftest.dir/file
+    { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5
    (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
-  rm -rf conftest.dir
-  if test -s conftest.tar; then
-    { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5
+    rm -rf conftest.dir
+    if test -s conftest.tar; then
+      { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5
    ($am__untar <conftest.tar) >&5 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
+      { echo "$as_me:$LINENO: cat conftest.dir/file" >&5
+   (cat conftest.dir/file) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+    fi
+  done
+  rm -rf conftest.dir
 
-if ${am_cv_prog_tar_ustar+:} false; then :
+  if ${am_cv_prog_tar_ustar+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   am_cv_prog_tar_ustar=$_am_tool
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
 $as_echo "$am_cv_prog_tar_ustar" >&6; }
 
 
 
 
 
+
 ac_config_headers="$ac_config_headers config.h"
 
 
@@ -12412,6 +12453,8 @@
         -Werror=missing-include-dirs \
     "
 
+                additional_flags=""
+
     case "$enable_compile_warnings" in
     no)
         warning_flags=
@@ -12420,10 +12463,10 @@
         warning_flags="-Wall"
         ;;
     yes)
-        warning_flags="$base_warn_flags $base_error_flags"
+        warning_flags="$base_warn_flags $base_error_flags $additional_flags"
         ;;
     maximum|error)
-        warning_flags="$base_warn_flags $base_error_flags"
+        warning_flags="$base_warn_flags $base_error_flags $additional_flags"
         ;;
     *)
         as_fn_error $? "Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" "$LINENO" 5
@@ -12630,7 +12673,8 @@
 .PHONY: pot
 pot: $(_HELP_POTFILE)
 $(_HELP_POTFILE): $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA)
-	$(AM_V_GEN)$(ITSTOOL) -o "$@" $(_HELP_C_FILES)
+	$(AM_V_GEN)if test -d "C"; then d=; else d="$(srcdir)/"; fi; \
+	$(ITSTOOL) -o "$@" $(foreach f,$(_HELP_C_FILES),"$${d}$(f)")
 
 .PHONY: repo
 repo: $(_HELP_POTFILE)
@@ -12895,26 +12939,24 @@
 
 
 
-    # Extract the first word of "gtkdoc-check", so it can be a program name with args.
+            # Extract the first word of "gtkdoc-check", so it can be a program name with args.
 set dummy gtkdoc-check; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GTKDOC_CHECK+:} false; then :
+if ${ac_cv_prog_GTKDOC_CHECK+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  case $GTKDOC_CHECK in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  if test -n "$GTKDOC_CHECK"; then
+  ac_cv_prog_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
+    ac_cv_prog_GTKDOC_CHECK="gtkdoc-check.test"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -12922,10 +12964,9 @@
   done
 IFS=$as_save_IFS
 
-  ;;
-esac
-fi
-GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
+fi
+fi
+GTKDOC_CHECK=$ac_cv_prog_GTKDOC_CHECK
 if test -n "$GTKDOC_CHECK"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5
 $as_echo "$GTKDOC_CHECK" >&6; }
@@ -12935,6 +12976,46 @@
 fi
 
 
+  # Extract the first word of "gtkdoc-check", so it can be a program name with args.
+set dummy gtkdoc-check; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_GTKDOC_CHECK_PATH+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $GTKDOC_CHECK_PATH in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GTKDOC_CHECK_PATH="$GTKDOC_CHECK_PATH" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_GTKDOC_CHECK_PATH="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+GTKDOC_CHECK_PATH=$ac_cv_path_GTKDOC_CHECK_PATH
+if test -n "$GTKDOC_CHECK_PATH"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK_PATH" >&5
+$as_echo "$GTKDOC_CHECK_PATH" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
   for ac_prog in gtkdoc-rebase
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -16205,7 +16286,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by gnome-packagekit $as_me 3.8.2, which was
+This file was extended by gnome-packagekit $as_me 3.10.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16271,7 +16352,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-gnome-packagekit config.status 3.8.2
+gnome-packagekit config.status 3.10.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -17360,7 +17441,7 @@
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
+    test -z "$am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
 
=== modified file 'configure.ac'
--- configure.ac	2013-06-04 14:16:12 +0000
+++ configure.ac	2014-01-19 08:23:49 +0000
@@ -1,6 +1,6 @@
 AC_PREREQ(2.65)
 
-AC_INIT([gnome-packagekit],[3.8.2])
+AC_INIT([gnome-packagekit],[3.10.1])
 AC_CONFIG_SRCDIR(src)
 AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-xz tar-ustar])
 AC_CONFIG_HEADERS([config.h])
 
=== modified file 'data/Makefile.am'
--- data/Makefile.am	2012-03-28 01:59:22 +0000
+++ data/Makefile.am	2014-01-19 08:23:49 +0000
@@ -5,6 +5,11 @@
 migrationdir = $(datadir)/GConf/gsettings
 dist_migration_DATA = org.gnome.packagekit.gschema.migrate
 
+appdatadir = $(datadir)/appdata
+dist_appdata_DATA =					\
+	gpk-application.appdata.xml			\
+	gpk-update-viewer.appdata.xml
+
 @INTLTOOL_DESKTOP_RULE@
 desktopdir = $(datadir)/applications
 desktop_in_files =					\
 
=== modified file 'data/Makefile.in'
--- data/Makefile.in	2013-06-04 14:16:12 +0000
+++ data/Makefile.in	2014-01-19 08:23:49 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +80,7 @@
 host_triplet = @host@
 subdir = data
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(dist_migration_DATA)
+	$(dist_appdata_DATA) $(dist_migration_DATA)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -115,11 +143,11 @@
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
-am__installdirs = "$(DESTDIR)$(desktopdir)" \
+am__installdirs = "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(appdatadir)" \
 	"$(DESTDIR)$(migrationdir)" "$(DESTDIR)$(pkgdatadir)" \
 	"$(DESTDIR)$(servicedir)"
-DATA = $(desktop_DATA) $(dist_migration_DATA) $(pkgdata_DATA) \
-	$(service_DATA)
+DATA = $(desktop_DATA) $(dist_appdata_DATA) $(dist_migration_DATA) \
+	$(pkgdata_DATA) $(service_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 am__recursive_targets = \
@@ -221,6 +249,7 @@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -375,6 +404,11 @@
 SUBDIRS = icons
 migrationdir = $(datadir)/GConf/gsettings
 dist_migration_DATA = org.gnome.packagekit.gschema.migrate
+appdatadir = $(datadir)/appdata
+dist_appdata_DATA = \
+	gpk-application.appdata.xml			\
+	gpk-update-viewer.appdata.xml
+
 desktopdir = $(datadir)/applications
 desktop_in_files = \
 	gpk-install-local-file.desktop.in		\
@@ -486,6 +520,27 @@
 	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir)
+install-dist_appdataDATA: $(dist_appdata_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_appdata_DATA)'; test -n "$(appdatadir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(appdatadir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(appdatadir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(appdatadir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(appdatadir)" || exit $$?; \
+	done
+
+uninstall-dist_appdataDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_appdata_DATA)'; test -n "$(appdatadir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(appdatadir)'; $(am__uninstall_files_from_dir)
 install-dist_migrationDATA: $(dist_migration_DATA)
 	@$(NORMAL_INSTALL)
 	@list='$(dist_migration_DATA)'; test -n "$(migrationdir)" || list=; \
@@ -557,13 +612,12 @@
 #     (which will cause the Makefiles to be regenerated when you run 'make');
 # (2) otherwise, pass the desired values on the 'make' command line.
 $(am__recursive_targets):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	case "$@" in \
@@ -710,7 +764,7 @@
 all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(migrationdir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(servicedir)"; do \
+	for dir in "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(appdatadir)" "$(DESTDIR)$(migrationdir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(servicedir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
@@ -764,8 +818,9 @@
 
 info-am:
 
-install-data-am: install-desktopDATA install-dist_migrationDATA \
-	install-pkgdataDATA install-serviceDATA
+install-data-am: install-desktopDATA install-dist_appdataDATA \
+	install-dist_migrationDATA install-pkgdataDATA \
+	install-serviceDATA
 
 install-dvi: install-dvi-recursive
 
@@ -809,8 +864,9 @@
 
 ps-am:
 
-uninstall-am: uninstall-desktopDATA uninstall-dist_migrationDATA \
-	uninstall-pkgdataDATA uninstall-serviceDATA
+uninstall-am: uninstall-desktopDATA uninstall-dist_appdataDATA \
+	uninstall-dist_migrationDATA uninstall-pkgdataDATA \
+	uninstall-serviceDATA
 
 .MAKE: $(am__recursive_targets) install-am install-strip
 
@@ -819,15 +875,16 @@
 	cscopelist-am ctags ctags-am distclean distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-desktopDATA install-dist_migrationDATA \
-	install-dvi install-dvi-am install-exec install-exec-am \
-	install-html install-html-am install-info install-info-am \
-	install-man install-pdf install-pdf-am install-pkgdataDATA \
-	install-ps install-ps-am install-serviceDATA install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-am uninstall uninstall-am uninstall-desktopDATA \
+	install-data-am install-desktopDATA install-dist_appdataDATA \
+	install-dist_migrationDATA install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-pkgdataDATA install-ps install-ps-am \
+	install-serviceDATA install-strip installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-desktopDATA uninstall-dist_appdataDATA \
 	uninstall-dist_migrationDATA uninstall-pkgdataDATA \
 	uninstall-serviceDATA
 
 
=== added file 'data/gpk-application.appdata.xml'
--- data/gpk-application.appdata.xml	1970-01-01 00:00:00 +0000
+++ data/gpk-application.appdata.xml	2014-01-19 08:23:49 +0000
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2013 Richard Hughes <[e-mail]> -->
+<application>
+  <id type="desktop">gpk-application.desktop</id>
+  <licence>CC0</licence>
+  <name>GNOME Package Installer</name>
+  <description>
+    <p>
+      Package Installer allows you to install and remove packages on your system.
+      You can view search packages by name, details or even file name and also
+      see dependencies of one package on other packages.
+      Searching by groups is possible and is an easy way to find software in
+      your favorite desktop environment.
+    </p>
+    <p>
+      Package Installer uses PackageKit and can work on any distribution using
+      the native package management framework.
+    </p>
+  </description>
+  <screenshots>
+    <screenshot type="default">https://git.gnome.org/browse/gnome-packagekit/plain/data/appdata/ss-application.png</screenshot>
+    <screenshot>https://git.gnome.org/browse/gnome-packagekit/plain/data/appdata/ss-application-details.png</screenshot>
+  </screenshots>
+  <url type="homepage">http://www.packagekit.org/</url>
+  <updatecontact>richard_at_hughsie.com</updatecontact>
+</application>
 
=== modified file 'data/gpk-application.desktop.in'
--- data/gpk-application.desktop.in	2013-06-04 14:16:12 +0000
+++ data/gpk-application.desktop.in	2014-01-19 08:23:49 +0000
@@ -1,11 +1,11 @@
 [Desktop Entry]
-_Name=Software
+_Name=Packages
 _Comment=Add or remove software installed on the system
 Icon=system-software-install
 Exec=gpk-application
 Terminal=false
 Type=Application
-Categories=GNOME;GTK;System;
+Categories=GNOME;GTK;System;Settings;PackageManager;
 _Keywords=Updates;Upgrade;Sources;Repositories;Preferences;Install;Store;
 NotShowIn=KDE;
 StartupNotify=true
 
=== modified file 'data/gpk-application.ui'
--- data/gpk-application.ui	2013-06-04 14:16:12 +0000
+++ data/gpk-application.ui	2014-01-19 08:23:49 +0000
@@ -325,7 +325,7 @@
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">Licence</property>
+                                            <property name="label" translatable="yes">License</property>
                                             <style>
                                               <class name="dim-label"/>
                                             </style>
 
=== added file 'data/gpk-update-viewer.appdata.xml'
--- data/gpk-update-viewer.appdata.xml	1970-01-01 00:00:00 +0000
+++ data/gpk-update-viewer.appdata.xml	2014-01-19 08:23:49 +0000
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2013 Richard Hughes <[e-mail]> -->
+<application>
+  <id type="desktop">gpk-update-viewer.desktop</id>
+  <licence>CC0</licence>
+  <name>GNOME Package Updater</name>
+  <description>
+    <p>
+      Package Updater allows you to update packages on your system without
+      rebooting.
+      You can view details about each update and choose which updates to apply.
+    </p>
+    <p>
+      Package Updater uses PackageKit and can work on any distribution using
+      the native package management framework.
+    </p>
+  </description>
+  <screenshots>
+    <screenshot type="default">https://git.gnome.org/browse/gnome-packagekit/plain/data/appdata/ss-updater.png</screenshot>
+  </screenshots>
+  <url type="homepage">http://www.packagekit.org/</url>
+  <updatecontact>richard_at_hughsie.com</updatecontact>
+</application>
 
=== modified file 'data/gpk-update-viewer.ui'
--- data/gpk-update-viewer.ui	2011-11-10 22:12:52 +0000
+++ data/gpk-update-viewer.ui	2014-01-19 08:23:49 +0000
@@ -234,6 +234,7 @@
                 <property name="can_focus">True</property>
                 <child>
                   <object class="GtkScrolledWindow" id="scrolledwindow_details">
+                    <property name="height_request">100</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="shadow_type">in</property>
 
=== modified file 'data/icons/16x16/Makefile.in'
--- data/icons/16x16/Makefile.in	2013-06-04 14:16:12 +0000
+++ data/icons/16x16/Makefile.in	2014-01-19 08:23:49 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14,23 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -187,6 +215,7 @@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -385,13 +414,12 @@
 #     (which will cause the Makefiles to be regenerated when you run 'make');
 # (2) otherwise, pass the desired values on the 'make' command line.
 $(am__recursive_targets):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	case "$@" in \
 
=== modified file 'data/icons/16x16/animations/Makefile.in'
--- data/icons/16x16/animations/Makefile.in	2013-06-04 14:16:12 +0000
+++ data/icons/16x16/animations/Makefile.in	2014-01-19 08:23:49 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -157,6 +185,7 @@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 
=== modified file 'data/icons/16x16/categories/Makefile.in'
--- data/icons/16x16/categories/Makefile.in	2013-06-04 14:16:12 +0000
+++ data/icons/16x16/categories/Makefile.in	2014-01-19 08:23:49 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -157,6 +185,7 @@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 
=== modified file 'data/icons/16x16/status/Makefile.in'
--- data/icons/16x16/status/Makefile.in	2013-06-04 14:16:12 +0000
+++ data/icons/16x16/status/Makefile.in	2014-01-19 08:23:49 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -157,6 +185,7 @@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 
=== modified file 'data/icons/22x22/Makefile.in'
--- data/icons/22x22/Makefile.in	2013-06-04 14:16:12 +0000
+++ data/icons/22x22/Makefile.in	2014-01-19 08:23:49 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14,23 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -187,6 +215,7 @@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -385,13 +414,12 @@
 #     (which will cause the Makefiles to be regenerated when you run 'make');
 # (2) otherwise, pass the desired values on the 'make' command line.
 $(am__recursive_targets):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	case "$@" in \
 
=== modified file 'data/icons/22x22/animations/Makefile.in'
--- data/icons/22x22/animations/Makefile.in	2013-06-04 14:16:12 +0000
+++ data/icons/22x22/animations/Makefile.in	2014-01-19 08:23:49 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -157,6 +185,7 @@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 
=== modified file 'data/icons/22x22/categories/Makefile.in'
--- data/icons/22x22/categories/Makefile.in	2013-06-04 14:16:12 +0000
+++ data/icons/22x22/categories/Makefile.in	2014-01-19 08:23:49 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -157,6 +185,7 @@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 
=== modified file 'data/icons/22x22/status/Makefile.in'
--- data/icons/22x22/status/Makefile.in	2013-06-04 14:16:12 +0000
+++ data/icons/22x22/status/Makefile.in	2014-01-19 08:23:49 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -157,6 +185,7 @@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 
=== modified file 'data/icons/24x24/Makefile.in'
--- data/icons/24x24/Makefile.in	2013-06-04 14:16:12 +0000
+++ data/icons/24x24/Makefile.in	2014-01-19 08:23:49 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14,23 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -187,6 +215,7 @@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -385,13 +414,12 @@
 #     (which will cause the Makefiles to be regenerated when you run 'make');
 # (2) otherwise, pass the desired values on the 'make' command line.
 $(am__recursive_targets):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	case "$@" in \
 
=== modified file 'data/icons/24x24/animations/Makefile.in'
--- data/icons/24x24/animations/Makefile.in	2013-06-04 14:16:12 +0000
+++ data/icons/24x24/animations/Makefile.in	2014-01-19 08:23:49 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -157,6 +185,7 @@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 
=== modified file 'data/icons/24x24/categories/Makefile.in'
--- data/icons/24x24/categories/Makefile.in	2013-06-04 14:16:12 +0000
+++ data/icons/24x24/categories/Makefile.in	2014-01-19 08:23:49 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -157,6 +185,7 @@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 
=== modified file 'data/icons/24x24/status/Makefile.in'
--- data/icons/24x24/status/Makefile.in	2013-06-04 14:16:12 +0000
+++ data/icons/24x24/status/Makefile.in	2014-01-19 08:23:49 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -157,6 +185,7 @@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 
=== modified file 'data/icons/48x48/Makefile.in'
--- data/icons/48x48/Makefile.in	2013-06-04 14:16:12 +0000
+++ data/icons/48x48/Makefile.in	2014-01-19 08:23:49 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14,23 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -187,6 +215,7 @@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -385,13 +414,12 @@
 #     (which will cause the Makefiles to be regenerated when you run 'make');
 # (2) otherwise, pass the desired values on the 'make' command line.
 $(am__recursive_targets):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	case "$@" in \
 
=== modified file 'data/icons/48x48/animations/Makefile.in'
--- data/icons/48x48/animations/Makefile.in	2013-06-04 14:16:12 +0000
+++ data/icons/48x48/animations/Makefile.in	2014-01-19 08:23:49 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -157,6 +185,7 @@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 
=== modified file 'data/icons/48x48/categories/Makefile.in'
--- data/icons/48x48/categories/Makefile.in	2013-06-04 14:16:12 +0000
+++ data/icons/48x48/categories/Makefile.in	2014-01-19 08:23:49 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -157,6 +185,7 @@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 
=== modified file 'data/icons/48x48/status/Makefile.in'
--- data/icons/48x48/status/Makefile.in	2013-06-04 14:16:12 +0000
+++ data/icons/48x48/status/Makefile.in	2014-01-19 08:23:49 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -157,6 +185,7 @@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 
=== modified file 'data/icons/Makefile.am'
--- data/icons/Makefile.am	2011-02-23 18:23:07 +0000
+++ data/icons/Makefile.am	2014-01-19 08:23:49 +0000
@@ -1,13 +1,15 @@
 SUBDIRS = scalable 16x16 22x22 24x24 48x48
 
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(pkgdatadir)/icons/hicolor
 
-install-data-hook:
+install-data-hook: update-icon-cache
+uninstall-hook: update-icon-cache
+update-icon-cache:
 	@-if test -z "$(DESTDIR)"; then \
 		echo "Updating Gtk icon cache."; \
 		$(gtk_update_icon_cache); \
 	else \
-		echo "*** Icon cache not updated.  After install, run this:"; \
+		echo "*** Icon cache not updated.  After (un)install, run this:"; \
 		echo "***   $(gtk_update_icon_cache)"; \
 	fi
 
 
=== modified file 'data/icons/Makefile.in'
--- data/icons/Makefile.in	2013-06-04 14:16:12 +0000
+++ data/icons/Makefile.in	2014-01-19 08:23:49 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14,23 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -187,6 +215,7 @@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -338,7 +367,7 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = scalable 16x16 22x22 24x24 48x48
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(pkgdatadir)/icons/hicolor
 all: all-recursive
 
 .SUFFIXES:
@@ -386,13 +415,12 @@
 #     (which will cause the Makefiles to be regenerated when you run 'make');
 # (2) otherwise, pass the desired values on the 'make' command line.
 $(am__recursive_targets):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	case "$@" in \
@@ -635,9 +663,10 @@
 ps-am:
 
 uninstall-am:
-
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
 .MAKE: $(am__recursive_targets) install-am install-data-am \
-	install-strip
+	install-strip uninstall-am
 
 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
 	check-am clean clean-generic clean-libtool cscopelist-am ctags \
@@ -651,15 +680,17 @@
 	installcheck-am installdirs installdirs-am maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
-	uninstall-am
-
-
-install-data-hook:
+	uninstall-am uninstall-hook
+
+
+install-data-hook: update-icon-cache
+uninstall-hook: update-icon-cache
+update-icon-cache:
 	@-if test -z "$(DESTDIR)"; then \
 		echo "Updating Gtk icon cache."; \
 		$(gtk_update_icon_cache); \
 	else \
-		echo "*** Icon cache not updated.  After install, run this:"; \
+		echo "*** Icon cache not updated.  After (un)install, run this:"; \
 		echo "***   $(gtk_update_icon_cache)"; \
 	fi
 
 
=== modified file 'data/icons/scalable/Makefile.in'
--- data/icons/scalable/Makefile.in	2013-06-04 14:16:12 +0000
+++ data/icons/scalable/Makefile.in	2014-01-19 08:23:49 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14,23 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -187,6 +215,7 @@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -385,13 +414,12 @@
 #     (which will cause the Makefiles to be regenerated when you run 'make');
 # (2) otherwise, pass the desired values on the 'make' command line.
 $(am__recursive_targets):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	case "$@" in \
 
=== modified file 'data/icons/scalable/categories/Makefile.in'
--- data/icons/scalable/categories/Makefile.in	2013-06-04 14:16:12 +0000
+++ data/icons/scalable/categories/Makefile.in	2014-01-19 08:23:49 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -157,6 +185,7 @@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 
=== modified file 'data/icons/scalable/status/Makefile.in'
--- data/icons/scalable/status/Makefile.in	2013-06-04 14:16:12 +0000
+++ data/icons/scalable/status/Makefile.in	2014-01-19 08:23:49 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -157,6 +185,7 @@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-08-28 06:56:44 +0000
+++ debian/changelog	2014-01-19 08:23:49 +0000
@@ -1,3 +1,25 @@
+gnome-packagekit (3.10.1-1ubuntu1) trusty; urgency=medium
+
+  * Merge from debian. Remaining changes:
+    - Drop build dependency on obsoleted gtk-doc-utils and libapt-pkg-dev
+    - Raise version of the libglib2.0-dev build dependency
+    - Alternatively depend on aptdaemon's PackageKit compatibility layer
+  * Revert update-notifier transition change from debian
+
+ -- Jackson Doak <[e-mail]>  Sat, 21 Dec 2013 09:51:49 +1100
+
+gnome-packagekit (3.10.1-1) unstable; urgency=low
+
+  * New upstream release: 3.10.1
+    - Closes: #717898
+    - Closes: #657801 (partially)
+  * Remove the old and outdated python-packagekit-gtk package
+  * Build-depend on yelp-tools instead of gnome-doc-utils
+  * Provide transition from update-notifier
+    to GNOME-PackageKit (Closes: #707706)
+
+ -- Matthias Klumpp <[e-mail]>  Wed, 04 Dec 2013 18:46:38 +0100
+
 gnome-packagekit (3.8.2-4ubuntu1) saucy; urgency=low
 
   * Merge with Debian Unstable (LP: #1200303). Remaining change:
 
=== modified file 'debian/control'
--- debian/control	2013-08-28 06:56:44 +0000
+++ debian/control	2014-01-19 08:23:49 +0000
@@ -2,13 +2,12 @@
 Section: gnome
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
-XSBC-Original-Maintainer: Matthias Klumpp <[e-mail]>
+XSBC-Original-Maintainer: Matthias Klumpp <[e-mail]>
 Vcs-Git: git://anonscm.debian.org/pkg-packagekit/gnome-packagekit.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-packagekit/gnome-packagekit.git
 Build-Depends: debhelper (>= 9.0.0),
                dh-autoreconf,
                docbook-utils,
-               yelp-tools,
                intltool (>= 0.40),
                itstool,
                libcanberra-gtk3-dev,
@@ -24,7 +23,8 @@
                libx11-dev,
                python-dev,
                rarian-compat,
-               xmlto
+               xmlto,
+               yelp-tools
 Standards-Version: 3.9.4
 Homepage: http://help.gnome.org/users/gnome-packagekit/stable/
 
@@ -93,4 +93,4 @@
  This package contains several small GUI helper tools for sofware management,
  which are able to install mime-types or package catalogs.
  It also contains an utility to generate service packs for offline package
- installation.
+ installation.
 \ No newline at end of file
 
=== modified file 'debian/gnome-packagekit.install'
--- debian/gnome-packagekit.install	2013-06-04 14:16:12 +0000
+++ debian/gnome-packagekit.install	2014-01-19 08:23:49 +0000
@@ -1,6 +1,7 @@
 usr/bin/gpk-application
 usr/bin/gpk-install-local-file
 usr/bin/gpk-update-viewer
+usr/share/appdata/*
 usr/share/applications/gpk-application.desktop
 usr/share/applications/gpk-install-local-file.desktop
 usr/share/applications/gpk-update-viewer.desktop
 
=== modified file 'debian/rules'
--- debian/rules	2012-09-27 23:50:55 +0000
+++ debian/rules	2014-01-19 08:23:49 +0000
@@ -8,7 +8,7 @@
 INSTALLDIR = $(CURDIR)/debian/tmp
 
 %:
-	dh $@ --parallel --with python2
+	dh $@ --parallel
 
 override_dh_auto_configure:
 	dh_auto_configure -- $(GPK_CONFIGURE_FLAGS)
@@ -19,6 +19,7 @@
 	# We don't ship these files
 	rm -f $(INSTALLDIR)/usr/share/applications/gpk-distro-upgrade.desktop
 	rm -f $(INSTALLDIR)/usr/bin/gpk-distro-upgrade
+	rm -rf $(INSTALLDIR)/usr/lib/python*
 
 override_dh_install:
 	dh_install --list-missing
 
=== modified file 'depcomp'
--- depcomp	2013-06-04 14:16:12 +0000
+++ depcomp	2014-01-19 08:23:49 +0000
@@ -1,7 +1,7 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2012-10-18.11; # UTC
+scriptversion=2013-05-30.07; # UTC
 
 # Copyright (C) 1999-2013 Free Software Foundation, Inc.
 
@@ -552,6 +552,7 @@
   G
   p
 }' >> "$depfile"
+  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
   rm -f "$tmpdepfile"
   ;;
 
 
=== modified file 'docs/Makefile.in'
--- docs/Makefile.in	2013-06-04 14:16:12 +0000
+++ docs/Makefile.in	2014-01-19 08:23:49 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14,23 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \