Imported Debian patch 2.0-1

diff --cc debian/README.source
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..85880c229e34cb6218f98cab49944689112a1e85
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/debian/README.source
@@@ -1,0 -1,0 +1,35 @@@
++This package uses CDBS (and therefore simple-patchsys.mk) in order to 
++apply patches to the upstream source. Patches are stored in 
++debian/patches and their filenames usually end in .patch or .diff .
++For further details, see the man page for cdbs-edit-patch.
++
++All commands described below should be run from the top directory of the 
++package source tree, unless otherwise stated.
++
++ * To generate the fully patched source, in a form ready for
++   editing, that would be built to create Debian packages, run: 
++
++     make -f debian/rules apply-patches
++
++   Note: It has been proposed that, in future, this should happen 
++   automatically when you run dpkg-source -x on a CDBS 
++   simple-patchsys.mk source package.  However, this proposal has 
++   apparently not yet been implemented, so for now you have to do 
++   it yourself like this.
++
++ * To modify the source and save those modifications so that
++   they will be applied when building the package, pick a
++   suitably informative patch file name, for example
++   01_add_README.source_file.patch, and then run:
++
++     cdbs-edit-patch 01_add_README.source_file.patch
++
++   This will place you in a new shell in a temporary copy of the 
++   source tree.  Make your desired modifications to it, and then 
++   exit the shell to create the patch file containing them (this 
++   file will appear in debian/patches).
++
++ * To remove source modifications that are currently being
++   applied when building the package, run:
++
++     make -f debian/rules reverse-patches

diff --cc debian/changelog
index 025e48cde73870a2273cd1e3d2e0ce1cf63861f2,0000000000000000000000000000000000000000..f882eb38dd7ee57c1e936f5798b7a4b911629cfa
mode 100644,000000..100644
--- 1/debian/changelog
--- /dev/null
+++ b/debian/changelog
@@@ -1,262 -1,0 +1,266 @@@
- bibletime (2.0~beta2-1) experimental; urgency=low
++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@fastmail.fm>  Sat, 02 May 2009 21:25:01 -0700
++ -- Jonathan Marsden <jmarsden@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@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@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@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@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@debian.org>  Sat, 10 Dec 2005 21:39:54 +0000
 +
 +bibletime (1.5.1-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Daniel Glassey <wdg@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@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@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@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@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@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@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@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@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@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@debian.org>  Fri, 18 Jul 2003 18:39:40 +0100
 +
 +bibletime (1.2.99-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Daniel Glassey <wdg@debian.org>  Fri,  13 Jul 2003 21:33:55 +0100
 +
 +bibletime (1.0.99b-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Daniel Glassey <wdg@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@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@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@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@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@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@debian.org>  Mon, 25 Jun 2001 22:22:30 +0000
 +
 +bibletime (0.31-3.1) unstable; urgency=low
 +
 +  * Non-maintainer upload (Ben Burton <benb@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@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@yahoo.com>  Mon, 22 Jan 2001 22:19:43 +0000
 +
 +bibletime (0.31-2) unstable; urgency=low
 +
 +  * Add dependencies on modules.
 +
 + -- Daniel Glassey <danglassey@yahoo.com>  Mon,  4 Dec 2000 22:34:34 +0000
 +
 +bibletime (0.31-1) unstable; urgency=low
 +
 +  * Initial Release.
 +
 + -- Daniel Glassey <danglassey@yahoo.com>  Thu, 23 Nov 2000 20:57:31 +0000
 +
 +Local variables:
 +mode: debian-changelog
 +End:

diff --cc debian/control
index 0229b3153924f0ec68fb666d3f1ed51acd055238,0000000000000000000000000000000000000000..ac3a7b82ab83433142fbc1f25916c5f89bacafe3
mode 100644,000000..100644
--- 1/debian/control
--- /dev/null
+++ b/debian/control
@@@ -1,34 -1,0 +1,34 @@@
-  cdbs (>= 0.4.27), debhelper (>= 7), libsword-dev (>= 1.5.11),
-  libqt4-dev, libclucene-dev, poxml, libboost-dev, cmake, pkg-config
 +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
 +Priority: optional
 +Maintainer: CrossWire Packages <pkg-crosswire-devel@lists.alioth.debian.org>
 +Uploaders: Daniel Glassey <wdg@debian.org>, 
 + Dmitrijs Ledkovs <dmitrij.ledkov@gmail.com>, 
 + Jonathan Marsden <jmarsden@fastmail.fm>
 +Standards-Version: 3.8.1
 +Homepage: http://www.bibletime.info/
 +
 +Package: bibletime
 +Architecture: any
 +Depends: ${shlibs:Depends}, ${misc:Depends}, bibletime-data
 +Suggests: bibletime-i18n
 +Provides: sword-frontend
 +Description: A bible study tool for Qt
 + BibleTime is a free and easy to use bible study tool for UNIX systems.
 + It requires a working KDE environment and the SWORD library.
 + 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.).
 +
 +Package: bibletime-data
 +Architecture: all
 +Depends: ${shlibs:Depends}, ${misc:Depends}
 +Suggests: bibletime
 +Description: Documentation and data for bibletime, a bible study tool
 + BibleTime is a free and easy to use bible study tool for UNIX systems.
 + .
 + This package contains the help, online documentation and data files
 + which BibleTime uses.

diff --cc debian/patches/01_main_window_icon.diff
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..d820e3ce27a6a7e291421bc30fd719bb4dfa941c
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/debian/patches/01_main_window_icon.diff
@@@ -1,0 -1,0 +1,60 @@@
++Associate an icon with the main window.  Upstream svn r1317.
++Index: ChangeLog
++===================================================================
++--- old/ChangeLog     (revision 1316)
+++++ new/ChangeLog     (working copy)
++@@ -1,3 +1,6 @@
+++2009-05-30 Gary Holmlund 
+++     * Fix defect, the main window icon was missing - defect # 2798758
+++
++ 2009-05-28 Martin Gruner <mgruner@crosswire.org>
++      * release 2.0
++ 
++Index: src/bibletime.cpp
++===================================================================
++--- old/src/bibletime.cpp     (revision 1316)
+++++ new/src/bibletime.cpp     (working copy)
++@@ -20,6 +20,7 @@
++ 
++ #include "util/ctoolclass.h"
++ #include "util/cpointers.h"
+++#include "util/cresmgr.h"
++ #include "util/directoryutil.h"
++ 
++ #include "backend/drivers/cswordmoduleinfo.h"
++@@ -75,6 +76,7 @@
++    initConnections();
++    readSettings();
++    setPlainCaption(QString());
+++     setWindowIcon( util::filesystem::DirectoryUtil::getIcon(CResMgr::mainWindow::icon) );
++ }
++ 
++ BibleTime::~BibleTime() 
++Index: src/util/cresmgr.cpp
++===================================================================
++--- old/src/util/cresmgr.cpp  (revision 1316)
+++++ new/src/util/cresmgr.cpp  (working copy)
++@@ -13,6 +13,9 @@
++ 
++ 
++ namespace CResMgr {
+++     namespace mainWindow {
+++             const QString icon = "bibletime.svg";
+++     } // mainWindow
++      namespace modules {
++              namespace bible {
++                      const QString icon_unlocked  = "bible.svg";
++Index: src/util/cresmgr.h
++===================================================================
++--- old/src/util/cresmgr.h    (revision 1316)
+++++ new/src/util/cresmgr.h    (working copy)
++@@ -20,6 +20,9 @@
++ namespace CResMgr {
++      void init_tr();
++ 
+++     namespace mainWindow {
+++             extern const QString icon;
+++     }
++      namespace modules {
++              namespace bible {
++                      extern const QString icon_unlocked;

diff --cc debian/patches/02_remove_unwanted_debug_code.diff
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..6028711414e0162e390ca643e6358c48f318da04
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/debian/patches/02_remove_unwanted_debug_code.diff
@@@ -1,0 -1,0 +1,32 @@@
++Remove unwanted debug code that created ./out.txt.  Upstream svn r1318.
++Index: src/frontend/display/bthtmlreaddisplay.cpp
++===================================================================
++--- src/frontend/display/bthtmlreaddisplay.cpp        (revision 1317)
+++++ src/frontend/display/bthtmlreaddisplay.cpp        (working copy)
++@@ -213,19 +213,11 @@
++      return QString();
++ }
++ 
++-#include <QTextStream>
++ // Puts html text and javascript into QWebView
++ void BtHtmlReadDisplay::setText( const QString& newText ) 
++ {
++      QString jsText = newText;
++ 
++-     QFile file("out.txt");
++-     if (!file.open(QIODevice::WriteOnly | QIODevice::Text))
++-         return;
++-
++-     QTextStream out(&file);
++-     out <<  newText << "\n";
++-
++      jsText.replace(body,jsBegin+javascript+jsEnd+body);
++ 
++      // Disconnect any previous connect and connect to slot that loads the javascript object
++@@ -379,4 +371,4 @@
++     if ( e->type() == QEvent::Leave )
++         m_display->m_jsObject->clearPrevAttribute();
++     return QWidget::event(e);
++-}
++\ No newline at end of file
+++}