lp:~noskcaj/ubuntu/trusty/gnome-packagekit/merge
- Get this branch:
- bzr branch lp:~noskcaj/ubuntu/trusty/gnome-packagekit/merge
Branch merges
- Michael Terry: Pending requested
-
Diff: 79390 lines (+20393/-14798)134 files modifiedChangeLog (+1049/-243)
INSTALL (+1/-1)
Makefile.in (+52/-24)
NEWS (+94/-41)
aclocal.m4 (+148/-75)
configure (+169/-88)
configure.ac (+1/-1)
data/Makefile.am (+5/-0)
data/Makefile.in (+99/-42)
data/gpk-application.appdata.xml (+26/-0)
data/gpk-application.desktop.in (+2/-2)
data/gpk-application.ui (+1/-1)
data/gpk-update-viewer.appdata.xml (+23/-0)
data/gpk-update-viewer.ui (+1/-0)
data/icons/16x16/Makefile.in (+52/-24)
data/icons/16x16/animations/Makefile.in (+46/-17)
data/icons/16x16/categories/Makefile.in (+46/-17)
data/icons/16x16/status/Makefile.in (+46/-17)
data/icons/22x22/Makefile.in (+52/-24)
data/icons/22x22/animations/Makefile.in (+46/-17)
data/icons/22x22/categories/Makefile.in (+46/-17)
data/icons/22x22/status/Makefile.in (+46/-17)
data/icons/24x24/Makefile.in (+52/-24)
data/icons/24x24/animations/Makefile.in (+46/-17)
data/icons/24x24/categories/Makefile.in (+46/-17)
data/icons/24x24/status/Makefile.in (+46/-17)
data/icons/48x48/Makefile.in (+52/-24)
data/icons/48x48/animations/Makefile.in (+46/-17)
data/icons/48x48/categories/Makefile.in (+46/-17)
data/icons/48x48/status/Makefile.in (+46/-17)
data/icons/Makefile.am (+5/-3)
data/icons/Makefile.in (+63/-32)
data/icons/scalable/Makefile.in (+52/-24)
data/icons/scalable/categories/Makefile.in (+46/-17)
data/icons/scalable/status/Makefile.in (+46/-17)
debian/changelog (+22/-0)
debian/control (+4/-4)
debian/gnome-packagekit.install (+1/-0)
debian/rules (+2/-1)
depcomp (+2/-1)
docs/Makefile.in (+52/-24)
docs/dbus/Makefile.in (+46/-17)
help/Makefile.am (+1/-1)
help/Makefile.in (+47/-18)
help/pt_BR/index.docbook (+969/-0)
help/pt_BR/legal.xml (+16/-0)
help/pt_BR/pt_BR.po (+1560/-0)
help/ru/index.docbook (+1025/-0)
help/ru/legal.xml (+75/-0)
help/ru/ru.po (+1440/-0)
man/Makefile.in (+46/-17)
po/as.po (+134/-130)
po/be.po (+272/-268)
po/ca.po (+230/-242)
po/ca@valencia.po (+230/-242)
po/cs.po (+271/-243)
po/da.po (+136/-132)
po/de.po (+138/-134)
po/el.po (+124/-130)
po/es.po (+135/-131)
po/et.po (+28/-18)
po/eu.po (+289/-283)
po/fi.po (+276/-270)
po/ga.po (+796/-722)
po/gl.po (+236/-240)
po/gu.po (+6/-4)
po/he.po (+720/-604)
po/hi.po (+195/-155)
po/hu.po (+241/-245)
po/id.po (+135/-131)
po/it.po (+134/-131)
po/ja.po (+155/-156)
po/kn.po (+154/-193)
po/ko.po (+298/-288)
po/lt.po (+134/-131)
po/lv.po (+277/-308)
po/ml.po (+329/-550)
po/mr.po (+156/-194)
po/nb.po (+135/-131)
po/or.po (+6/-4)
po/pa.po (+136/-129)
po/pl.po (+227/-241)
po/pt.po (+274/-742)
po/pt_BR.po (+238/-242)
po/ru.po (+145/-134)
po/sk.po (+267/-446)
po/sl.po (+135/-132)
po/sr.po (+136/-132)
po/sr@latin.po (+136/-132)
po/ta.po (+7/-5)
po/te.po (+6/-4)
po/tg.po (+1187/-1030)
po/th.po (+235/-240)
po/tr.po (+403/-350)
po/uk.po (+271/-263)
po/zh_HK.po (+632/-582)
po/zh_TW.po (+634/-583)
python/Makefile.in (+52/-24)
python/packagekit/Makefile.in (+46/-17)
src/Makefile.am (+1/-3)
src/Makefile.in (+73/-49)
src/egg-console-kit.c (+0/-1)
src/egg-markdown.c (+0/-387)
src/egg-string.c (+0/-219)
src/egg-test.c (+0/-359)
src/egg-test.h (+0/-48)
src/gpk-animated-icon.c (+7/-7)
src/gpk-application.c (+15/-7)
src/gpk-common.c (+0/-159)
src/gpk-common.h (+0/-1)
src/gpk-dbus-service.c (+0/-2)
src/gpk-dbus-task.c (+4/-132)
src/gpk-dbus-task.h (+9/-0)
src/gpk-dbus.c (+0/-29)
src/gpk-desktop.c (+0/-1)
src/gpk-distro-upgrade.c (+0/-1)
src/gpk-enum.c (+0/-199)
src/gpk-enum.h (+0/-1)
src/gpk-error.c (+0/-27)
src/gpk-gnome.c (+0/-1)
src/gpk-install-catalog.c (+0/-1)
src/gpk-install-local-file.c (+15/-1)
src/gpk-install-mime-type.c (+0/-1)
src/gpk-install-package-name.c (+0/-1)
src/gpk-install-provide-file.c (+0/-1)
src/gpk-language.c (+0/-60)
src/gpk-log.c (+0/-1)
src/gpk-modal-dialog.c (+1/-137)
src/gpk-prefs.c (+0/-2)
src/gpk-self-test.c (+768/-29)
src/gpk-service-pack.c (+1/-3)
src/gpk-task.c (+0/-93)
src/gpk-task.h (+0/-1)
src/gpk-update-viewer.c (+11/-2)
Branch information
- Owner:
- Jackson Doak
- Status:
- Development
Recent revisions
- 20. By Jackson Doak
-
* 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 - 19. By Sebastian Heinlein
-
* Merge with Debian Unstable (LP: #1200303). Remaining change:
+ Replace build dependecy on gnome-doc-utils by yelp-tools
* Drop obsolete python-packagekit- gtk package
* 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 - 18. By Matthias Klumpp
-
* New upstream release: 3.8.2
* Build with logind support, if it is available
* Fix package transition in Experimental (Closes: #703480)
* Install new manual pages - 17. By Matthias Klumpp
-
Resolve conflict with old package versions
from Experimental (Closes: #703480) - 16. By Martin Pitt
-
Add polkit-gobject and libsystemd-login build dependencies to use logind
instead of ConsoleKit. - 14. By Jeremy Bícha
-
* New upstream release.
* debian/control:
- Build-depend on yelp-tools instead of gnome-doc-utils
* debian/gnome-packageki t-data. install:
- Update for new help location
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/trusty/gnome-packagekit