HomeBank

Merge lp://staging/~strugee/homebank/improve-appstream into lp://staging/~mdoyen/homebank/5.5.x

  1. improve-appstream
  2. Merge into 5.5.x
Proposed by AJ Jordan
Status: Needs review
Proposed branch: lp://staging/~strugee/homebank/improve-appstream
Merge into: lp://staging/~mdoyen/homebank/5.5.x
Diff against target: 17603 lines (+16780/-106) (has conflicts)
18 files modified
Makefile.in (+0/-12)
aclocal.m4 (+3/-0)
autom4te.cache/output.0 (+7261/-0)
autom4te.cache/output.1 (+7261/-0)
autom4te.cache/requests (+81/-0)
autom4te.cache/traces.0 (+654/-0)
autom4te.cache/traces.1 (+1387/-0)
config.h.in (+3/-9)
configure (+123/-0)
data/Makefile.in (+0/-12)
data/datas/Makefile.in (+0/-12)
data/homebank.appdata.xml.in (+3/-1)
debian/changelog (+4/-0)
images/Makefile.in (+0/-12)
mime/Makefile.in (+0/-12)
pixmaps/Makefile.in (+0/-12)
themes/Makefile.in (+0/-12)
themes/hicolor/Makefile.in (+0/-12)
Text conflict in aclocal.m4
Text conflict in config.h.in
Text conflict in configure
Conflict adding file data/datas/hb-categories-cy.csv.  Moved existing file to data/datas/hb-categories-cy.csv.moved.
Conflict adding file data/datas/hb-categories-fr_CA.csv.  Moved existing file to data/datas/hb-categories-fr_CA.csv.moved.
Conflict adding file data/datas/hb-categories-hu.csv.  Moved existing file to data/datas/hb-categories-hu.csv.moved.
Text conflict in debian/changelog
Conflict adding file images/homebank-icon.svg.  Moved existing file to images/homebank-icon.svg.moved.
Conflict adding file src/dsp-account.c.  Moved existing file to src/dsp-account.c.moved.
Conflict adding file src/dsp-account.h.  Moved existing file to src/dsp-account.h.moved.
Conflict adding file src/dsp-mainwindow.c.  Moved existing file to src/dsp-mainwindow.c.moved.
Conflict adding file src/dsp-mainwindow.h.  Moved existing file to src/dsp-mainwindow.h.moved.
Conflict adding file src/gtk-chart-progress.c.  Moved existing file to src/gtk-chart-progress.c.moved.
Conflict adding file src/gtk-chart-progress.h.  Moved existing file to src/gtk-chart-progress.h.moved.
Conflict adding file src/hb-currency.c.  Moved existing file to src/hb-currency.c.moved.
Conflict adding file src/hb-currency.h.  Moved existing file to src/hb-currency.h.moved.
Conflict adding file src/hb-group.c.  Moved existing file to src/hb-group.c.moved.
Conflict adding file src/hb-group.h.  Moved existing file to src/hb-group.h.moved.
Conflict adding file src/hub-account.c.  Moved existing file to src/hub-account.c.moved.
Conflict adding file src/hub-account.h.  Moved existing file to src/hub-account.h.moved.
Conflict adding file src/hub-scheduled.c.  Moved existing file to src/hub-scheduled.c.moved.
Conflict adding file src/hub-scheduled.h.  Moved existing file to src/hub-scheduled.h.moved.
Conflict adding file src/hub-spending.c.  Moved existing file to src/hub-spending.c.moved.
Conflict adding file src/hub-spending.h.  Moved existing file to src/hub-spending.h.moved.
Conflict adding file src/hub-transaction.c.  Moved existing file to src/hub-transaction.c.moved.
Conflict adding file src/hub-transaction.h.  Moved existing file to src/hub-transaction.h.moved.
Conflict adding file src/list-account.c.  Moved existing file to src/list-account.c.moved.
Conflict adding file src/list-account.h.  Moved existing file to src/list-account.h.moved.
Conflict adding file src/list-operation.c.  Moved existing file to src/list-operation.c.moved.
Conflict adding file src/list-operation.h.  Moved existing file to src/list-operation.h.moved.
Conflict adding file src/list-report.c.  Moved existing file to src/list-report.c.moved.
Conflict adding file src/list-report.h.  Moved existing file to src/list-report.h.moved.
Conflict adding file src/list-scheduled.c.  Moved existing file to src/list-scheduled.c.moved.
Conflict adding file src/list-scheduled.h.  Moved existing file to src/list-scheduled.h.moved.
Conflict adding file src/rep-balance.c.  Moved existing file to src/rep-balance.c.moved.
Conflict adding file src/rep-balance.h.  Moved existing file to src/rep-balance.h.moved.
Conflict adding file src/rep-budget.c.  Moved existing file to src/rep-budget.c.moved.
Conflict adding file src/rep-budget.h.  Moved existing file to src/rep-budget.h.moved.
Conflict adding file src/rep-stats.c.  Moved existing file to src/rep-stats.c.moved.
Conflict adding file src/rep-stats.h.  Moved existing file to src/rep-stats.h.moved.
Conflict adding file src/rep-time.c.  Moved existing file to src/rep-time.c.moved.
Conflict adding file src/rep-time.h.  Moved existing file to src/rep-time.h.moved.
Conflict adding file src/rep-vehicle.c.  Moved existing file to src/rep-vehicle.c.moved.
Conflict adding file src/rep-vehicle.h.  Moved existing file to src/rep-vehicle.h.moved.
Conflict adding file src/ui-budget-tabview.c.  Moved existing file to src/ui-budget-tabview.c.moved.
Conflict adding file src/ui-budget-tabview.h.  Moved existing file to src/ui-budget-tabview.h.moved.
Conflict adding file src/ui-currency.c.  Moved existing file to src/ui-currency.c.moved.
Conflict adding file src/ui-currency.h.  Moved existing file to src/ui-currency.h.moved.
Conflict adding file src/ui-group.c.  Moved existing file to src/ui-group.c.moved.
Conflict adding file src/ui-group.h.  Moved existing file to src/ui-group.h.moved.
Conflict adding file src/ui-tag.c.  Moved existing file to src/ui-tag.c.moved.
Conflict adding file src/ui-tag.h.  Moved existing file to src/ui-tag.h.moved.
Conflict adding file src/ui-txn-multi.c.  Moved existing file to src/ui-txn-multi.c.moved.
Conflict adding file src/ui-txn-multi.h.  Moved existing file to src/ui-txn-multi.h.moved.
Conflict adding file src/ui-widgets-data.c.  Moved existing file to src/ui-widgets-data.c.moved.
Conflict adding file themes/hicolor/hicolor_actions_16x16_hb-ope-future.png.  Moved existing file to themes/hicolor/hicolor_actions_16x16_hb-ope-future.png.moved.
Conflict adding file themes/hicolor/hicolor_actions_24x24_hb-currency.png.  Moved existing file to themes/hicolor/hicolor_actions_24x24_hb-currency.png.moved.
Conflict adding file themes/hicolor/hicolor_actions_24x24_hb-document-new.png.  Moved existing file to themes/hicolor/hicolor_actions_24x24_hb-document-new.png.moved.
Conflict adding file themes/hicolor/hicolor_actions_24x24_hb-document-open.png.  Moved existing file to themes/hicolor/hicolor_actions_24x24_hb-document-open.png.moved.
Conflict adding file themes/hicolor/hicolor_actions_24x24_hb-document-print.png.  Moved existing file to themes/hicolor/hicolor_actions_24x24_hb-document-print.png.moved.
Conflict adding file themes/hicolor/hicolor_actions_24x24_hb-document-save-as.png.  Moved existing file to themes/hicolor/hicolor_actions_24x24_hb-document-save-as.png.moved.
Conflict adding file themes/hicolor/hicolor_actions_24x24_hb-document-save.png.  Moved existing file to themes/hicolor/hicolor_actions_24x24_hb-document-save.png.moved.
Conflict adding file themes/hicolor/hicolor_actions_24x24_hb-donate.png.  Moved existing file to themes/hicolor/hicolor_actions_24x24_hb-donate.png.moved.
Conflict adding file themes/hicolor/hicolor_actions_24x24_hb-go-down.png.  Moved existing file to themes/hicolor/hicolor_actions_24x24_hb-go-down.png.moved.
Conflict adding file themes/hicolor/hicolor_actions_24x24_hb-go-up.png.  Moved existing file to themes/hicolor/hicolor_actions_24x24_hb-go-up.png.moved.
Conflict adding file themes/hicolor/hicolor_actions_24x24_hb-help.png.  Moved existing file to themes/hicolor/hicolor_actions_24x24_hb-help.png.moved.
Conflict adding file themes/hicolor/hicolor_actions_24x24_hb-ope-multiedit.png.  Moved existing file to themes/hicolor/hicolor_actions_24x24_hb-ope-multiedit.png.moved.
Conflict adding file themes/hicolor/hicolor_actions_24x24_hb-view-progress.png.  Moved existing file to themes/hicolor/hicolor_actions_24x24_hb-view-progress.png.moved.
Conflict adding file themes/hicolor/hicolor_actions_24x24_hb-view-refresh.png.  Moved existing file to themes/hicolor/hicolor_actions_24x24_hb-view-refresh.png.moved.
Conflict adding file themes/hicolor/hicolor_actions_24x24_hb-view-stack100.png.  Moved existing file to themes/hicolor/hicolor_actions_24x24_hb-view-stack100.png.moved.
Conflict adding file themes/hicolor/hicolor_actions_scalable_edit-split-symbolic.svg.  Moved existing file to themes/hicolor/hicolor_actions_scalable_edit-split-symbolic.svg.moved.
Conflict adding file themes/hicolor/hicolor_actions_scalable_list-collapse-all-symbolic.svg.  Moved existing file to themes/hicolor/hicolor_actions_scalable_list-collapse-all-symbolic.svg.moved.
Conflict adding file themes/hicolor/hicolor_actions_scalable_list-expand-all-symbolic.svg.  Moved existing file to themes/hicolor/hicolor_actions_scalable_list-expand-all-symbolic.svg.moved.
Conflict adding file themes/hicolor/hicolor_actions_scalable_list-merge-symbolic.svg.  Moved existing file to themes/hicolor/hicolor_actions_scalable_list-merge-symbolic.svg.moved.
Conflict adding file themes/hicolor/hicolor_actions_scalable_text-casesensitive-symbolic.svg.  Moved existing file to themes/hicolor/hicolor_actions_scalable_text-casesensitive-symbolic.svg.moved.
Conflict adding file themes/hicolor/hicolor_actions_scalable_text-regularexpression-symbolic.svg.  Moved existing file to themes/hicolor/hicolor_actions_scalable_text-regularexpression-symbolic.svg.moved.
Conflict adding file themes/hicolor/hicolor_status_16x16_hb-ope-auto.png.  Moved existing file to themes/hicolor/hicolor_status_16x16_hb-ope-auto.png.moved.
Conflict adding file themes/hicolor/hicolor_status_16x16_hb-ope-budget.png.  Moved existing file to themes/hicolor/hicolor_status_16x16_hb-ope-budget.png.moved.
Conflict adding file themes/hicolor/hicolor_status_16x16_hb-ope-cleared.png.  Moved existing file to themes/hicolor/hicolor_status_16x16_hb-ope-cleared.png.moved.
Conflict adding file themes/hicolor/hicolor_status_16x16_hb-ope-edit.png.  Moved existing file to themes/hicolor/hicolor_status_16x16_hb-ope-edit.png.moved.
Conflict adding file themes/hicolor/hicolor_status_16x16_hb-ope-forced.png.  Moved existing file to themes/hicolor/hicolor_status_16x16_hb-ope-forced.png.moved.
Conflict adding file themes/hicolor/hicolor_status_16x16_hb-ope-future.png.  Moved existing file to themes/hicolor/hicolor_status_16x16_hb-ope-future.png.moved.
Conflict adding file themes/hicolor/hicolor_status_16x16_hb-ope-new.png.  Moved existing file to themes/hicolor/hicolor_status_16x16_hb-ope-new.png.moved.
Conflict adding file themes/hicolor/hicolor_status_16x16_hb-ope-reconciled.png.  Moved existing file to themes/hicolor/hicolor_status_16x16_hb-ope-reconciled.png.moved.
Conflict adding file themes/hicolor/hicolor_status_16x16_hb-ope-remind.png.  Moved existing file to themes/hicolor/hicolor_status_16x16_hb-ope-remind.png.moved.
Conflict adding file themes/hicolor/hicolor_status_16x16_hb-ope-similar.png.  Moved existing file to themes/hicolor/hicolor_status_16x16_hb-ope-similar.png.moved.
Conflict adding file themes/hicolor/hicolor_status_16x16_hb-ope-void.png.  Moved existing file to themes/hicolor/hicolor_status_16x16_hb-ope-void.png.moved.
Conflict adding file themes/hicolor/hicolor_status_48x48_prf-backup.png.  Moved existing file to themes/hicolor/hicolor_status_48x48_prf-backup.png.moved.
Conflict adding file themes/hicolor/hicolor_status_48x48_prf-folder.png.  Moved existing file to themes/hicolor/hicolor_status_48x48_prf-folder.png.moved.
Conflict adding file themes/hicolor/hicolor_status_48x48_prf-locale.png.  Moved existing file to themes/hicolor/hicolor_status_48x48_prf-locale.png.moved.
To merge this branch: bzr merge lp://staging/~strugee/homebank/improve-appstream
Reviewer Review Type Date Requested Status
Maxime DOYEN Pending
Review via email: mp+412491@code.staging.launchpad.net

Description of the change

Details are in the commit message, but mostly this just fixes issues with the Appstream metadata. You can check this using `appstream-util validate data/homebank.appdata.xml.in`, although note that I did _not_ fix _all_ of the issues.

Also important to note: I set the metadata licensing (that is, the licensing for the Appstream metadata itself, desktop file, etc.) to the FSF All Permissive license because https://www.freedesktop.org/software/appstream/docs/chap-Quickstart.html#qsr-app-contents recommended it. Happy to change to something else if you're not willing to license that way (assuming you're the author of this metadata file; I actually didn't check).

To post a comment you must log in.
Revision history for this message
AJ Jordan (strugee) wrote :

I should also note that this is my first time ever contributing to something using Launchpad or bzr, so let me know if I've done something wrong!

Reply

Unmerged revisions

71. By AJ Jordan

Fix (some) Appdata validation errors

In particular, this *should* fix GNOME Software thinking HomeBank is
proprietary, though I haven't tested it.

70. By Maxime DOYEN

5.5.3 release

69. By Maxime DOYEN

5.5.2 release

68. By Maxime DOYEN

5.5 release

67. By Maxime DOYEN

5.4.3 release

66. By Maxime DOYEN

5.4.2 release

65. By Maxime DOYEN

5.3.2 release

64. By Maxime DOYEN

5.3.1 release

63. By Maxime DOYEN

5.3 release

62. By Maxime DOYEN

5.2.8 release

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