diff -u gnucash-2.0.1/debian/changelog gnucash-2.0.1/debian/changelog --- gnucash-2.0.1/debian/changelog +++ gnucash-2.0.1/debian/changelog @@ -1,3 +1,10 @@ +gnucash (2.0.1-3ubuntu2) edgy; urgency=low + + * Fix crash by not building gtktreedatalist and gnctreemodelsort + (Closes: Malone #55462) + + -- Scott Henson Sat, 16 Sep 2006 20:11:18 -0400 + gnucash (2.0.1-3ubuntu1) edgy; urgency=low * Merge from Debian unstable. Remaining changes: only in patch2: unchanged: --- gnucash-2.0.1.orig/po/POTFILES.skip +++ gnucash-2.0.1/po/POTFILES.skip @@ -4,6 +4,8 @@ src/import-export/csv/gnc-csv2glist.c src/business/business-core/gncBusPeriod.c src/backend/dwi/qofmap.c +src/gnome-utils/gnctreemodelsort.c +src/gnome-utils/gtktreedatalist.c src/gnome-utils/gnc-tree-model-selection.c src/backend/file/gncmod-backend-file.c src/backend/file/io-gncbin-r.c only in patch2: unchanged: --- gnucash-2.0.1.orig/ChangeLog +++ gnucash-2.0.1/ChangeLog @@ -1,3 +1,10 @@ +2006-08-22 Chris Shoemaker + + Drop gtktreedatalist (and gnctreemodelsort) from the build because it can + conflict with the real gtk+ version of the same file, depending on the + linking order of libgncmod-gnome-utils.so and the gtk+ libraries. + + 2006-07-30 Chris Lyttle * NEWS: Added some text about the release. only in patch2: unchanged: --- gnucash-2.0.1.orig/src/gnome-utils/Makefile.am +++ gnucash-2.0.1/src/gnome-utils/Makefile.am @@ -30,8 +30,6 @@ ${GSF_CFLAGS} libgncmod_gnome_utils_la_SOURCES = \ - gtktreedatalist.c \ - gnctreemodelsort.c \ QuickFill.c \ account-quickfill.c \ cursors.c \ @@ -101,8 +99,6 @@ gncincludedir = ${GNC_INCLUDE_DIR} gncinclude_HEADERS = \ - gtktreedatalist.h \ - gnctreemodelsort.h \ QuickFill.h \ account-quickfill.h \ dialog-account.h \