summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorDmitrijs Ledkovs <xnox@debian.org>2012-04-14 18:11:50 +0100
committerRoberto C. Sanchez <roberto@connexer.com>2014-10-21 22:48:45 -0400
commit1da8254d16a30cc96f545d198975e9f3a4d847be (patch)
tree6d94b7a0d34cb80e14287ae50994f1c46d39a154 /debian
parentbc6baa3433b5781439754ff2a2a4d475986ec393 (diff)
parent00bc0a3de99e088902379dcb2905fb1546c7eca2 (diff)
Imported Debian patch 2.9.1-1
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog13
-rw-r--r--debian/control8
-rw-r--r--debian/patches/01-fix-search-works-print-crash.patch52
-rw-r--r--debian/patches/02-prevent-unused-but-set-variable-ftbfs.patch22
-rw-r--r--debian/patches/series2
5 files changed, 17 insertions, 80 deletions
diff --git a/debian/changelog b/debian/changelog
index c024ea9..48b9c1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+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@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:
diff --git a/debian/control b/debian/control
index bf1dc81..cb63a9d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,13 @@ 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,
- pkg-config, zlib1g-dev, libcurl4-gnutls-dev, libqtwebkit-dev | libqt4-dev
+ pkg-config, zlib1g-dev, libcurl4-gnutls-dev, libqtwebkit-dev | libqt4-dev (<= 4:4.7.0~beta1)
Priority: optional
Maintainer: CrossWire Packages <pkg-crosswire-devel@lists.alioth.debian.org>
Uploaders: Daniel Glassey <wdg@debian.org>,
- Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>,
+ Dmitrijs Ledkovs <xnox@debian.org>,
Jonathan Marsden <jmarsden@fastmail.fm>
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Homepage: http://www.bibletime.info/
Package: bibletime
@@ -16,7 +16,7 @@ Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
libqtgui4 (>= 4.4.0),
libqt4-svg (>=4.4.0),
- bibletime-data
+ bibletime-data (=${source:Version})
Provides: sword-frontend
Description: bible study tool for Qt
BibleTime is a free and easy to use bible study tool.
diff --git a/debian/patches/01-fix-search-works-print-crash.patch b/debian/patches/01-fix-search-works-print-crash.patch
deleted file mode 100644
index cedafc1..0000000
--- a/debian/patches/01-fix-search-works-print-crash.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Upstream git commit https://gitorious.org/bibletime/bibletime/commit/f22df940f92da55445c36e1334ab542addf690ff
-2011-05-15 Gary Holmlund <gary.holmlund@gmail.com>
- * 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<const sword::VerseKey&>(l) != 0) {
-- const sword::VerseKey &vk = static_cast<const sword::VerseKey&>(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<const sword::VerseKey*>(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<CPrinter> printer(new CPrinter(0, displayOptions, filterOptions));
diff --git a/debian/patches/02-prevent-unused-but-set-variable-ftbfs.patch b/debian/patches/02-prevent-unused-but-set-variable-ftbfs.patch
deleted file mode 100644
index d7354d0..0000000
--- a/debian/patches/02-prevent-unused-but-set-variable-ftbfs.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Prevents gcc 4.6 FTBFS (do not create a variable that is never used).
- The relevant Bibletime upstream git log entry is:
- commit 984d9f41bdb7efb9477a706fb1f524b2fbc9c54b
- Author: Gary Holmlund <gary.holmlund@gmail.com>
- Date: Mon May 16 22:05:02 2011 -0700
- Fix compile error on Fedora 15
-Origin: upstream, https://gitorious.org/bibletime/bibletime/commit/984d9f41bdb7efb9477a706fb1f524b2fbc9c54b
-Author: Gary Holmlund <gary.holmlund@gmail.com>
-
-Index: debian/src/frontend/keychooser/ckeychooserwidget.cpp
-===================================================================
---- debian.orig/src/frontend/keychooser/ckeychooserwidget.cpp 2011-07-10 14:10:48.000000000 -0700
-+++ debian/src/frontend/keychooser/ckeychooserwidget.cpp 2011-07-10 14:11:20.000000000 -0700
-@@ -180,7 +180,7 @@
- emit changed(m_comboBox->currentIndex());
- }
-
-- const QSize dummySize = m_comboBox->sizeHint(); //without this function call the combo box won't be properly sized!
-+ m_comboBox->sizeHint(); //without this function call the combo box won't be properly sized!
- //DON'T REMOVE OR MOVE THE show()! Otherwise QComboBox's sizeHint() function won't work properly!
- m_comboBox->show();
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 0957dca..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-01-fix-search-works-print-crash.patch
-02-prevent-unused-but-set-variable-ftbfs.patch