From: Jonathan Marsden Date: Mon, 20 Jun 2011 05:40:22 +0000 (-0700) Subject: Imported Debian patch 2.8.1-1 X-Git-Tag: archive/raspbian/3.0-3+rpi1~1^2~82 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=da83befb5a5c7b5e67b92bcf13ed56952783332a;p=bibletime.git Imported Debian patch 2.8.1-1 --- da83befb5a5c7b5e67b92bcf13ed56952783332a diff --cc debian/bibletime.install index 94bf506,0000000..5858c8a mode 100644,000000..100644 --- a/debian/bibletime.install +++ b/debian/bibletime.install @@@ -1,3 -1,0 +1,5 @@@ +usr/bin/ +usr/share/applications/ +usr/share/icons/ ++debian/bibletime.xpm usr/share/bibletime ++debian/bibletime.xpm usr/share/pixmaps diff --cc debian/bibletime.manpages index 0000000,0000000..85d91b0 new file mode 100644 --- /dev/null +++ b/debian/bibletime.manpages @@@ -1,0 -1,0 +1,2 @@@ ++docs/manpages/bibletime.1 ++docs/manpages/bibletime.de.1 diff --cc debian/changelog index 2177f83,0000000..64ea152 mode 100644,000000..100644 --- a/debian/changelog +++ b/debian/changelog @@@ -1,325 -1,0 +1,352 @@@ ++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 Sun, 19 Jun 2011 22:40:22 -0700 ++ +bibletime (2.5-1) unstable; urgency=low + + * New upstream version 2.5 (Closes: #564551). + + -- Jonathan Marsden 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 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 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 Thu, 08 Oct 2009 22:55:24 -0700 + +bibletime (2.2-1) unstable; urgency=low + + * New upstream version 2.2 + + -- Jonathan Marsden Wed, 26 Aug 2009 21:58:15 -0700 + +bibletime (2.1-1~karmic1) karmic; urgency=low + + * New upstream version 2.1. + + -- Jonathan Marsden 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 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 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 Sat, 10 May 2008 15:18:16 +0100 + +bibletime (1.6.4.dfsg-1) unstable; urgency=low + + * New upstream version + + -- Daniel Glassey 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 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 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 Sat, 10 Dec 2005 21:39:54 +0000 + +bibletime (1.5.1-1) unstable; urgency=low + + * New upstream release + + -- Daniel Glassey 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 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 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 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 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 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 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 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 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 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 Fri, 18 Jul 2003 18:39:40 +0100 + +bibletime (1.2.99-1) unstable; urgency=low + + * New upstream release + + -- Daniel Glassey Fri, 13 Jul 2003 21:33:55 +0100 + +bibletime (1.0.99b-1) unstable; urgency=low + + * New upstream release + + -- Daniel Glassey 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 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 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@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 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 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 Mon, 25 Jun 2001 22:22:30 +0000 + +bibletime (0.31-3.1) unstable; urgency=low + + * Non-maintainer upload (Ben Burton ). + * 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 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 Mon, 22 Jan 2001 22:19:43 +0000 + +bibletime (0.31-2) unstable; urgency=low + + * Add dependencies on modules. + + -- Daniel Glassey Mon, 4 Dec 2000 22:34:34 +0000 + +bibletime (0.31-1) unstable; urgency=low + + * Initial Release. + + -- Daniel Glassey Thu, 23 Nov 2000 20:57:31 +0000 + +Local variables: +mode: debian-changelog +End: diff --cc debian/control index f74d62a,0000000..cf4294d mode 100644,000000..100644 --- a/debian/control +++ b/debian/control @@@ -1,36 -1,0 +1,35 @@@ +Source: bibletime +Section: kde - Build-Depends: bzip2, autotools-dev, quilt, patchutils (>= 0.2.25), - cdbs (>= 0.4.27), debhelper (>= 7), libsword-dev (> 1.5.11), - libqt4-dev (>= 4.4.0), libclucene-dev, poxml, libboost-dev, cmake, pkg-config, - zlib1g-dev, libcurl4-gnutls-dev ++Build-Depends: quilt (>= 0.46-7~), debhelper (>= 7.0.50~), ++ libsword-dev (>= 1.5.11), libclucene-dev, poxml, libboost-dev, cmake, ++ pkg-config, zlib1g-dev, libcurl4-gnutls-dev, libqtwebkit-dev | libqt4-dev +Priority: optional +Maintainer: CrossWire Packages +Uploaders: Daniel Glassey , - Dmitrijs Ledkovs , ++ Dmitrijs Ledkovs , + Jonathan Marsden - Standards-Version: 3.8.3 ++Standards-Version: 3.9.2 +Homepage: http://www.bibletime.info/ + +Package: bibletime +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, libqtgui4 (>= 4.4.0), bibletime-data +Provides: sword-frontend - Description: A bible study tool for Qt ++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 +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/patches/01-fix-search-works-print-crash.patch index 0000000,0000000..cedafc1 new file mode 100644 --- /dev/null +++ b/debian/patches/01-fix-search-works-print-crash.patch @@@ -1,0 -1,0 +1,52 @@@ ++Upstream git commit https://gitorious.org/bibletime/bibletime/commit/f22df940f92da55445c36e1334ab542addf690ff ++2011-05-15 Gary Holmlund ++ * Fix crash when printing from Works pane of search dialog. ++Index: src/frontend/cexportmanager.cpp ++=================================================================== ++--- a/src/frontend/cexportmanager.cpp 2011-06-19 21:35:46.000000000 -0700 +++++ b/src/frontend/cexportmanager.cpp 2011-06-19 21:35:58.000000000 -0700 ++@@ -342,29 +342,27 @@ ++ CPrinter::KeyTreeItem::Settings settings; ++ CPrinter::KeyTree tree; ++ ++- QString startKey, stopKey; ++ setProgressRange(list.Count()); ++- ++- list.setPosition(sword::TOP); ++- while (!list.Error() && !progressWasCancelled()) { ++- if (dynamic_cast(l) != 0) { ++- const sword::VerseKey &vk = static_cast(l); ++- startKey = QString::fromUtf8((const char*) vk.LowerBound()); ++- stopKey = QString::fromUtf8((const char*) vk.UpperBound()); +++ for (int i=0; i< list.Count(); i++) { +++ const sword::SWKey* swKey = list.getElement(i); +++ const sword::VerseKey* vKey = dynamic_cast(swKey); +++ if (vKey != 0) { +++ QString startKey = vKey->getText(); ++ tree.append(new CTextRendering::KeyTreeItem(startKey, ++- stopKey, ++- module, ++- settings)); +++ startKey, +++ module, +++ settings)); ++ } ++ else { ++- startKey = QString::fromUtf8((const char*) * list); ++- tree.append(new CTextRendering::KeyTreeItem(startKey, ++- module, ++- settings)); +++ QString key = swKey->getText(); +++ tree.append(new CTextRendering::KeyTreeItem(key, +++ key, +++ module, +++ settings)); ++ } ++- ++- list.increment(); ++ incProgress(); +++ if (progressWasCancelled()) +++ break; ++ } ++ ++ QSharedPointer printer(new CPrinter(0, displayOptions, filterOptions)); diff --cc debian/patches/series index 8b13789,0000000..011c416 mode 100644,000000..100644 --- a/debian/patches/series +++ b/debian/patches/series @@@ -1,1 -1,0 +1,1 @@@ - ++01-fix-search-works-print-crash.patch diff --cc debian/rules index 792e3e5,0000000..2fa5a43 mode 100755,000000..100755 --- a/debian/rules +++ b/debian/rules @@@ -1,11 -1,0 +1,8 @@@ +#!/usr/bin/make -f ++ppa:=$(shell sed -n "1s/.*~.*/yes/p" debian/changelog) + - include /usr/share/cdbs/1/rules/debhelper.mk - include /usr/share/cdbs/1/class/cmake.mk - include /usr/share/cdbs/1/rules/simple-patchsys.mk - - install/bibletime:: - dh_install debian/bibletime.xpm usr/share/bibletime - dh_install debian/bibletime.xpm usr/share/pixmaps - dh_installman docs/manpages/bibletime.1 - dh_installman --language=de docs/manpages/bibletime.de.1 ++%: ++ dh $@ --with quilt -Scmake --parallel ++override_dh_clean: ++ echo $(if $(ppa),"1.0","3.0 (quilt)") > debian/source/format ++ dh_clean diff --cc debian/source/format index 0000000,0000000..163aaf8 new file mode 100644 --- /dev/null +++ b/debian/source/format @@@ -1,0 -1,0 +1,1 @@@ ++3.0 (quilt) diff --cc debian/watch index 6fb159a,0000000..086223e 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.gz ++http://sf.net/bibletime/bibletime-([\d\.]+).tar.[bg]z2?