Imported Debian patch 2.0~beta2-1

15 files changed, 68 insertions, 324 deletions

diff --git a/debian/bibletime-data.install b/debian/bibletime-data.install
new file mode 100644
index 0000000..3632979
--- /dev/null
+++ b/debian/bibletime-data.install
@@ -0,0 +1 @@
+usr/share/bibletime/
diff --git a/debian/bibletime.install b/debian/bibletime.install
new file mode 100644
index 0000000..94bf506
--- /dev/null
+++ b/debian/bibletime.install
@@ -0,0 +1,3 @@
+usr/bin/
+usr/share/applications/
+usr/share/icons/
diff --git a/debian/changelog b/debian/changelog
index 31317aa..025e48c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,31 @@
+bibletime (2.0~beta2-1) experimental; 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/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
+
 bibletime (1.6.5.1-1) unstable; urgency=low
 
   * New upstream version (Closes: #441161, #271502)
diff --git a/debian/compat b/debian/compat
index b8626c4..49019db 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1,2 @@
-4
+7
+7
diff --git a/debian/control b/debian/control
index b5a2b37..0229b31 100644
--- a/debian/control
+++ b/debian/control
@@ -1,21 +1,34 @@
 Source: bibletime
 Section: kde
-Build-Depends: bzip2, autotools-dev, quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), debhelper (>= 4.1.0), kdelibs4-dev (>= 3.4.3), libsword-dev (>= 1.5.9), libsword-dev (<< 1.5.9.90-1), libclucene-dev, poxml
+Build-Depends: bzip2, autotools-dev, quilt, patchutils (>= 0.2.25),
+ cdbs (>= 0.4.27), debhelper (>= 7), libsword-dev (>= 1.5.11),
+ libqt4-dev, libclucene-dev, poxml, libboost-dev, cmake, pkg-config
 Priority: optional
-Maintainer: Ralph Janke <txwikinger@ubuntu.com>
-Standards-Version: 3.7.3
+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
-Section: kde
-Depends: ${shlibs:Depends}
-Recommends: sword-text, sword-dict, sword-comm
+Depends: ${shlibs:Depends}, ${misc:Depends}, bibletime-data
 Suggests: bibletime-i18n
 Provides: sword-frontend
-Description: A bible study tool for KDE
+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 --git a/debian/copyright b/debian/copyright
index c256c74..c71e35f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,11 +2,13 @@ This package was initially debianized by
 Daniel Glassey <danglassey@yahoo.com> on
 Thu, 23 Nov 2000 20:57:31 +0000.
 
-It was downloaded from www.bibletime.de
+It was initially downloaded from www.bibletime.de .
+More recently it has been downloaded from
+http://downloads.sourceforge.net/sourceforge/bibletime/
 
 Upstream Authors: Bibletime team <info@bibletime.info>
 
-Copyright 1999-2005 BibleTime team <info@bibletime.info>
+Copyright 1999-2009 BibleTime team <info@bibletime.info>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/debian/de/bibletime.1 b/debian/de/bibletime.1
deleted file mode 100644
index 6b662b1..0000000
--- a/debian/de/bibletime.1
+++ /dev/null
@@ -1,109 +0,0 @@
-.TH "BibleTime" "1" "17. Juli 2004" "BibleTime 1.4.1" "KDE Application"
-.SH "NAME"
-bibletime \- Software für das Bibelstudium für KDE
-.SH "ÜBERSICHT"
-.B bibletime
-[
-\fIQt\-Optionen\fR
-] 
-[
-\fIKDE\-Optionen\fR
-]
-[
-\fIOptionen\fR
-]
-.SH "BESCHREIBUNG"
-Diese Manpage beschreibt die 
-KDE\-Applikation
-.B bibletime
-und wurde für Debian GNU/Linux geschrieben, weil
-das Programm selbst keine Manpage mitbrachte.
-.P
-.B BibleTime
-ist ein freies und einfach zu bedienendes Hilfsmittel zum Bibelstudium
-für UNIX\-Systeme.
-Es erfordert eine laufende KDE\-Umgebung und die Bibliothek SWORD.
-BibleTime ermöglicht den einfachen Umgang mit digitalen Texten (Bibeln, 
-Kommentare und Lexikas) und bietet leistungsfähige Funktionen, um mit diesen
-Texten zu arbeiten (suchen in Texten, eigene Notizen schreiben, speichern,
-drucken usw.).
-.SS "Einfache Optionen:"
-.TP 
-\fB\-\-help\fR
-Optionen von "Hilfe zu" anzeigen
-.TP 
-\fB\-\-help\-qt\fR
-Spezielle Optionen zu Qt anzeigen
-.TP 
-\fB\-\-help\-kde\fR
-Spezielle Optionen zu KDE anzeigen
-.TP 
-\fB\-\-help\-all\fR
-Alle Optionen anzeigen
-.TP 
-\fB\-\-author\fR
-Autoren\-Information anzeigen
-.TP 
-\fB\-v\fR, \fB\-\-version\fR
-Versionsinformation anzeigen
-.TP 
-\fB\-\-license\fR
-Lizenz\-Info anzeigen
-.TP 
-\fB\-\-\fR
-Ende der Optionen
-.SH "OPTIONEN"
-.TP 
-\fB\-\-debug\fR
-Fehlermeldungen aktivieren
-.TP 
-\fB\-\-ignore\-session\fR
-Die Startsitzung ignorieren, die beim letzten Beenden von BibleTime
-gespeichert wurde.
-.TP 
-\fB\-\-open\-default\-bible\fR \fIkey\fR
-Die Standardbibel an der angegebenen Stelle \fIkey\fR öffnen.
-Verwenden Sie \fIrandom\fR, um eine zufällige Stelle aufzuschlagen.
-.SH "SIEHE AUCH"
-Die vollständige Dokumentation für
-.B bibletime
-und das
-.B Bibelstudium
-werden als DocBook\-Handbuch bereitgestellt. Wenn das Progamm
-.B khelpcenter
-richtig eingerichtet ist, sollte das Kommando
-.IP 
-.B khelpcenter help:/bibletime
-.PP 
-das komplette Handbuch zugänglich machen.
-.SH "FEHLER"
-Bitte melden Sie Fehler an 
-.br 
-http://bugs.kde.org oder info@bibletime.info ,
-.br 
-nicht direkt an die Autoren.
-.br 
-.SH "AUTOREN"
-BibleTime wurde geschrieben von:
-.br 
-.nh
-Joachim Ansorg <junkmail@joachim.ansorgs.de>
-.br 
-Martin Gruner <mg.pub@gmx.net>
-.br 
-Nikolay Igotti <olonho@hotmail.com>
-.br 
-Gary Sims <gary@garysims.co.uk>
-.br 
-Timothy R. Butler <tbutler@uninetsolutions.com>
-.br 
-James Ots <me@jamesots.com>
-.br 
-Fred Saalbach <saalbach@sybercom.net>
-.hy
-.P 
-Diese Manpage wurde erstellt von
-.nh
-Erik Schanze <schanzi_@gmx.de>
-.hy
-für Debian GNU/Linux (kann aber auch von anderen genutzt werden).
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index 0b28cc5..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin
-usr/share/man/man1
-usr/share/pixmaps
diff --git a/debian/en/bibletime.1 b/debian/en/bibletime.1
deleted file mode 100644
index b711923..0000000
--- a/debian/en/bibletime.1
+++ /dev/null
@@ -1,109 +0,0 @@
-.TH "BibleTime" "1" "July 17, 2004" "BibleTime 1.4.1" "KDE Application"
-.SH "NAME"
-bibletime \- Bible study tool for KDE
-.SH "SYNOPSIS"
-.B bibletime
-[
-\fIQt\-options\fR
-] 
-[
-\fIKDE\-options\fR
-]
-[
-\fIoptions\fR
-]
-.SH "DESCRIPTION"
-This manual page documents briefly the
-.B bibletime
-KDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.P
-.B 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.).
-.SS "Generic options:"
-.TP 
-\fB\-\-help\fR
-Show help about options
-.TP 
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP 
-\fB\-\-help\-kde\fR
-Show KDE specific options
-.TP 
-\fB\-\-help\-all\fR
-Show all options
-.TP 
-\fB\-\-author\fR
-Show author information
-.TP 
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP 
-\fB\-\-license\fR
-Show license information
-.TP 
-\fB\-\-\fR
-End of options.
-.SH "OPTIONS"
-.TP 
-\fB\-\-debug\fR
-Enable debug messages.
-.TP 
-\fB\-\-ignore\-session\fR
-Ignore the startup session that was saved when BibleTime was closed
-the last time.
-.TP 
-\fB\-\-open\-default\-bible\fR \fIkey\fR
-Open the default bible with the given \fIkey\fR.
-Use 
-.I random
-to open at a random position.
-.SH "SEE ALSO"
-The full documentations for
-.B bibletime
-and 
-.B bible study
-are maintained as docbook manuals. If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP 
-.B khelpcenter help:/bibletime
-.PP 
-should give you access to the complete manual.
-.SH "BUGS"
-Please use 
-.br 
-http://bugs.kde.org or info@bibletime.info 
-.br 
-to report bugs, do not mail the authors directly.
-.br 
-.SH "AUTHOR"
-BibleTime was written by
-.br 
-.nh
-Joachim Ansorg <junkmail@joachim.ansorgs.de>
-.br 
-Martin Gruner <mg.pub@gmx.net>
-.br 
-Nikolay Igotti <olonho@hotmail.com>
-.br 
-Gary Sims <gary@garysims.co.uk>
-.br 
-Timothy R. Butler <tbutler@uninetsolutions.com>
-.br 
-James Ots <me@jamesots.com>
-.br 
-Fred Saalbach <saalbach@sybercom.net>
-.hy
-.P 
-This manual page was prepared by
-.nh
-Erik Schanze <schanzi_@gmx.de>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/install b/debian/install
deleted file mode 100644
index 6f0e927..0000000
--- a/debian/install
+++ /dev/null
@@ -1,3 +0,0 @@
-bibletime.xpm /usr/share/pixmaps/
-en/bibletime.1 /usr/share/man/man1
-de/bibletime.1 /usr/share/man/de/man1
diff --git a/debian/kde.mk b/debian/kde.mk
deleted file mode 100644
index 510cdbd..0000000
--- a/debian/kde.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Description: A class for KDE packages; sets KDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_kde
-_cdbs_class_kde := 1
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-#DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-
-export kde_cgidir = /usr/lib/cgi-bin
-export kde_confdir = /etc/kde3
-export kde_htmldir = /usr/share/doc/kde/HTML
-
-ifeq (,$(findstring nofinal,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-endif
-ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final = 
-	cdbs_kde_enable_debug = --enable-debug
-endif
-
-cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
-DEB_COMPRESS_EXCLUDE := .dcl .docbook -license
-
-# Temporary fix until CDBS v2
-DEB_DH_MAKESHLIBS_ARGS = $(if $(strip $(DEB_DH_MAKESHLIBS_ARGS_ALL) $(DEB_DH_MAKESHLIBS_ARGS_$(cdbs_curpkg))),$(DEB_DH_MAKESHLIBS_ARGS_ALL) $(DEB_DH_MAKESHLIBS_ARGS_$(cdbs_curpkg)),-V)
-
-cleanbuilddir::
-	-if test "$(DEB_BUILDDIR)" != "$(DEB_SRCDIR)"; then rm -rf $(DEB_BUILDDIR); fi
-
-endif
diff --git a/debian/patches/00-fix-desktop-file.patch b/debian/patches/00-fix-desktop-file.patch
deleted file mode 100644
index b4d65fd..0000000
--- a/debian/patches/00-fix-desktop-file.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Nur -x '*.orig' -x '*~' bibletime-1.6.5.1/bibletime.desktop.in bibletime-1.6.5.1.new/bibletime.desktop.in
---- bibletime-1.6.5.1/bibletime.desktop.in	2008-02-04 18:19:03.000000000 +0000
-+++ bibletime-1.6.5.1.new/bibletime.desktop.in	2008-05-22 15:51:47.000000000 +0100
-@@ -15,12 +15,9 @@
- Name[de]=BibleTime @VERSION@
- Name[fr]=BibleTime @VERSION@
- GenericName=Bible Study Tool
--SwallowExec=
--SwallowTitle=
- Terminal=false
--TerminalOptions=
- Type=Application
- X-KDE-SubstituteUID=false
- X-KDE-Username=
--Categories=X-Bible;X-Religion;Literature;Art;Education;Utility;KDE;QT
-+Categories=X-Bible;X-Religion;Literature;Art;Education;Utility;KDE
- DocPath=bibletime/handbook/index.html
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+
diff --git a/debian/rules b/debian/rules
index 782e2a8..792e3e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,11 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-
+include /usr/share/cdbs/1/class/cmake.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_DH_INSTALL_SOURCEDIR := debian
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/kde.mk
-DEB_BUILDDIR = $(DEB_SRCDIR)
-
-DEB_CONFIGURE_EXTRA_FLAGS := 
-
-binary-install/bibletime::
-	chmod 644 debian/bibletime/usr/share/apps/bibletime/pics/*
-	chmod 644 debian/bibletime/usr/share/apps/bibletime/bibletimeui.rc
-	chmod 644 debian/bibletime/usr/share/apps/bibletime/tips
+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
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..98c3efc
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=3
+
+http://sf.net/bibletime/bibletime-(\d.+).tar.gz