[Pkg-crosswire-commits] [bibletime] 02/06: Imported Debian patch 2.10.1-1
Roberto C. Sanchez
roberto at moszumanska.debian.org
Wed Oct 22 03:41:33 UTC 2014
This is an automated email from the git hooks/post-receive script.
roberto pushed a commit to branch master
in repository bibletime.
commit c04698777033d5a61b2609a45c07d3c139750604
Merge: d40aeea 1ea03c0
Author: David Sanders <david at sandersweb.net>
Date: Thu Oct 9 12:41:00 2014 +0400
Imported Debian patch 2.10.1-1
.gitattributes | 7 -
.gitignore | 24 -
CMakeLists.txt | 469 +-
ChangeLog | 78 +-
README | 6 +-
archive.sh | 14 +-
cmake/BTBinaryPackageMacOS.cmake | 49 +-
cmake/BTBinaryPackageWindows.cmake | 112 +-
cmake/BTDeveloper.cmake | 16 -
cmake/BTDocumentation.cmake | 6 +-
cmake/BTSourceFileList.cmake | 227 +-
cmake/BTUITranslation.cmake | 41 +-
cmake/FindCLucene.cmake | 176 +-
cmake/FindGit.cmake | 70 -
cmake/FindICU.cmake | 51 -
cmake/FindSword.cmake | 259 +-
...hDebug.cmake => KDE4FindLibraryWithDebug.cmake} | 0
cmake/platforms/linux/bibletime.desktop.cmake | 16 +-
cmake/platforms/macos/Info.plist | 16 +
cmake/platforms/macos/bt_start.sh | 21 -
cmake/platforms/windows/qt.conf | 2 +
cmake/platforms/windows/rawfiles.cpp | 228 +-
cmake/platforms/windows/rawfiles.h | 94 +-
cmake/sword_linker_check.cpp | 27 -
...version_compare.cpp => sword_version_print.cpp} | 13 +-
debian/changelog | 6 +
debian/control | 3 +-
debian/patches/find-clucene-config.h.diff | 13 -
debian/patches/gcc4.7-ftbfs.patch | 14 -
debian/patches/libsword-1.7.patch | 74 -
debian/patches/series | 3 -
debian/rules | 6 +-
debian/watch | 2 +-
docs/development/ksgmltools-bug-read-me.txt | 2 +-
docs/development/packaging-howto.txt | 58 +-
docs/development/trinitarian.formula.sh | 50 +
docs/handbook/ar/docbook/index.docbook | 17 +-
docs/handbook/ar/html/index.html | 11 +-
docs/handbook/cs/docbook/index.docbook | 9 +-
docs/handbook/cs/html/index.html | 5 +-
docs/handbook/cs/pdf/handbook.pdf | Bin 384549 -> 384549 bytes
docs/handbook/de/docbook/index.docbook | 18 +-
docs/handbook/de/html/index.html | 14 +-
docs/handbook/de/pdf/handbook.pdf | Bin 388356 -> 388311 bytes
docs/handbook/en/docbook/index.docbook | 8 +-
docs/handbook/en/html/i_back.png | Bin 1502 -> 1427 bytes
docs/handbook/en/html/i_bible.png | Bin 1547 -> 1496 bytes
docs/handbook/en/html/i_bible_add.png | Bin 1662 -> 1611 bytes
docs/handbook/en/html/i_bibletime.png | Bin 1571 -> 1536 bytes
docs/handbook/en/html/i_book.png | Bin 1528 -> 1482 bytes
docs/handbook/en/html/i_book_add.png | Bin 1641 -> 1590 bytes
docs/handbook/en/html/i_bookmark.png | Bin 1442 -> 1404 bytes
docs/handbook/en/html/i_books.png | Bin 1477 -> 1427 bytes
docs/handbook/en/html/i_cascade.png | Bin 1516 -> 1382 bytes
docs/handbook/en/html/i_checkbox.png | Bin 1462 -> 1403 bytes
docs/handbook/en/html/i_commentary.png | Bin 1552 -> 1507 bytes
docs/handbook/en/html/i_commentary_add.png | Bin 1647 -> 1603 bytes
docs/handbook/en/html/i_configure.png | Bin 1302 -> 1255 bytes
docs/handbook/en/html/i_configuresword.png | Bin 1524 -> 1475 bytes
docs/handbook/en/html/i_contents2.png | Bin 1437 -> 1382 bytes
docs/handbook/en/html/i_displayconfig.png | Bin 1578 -> 1531 bytes
docs/handbook/en/html/i_document_magnifier.png | Bin 1523 -> 1469 bytes
docs/handbook/en/html/i_exit.png | Bin 1505 -> 1422 bytes
docs/handbook/en/html/i_fileclose.png | Bin 945 -> 861 bytes
docs/handbook/en/html/i_find.png | Bin 1380 -> 1350 bytes
docs/handbook/en/html/i_forward.png | Bin 1530 -> 1459 bytes
docs/handbook/en/html/i_lexicon.png | Bin 1568 -> 1511 bytes
docs/handbook/en/html/i_lexicon_add.png | Bin 1666 -> 1611 bytes
docs/handbook/en/html/i_light_bulb.png | Bin 1328 -> 1292 bytes
docs/handbook/en/html/i_sync.png | Bin 1662 -> 1610 bytes
docs/handbook/en/html/i_tile.png | Bin 1515 -> 1432 bytes
docs/handbook/en/html/i_tile_horiz.png | Bin 484 -> 415 bytes
docs/handbook/en/html/i_tile_vert.png | Bin 477 -> 409 bytes
docs/handbook/en/html/i_view_index.png | Bin 380 -> 313 bytes
docs/handbook/en/html/i_window_fullscreen.png | Bin 968 -> 889 bytes
docs/handbook/en/html/index.html | 4 +-
docs/handbook/en/html/ss_configfonts.png | Bin 24858 -> 22491 bytes
docs/handbook/en/html/ss_mainterms.png | Bin 95356 -> 90155 bytes
docs/handbook/en/html/ss_searchanal.png | Bin 15920 -> 14117 bytes
docs/handbook/en/html/ss_searchopts.png | Bin 44197 -> 39772 bytes
docs/handbook/en/html/ss_shortcuts.png | Bin 25181 -> 23323 bytes
docs/handbook/en/pdf/handbook.pdf | Bin 384191 -> 384191 bytes
docs/handbook/es/docbook/index.docbook | 18 +-
docs/handbook/es/html/index.html | 14 +-
docs/handbook/es/pdf/handbook.pdf | Bin 388190 -> 388166 bytes
docs/handbook/fi/docbook/index.docbook | 9 +-
docs/handbook/fi/html/index.html | 5 +-
docs/handbook/fi/pdf/handbook.pdf | Bin 385169 -> 385165 bytes
docs/handbook/fr/docbook/index.docbook | 18 +-
docs/handbook/fr/html/index.html | 12 +-
docs/handbook/fr/pdf/handbook.pdf | Bin 385429 -> 385401 bytes
docs/handbook/hu/docbook/index.docbook | 18 +-
docs/handbook/hu/html/index.html | 12 +-
docs/handbook/hu/pdf/handbook.pdf | Bin 386072 -> 386009 bytes
docs/handbook/it/docbook/index.docbook | 18 +-
docs/handbook/it/html/index.html | 14 +-
docs/handbook/it/pdf/handbook.pdf | Bin 385560 -> 385560 bytes
docs/handbook/nl/docbook/index.docbook | 9 +-
docs/handbook/nl/html/index.html | 5 +-
docs/handbook/nl/pdf/handbook.pdf | Bin 385676 -> 385665 bytes
docs/handbook/pt_BR/docbook/index.docbook | 18 +-
docs/handbook/pt_BR/html/index.html | 12 +-
docs/handbook/{nl => pt_BR}/pdf/handbook.pdf | Bin 385676 -> 385975 bytes
docs/howto/ar/docbook/index.docbook | 2 +-
docs/howto/ar/html/index.html | 4 +-
docs/howto/bg/docbook/index.docbook | 2 +-
docs/howto/bg/html/index.html | 4 +-
docs/howto/cs/docbook/index.docbook | 2 +-
docs/howto/cs/html/index.html | 4 +-
docs/howto/da/docbook/index.docbook | 2 +-
docs/howto/da/html/index.html | 4 +-
docs/howto/de/docbook/index.docbook | 2 +-
docs/howto/de/html/index.html | 4 +-
docs/howto/en/docbook/index.docbook | 2 +-
docs/howto/en/html/index.html | 2 +-
docs/howto/es/docbook/index.docbook | 2 +-
docs/howto/es/html/index.html | 4 +-
docs/howto/fi/docbook/index.docbook | 2 +-
docs/howto/fi/html/index.html | 4 +-
docs/howto/fr/docbook/index.docbook | 2 +-
docs/howto/fr/html/index.html | 4 +-
docs/howto/hu/docbook/index.docbook | 2 +-
docs/howto/hu/html/index.html | 4 +-
docs/howto/it/docbook/index.docbook | 2 +-
docs/howto/it/html/index.html | 4 +-
docs/howto/ko/docbook/index.docbook | 2 +-
docs/howto/ko/html/index.html | 4 +-
docs/howto/nl/docbook/index.docbook | 2 +-
docs/howto/nl/html/index.html | 4 +-
docs/howto/pt_BR/docbook/index.docbook | 2 +-
docs/howto/pt_BR/html/index.html | 4 +-
docs/howto/ru/docbook/index.docbook | 2 +-
docs/howto/ru/html/index.html | 4 +-
i18n/handbook/handbook-ar.po | 36 +-
i18n/handbook/handbook-cs.po | 40 +-
i18n/handbook/handbook-de.po | 43 +-
i18n/handbook/handbook-es.po | 36 +-
i18n/handbook/handbook-fi.po | 26 +-
i18n/handbook/handbook-fr.po | 32 +-
i18n/handbook/handbook-hu.po | 55 +-
i18n/handbook/handbook-it.po | 45 +-
i18n/handbook/handbook-nl.po | 26 +-
i18n/handbook/handbook-pt_BR.po | 43 +-
i18n/handbook/handbook.pot | 11 +-
i18n/howto/howto-ar.po | 8 +-
i18n/howto/howto-bg.po | 4 +-
i18n/howto/howto-cs.po | 4 +-
i18n/howto/howto-da.po | 4 +-
i18n/howto/howto-de.po | 8 +-
i18n/howto/howto-es.po | 26 +-
i18n/howto/howto-fi.po | 4 +-
i18n/howto/howto-fr.po | 8 +-
i18n/howto/howto-hu.po | 4 +-
i18n/howto/howto-it.po | 8 +-
i18n/howto/howto-ko.po | 4 +-
i18n/howto/howto-nl.po | 4 +-
i18n/howto/howto-pt_BR.po | 4 +-
i18n/howto/howto-ru.po | 4 +-
i18n/howto/howto.pot | 4 +-
i18n/messages/bibletime_ui.ts | 2188 ++++----
i18n/messages/bibletime_ui_ar.ts | 2283 ++++----
i18n/messages/bibletime_ui_cs.ts | 504 +-
i18n/messages/bibletime_ui_da.ts | 2370 ++++-----
i18n/messages/bibletime_ui_de.ts | 747 +--
i18n/messages/bibletime_ui_en_GB.ts | 2256 ++++----
i18n/messages/bibletime_ui_es.ts | 2127 ++++----
i18n/messages/bibletime_ui_et.ts | 2399 ++++-----
i18n/messages/bibletime_ui_fi.ts | 2372 ++++-----
i18n/messages/bibletime_ui_fr.ts | 5409 -------------------
i18n/messages/bibletime_ui_hu.ts | 2121 ++++----
i18n/messages/bibletime_ui_it.ts | 2573 ++++-----
i18n/messages/bibletime_ui_nl.ts | 5432 --------------------
i18n/messages/bibletime_ui_nn_NO.ts | 5249 -------------------
i18n/messages/bibletime_ui_pl.ts | 3644 ++++++-------
i18n/messages/bibletime_ui_pt.ts | 2270 ++++----
i18n/messages/bibletime_ui_pt_BR.ts | 2153 ++++----
i18n/messages/bibletime_ui_ro.ts | 5288 -------------------
i18n/messages/bibletime_ui_ru.ts | 2261 ++++----
i18n/messages/bibletime_ui_sk.ts | 3200 ++++++------
i18n/messages/bibletime_ui_zh_CN.ts | 5186 -------------------
i18n/messages/bibletime_ui_zh_TW.ts | 2328 ++++-----
.../bookshelfmodel/btbookshelffiltermodel.cpp | 158 +-
.../bookshelfmodel/btbookshelffiltermodel.h | 210 +-
src/backend/bookshelfmodel/btbookshelfmodel.cpp | 130 +-
src/backend/bookshelfmodel/btbookshelfmodel.h | 295 +-
.../bookshelfmodel/btbookshelftreemodel.cpp | 534 +-
src/backend/bookshelfmodel/btbookshelftreemodel.h | 308 +-
src/backend/bookshelfmodel/categoryitem.cpp | 24 +-
src/backend/bookshelfmodel/categoryitem.h | 33 +-
src/backend/bookshelfmodel/indexingitem.cpp | 24 +-
src/backend/bookshelfmodel/indexingitem.h | 25 +-
src/backend/bookshelfmodel/item.cpp | 48 +-
src/backend/bookshelfmodel/item.h | 266 +-
src/backend/bookshelfmodel/languageitem.cpp | 15 +-
src/backend/bookshelfmodel/languageitem.h | 26 +-
src/backend/bookshelfmodel/moduleitem.cpp | 11 +-
src/backend/bookshelfmodel/moduleitem.h | 46 +-
src/backend/btinstallbackend.cpp | 78 +-
src/backend/btinstallbackend.h | 6 +-
src/backend/btinstallmgr.cpp | 99 +
src/backend/btinstallmgr.h | 73 +
src/backend/btinstallthread.cpp | 143 +
src/backend/btinstallthread.h | 94 +
src/backend/btmoduletreeitem.cpp | 2 +-
src/backend/btmoduletreeitem.h | 16 +-
src/backend/config/btconfig.cpp | 363 ++
src/backend/config/btconfig.h | 248 +
src/backend/config/btconfigcore.cpp | 202 +
src/backend/config/btconfigcore.h | 342 ++
src/backend/config/cbtconfig.cpp | 776 ---
src/backend/config/cbtconfig.h | 204 -
src/backend/cswordmodulesearch.cpp | 293 +-
src/backend/cswordmodulesearch.h | 15 +-
src/backend/drivers/cswordbiblemoduleinfo.cpp | 33 +-
src/backend/drivers/cswordbiblemoduleinfo.h | 7 +-
src/backend/drivers/cswordbookmoduleinfo.cpp | 31 +-
src/backend/drivers/cswordbookmoduleinfo.h | 11 +-
src/backend/drivers/cswordcommentarymoduleinfo.cpp | 6 +-
src/backend/drivers/cswordcommentarymoduleinfo.h | 14 +-
src/backend/drivers/cswordlexiconmoduleinfo.cpp | 16 +-
src/backend/drivers/cswordlexiconmoduleinfo.h | 8 +-
src/backend/drivers/cswordmoduleinfo.cpp | 924 ++--
src/backend/drivers/cswordmoduleinfo.h | 812 +--
src/backend/filters/btosismorphsegmentation.cpp | 95 +
src/backend/filters/btosismorphsegmentation.h | 47 +
src/backend/filters/gbftohtml.cpp | 6 +-
src/backend/filters/gbftohtml.h | 4 +-
src/backend/filters/osismorphsegmentation.cpp | 83 -
src/backend/filters/osismorphsegmentation.h | 37 -
src/backend/filters/osistohtml.cpp | 39 +-
src/backend/filters/osistohtml.h | 4 +-
src/backend/filters/plaintohtml.cpp | 2 +-
src/backend/filters/plaintohtml.h | 4 +-
src/backend/filters/teitohtml.cpp | 9 +-
src/backend/filters/teitohtml.h | 4 +-
src/backend/filters/thmltohtml.cpp | 17 +-
src/backend/filters/thmltohtml.h | 4 +-
src/backend/filters/thmltoplain.cpp | 2 +-
src/backend/filters/thmltoplain.h | 4 +-
src/backend/keys/cswordkey.cpp | 207 +-
src/backend/keys/cswordkey.h | 227 +-
src/backend/keys/cswordldkey.cpp | 6 +-
src/backend/keys/cswordldkey.h | 4 +-
src/backend/keys/cswordtreekey.cpp | 6 +-
src/backend/keys/cswordtreekey.h | 4 +-
src/backend/keys/cswordversekey.cpp | 38 +-
src/backend/keys/cswordversekey.h | 4 +-
src/backend/managers/btstringmgr.cpp | 55 +-
src/backend/managers/btstringmgr.h | 22 +-
src/backend/managers/cdisplaytemplatemgr.cpp | 54 +-
src/backend/managers/cdisplaytemplatemgr.h | 4 +-
src/backend/managers/clanguagemgr.cpp | 35 +-
src/backend/managers/clanguagemgr.h | 117 +-
src/backend/managers/cswordbackend.cpp | 461 +-
src/backend/managers/cswordbackend.h | 429 +-
src/backend/managers/referencemanager.cpp | 37 +-
src/backend/managers/referencemanager.h | 4 +-
src/backend/rendering/cbookdisplay.cpp | 2 +-
src/backend/rendering/cbookdisplay.h | 4 +-
src/backend/rendering/cchapterdisplay.cpp | 6 +-
src/backend/rendering/cchapterdisplay.h | 4 +-
src/backend/rendering/cdisplayrendering.cpp | 5 +-
src/backend/rendering/cdisplayrendering.h | 9 +-
src/backend/rendering/centrydisplay.cpp | 7 +-
src/backend/rendering/centrydisplay.h | 8 +-
src/backend/rendering/chtmlexportrendering.cpp | 30 +-
src/backend/rendering/chtmlexportrendering.h | 12 +-
.../rendering/cplaintextexportrendering.cpp | 2 +-
src/backend/rendering/cplaintextexportrendering.h | 9 +-
src/backend/rendering/ctextrendering.cpp | 25 +-
src/backend/rendering/ctextrendering.h | 6 +-
src/bibletime.cpp | 77 +-
src/bibletime.h | 98 +-
src/bibletime_dbus.cpp | 5 +-
src/bibletime_dbus_adaptor.cpp | 8 +-
src/bibletime_dbus_adaptor.h | 4 +-
src/bibletime_init.cpp | 303 +-
src/bibletime_slots.cpp | 610 +--
src/bibletimeapp.cpp | 39 +-
src/bibletimeapp.h | 19 +-
src/btglobal.h | 12 +-
src/display-templates/Basic.tmpl | 25 +-
src/display-templates/Blue.css | 222 +-
src/display-templates/Christmastide.css | 92 +-
src/display-templates/Crazy.css | 108 +-
src/display-templates/Green.css | 220 +-
src/display-templates/HighContrast.css | 242 +-
src/display-templates/Simple.css | 96 +-
src/frontend/bookmarks/btbookmarkfolder.cpp | 14 +-
src/frontend/bookmarks/btbookmarkfolder.h | 4 +-
src/frontend/bookmarks/btbookmarkitem.cpp | 16 +-
src/frontend/bookmarks/btbookmarkitem.h | 4 +-
src/frontend/bookmarks/btbookmarkitembase.h | 4 +-
src/frontend/bookmarks/btbookmarkloader.cpp | 2 +-
src/frontend/bookmarks/btbookmarkloader.h | 4 +-
src/frontend/bookmarks/bteditbookmarkdialog.cpp | 13 +-
src/frontend/bookmarks/bteditbookmarkdialog.h | 4 +-
src/frontend/bookmarks/cbookmarkindex.cpp | 17 +-
src/frontend/bookmarks/cbookmarkindex.h | 4 +-
src/frontend/bookshelfmanager/btconfigdialog.cpp | 2 +-
src/frontend/bookshelfmanager/btconfigdialog.h | 4 +-
src/frontend/bookshelfmanager/btinstallmgr.cpp | 76 -
src/frontend/bookshelfmanager/btinstallmgr.h | 62 -
.../bookshelfmanager/btmodulemanagerdialog.cpp | 16 +-
.../bookshelfmanager/btmodulemanagerdialog.h | 4 +-
.../cswordsetupinstallsourcesdialog.cpp | 56 +-
.../cswordsetupinstallsourcesdialog.h | 7 +-
.../bookshelfmanager/indexpage/btindexpage.cpp | 19 +-
.../bookshelfmanager/indexpage/btindexpage.h | 4 +-
.../installpage/btinstallmodulechooserdialog.cpp | 2 +-
.../installpage/btinstallmodulechooserdialog.h | 2 +-
.../btinstallmodulechooserdialogmodel.cpp | 17 +-
.../btinstallmodulechooserdialogmodel.h | 3 +-
.../bookshelfmanager/installpage/btinstallpage.cpp | 69 +-
.../bookshelfmanager/installpage/btinstallpage.h | 4 +-
.../installpage/btinstallpagemodel.cpp | 6 +-
.../installpage/btinstallpagemodel.h | 3 +-
.../installpage/btinstallpageworkswidget.cpp | 42 +-
.../installpage/btinstallpageworkswidget.h | 8 +-
.../installpage/btinstallpathdialog.cpp | 18 +-
.../installpage/btinstallpathdialog.h | 4 +-
.../installpage/btinstallprogressdialog.cpp | 250 +-
.../installpage/btinstallprogressdialog.h | 88 +-
.../installpage/btinstallthread.cpp | 185 -
.../bookshelfmanager/installpage/btinstallthread.h | 99 -
.../installpage/btrefreshprogressdialog.cpp | 4 +-
.../installpage/btrefreshprogressdialog.h | 6 +-
.../bookshelfmanager/removepage/btremovepage.cpp | 23 +-
.../bookshelfmanager/removepage/btremovepage.h | 2 +-
.../removepage/btremovepagetreemodel.cpp | 2 +-
.../removepage/btremovepagetreemodel.h | 2 +-
src/frontend/btaboutdialog.cpp | 16 +-
src/frontend/btaboutdialog.h | 5 +-
src/frontend/btaboutmoduledialog.cpp | 6 +-
src/frontend/btaboutmoduledialog.h | 4 +-
src/frontend/btbookshelfdockwidget.cpp | 22 +-
src/frontend/btbookshelfdockwidget.h | 2 +-
src/frontend/btbookshelfgroupingmenu.cpp | 7 +-
src/frontend/btbookshelfgroupingmenu.h | 2 +-
src/frontend/btbookshelfview.cpp | 13 +-
src/frontend/btbookshelfview.h | 3 +-
src/frontend/btbookshelfwidget.cpp | 11 +-
src/frontend/btbookshelfwidget.h | 3 +-
src/frontend/btcentralwidget.cpp | 51 +
src/frontend/btcentralwidget.h | 33 +
src/frontend/btmenuview.cpp | 2 +-
src/frontend/btmenuview.h | 2 +-
src/frontend/btmodulechooserdialog.cpp | 10 +-
src/frontend/btmodulechooserdialog.h | 4 +-
src/frontend/btmoduleindexdialog.cpp | 2 +-
src/frontend/btmoduleindexdialog.h | 4 +-
src/frontend/btopenworkaction.cpp | 11 +-
src/frontend/btopenworkaction.h | 3 +-
src/frontend/cdragdrop.h | 4 +-
src/frontend/cexportmanager.cpp | 39 +-
src/frontend/cexportmanager.h | 10 +-
src/frontend/cinfodisplay.cpp | 304 +-
src/frontend/cinfodisplay.h | 102 +-
src/frontend/cmdiarea.cpp | 86 +-
src/frontend/cmdiarea.h | 23 +-
src/frontend/cprinter.cpp | 3 +-
src/frontend/cprinter.h | 4 +-
src/frontend/crossrefrendering.cpp | 2 +-
src/frontend/crossrefrendering.h | 9 +-
src/frontend/display/btcolorwidget.cpp | 2 +-
src/frontend/display/btcolorwidget.h | 4 +-
src/frontend/display/btfindwidget.cpp | 118 +
src/frontend/display/btfindwidget.h | 56 +
src/frontend/display/btfontsizewidget.cpp | 2 +-
src/frontend/display/btfontsizewidget.h | 4 +-
src/frontend/display/bthtml.js | 156 +-
src/frontend/display/bthtmlfindtext.cpp | 95 -
src/frontend/display/bthtmlfindtext.h | 36 -
src/frontend/display/bthtmlfindtext.ui | 145 -
src/frontend/display/bthtmljsobject.cpp | 42 +-
src/frontend/display/bthtmljsobject.h | 4 +-
src/frontend/display/bthtmlreaddisplay.cpp | 10 +-
src/frontend/display/bthtmlreaddisplay.h | 17 +-
src/frontend/display/cdisplay.cpp | 16 +-
src/frontend/display/cdisplay.h | 17 +-
src/frontend/display/chtmlwritedisplay.cpp | 183 +-
src/frontend/display/chtmlwritedisplay.h | 52 +-
src/frontend/display/cplainwritedisplay.cpp | 9 +-
src/frontend/display/cplainwritedisplay.h | 31 +-
src/frontend/display/creaddisplay.cpp | 2 +-
src/frontend/display/creaddisplay.h | 6 +-
src/frontend/display/cwritedisplay.cpp | 21 -
src/frontend/display/cwritedisplay.h | 47 -
src/frontend/displaywindow/btactioncollection.cpp | 67 +-
src/frontend/displaywindow/btactioncollection.h | 35 +-
.../displaywindow/btdisplaysettingsbutton.cpp | 9 +-
.../displaywindow/btdisplaysettingsbutton.h | 4 +-
src/frontend/displaywindow/btmodulechooserbar.cpp | 2 +-
src/frontend/displaywindow/btmodulechooserbar.h | 4 +-
.../displaywindow/btmodulechooserbutton.cpp | 14 +-
src/frontend/displaywindow/btmodulechooserbutton.h | 4 +-
src/frontend/displaywindow/bttextwindowheader.cpp | 2 +-
src/frontend/displaywindow/bttextwindowheader.h | 4 +-
.../displaywindow/bttextwindowheaderwidget.cpp | 23 +-
.../displaywindow/bttextwindowheaderwidget.h | 4 +-
.../displaywindow/bttoolbarpopupaction.cpp | 2 +-
src/frontend/displaywindow/bttoolbarpopupaction.h | 4 +-
src/frontend/displaywindow/btwindowmodulechooser.h | 4 +-
src/frontend/displaywindow/cbiblereadwindow.cpp | 91 +-
src/frontend/displaywindow/cbiblereadwindow.h | 44 +-
src/frontend/displaywindow/cbookreadwindow.cpp | 36 +-
src/frontend/displaywindow/cbookreadwindow.h | 46 +-
.../displaywindow/ccommentaryreadwindow.cpp | 38 +-
src/frontend/displaywindow/ccommentaryreadwindow.h | 18 +-
src/frontend/displaywindow/cdisplaywindow.cpp | 122 +-
src/frontend/displaywindow/cdisplaywindow.h | 19 +-
.../displaywindow/cdisplaywindowfactory.cpp | 11 +-
src/frontend/displaywindow/cdisplaywindowfactory.h | 14 +-
src/frontend/displaywindow/chtmlwritewindow.cpp | 70 +-
src/frontend/displaywindow/chtmlwritewindow.h | 36 +-
src/frontend/displaywindow/clexiconreadwindow.cpp | 13 +-
src/frontend/displaywindow/clexiconreadwindow.h | 6 +-
src/frontend/displaywindow/cplainwritewindow.cpp | 159 +-
src/frontend/displaywindow/cplainwritewindow.h | 56 +-
src/frontend/displaywindow/creadwindow.cpp | 56 +-
src/frontend/displaywindow/creadwindow.h | 28 +-
src/frontend/displaywindow/cwritewindow.cpp | 158 -
src/frontend/displaywindow/cwritewindow.h | 92 -
src/frontend/keychooser/bthistory.cpp | 5 +-
src/frontend/keychooser/bthistory.h | 6 +-
src/frontend/keychooser/cbookkeychooser.cpp | 163 +-
src/frontend/keychooser/cbookkeychooser.h | 142 +-
src/frontend/keychooser/cbooktreechooser.cpp | 20 +-
src/frontend/keychooser/cbooktreechooser.h | 6 +-
src/frontend/keychooser/ckeychooser.cpp | 56 +-
src/frontend/keychooser/ckeychooser.h | 161 +-
src/frontend/keychooser/ckeychooserwidget.cpp | 214 +-
src/frontend/keychooser/ckeychooserwidget.h | 274 +-
src/frontend/keychooser/clexiconkeychooser.cpp | 25 +-
src/frontend/keychooser/clexiconkeychooser.h | 6 +-
src/frontend/keychooser/cscrollbutton.cpp | 6 +-
src/frontend/keychooser/cscrollbutton.h | 5 +-
src/frontend/keychooser/cscrollerwidgetset.cpp | 79 +-
src/frontend/keychooser/cscrollerwidgetset.h | 96 +-
.../versekeychooser/btbiblekeywidget.cpp | 18 +-
.../keychooser/versekeychooser/btbiblekeywidget.h | 4 +-
.../versekeychooser/btdropdownchooserbutton.cpp | 2 +-
.../versekeychooser/btdropdownchooserbutton.h | 4 +-
.../keychooser/versekeychooser/btversekeymenu.cpp | 8 +-
.../keychooser/versekeychooser/btversekeymenu.h | 4 +-
.../versekeychooser/cbiblekeychooser.cpp | 15 +-
.../keychooser/versekeychooser/cbiblekeychooser.h | 10 +-
.../dialogutil.cpp => frontend/messagedialog.cpp} | 20 +-
.../dialogutil.h => frontend/messagedialog.h} | 26 +-
src/frontend/profile/cprofile.cpp | 380 --
src/frontend/profile/cprofile.h | 113 -
src/frontend/profile/cprofilemgr.cpp | 118 -
src/frontend/profile/cprofilemgr.h | 67 -
src/frontend/profile/cprofilewindow.cpp | 30 -
src/frontend/profile/cprofilewindow.h | 45 -
.../analysis/csearchanalysisdialog.cpp | 6 +-
.../searchdialog/analysis/csearchanalysisdialog.h | 4 +-
.../searchdialog/analysis/csearchanalysisitem.cpp | 57 +-
.../searchdialog/analysis/csearchanalysisitem.h | 18 +-
.../analysis/csearchanalysislegenditem.cpp | 2 +-
.../analysis/csearchanalysislegenditem.h | 4 +-
.../searchdialog/analysis/csearchanalysisscene.cpp | 136 +-
.../searchdialog/analysis/csearchanalysisscene.h | 4 +-
.../searchdialog/analysis/csearchanalysisview.cpp | 2 +-
.../searchdialog/analysis/csearchanalysisview.h | 4 +-
.../searchdialog/btsearchmodulechooserdialog.cpp | 6 +-
.../searchdialog/btsearchmodulechooserdialog.h | 3 +-
src/frontend/searchdialog/btsearchoptionsarea.cpp | 58 +-
src/frontend/searchdialog/btsearchoptionsarea.h | 6 +-
src/frontend/searchdialog/btsearchresultarea.cpp | 332 +-
src/frontend/searchdialog/btsearchresultarea.h | 14 +-
.../searchdialog/btsearchsyntaxhelpdialog.cpp | 11 +-
.../searchdialog/btsearchsyntaxhelpdialog.h | 5 +-
src/frontend/searchdialog/chistorycombobox.cpp | 2 +-
src/frontend/searchdialog/chistorycombobox.h | 4 +-
src/frontend/searchdialog/cmoduleresultview.cpp | 81 +-
src/frontend/searchdialog/cmoduleresultview.h | 4 +-
src/frontend/searchdialog/crangechooserdialog.cpp | 26 +-
src/frontend/searchdialog/crangechooserdialog.h | 4 +-
src/frontend/searchdialog/csearchdialog.cpp | 32 +-
src/frontend/searchdialog/csearchdialog.h | 4 +-
src/frontend/searchdialog/csearchresultview.cpp | 22 +-
src/frontend/searchdialog/csearchresultview.h | 4 +-
.../settingsdialogs/btfontchooserwidget.cpp | 2 +-
src/frontend/settingsdialogs/btfontchooserwidget.h | 4 +-
src/frontend/settingsdialogs/btfontsettings.cpp | 30 +-
src/frontend/settingsdialogs/btfontsettings.h | 8 +-
.../settingsdialogs/btlanguagesettings.cpp | 19 +-
src/frontend/settingsdialogs/btlanguagesettings.h | 4 +-
src/frontend/settingsdialogs/btshortcutsdialog.cpp | 6 +-
src/frontend/settingsdialogs/btshortcutsdialog.h | 4 +-
src/frontend/settingsdialogs/btshortcutseditor.cpp | 2 +-
src/frontend/settingsdialogs/btshortcutseditor.h | 4 +-
.../settingsdialogs/btstandardworkstab.cpp | 203 +
src/frontend/settingsdialogs/btstandardworkstab.h | 55 +
src/frontend/settingsdialogs/bttextfilterstab.cpp | 87 +
src/frontend/settingsdialogs/bttextfilterstab.h | 54 +
.../settingsdialogs/cacceleratorsettings.cpp | 58 +-
.../settingsdialogs/cacceleratorsettings.h | 4 +-
.../settingsdialogs/cconfigurationdialog.cpp | 19 +-
.../settingsdialogs/cconfigurationdialog.h | 4 +-
src/frontend/settingsdialogs/cdisplaysettings.cpp | 19 +-
src/frontend/settingsdialogs/cdisplaysettings.h | 4 +-
src/frontend/settingsdialogs/clistwidget.cpp | 6 +-
src/frontend/settingsdialogs/clistwidget.h | 6 +-
src/frontend/settingsdialogs/cswordsettings.cpp | 306 +-
src/frontend/settingsdialogs/cswordsettings.h | 97 +-
src/frontend/tips/bttipdialog.cpp | 32 +-
src/frontend/tips/bttipdialog.h | 4 +-
src/main.cpp | 65 +-
src/mobile/bibletime.cpp | 101 +
src/mobile/bibletime.h | 31 +
src/mobile/bibletimeapp.cpp | 95 +
src/mobile/bibletimeapp.h | 55 +
src/mobile/bookshelfmanager/installmanager.cpp | 371 ++
src/mobile/bookshelfmanager/installmanager.h | 82 +
src/mobile/bookshelfmanager/installprogress.cpp | 199 +
src/mobile/bookshelfmanager/installprogress.h | 61 +
src/mobile/bookshelfmanager/installsources.cpp | 75 +
src/mobile/bookshelfmanager/installsources.h | 52 +
.../bookshelfmanager/installsourcesmanager.cpp | 85 +
.../bookshelfmanager/installsourcesmanager.h | 45 +
src/mobile/btmmain.cpp | 106 +
src/mobile/btmmain.h | 23 +
src/mobile/keychooser/bookkeychooser.cpp | 272 +
src/mobile/keychooser/bookkeychooser.h | 81 +
src/mobile/keychooser/versechooser.cpp | 160 +
src/mobile/keychooser/versechooser.h | 86 +
src/mobile/models/bibletextmodelbuilder.cpp | 184 +
src/mobile/models/bibletextmodelbuilder.h | 46 +
src/mobile/models/booktextmodelbuilder.cpp | 101 +
src/mobile/models/booktextmodelbuilder.h | 40 +
src/mobile/models/roleitemmodel.cpp | 54 +
src/mobile/models/roleitemmodel.h | 24 +
src/mobile/qml/ContextMenu.qml | 62 +
src/mobile/qml/FontSizeSlider.qml | 139 +
src/mobile/qml/GridChooser.qml | 117 +
src/mobile/qml/GridChooserButton.qml | 52 +
src/mobile/qml/ImageButton.qml | 24 +
src/mobile/qml/InstallManagerChooser.qml | 153 +
src/mobile/qml/ListTextView.qml | 108 +
src/mobile/qml/ListWorksView.qml | 123 +
src/mobile/qml/MainToolbar.qml | 27 +
src/mobile/qml/MenuButton.qml | 30 +
src/mobile/qml/MenuView.qml | 28 +
src/mobile/qml/Menus.qml | 61 +
src/mobile/qml/ModuleChooser.qml | 109 +
src/mobile/qml/Progress.qml | 63 +
src/mobile/qml/Settings.qml | 93 +
src/mobile/qml/TreeChooser.qml | 167 +
src/mobile/qml/Window.qml | 178 +
src/mobile/qml/WindowManager.qml | 291 ++
src/mobile/qml/checkmark.svg | 42 +
src/mobile/qml/leftarrow.svg | 83 +
src/mobile/qml/main.qml | 270 +
src/mobile/qml/rightarrow.svg | 82 +
src/mobile/qml/tab.png | Bin 0 -> 507 bytes
src/mobile/ui/btstyle.cpp | 334 ++
src/mobile/ui/btstyle.h | 132 +
src/mobile/ui/btwindowinterface.cpp | 257 +
src/mobile/ui/btwindowinterface.h | 73 +
src/mobile/ui/gridchooser.cpp | 63 +
src/mobile/ui/gridchooser.h | 43 +
src/mobile/ui/modulechooser.cpp | 44 +
src/mobile/ui/modulechooser.h | 35 +
src/mobile/ui/moduleinterface.cpp | 187 +
src/mobile/ui/moduleinterface.h | 48 +
src/mobile/ui/qtquick2applicationviewer.cpp | 63 +
src/mobile/ui/qtquick2applicationviewer.h | 32 +
src/mobile/ui/treechoosermodel.cpp | 22 +
src/mobile/ui/treechoosermodel.h | 20 +
src/mobile/ui/viewmanager.cpp | 52 +
src/mobile/ui/viewmanager.h | 34 +
src/mobile/util/findqmlobject.cpp | 34 +
src/mobile/util/findqmlobject.h | 28 +
src/mobile/util/messagedialog.cpp | 36 +
src/mobile/util/messagedialog.h | 36 +
src/util/btmodules.cpp | 2 +-
src/util/btmodules.h | 4 +-
src/util/btsignal.h | 40 +-
src/util/cresmgr.cpp | 8 +-
src/util/cresmgr.h | 10 +-
src/util/directory.cpp | 287 +-
src/util/directory.h | 11 +-
src/util/exceptions.h | 4 +-
src/util/geticon.cpp | 54 +
src/util/geticon.h | 30 +
src/util/htmlescape.h | 33 +
src/util/macros.h | 4 +-
src/util/tool.cpp | 98 +-
src/util/tool.h | 82 +-
591 files changed, 35803 insertions(+), 58417 deletions(-)
diff --cc debian/changelog
index 098a9e2,0000000..593fb3a
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,404 -1,0 +1,410 @@@
++bibletime (2.10.1-1) unstable; urgency=medium
++
++ * New Upstream Release
++
++ -- David Sanders <david at sandersweb.net> Thu, 09 Oct 2014 12:41:00 +0400
++
+bibletime (2.9.2-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Build with libsword 1.7.
+ Add libsword-1.7.patch.
+ Patch by Plamen Aleksandrov <plamen at aomeda.com>.
+ Work done as part of a Debian GSOC 2014 project.
+ Closes: #748685.
+
+ -- Anibal Monsalve Salazar <anibal at debian.org> Fri, 27 Jun 2014 11:59:08 +0100
+
+bibletime (2.9.2-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Dmitrijs Ledkovs <dmitrij.ledkov at ubuntu.com> Mon, 12 Aug 2013 21:02:54 +0100
+
+bibletime (2.9.1-3) unstable; urgency=low
+
+ * fix FindCLucene.cmake to look in /usr/lib/{CMAKE_LIBRARY_ARCHITECTURE}
+ to find clucene-config.h with multiarched clucene (Closes: #718374)
+
+ -- Rene Engelhard <rene at debian.org> Tue, 30 Jul 2013 19:23:42 +0000
+
+bibletime (2.9.1-2) unstable; urgency=low
+
+ * Disable -Werror to work-around FTBFS with gcc-4.7 (Closes: #667113)
+
+ -- Dmitrijs Ledkovs <xnox at debian.org> Tue, 17 Apr 2012 22:40:49 +0100
+
+bibletime (2.9.1-1) unstable; urgency=low
+
+ [ Jonathan Marsden ]
+ * New upstream version 2.9.1
+ * debian/patches/*: Remove all patches (incorporated upstream)
+ * debian/control: bibletime now depends on a matching version of
+ bibletime-data.
+
+ [ Dmitrijs Ledkovs ]
+ * Add more strict alternative build-dependency on the libqt4-dev.
+
+ -- Dmitrijs Ledkovs <xnox at debian.org> Sat, 14 Apr 2012 18:11:50 +0100
+
+bibletime (2.8.1-2) unstable; urgency=low
+
+ * debian/patches/02-prevent-unused-but-set-variable-ftbfs.patch:
+ - Prevent FTBFS using recent gcc 4.6 by using an existing upstream fix.
+ * debian/control:
+ - Add Depends: libqt4-svg so toolbar icons display. (Closes: #612661).
+
+ -- Jonathan Marsden <jmarsden at fastmail.fm> Sun, 10 Jul 2011 18:06:23 -0700
+
+bibletime (2.8.1-1) unstable; urgency=low
+
+ [ Jonathan Marsden ]
+ * New upstream version 2.8.1 (Closes: #629607).
+ * debian/control:
+ - Remove article from start of Description: synopsis line.
+ - Replace Build-Depends: libqt4-dev with libqtwebkit-dev | libqt4-dev.
+ * Bump Standards-Version to 3.9.2 (no changes needed)
+ * debian/control: Fix version comparison > to >= for libsword
+ * debian/watch: Look for .bz2 as well as .gz compressed tarballs.
+ * debian/patches/01-fix-search-works-print-crash.patch:
+ - An upstream git commit to fix a crash when printing.
+ - Also fixes a gcc-4.6 FTBFS.
+
+ [ Dmitrijs Ledkovs ]
+ * Daily-build / build from recipes:
+ - Generate debian/source/format on the fly
+ - Add .bzr-builddeb/default.conf to run above
+ - Add debian/source/local-options to keep bzr tree clean
+ * Convert to dh7
+ - This unifies packaging with sword and xiphos
+ - This allows building from recipes since cdbs simple-patchsys was
+ interfering
+ - Move dh_install[man] options from debian/rules to package files.
+
+ -- Jonathan Marsden <jmarsden at fastmail.fm> Sun, 19 Jun 2011 22:40:22 -0700
+
+bibletime (2.5-1) unstable; urgency=low
+
+ * New upstream version 2.5 (Closes: #564551).
+
+ -- Jonathan Marsden <jmarsden at fastmail.fm> Sun, 10 Jan 2010 22:21:36 -0800
+
+bibletime (2.4-1) unstable; urgency=low
+
+ * New upstream version 2.4
+ * debian/control:
+ - Replace incorrect bibletime-data Depends on lib4qt-gui
+ with bibletime Depends on libqtgui4 (>= 4.4.0). (Closes: #556209).
+ - Add Build-depends: on zlib1g-dev and libcurl4-gnutls-dev
+ (Closes: #556805).
+
+ -- Jonathan Marsden <jmarsden at fastmail.fm> Wed, 18 Nov 2009 17:30:00 -0800
+
+bibletime (2.3.3-1) unstable; urgency=low
+
+ * New upstream version 2.3.3
+ * debian/control:
+ - Change Description: to avoid mentioning KDE (Closes: #539166).
+ - Add libqt4-gui to Depends: to avoid toolbar icon display issues.
+
+ -- Jonathan Marsden <jmarsden at fastmail.fm> Sun, 01 Nov 2009 15:49:17 -0800
+
+bibletime (2.3-1) unstable; urgency=low
+
+ * New upstream version 2.3
+ * Bump Standards-Version to 3.8.3 (no changes needed).
+
+ -- Jonathan Marsden <jmarsden at fastmail.fm> Thu, 08 Oct 2009 22:55:24 -0700
+
+bibletime (2.2-1) unstable; urgency=low
+
+ * New upstream version 2.2
+
+ -- Jonathan Marsden <jmarsden at fastmail.fm> Wed, 26 Aug 2009 21:58:15 -0700
+
+bibletime (2.1-1~karmic1) karmic; urgency=low
+
+ * New upstream version 2.1.
+
+ -- Jonathan Marsden <jmarsden at fastmail.fm> Sun, 12 Jul 2009 18:21:11 -0700
+
+bibletime (2.0.1-1) unstable; urgency=low
+
+ * New upstream version.
+ * debian/patches/:
+ - 01_main_window_icon.diff removed (now in upstream sources).
+ - 02_remove_unwanted_debug_code.diff removed (now in upstream sources).
+ * debian/control: Correctly update systems with old bibletime-i18n:
+ - Remove Suggests: bibletime-i18n from bibletime package.
+ - Add Conflicts: and Replaces: bibletime-i18n to bibletime-data package.
+ - Bump Standards-Version to 3.8.2 (no changes needed).
+ * debian/watch: Change regex to ignore alpha/beta/rc source tarballs.
+
+ -- Jonathan Marsden <jmarsden at fastmail.fm> Sun, 07 Jun 2009 16:24:33 -0700
+
+bibletime (2.0-1) unstable; urgency=low
+
+ * New upstream version.
+ * debian/rules:
+ - Ensure installation of manpages and .xpm work once again.
+ * Remove debian/dirs, debian/install and other files from debian/
+ * Remove debian/patches/00-fix-desktop.patch -- upstream fixed this.
+ * Add debian/patches/01_main_window_icon.diff
+ - upstream svn r1317.
+ * Add debian/patches/02_remove_unwanted_debug_code.diff
+ - upstream svn r1318.
+ * Add debian/watch file.
+ * debian/rules: use cdbs cmake.mk not kde4.mk
+ * debian/control: Remove Build-depend on pkg-kde-tools.
+ - Replace kdelibs5-dev build dependency with libqt4-dev.
+ - Add build dependency on cmake and pkg-config.
+ - Set Maintainer and Uploaders fields.
+ - Qualify libsword-dev Build-Depends with (>= 1.5.11).
+ - Bump Standards-Version to 3.8.1 (no changes needed).
+ * Separate out /usr/share/bibletime into its own package:
+ - debian/bibletime-data.install: create file.
+ - debian/bibletime.install: create file.
+ - debian/compat: Increase to 7 so dh_install looks in debian/tmp.
+ - debian/control:
+ + Add info about new binary package bibletime-data.
+ + Build-Depend: on debhelper >= 7 and wrap Build-Depends line.
+ * debian/copyright:
+ - Update copyright year range.
+ - Update download location.
+
+ -- Jonathan Marsden <jmarsden at fastmail.fm> Tue, 02 Jun 2009 23:37:30 -0700
+
+bibletime (1.6.5.1-1) unstable; urgency=low
+
+ * New upstream version (Closes: #441161, #271502)
+ * fixes for new autotools and gcc 4.3 (Closes: #407291)
+ * added poxml to Build-Depends
+ * No DFSG necessary anymore since biblestudy howto has
+ now Commons Licence
+ * Added libclucene-dev to dev-depends (Closes: #436677)
+
+ -- Ralph Janke <txwikinger at ubuntu.com> Sat, 10 May 2008 15:18:16 +0100
+
+bibletime (1.6.4.dfsg-1) unstable; urgency=low
+
+ * New upstream version
+
+ -- Daniel Glassey <wdg at debian.org> Fri, 22 Jun 2007 18:47:48 +0100
+
+bibletime (1.6.2.dfsg-1) unstable; urgency=low
+
+ * New upstream release using sword 1.5.9, Closes: #401068
+ * upstream now allows build without howto (which has been declared
+ non-DFSG free), Closes: #331547
+ * DFSG free source tarball created from upstream by
+ rm docs/howto/unicode/*.docbook
+ * "Highlight words of Jesus" fixed, Closes: #329244
+ * recommend bibletime-i18n, Closes: #375905
+ * don't need custom kde.mk for cdbs anymore (see bug #284428)
+
+ -- Daniel Glassey <wdg at debian.org> Thu, 7 Dec 2006 19:03:21 +0000
+
+bibletime (1.6.1-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/control: Uses sword 1.5.9 - build depends
+ standards version 3.7.2.2 (no changes)
+
+ -- Daniel Glassey <wdg at debian.org> Thu, 23 Nov 2006 22:50:46 +0000
+
+bibletime (1.5.3-1) unstable; urgency=low
+
+ * New upstream release
+ * rebuild against transistion sword and KDE
+ * Don't autogenerate debian/control using cdbs
+ fix generated file build-deps
+
+ -- Daniel Glassey <wdg at debian.org> Sat, 10 Dec 2005 21:39:54 +0000
+
+bibletime (1.5.1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Daniel Glassey <wdg at debian.org> Mon, 12 Sep 2005 22:39:30 +0100
+
+bibletime (1.5-1) unstable; urgency=low
+
+ * New upstream release
+ * Use cdbs
+ use a local kde.mk because the supplied one is broken for tarballs
+ bug #284428
+ * cdbs will update config.sub/guess (Closes: #304632)
+ * Acknowledge NMU, thanks (Closes: #279471)
+ * Manpage is included upstream now
+ Thanks to Erik Schanze <schanzi_usenet at gmx.de> for it (Closes: #259948)
+ not installed upstream so install from the debian dir
+ * debian/menu: quote the strings, remove kderemove
+ set the section to Education (Closes: #297873)
+ * debian/copyright: Upstream Authors fix
+ * clean up the debian dir, override not needed any more
+
+ -- Daniel Glassey <wdg at debian.org> Fri, 12 Aug 2005 09:33:45 +0100
+
+bibletime (1.4.1-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Switched to libcurl3-dev (closes: #279471).
+
+ -- Domenico Andreoli <cavok at debian.org> Wed, 22 Dec 2004 18:34:21 +0100
+
+bibletime (1.4.1-2) unstable; urgency=low
+
+ * Rebuild for KDE 3.3, Closes: #237905
+
+ -- Daniel Glassey <wdg at debian.org> Wed, 31 Mar 2004 16:29:26 +0100
+
+bibletime (1.4.1-1) unstable; urgency=low
+
+ * New upstream version
+ * Exclude docbook from dh_compress, Closes: #220891
+ * Hebrew displays RTL with KDE3 so closing old bug, Closes: #158456
+ * Tried search dialog and it works fine now so, Closes: #145965
+
+ -- Daniel Glassey <wdg at debian.org> Thu, 29 Jan 2004 22:10:38 +0000
+
+bibletime (1.4-1) unstable; urgency=low
+
+ * New upstream version
+ * depend on sword 1.5.7
+
+ -- Daniel Glassey <wdg at debian.org> Thu, 8 Jan 2004 11:50:46 +0000
+
+bibletime (1.3-3) unstable; urgency=low
+
+ * Fix copyright file
+ * Acknowledge NMU, thanks, Closes: #187033
+
+ -- Daniel Glassey <wdg at debian.org> Tue, 16 Dec 2003 22:40:52 +0000
+
+bibletime (1.3-2) unstable; urgency=medium
+
+ * Build Depend on sword >= 1.5.6-9
+ * Time to upload to unstable
+ * Standards version now 3.6.1.0
+
+ -- Daniel Glassey <wdg at debian.org> Wed, 12 Nov 2003 17:59:31 +0000
+
+bibletime (1.3-1) experimental; urgency=low
+
+ * 1.3 is released :)
+ * depend on sword 1.5.6
+ * Upload to experimental for now
+
+ -- Daniel Glassey <wdg at debian.org> Thu, 28 Aug 2003 15:29:45 +0100
+
+bibletime (1.2.99-2) unstable; urgency=low
+
+ * rebuild against not quite released sword1.5.5.99-3
+
+ -- Daniel Glassey <wdg at debian.org> Fri, 18 Jul 2003 18:39:40 +0100
+
+bibletime (1.2.99-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Daniel Glassey <wdg at debian.org> Fri, 13 Jul 2003 21:33:55 +0100
+
+bibletime (1.0.99b-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Daniel Glassey <wdg at debian.org> Tue, 2 Apr 2002 21:33:55 +0100
+
+bibletime (1.0.3-1) unstable; urgency=low
+
+ * New upstream release
+ * build against autotooled sword
+ * correct spelling error, Closes: #124449
+ * not uploading til sword 1.5.2-8 is in
+ * bulid depend on sword >=1.5.2-9
+
+ -- Daniel Glassey <wdg at debian.org> Fri, 1 Feb 2002 23:01:55 +0000
+
+bibletime (1.0.2-2) unstable; urgency=low
+
+ * Remove debian/controly which shouldn't be there
+ * stop configure from being run twice to fix alpha build, Closes: #121674
+ * build-depend on kdelibs-dev >= 2.2.2-8 to catch libfam-dev dependency, see bug 124264
+ * Update description for bibletime 1.0.2
+ * Update to policy version 3.5.6.0, no necessary changes noticed yet
+ * modify clean target in debian/rules to use clean instead of distclean
+ and remove */Makefile and */*.moc.cpp
+
+ -- Daniel Glassey <wdg at debian.org> Sat, 15 Dec 2001 21:40:18 +0000
+
+bibletime (1.0.2-1) unstable; urgency=low
+
+ * New upstream release - see www.bibletime.de for changes
+ * Using latest config.sub and config.guess, Closes #105779
+ * may compile on ia64 now (cswordbackendmanager.* does not exist now), Closes #110187
+ * Change maintainer to wdg at debian.org
+ * Depend on sword >= 1.5.2-4 (new libsword1 shlibs)
+ * use AM_MAINTAINER_MODE in configure.in - try to stop automake etc
+ from running while building
+ so don't build depend on automake, autoconf
+ * fixes for alpha compilation in debian/rules, Closes: #121674
+ * .xvpics has been removed from source, Closes: #112706
+ * in debian/rules use dh_compress -X to stop tipsdatabase from being installed compressed, Closes #110847
+
+ -- Daniel Glassey <wdg at debian.org> Fri, 30 Nov 2001 19:41:44 +0000
+
+bibletime (1.0.1-1) unstable; urgency=low
+
+ * New upstream release - see www.bibletime.de for changes
+ * patched bibletime/pics/Makefile.am to allow install to $DESTDIR
+ * removed AUTHORS from debian/docs
+
+ -- Daniel Glassey <wdg at debian.org> Sat, 25 Aug 2001 13:47:36 +0000
+
+bibletime (1.0-1) unstable; urgency=low
+
+ * New upstream release - see www.bibletime.de for changes
+
+ -- Daniel Glassey <wdg at debian.org> Mon, 25 Jun 2001 22:22:30 +0000
+
+bibletime (0.31-3.1) unstable; urgency=low
+
+ * Non-maintainer upload (Ben Burton <benb at acm.org>).
+ * Rebuilt with new Qt libs (closes: #89789).
+ * Build-Depends: Replaced kdebase-dev with kdelibs-dev; removed
+ autoconf (redundant); added libtool.
+ * Replaced admin/debianrules with a newer version and modified
+ debian/rules to use admin/debianrules; this way everything gets
+ installed into the correct directory; this also required modifying
+ $(localedir) in po/Makefile.am.
+ * Added debian menu item, lintian overrides file and doc-base registration.
+ * In debian/rules, using configure-stamp instead of configure.stamp
+ (this stops ./configure being run again and again and again).
+ * In debian/rules, deletes Makefile.ins on "make clean" and recreates
+ them during "make configure"; this removes some unnecessary junk
+ from the debian diff.gz file.
+
+ -- Ben Burton <benb at acm.org> Thu, 17 May 2001 13:02:11 -0500
+
+bibletime (0.31-3) unstable; urgency=low
+
+ * Standards version now 3.2.1
+ * Added build-depends
+
+ -- Daniel Glassey <danglassey at yahoo.com> Mon, 22 Jan 2001 22:19:43 +0000
+
+bibletime (0.31-2) unstable; urgency=low
+
+ * Add dependencies on modules.
+
+ -- Daniel Glassey <danglassey at yahoo.com> Mon, 4 Dec 2000 22:34:34 +0000
+
+bibletime (0.31-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Daniel Glassey <danglassey at yahoo.com> Thu, 23 Nov 2000 20:57:31 +0000
+
+Local variables:
+mode: debian-changelog
+End:
diff --cc debian/control
index cb63a9d,0000000..3e8444f
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,38 -1,0 +1,39 @@@
+Source: bibletime
+Section: kde
+Build-Depends: quilt (>= 0.46-7~), debhelper (>= 7.0.50~),
- libsword-dev (>= 1.5.11), libclucene-dev, poxml, libboost-dev, cmake,
++ libsword-dev (>= 1.7.3), libclucene-dev, poxml, libboost-dev, cmake,
+ pkg-config, zlib1g-dev, libcurl4-gnutls-dev, libqtwebkit-dev | libqt4-dev (<= 4:4.7.0~beta1)
+Priority: optional
+Maintainer: CrossWire Packages <pkg-crosswire-devel at lists.alioth.debian.org>
+Uploaders: Daniel Glassey <wdg at debian.org>,
+ Dmitrijs Ledkovs <xnox at debian.org>,
+ Jonathan Marsden <jmarsden at fastmail.fm>
+Standards-Version: 3.9.3
+Homepage: http://www.bibletime.info/
+
+Package: bibletime
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ libqtgui4 (>= 4.4.0),
+ libqt4-svg (>=4.4.0),
+ bibletime-data (=${source:Version})
+Provides: sword-frontend
+Description: bible study tool for Qt
+ BibleTime is a free and easy to use bible study tool.
+ It uses the Qt and SWORD software libraries.
+ BibleTime provides easy handling of digitized texts (Bibles, commentaries
+ and lexicons) and powerful features to work with these texts (search in
+ texts, write own notes, save, print etc.) in the SWORD module format.
+
+Package: bibletime-data
+Architecture: all
++Multi-Arch: foreign
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: bibletime
+Conflicts: bibletime-i18n
+Replaces: bibletime-i18n
+Description: Documentation and data for bibletime, a bible study tool
+ BibleTime is a free and easy to use bible study tool.
+ .
+ This package contains the help, online documentation and data files
+ which BibleTime uses.
diff --cc debian/rules
index 2fa5a43,0000000..7b6d42a
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,8 -1,0 +1,4 @@@
+#!/usr/bin/make -f
- ppa:=$(shell sed -n "1s/.*~.*/yes/p" debian/changelog)
+
+%:
- dh $@ --with quilt -Scmake --parallel
- override_dh_clean:
- echo $(if $(ppa),"1.0","3.0 (quilt)") > debian/source/format
- dh_clean
++ dh $@ -Scmake --parallel
diff --cc debian/watch
index 086223e,0000000..ac6c748
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,3 -1,0 +1,3 @@@
+version=3
+
- http://sf.net/bibletime/bibletime-([\d\.]+).tar.[bg]z2?
++http://sf.net/bibletime/bibletime-([\d\.]+).tar.xz?
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-crosswire/bibletime.git
More information about the Pkg-crosswire-commits
mailing list