Merge lp://staging/~cbrunet/homebank/homebank into lp://staging/homebank/trunk
Proposed by
Charles Brunet
Status: | Merged |
---|---|
Merged at revision: | 12 |
Proposed branch: | lp://staging/~cbrunet/homebank/homebank |
Merge into: | lp://staging/homebank/trunk |
Diff against target: |
250775 lines (+249081/-0) (has conflicts) 261 files modified
AUTHORS (+5/-0) COPYING (+340/-0) ChangeLog (+564/-0) INSTALL (+182/-0) Makefile.am (+20/-0) Makefile.in (+774/-0) NEWS (+5/-0) README (+13/-0) aclocal.m4 (+1828/-0) config.guess (+1497/-0) config.h.in (+125/-0) config.sub (+1608/-0) configure (+7721/-0) configure.ac (+122/-0) data/Makefile.am (+15/-0) data/Makefile.in (+645/-0) data/datas/Makefile.am (+14/-0) data/datas/Makefile.in (+445/-0) data/datas/example.xhb (+172/-0) data/datas/hb-categories-de.csv (+126/-0) data/datas/hb-categories-en.csv (+126/-0) data/datas/hb-categories-es.csv (+127/-0) data/datas/hb-categories-fr.csv (+138/-0) data/datas/hb-categories-it.csv (+126/-0) data/datas/hb-categories-pt.csv (+126/-0) data/datas/hb-categories-ro.csv (+126/-0) data/datas/hb-categories-ru.csv (+126/-0) data/datas/hb-categories-sk.csv (+118/-0) data/homebank.desktop.in (+10/-0) data/homebank.desktop.in.in (+10/-0) data/icons/Makefile.am (+175/-0) data/icons/Makefile.in (+549/-0) data/icons/hicolor_apps_scalable_homebank.svg (+841/-0) debian/changelog (+5/-0) debian/compat (+1/-0) debian/control (+24/-0) debian/copyright (+25/-0) debian/docs (+2/-0) debian/homebank-data.install (+3/-0) debian/homebank.1 (+60/-0) debian/homebank.install (+7/-0) debian/homebank.manpages (+1/-0) debian/rules (+13/-0) debian/source/format (+1/-0) depcomp (+530/-0) doc/00-intro.html (+82/-0) doc/00-lexicon.html (+291/-0) doc/00-whatsnew.html (+132/-0) doc/Makefile.am (+41/-0) doc/Makefile.in (+670/-0) doc/TODO (+48/-0) doc/dlg-acco.html (+159/-0) doc/dlg-arch.html (+112/-0) doc/dlg-assi.html (+96/-0) doc/dlg-bud1.html (+94/-0) doc/dlg-cate.html (+106/-0) doc/dlg-filt.html (+276/-0) doc/dlg-paye.html (+88/-0) doc/dlg-pref.html (+484/-0) doc/dlg-spli.html (+109/-0) doc/dlg-tran.html (+174/-0) doc/dlg-wall.html (+89/-0) doc/frm-main.html (+23/-0) doc/frm-navig.html (+82/-0) doc/help.css (+126/-0) doc/images/Makefile.am (+82/-0) doc/images/Makefile.in (+510/-0) doc/index.html (+19/-0) doc/misc-balance.html (+62/-0) doc/misc-csvformat.html (+217/-0) doc/misc-minor.html (+49/-0) doc/misc-reconcile.html (+50/-0) doc/use-auto_addition.html (+105/-0) doc/use-auto_assign.html (+78/-0) doc/use-budget.html (+96/-0) doc/use-import.html (+171/-0) doc/use-tipsandtricks.html (+114/-0) doc/use-vehiclecost.html (+106/-0) doc/win-account.html (+118/-0) doc/win-balance.html (+115/-0) doc/win-budget.html (+112/-0) doc/win-main.html (+103/-0) doc/win-statistics.html (+154/-0) doc/win-trendtime.html (+158/-0) doc/win-vehiclecost.html (+125/-0) images/Makefile.am (+8/-0) images/Makefile.in (+436/-0) install-sh (+269/-0) mime/Makefile.am (+34/-0) mime/Makefile.in (+507/-0) mime/homebank.applications (+7/-0) mime/homebank.keys (+9/-0) mime/homebank.mime (+2/-0) mime/homebank.xml (+12/-0) missing (+198/-0) mkinstalldirs (+40/-0) po/Makefile.in.in (+222/-0) po/POTFILES.in (+34/-0) po/POTFILES.skip (+4/-0) po/am.po (+2618/-0) po/ar.po (+2625/-0) po/ast.po (+2641/-0) po/be.po (+2647/-0) po/bg.po (+2649/-0) po/br.po (+2618/-0) po/bs.po (+2618/-0) po/ca.po (+2701/-0) po/cs.po (+2654/-0) po/da.po (+2640/-0) po/de.po (+2660/-0) po/el.po (+2658/-0) po/en_AU.po (+2694/-0) po/en_CA.po (+2649/-0) po/en_GB.po (+2694/-0) po/es.po (+2698/-0) po/et.po (+2629/-0) po/eu.po (+2654/-0) po/fa.po (+2638/-0) po/fi.po (+2648/-0) po/fr.po (+2886/-0) po/gl.po (+2655/-0) po/he.po (+2637/-0) po/homebank.pot (+2617/-0) po/hr.po (+2639/-0) po/ht.po (+2621/-0) po/hu.po (+2657/-0) po/id.po (+2648/-0) po/is.po (+2654/-0) po/it.po (+2698/-0) po/ja.po (+2640/-0) po/ka.po (+2623/-0) po/kk.po (+2618/-0) po/kn.po (+2618/-0) po/ko.po (+2618/-0) po/lt.po (+2643/-0) po/lv.po (+2652/-0) po/mi.po (+2618/-0) po/ml.po (+2630/-0) po/ms.po (+2656/-0) po/nb.po (+2638/-0) po/nds.po (+2654/-0) po/nl.po (+2655/-0) po/oc.po (+2628/-0) po/pl.po (+2652/-0) po/pt.po (+2660/-0) po/pt_BR.po (+2659/-0) po/pt_PT.po (+2620/-0) po/ro.po (+2651/-0) po/ru.po (+2656/-0) po/sk.po (+2645/-0) po/sl.po (+2704/-0) po/sn.po (+2618/-0) po/sr.po (+2696/-0) po/sv.po (+2651/-0) po/ta.po (+2618/-0) po/th.po (+2620/-0) po/tr.po (+2644/-0) po/uk.po (+2651/-0) po/ur.po (+2618/-0) po/uz.po (+2618/-0) po/vi.po (+2648/-0) po/zh_CN.po (+2640/-0) po/zh_HK.po (+2618/-0) po/zh_TW.po (+2646/-0) src/Makefile.am (+118/-0) src/Makefile.in (+687/-0) src/dsp_account.c (+1877/-0) src/dsp_account.h (+90/-0) src/dsp_mainwindow.c (+2579/-0) src/dsp_mainwindow.h (+78/-0) src/enums.h (+143/-0) src/gtk-chart-colors.c (+293/-0) src/gtk-chart-colors.h (+90/-0) src/gtk-chart.c (+2229/-0) src/gtk-chart.h (+202/-0) src/gtk-dateentry.c (+879/-0) src/gtk-dateentry.h (+87/-0) src/hb-account.c (+585/-0) src/hb-account.h (+114/-0) src/hb-archive.c (+172/-0) src/hb-archive.h (+54/-0) src/hb-assign.c (+266/-0) src/hb-assign.h (+56/-0) src/hb-category.c (+1039/-0) src/hb-category.h (+77/-0) src/hb-encoding.c (+337/-0) src/hb-encoding.h (+123/-0) src/hb-export.c (+36/-0) src/hb-export.h (+28/-0) src/hb-filter.c (+474/-0) src/hb-filter.h (+98/-0) src/hb-hbfile.c (+518/-0) src/hb-hbfile.h (+37/-0) src/hb-import.c (+36/-0) src/hb-import.h (+28/-0) src/hb-misc.c (+871/-0) src/hb-misc.h (+56/-0) src/hb-payee.c (+572/-0) src/hb-payee.h (+63/-0) src/hb-preferences.c (+934/-0) src/hb-preferences.h (+170/-0) src/hb-report.c (+68/-0) src/hb-report.h (+43/-0) src/hb-tag.c (+298/-0) src/hb-tag.h (+52/-0) src/hb-transaction.c (+1030/-0) src/hb-transaction.h (+121/-0) src/hb-xml.c (+1138/-0) src/hb-xml.h (+36/-0) src/homebank.c (+1318/-0) src/homebank.h (+250/-0) src/imp_qif.c (+989/-0) src/imp_qif.h (+80/-0) src/import.c (+2642/-0) src/import.h (+142/-0) src/language.c (+740/-0) src/language.h (+27/-0) src/list_account.c (+405/-0) src/list_account.h (+49/-0) src/list_operation.c (+978/-0) src/list_operation.h (+34/-0) src/list_topspending.c (+61/-0) src/list_topspending.h (+39/-0) src/list_upcoming.c (+310/-0) src/list_upcoming.h (+37/-0) src/rep_balance.c (+1320/-0) src/rep_balance.h (+29/-0) src/rep_budget.c (+1526/-0) src/rep_budget.h (+26/-0) src/rep_stats.c (+2033/-0) src/rep_stats.h (+26/-0) src/rep_time.c (+1826/-0) src/rep_time.h (+26/-0) src/rep_vehicle.c (+1044/-0) src/rep_vehicle.h (+25/-0) src/ui-account.c (+1318/-0) src/ui-account.h (+123/-0) src/ui-archive.c (+1050/-0) src/ui-archive.h (+27/-0) src/ui-assign.c (+773/-0) src/ui-assign.h (+83/-0) src/ui-assist-start.c (+462/-0) src/ui-assist-start.h (+49/-0) src/ui-budget.c (+1024/-0) src/ui-budget.h (+64/-0) src/ui-category.c (+1636/-0) src/ui-category.h (+85/-0) src/ui-dialogs.c (+541/-0) src/ui-dialogs.h (+42/-0) src/ui-filter.c (+1455/-0) src/ui-filter.h (+69/-0) src/ui-hbfile.c (+282/-0) src/ui-hbfile.h (+37/-0) src/ui-payee.c (+1061/-0) src/ui-payee.h (+73/-0) src/ui-pref.c (+2193/-0) src/ui-pref.h (+120/-0) src/ui-transaction.c (+1336/-0) src/ui-transaction.h (+98/-0) src/ui-widgets.c (+884/-0) src/ui-widgets.h (+64/-0) Conflict adding file AUTHORS. Moved existing file to AUTHORS.moved. Conflict adding file COPYING. Moved existing file to COPYING.moved. Conflict adding file ChangeLog. Moved existing file to ChangeLog.moved. Conflict adding file INSTALL. Moved existing file to INSTALL.moved. Conflict adding file Makefile.am. Moved existing file to Makefile.am.moved. Conflict adding file Makefile.in. Moved existing file to Makefile.in.moved. Conflict adding file NEWS. Moved existing file to NEWS.moved. Conflict adding file README. Moved existing file to README.moved. Conflict adding file aclocal.m4. Moved existing file to aclocal.m4.moved. Conflict adding file config.guess. Moved existing file to config.guess.moved. Conflict adding file config.h.in. Moved existing file to config.h.in.moved. Conflict adding file config.sub. Moved existing file to config.sub.moved. Conflict adding file configure.ac. Moved existing file to configure.ac.moved. Conflict adding file configure. Moved existing file to configure.moved. Conflict adding file data. Moved existing file to data.moved. Conflict adding file depcomp. Moved existing file to depcomp.moved. Conflict adding file doc. Moved existing file to doc.moved. Conflict adding file images. Moved existing file to images.moved. Conflict adding file install-sh. Moved existing file to install-sh.moved. Conflict adding file mime. Moved existing file to mime.moved. Conflict adding file missing. Moved existing file to missing.moved. Conflict adding file mkinstalldirs. Moved existing file to mkinstalldirs.moved. Conflict adding file po. Moved existing file to po.moved. Conflict adding file src. Moved existing file to src.moved. |
To merge this branch: | bzr merge lp://staging/~cbrunet/homebank/homebank |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Maxime DOYEN | Pending | ||
Review via email: mp+150475@code.staging.launchpad.net |
Description of the change
Here is a try to provide required files for building a .deb archive. Please feel free to review to proposed files. More instructions about the process can be found on http://
To post a comment you must log in.