Merge lp://staging/ubuntu/trusty-proposed/software-properties into lp://staging/ubuntu/trusty/software-properties
Proposed by
violethaze74@jazzededtech.com
Status: | Merged | ||||||||||||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Merge reported by: | violethaze74@jazzededtech.com | ||||||||||||||||||||||||||||||||||||
Merged at revision: | not available | ||||||||||||||||||||||||||||||||||||
Proposed branch: | lp://staging/ubuntu/trusty-proposed/software-properties | ||||||||||||||||||||||||||||||||||||
Merge into: | lp://staging/ubuntu/trusty/software-properties | ||||||||||||||||||||||||||||||||||||
Diff against target: |
111882 lines (+1/-110991) 168 files modified
.bzr-builddeb/default.conf (+0/-2) AUTHORS (+0/-19) BUGS (+0/-1) COPYING (+0/-340) ChangeLog (+0/-62) KDE-BUGS-TODO (+0/-64) LGPL (+0/-510) README (+0/-8) THIS_REPOSITORY_HAS_BEEN_MOVED_TO_GIT (+1/-0) TODO (+0/-2) add-apt-repository (+0/-170) data/com.ubuntu.SoftwareProperties.conf (+0/-20) data/com.ubuntu.SoftwareProperties.service (+0/-4) data/com.ubuntu.softwareproperties.policy.in (+0/-33) data/designer/dialog_add.ui (+0/-79) data/designer/dialog_edit.ui (+0/-122) data/designer/dialog_mirror.ui (+0/-176) data/designer/main.ui (+0/-499) data/gtkbuilder/dialog-add-sources-list.ui (+0/-142) data/gtkbuilder/dialog-add.ui (+0/-193) data/gtkbuilder/dialog-cache-outofdate.ui (+0/-145) data/gtkbuilder/dialog-cdrom-progress.ui (+0/-83) data/gtkbuilder/dialog-edit-source.ui (+0/-251) data/gtkbuilder/dialog-mirror.ui (+0/-335) data/gtkbuilder/main.ui (+0/-1125) data/icons/scalable/apps/disable-device.svg (+0/-150) data/icons/scalable/apps/other-driver.svg (+0/-375) data/icons/scalable/apps/recommended-driver.svg (+0/-143) data/icons/scalable/apps/software-properties.svg (+0/-412) data/mime/apt.xml.in (+0/-8) data/software-properties-drivers.desktop.in (+0/-12) data/software-properties-gnome.desktop.in (+0/-15) data/software-properties-gtk.desktop.in (+0/-17) data/software-properties-kde.desktop.in (+0/-14) debian/changelog (+0/-2492) debian/compat (+0/-1) debian/control (+0/-83) debian/copyright (+0/-25) debian/docs (+0/-3) debian/manpages/add-apt-repository.1 (+0/-63) debian/manpages/software-properties-gtk.1 (+0/-32) debian/manpages/software-properties-kde.1 (+0/-153) debian/python-software-properties.install (+0/-1) debian/python3-software-properties.install (+0/-1) debian/rules (+0/-30) debian/software-properties-common.install (+0/-7) debian/software-properties-common.links (+0/-2) debian/software-properties-common.manpages (+0/-1) debian/software-properties-gtk.install (+0/-9) debian/software-properties-gtk.manpages (+0/-1) debian/software-properties-kde.install (+0/-4) debian/software-properties-kde.manpages (+0/-1) debian/source/format (+0/-1) debian/tests/control (+0/-2) debian/tests/run-tests (+0/-26) po/ChangeLog (+0/-196) po/POTFILES.in (+0/-41) po/am.po (+0/-553) po/ar.po (+0/-896) po/be.po (+0/-808) po/bg.po (+0/-1875) po/bn.po (+0/-1327) po/br.po (+0/-557) po/ca.po (+0/-1832) po/cs.po (+0/-1756) po/csb.po (+0/-727) po/da.po (+0/-1754) po/de.po (+0/-2079) po/el.po (+0/-1854) po/en_AU.po (+0/-1696) po/en_CA.po (+0/-1183) po/en_GB.po (+0/-1948) po/eo.po (+0/-765) po/es.po (+0/-2029) po/et.po (+0/-624) po/eu.po (+0/-593) po/fa.po (+0/-537) po/fi.po (+0/-2061) po/fr.po (+0/-2031) po/fur.po (+0/-551) po/gl.po (+0/-1983) po/he.po (+0/-1701) po/hi.po (+0/-554) po/hr.po (+0/-1749) po/hu.po (+0/-1763) po/id.po (+0/-1632) po/it.po (+0/-2105) po/ja.po (+0/-2061) po/ka.po (+0/-1735) po/ko.po (+0/-1567) po/ku.po (+0/-1633) po/lt.po (+0/-1635) po/lv.po (+0/-616) po/mk.po (+0/-1651) po/mr.po (+0/-537) po/ms.po (+0/-834) po/nb.po (+0/-1990) po/ne.po (+0/-1184) po/nl.po (+0/-1781) po/nn.po (+0/-669) po/no.po (+0/-1244) po/oc.po (+0/-1047) po/pa.po (+0/-693) po/pl.po (+0/-2257) po/ps.po (+0/-536) po/pt.po (+0/-1849) po/pt_BR.po (+0/-1809) po/qu.po (+0/-537) po/ro.po (+0/-1702) po/ru.po (+0/-1792) po/rw.po (+0/-1117) po/sk.po (+0/-1999) po/sl.po (+0/-787) po/software-properties.pot (+0/-740) po/sq.po (+0/-646) po/sr.po (+0/-633) po/sv.po (+0/-4068) po/ta.po (+0/-594) po/th.po (+0/-1706) po/tl.po (+0/-1069) po/tr.po (+0/-1594) po/uk.po (+0/-1153) po/ur.po (+0/-555) po/urd.po (+0/-552) po/vi.po (+0/-1191) po/xh.po (+0/-659) po/zh_CN.po (+0/-1770) po/zh_HK.po (+0/-1058) po/zh_TW.po (+0/-568) setup.cfg (+0/-20) setup.py (+0/-27) software-properties-dbus (+0/-60) software-properties-gtk (+0/-103) software-properties-kde (+0/-138) softwareproperties/AptAuth.py (+0/-101) softwareproperties/CountryInformation.py (+0/-60) softwareproperties/MirrorTest.py (+0/-189) softwareproperties/SoftwareProperties.py (+0/-847) softwareproperties/__init__.py (+0/-39) softwareproperties/cloudarchive.py (+0/-123) softwareproperties/dbus/SoftwarePropertiesDBus.py (+0/-363) softwareproperties/distro.py (+0/-46) softwareproperties/gtk/CdromProgress.py (+0/-76) softwareproperties/gtk/DialogAdd.py (+0/-87) softwareproperties/gtk/DialogAddSourcesList.py (+0/-125) softwareproperties/gtk/DialogCacheOutdated.py (+0/-82) softwareproperties/gtk/DialogEdit.py (+0/-128) softwareproperties/gtk/DialogMirror.py (+0/-348) softwareproperties/gtk/SimpleGtkbuilderApp.py (+0/-70) softwareproperties/gtk/SoftwarePropertiesGtk.py (+0/-1404) softwareproperties/gtk/dialogs.py (+0/-33) softwareproperties/gtk/utils.py (+0/-36) softwareproperties/kde/CdromProgress.py (+0/-63) softwareproperties/kde/DialogAdd.py (+0/-85) softwareproperties/kde/DialogEdit.py (+0/-131) softwareproperties/kde/DialogMirror.py (+0/-243) softwareproperties/kde/I18nHelper.py (+0/-83) softwareproperties/kde/SoftwarePropertiesKDE.py (+0/-758) softwareproperties/kde/__init__.py (+0/-1) softwareproperties/ppa.py (+0/-382) softwareproperties/shortcuts.py (+0/-57) tests/aptroot/etc/popularity-contest.conf (+0/-14) tests/data/sources.list (+0/-6) tests/data/sources.list.testDistribution (+0/-11) tests/data/testkey.gpg (+0/-29) tests/test_aptsources.py (+0/-134) tests/test_dbus.py (+0/-338) tests/test_lp.py (+0/-104) |
||||||||||||||||||||||||||||||||||||
To merge this branch: | bzr merge lp://staging/ubuntu/trusty-proposed/software-properties | ||||||||||||||||||||||||||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
violethaze74@jazzededtech.com | Pending | ||
Review via email: mp+414233@code.staging.launchpad.net |
To post a comment you must log in.