Merge lp://staging/~noskcaj/ubuntu/saucy/xfce4-indicator-plugin/1.0.0-1 into lp://staging/ubuntu/saucy/xfce4-indicator-plugin
Proposed by
Jackson Doak
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~noskcaj/ubuntu/saucy/xfce4-indicator-plugin/1.0.0-1 |
| Merge into: | lp://staging/ubuntu/saucy/xfce4-indicator-plugin |
| Diff against target: |
15385 lines (+7867/-2709) 60 files modified
.pc/applied-patches (+0/-1) .pc/migrate-xfcerc-xfconf.patch/panel-plugin/indicator.c (+0/-413) ChangeLog (+76/-1) INSTALL (+7/-2) Makefile.am (+3/-0) Makefile.in (+92/-32) aclocal.m4 (+427/-157) config.guess (+147/-118) config.h.in (+1/-1) config.sub (+145/-68) configure (+677/-317) configure.ac (+131/-0) configure.in (+0/-123) debian/changelog (+24/-0) debian/control (+2/-1) debian/patches/series (+1/-1) debian/rules (+11/-1) depcomp (+134/-56) icons/48x48/Makefile.in (+63/-12) icons/Makefile.in (+56/-15) icons/scalable/Makefile.in (+63/-12) install-sh (+18/-11) ltmain.sh (+74/-49) missing (+4/-49) panel-plugin/Makefile.am (+45/-23) panel-plugin/Makefile.in (+256/-181) panel-plugin/indicator-box.c (+321/-315) panel-plugin/indicator-box.h (+11/-29) panel-plugin/indicator-button.c (+352/-143) panel-plugin/indicator-button.h (+44/-56) panel-plugin/indicator-config.c (+781/-0) panel-plugin/indicator-config.h (+103/-0) panel-plugin/indicator-dialog.c (+602/-0) panel-plugin/indicator-dialog.glade (+442/-0) panel-plugin/indicator-dialog.h (+44/-0) panel-plugin/indicator-dialog_ui.h (+219/-0) panel-plugin/indicator.c (+271/-309) panel-plugin/indicator.desktop.in (+8/-0) panel-plugin/indicator.desktop.in.in (+0/-8) panel-plugin/indicator.h (+23/-21) po/Makefile.in.in (+9/-4) po/POTFILES.in (+6/-1) po/de.po (+139/-9) po/es.po (+142/-14) po/fr.po (+137/-16) po/gl.po (+35/-0) po/hr.po (+120/-12) po/hu.po (+122/-11) po/it.po (+125/-10) po/ja.po (+145/-0) po/ko.po (+128/-16) po/nl.po (+141/-7) po/pl.po (+133/-11) po/pt.po (+117/-9) po/pt_BR.po (+130/-11) po/ro.po (+151/-20) po/ru.po (+145/-19) po/sr.po (+141/-0) po/ug.po (+7/-7) po/uk.po (+116/-7) |
| To merge this branch: | bzr merge lp://staging/~noskcaj/ubuntu/saucy/xfce4-indicator-plugin/1.0.0-1 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Micah Gersten | Needs Fixing | ||
|
Review via email:
|
|||
Description of the change
Merged from debian unstable
To post a comment you must log in.
Revision history for this message
| Jackson Doak (noskcaj) wrote | # |
Unmerged revisions
- 28. By Jackson Doak
-
* Merge from Debian unstable. Remaining changes:
- debian/control: Drop recommends on indicator-messages- gtk2, as it
was removed from the archive.
* Drop debian/patches/ migrate- xfcerc- xfconf. patch, it no longer applies.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
You can't just drop a patch because it doesn't apply. Last time I checked, this patch wasn't included upstream yet, so it needs to be rebased.