Merge lp://staging/~mh21/ubuntu/raring/indicator-multiload/upstream-0.3 into lp://staging/ubuntu/raring/indicator-multiload

Proposed by Michael Hofmann
Status: Merged
Merge reported by: Martin Pitt
Merged at revision: not available
Proposed branch: lp://staging/~mh21/ubuntu/raring/indicator-multiload/upstream-0.3
Merge into: lp://staging/ubuntu/raring/indicator-multiload
Diff against target: 89862 lines (+39534/-28799)
185 files modified
.pc/01-ensure_dirs_exist.patch/src/main.vala (+0/-319)
.pc/applied-patches (+0/-1)
Makefile.am (+18/-0)
Makefile.in (+93/-44)
README (+7/-0)
TODO (+9/-1)
aclocal.m4 (+132/-99)
config.guess (+146/-118)
config.sub (+134/-75)
configure (+234/-182)
configure.ac (+1/-2)
data/Makefile.in (+33/-21)
data/de.mh21.indicator.multiload.gschema.xml.in.in (+704/-51)
data/preferences.ui.in (+299/-72)
debian/changelog (+11/-0)
debian/compat (+1/-1)
debian/control (+1/-1)
debian/copyright (+2/-4)
debian/patches/01-ensure_dirs_exist.patch (+0/-29)
debian/patches/series (+0/-1)
debian/rules (+1/-1)
debian/watch (+1/-1)
depcomp (+66/-8)
install-sh (+18/-11)
missing (+4/-49)
po/LINGUAS (+1/-0)
po/Makefile.in.in (+9/-4)
po/POTFILES.in (+18/-8)
po/POTFILES.skip (+18/-8)
po/af.po (+189/-234)
po/am.po (+161/-207)
po/ar.po (+201/-245)
po/as.po (+198/-242)
po/ast.po (+210/-269)
po/az.po (+183/-230)
po/be.po (+200/-244)
po/bg.po (+208/-252)
po/bn.po (+228/-275)
po/br.po (+176/-226)
po/bs.po (+182/-228)
po/ca.po (+208/-260)
po/ca@valencia.po (+199/-252)
po/crh.po (+211/-279)
po/cs.po (+228/-267)
po/cy.po (+193/-238)
po/da.po (+230/-271)
po/de.po (+244/-270)
po/dz.po (+192/-243)
po/el.po (+214/-255)
po/en_CA.po (+193/-237)
po/en_GB.po (+213/-257)
po/eo.po (+196/-247)
po/es.po (+212/-261)
po/et.po (+201/-246)
po/eu.po (+199/-244)
po/fa.po (+196/-241)
po/fi.po (+217/-259)
po/fo.po (+386/-0)
po/fr.po (+222/-264)
po/ga.po (+185/-230)
po/gl.po (+205/-251)
po/gu.po (+198/-243)
po/he.po (+202/-247)
po/hi.po (+199/-244)
po/hr.po (+229/-280)
po/hu.po (+225/-270)
po/hy.po (+194/-247)
po/id.po (+198/-243)
po/is.po (+198/-253)
po/it.po (+229/-271)
po/ja.po (+210/-255)
po/ka.po (+192/-239)
po/kk.po (+162/-206)
po/kn.po (+198/-242)
po/ko.po (+199/-244)
po/ku.po (+197/-239)
po/ky.po (+145/-189)
po/lt.po (+226/-265)
po/lv.po (+200/-245)
po/mai.po (+194/-238)
po/mg.po (+192/-242)
po/mk.po (+195/-239)
po/ml.po (+200/-245)
po/mn.po (+181/-227)
po/mr.po (+199/-244)
po/ms.po (+217/-257)
po/nb.po (+197/-241)
po/ne.po (+193/-238)
po/nl.po (+224/-266)
po/nn.po (+199/-244)
po/oc.po (+197/-244)
po/or.po (+198/-242)
po/pa.po (+199/-244)
po/pl.po (+217/-255)
po/ps.po (+172/-217)
po/pt.po (+199/-248)
po/pt_BR.po (+225/-269)
po/ro.po (+201/-257)
po/ru.po (+232/-266)
po/rw.po (+153/-199)
po/si.po (+175/-219)
po/sk.po (+223/-262)
po/sl.po (+217/-259)
po/sq.po (+194/-238)
po/sr.po (+201/-248)
po/sr@latin.po (+200/-247)
po/sv.po (+204/-249)
po/ta.po (+199/-244)
po/te.po (+196/-247)
po/th.po (+202/-251)
po/tr.po (+197/-242)
po/ug.po (+198/-249)
po/uk.po (+223/-261)
po/vi.po (+195/-243)
po/wa.po (+167/-213)
po/xh.po (+194/-240)
po/zh_CN.po (+216/-261)
po/zh_HK.po (+203/-248)
po/zh_TW.po (+203/-248)
src/Makefile.am (+32/-14)
src/Makefile.in (+232/-120)
src/cpuicondata.c (+0/-341)
src/cpuicondata.vala (+0/-66)
src/cpuprovider.c (+415/-0)
src/cpuprovider.vala (+49/-0)
src/diskicondata.c (+0/-575)
src/diskicondata.vala (+0/-113)
src/diskprovider.c (+697/-0)
src/diskprovider.vala (+97/-0)
src/expressionparser.c (+2752/-0)
src/expressionparser.vala (+438/-0)
src/function.c (+792/-0)
src/function.vala (+91/-0)
src/graphmodel.c (+1183/-0)
src/graphmodel.vala (+111/-0)
src/graphmodels.c (+356/-0)
src/graphmodels.vala (+33/-0)
src/gsettings-fixed.vapi (+1/-1)
src/gtop.vapi (+3/-0)
src/icondata.c (+0/-667)
src/icondata.vala (+0/-97)
src/icontracedata.c (+0/-272)
src/icontracedata.vala (+0/-46)
src/indicator_multiload_vala.stamp (+1/-0)
src/itempreferences.c (+1089/-0)
src/itempreferences.vala (+258/-0)
src/loadicondata.c (+0/-187)
src/loadicondata.vala (+0/-38)
src/loadprovider.c (+197/-0)
src/loadprovider.vala (+32/-0)
src/main.c (+1648/-1015)
src/main.vala (+237/-163)
src/memicondata.c (+0/-213)
src/memicondata.vala (+0/-44)
src/memprovider.c (+268/-0)
src/memprovider.vala (+36/-0)
src/menumodel.c (+413/-0)
src/menumodel.vala (+47/-0)
src/multiloadindicator.c (+1658/-825)
src/multiloadindicator.vala (+191/-138)
src/neticondata.c (+0/-371)
src/neticondata.vala (+0/-71)
src/netprovider.c (+564/-0)
src/netprovider.vala (+82/-0)
src/preferences.c (+558/-0)
src/preferences.vala (+106/-0)
src/provider.c (+355/-0)
src/provider.vala (+34/-0)
src/providers.c (+765/-0)
src/providers.vala (+73/-0)
src/reaper.c (+406/-0)
src/reaper.vala (+46/-0)
src/settingscache.c (+350/-0)
src/settingscache.vala (+62/-0)
src/settingsconversion.c (+1001/-0)
src/settingsconversion.vala (+174/-0)
src/swapicondata.c (+0/-194)
src/swapicondata.vala (+0/-38)
src/swapprovider.c (+204/-0)
src/swapprovider.vala (+32/-0)
src/tracemodel.c (+524/-0)
src/tracemodel.vala (+46/-0)
src/utils.c (+502/-131)
src/utils.vala (+57/-10)
src/various.vapi (+3/-1)
To merge this branch: bzr merge lp://staging/~mh21/ubuntu/raring/indicator-multiload/upstream-0.3
Reviewer Review Type Date Requested Status
Martin Pitt Pending
Review via email: mp+148883@code.staging.launchpad.net

Description of the change

* New upstream release 0.3: fixes LP: #926399, #823141, #891428, #905854, #962646, #1015623.
* Small packaging changes

* Identical to PPA version at indicator-multiload/stable-daily with merged translations
* Tested to work on 11.10 oneiric i386, precise amd64 unity-2d, quantal amd64

To post a comment you must log in.
6. By Michael Hofmann

debian/copyright: Fix license text, copyright years, email.
really remove patch.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches