summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt4
-rw-r--r--ChangeLog10
-rw-r--r--debian/changelog14
-rw-r--r--debian/control5
-rw-r--r--debian/patches/01_main_window_icon.diff60
-rw-r--r--debian/patches/02_remove_unwanted_debug_code.diff32
-rw-r--r--debian/watch2
-rw-r--r--src/backend/rendering/cdisplayrendering.cpp6
-rw-r--r--src/bibletime.cpp2
-rw-r--r--src/frontend/display/bthtmlreaddisplay.cpp10
-rw-r--r--src/util/cresmgr.cpp3
-rw-r--r--src/util/cresmgr.h3
12 files changed, 43 insertions, 108 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9274447..e2f052b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ PROJECT(bibletime CXX C)
CMAKE_MINIMUM_REQUIRED(VERSION 2.4.0)
#Version
-ADD_DEFINITIONS(-DBT_VERSION=\\\"2.0\\\")
+ADD_DEFINITIONS(-DBT_VERSION=\\\"2.0.1\\\")
#Non-English locales to be processed and installed for UI, handbook and howto
LIST(APPEND MESSAGE_LOCALE_LANGS af bg cs da de en_GB es et fi fr hu it ko nl nn_NO no pl pt_br ro ru sk sv ua vi zh_CN zh_TW)
@@ -307,7 +307,7 @@ SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "BibleTime for Windows Beta")
SET(CPACK_PACKAGE_VENDOR "http://www.bibletime.info")
SET(CPACK_PACKAGE_VERSION_MAJOR "2")
SET(CPACK_PACKAGE_VERSION_MINOR "0")
-SET(CPACK_PACKAGE_VERSION_PATCH "0")
+SET(CPACK_PACKAGE_VERSION_PATCH "1")
SET(CPACK_PACKAGE_INSTALL_DIRECTORY "BibleTime")
######################################################
diff --git a/ChangeLog b/ChangeLog
index fd0afa1..ce7b6a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-06-06 Martin Gruner <mgruner@crosswire.org>
+ * Release 2.0.1
+
+2009-06-02 Martin Gruner <mgruner@crosswire.org>
+ * Fix bug #2799800: Display broken when verse numbers are turned off
+
+2009-05-30 Gary Holmlund
+ * Fix defect, the main window icon was missing - defect # 2798758
+ * Removed debug code writing a out.txt file in the current directory without warning
+
2009-05-28 Martin Gruner <mgruner@crosswire.org>
* release 2.0
diff --git a/debian/changelog b/debian/changelog
index f882eb3..47448b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+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@fastmail.fm> Sun, 07 Jun 2009 16:24:33 -0700
+
bibletime (2.0-1) unstable; urgency=low
* New upstream version.
diff --git a/debian/control b/debian/control
index ac3a7b8..ae1d276 100644
--- a/debian/control
+++ b/debian/control
@@ -8,13 +8,12 @@ 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
+Standards-Version: 3.8.2
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.
@@ -27,6 +26,8 @@ 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 for UNIX systems.
.
diff --git a/debian/patches/01_main_window_icon.diff b/debian/patches/01_main_window_icon.diff
deleted file mode 100644
index d820e3c..0000000
--- a/debian/patches/01_main_window_icon.diff
+++ /dev/null
@@ -1,60 +0,0 @@
-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 --git a/debian/patches/02_remove_unwanted_debug_code.diff b/debian/patches/02_remove_unwanted_debug_code.diff
deleted file mode 100644
index 6028711..0000000
--- a/debian/patches/02_remove_unwanted_debug_code.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-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
-+}
diff --git a/debian/watch b/debian/watch
index 98c3efc..6fb159a 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
version=3
-http://sf.net/bibletime/bibletime-(\d.+).tar.gz
+http://sf.net/bibletime/bibletime-([\d\.]+).tar.gz
diff --git a/src/backend/rendering/cdisplayrendering.cpp b/src/backend/rendering/cdisplayrendering.cpp
index 8c6c525..50d5b18 100644
--- a/src/backend/rendering/cdisplayrendering.cpp
+++ b/src/backend/rendering/cdisplayrendering.cpp
@@ -19,6 +19,7 @@
//Qt
#include <QString>
#include <QRegExp>
+#include <QDebug>
namespace Rendering {
@@ -80,8 +81,9 @@ namespace Rendering {
}
}
+
if (linkText.isEmpty()) {
- return QString("<a name=\"").append(keyToHTMLAnchor(item.key())).append("\" />");
+ return QString("<a name=\"").append(keyToHTMLAnchor(item.key())).append("\"></a>");
}
else {
return QString("<a name=\"").append(keyToHTMLAnchor(item.key())).append("\" ")
@@ -147,7 +149,7 @@ namespace Rendering {
CDisplayTemplateMgr::Settings settings;
settings.modules = modules;
settings.langAbbrev = ((modules.count() == 1) && lang->isValid()) ? lang->abbrev() : QString::null;
-
+
if (modules.count() == 1)
settings.pageDirection = (modules.first()->textDirection() == CSwordModuleInfo::LeftToRight) ? "ltr" : "rtl";
else
diff --git a/src/bibletime.cpp b/src/bibletime.cpp
index c4510f6..0877a8f 100644
--- a/src/bibletime.cpp
+++ b/src/bibletime.cpp
@@ -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 @@ BibleTime::BibleTime() :
initConnections();
readSettings();
setPlainCaption(QString());
+ setWindowIcon( util::filesystem::DirectoryUtil::getIcon(CResMgr::mainWindow::icon) );
}
BibleTime::~BibleTime()
diff --git a/src/frontend/display/bthtmlreaddisplay.cpp b/src/frontend/display/bthtmlreaddisplay.cpp
index 6cb959c..53d10e7 100644
--- a/src/frontend/display/bthtmlreaddisplay.cpp
+++ b/src/frontend/display/bthtmlreaddisplay.cpp
@@ -213,19 +213,11 @@ const QString BtHtmlReadDisplay::text( const CDisplay::TextType format, const CD
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 @@ bool BtHtmlReadDisplayView::event(QEvent* e)
if ( e->type() == QEvent::Leave )
m_display->m_jsObject->clearPrevAttribute();
return QWidget::event(e);
-} \ No newline at end of file
+}
diff --git a/src/util/cresmgr.cpp b/src/util/cresmgr.cpp
index 1bd51af..27eb8f4 100644
--- a/src/util/cresmgr.cpp
+++ b/src/util/cresmgr.cpp
@@ -13,6 +13,9 @@
namespace CResMgr {
+ namespace mainWindow {
+ const QString icon = "bibletime.svg";
+ } // mainWindow
namespace modules {
namespace bible {
const QString icon_unlocked = "bible.svg";
diff --git a/src/util/cresmgr.h b/src/util/cresmgr.h
index 1fa3953..95d931e 100644
--- a/src/util/cresmgr.h
+++ b/src/util/cresmgr.h
@@ -20,6 +20,9 @@
namespace CResMgr {
void init_tr();
+ namespace mainWindow {
+ extern const QString icon;
+ }
namespace modules {
namespace bible {
extern const QString icon_unlocked;
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 20:08:34 +0000