Imported Debian patch 1.4.1-2.1

9 files changed, 89 insertions, 45 deletions

diff --git a/debian/Makefile.am b/debian/Makefile.am
new file mode 100644
index 0000000..e0134b8
--- /dev/null
+++ b/debian/Makefile.am
@@ -0,0 +1,11 @@
+btdebdir = $(top_srcdir)/debian
+
+EXTRA_DIST += $(btdebdir)/bibletime.xpm
+EXTRA_DIST += $(btdebdir)/changelog
+EXTRA_DIST += $(btdebdir)/control
+EXTRA_DIST += $(btdebdir)/copyright
+EXTRA_DIST += $(btdebdir)/dirs
+EXTRA_DIST += $(btdebdir)/docs
+EXTRA_DIST += $(btdebdir)/menu
+EXTRA_DIST += $(btdebdir)/override
+EXTRA_DIST += $(btdebdir)/rules
diff --git a/debian/changelog b/debian/changelog
index df0ebe4..4155a0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,40 +1,70 @@
-bibletime (1.1-4) unstable; urgency=high
+bibletime (1.4.1-2.1) unstable; urgency=low
 
-  * build depend on sword 1.5.3-3
+  * Non-maintainer upload.
+  * Switched to libcurl3-dev (closes: #279471).
 
- -- Daniel Glassey <wdg@debian.org>  Thu, 18 Apr 2002 09:35:13 +0100
+ -- Domenico Andreoli <cavok@debian.org>  Wed, 22 Dec 2004 18:34:21 +0100
 
-bibletime (1.1-3) unstable; urgency=low
+bibletime (1.4.1-2) unstable; urgency=low
 
-  * fixes to compile with gcc3, Closes: #143212
-  * fixes to get rid of some compiler warnings too
-  
- -- Daniel Glassey <wdg@debian.org>  Wed, 17 Apr 2002 23:48:16 +0100
+  * Rebuild for KDE 3.3, Closes: #237905
 
-bibletime (1.1-2) unstable; urgency=high
+ -- Daniel Glassey <wdg@debian.org>  Wed, 31 Mar 2004 16:29:26 +0100
 
-  * integrate docs into this package since there isn't time to
-     get a new package in
-  * fonts seem ok in optionsdialog now, Closes: #139703
-  * verses wrap ok now, tested WEB 1Tim5:18, Closes: #140108
+bibletime (1.4.1-1) unstable; urgency=low
 
- -- Daniel Glassey <wdg@debian.org>  Mon, 15 Apr 2002 09:20:13 +0100
+  * 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
 
-bibletime (1.1-1) unstable; urgency=low
+ -- Daniel Glassey <wdg@debian.org>  Thu, 29 Jan 2004 22:10:38 +0000
 
-  * New upstream release
+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>  Mon,  8 Apr 2002 20:36:07 +0100
+ -- Daniel Glassey <wdg@debian.org>  Wed, 12 Nov 2003 17:59:31 +0000
 
-bibletime (1.0.99b-2) unstable; urgency=low
+bibletime (1.3-1) experimental; urgency=low
 
-  * Depend on bibletime-doc, required documentation
+  * 1.3 is released :)
+  * depend on sword 1.5.6
+  * Upload to experimental for now
 
- -- Daniel Glassey <wdg@debian.org>  Sat,  6 Apr 2002 18:45:50 +0100
+ -- 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 beta release
+  * New upstream release
 
  -- Daniel Glassey <wdg@debian.org>  Tue,  2 Apr 2002 21:33:55 +0100
 
diff --git a/debian/conffiles b/debian/conffiles
deleted file mode 100644
index 5e390cd..0000000
--- a/debian/conffiles
+++ /dev/null
@@ -1 +0,0 @@
-/etc/kde2/bt-printing
diff --git a/debian/control b/debian/control
index f2ecea7..c700207 100644
--- a/debian/control
+++ b/debian/control
@@ -1,20 +1,19 @@
 Source: bibletime
-Section: x11
-Build-Depends: debhelper, kdelibs-dev (>= 2.2.2-8), libsword-dev (>=1.5.3-3)
+Section: kde
+Build-Depends: debhelper, kdelibs4-dev, libsword-dev (>= 1.5.7-1), libsword-dev (<< 1.5.7.90-1), libcurl3-dev | libcurl-dev
 Priority: optional
 Maintainer: Daniel Glassey <wdg@debian.org>
-Standards-Version: 3.5.6.0
+Standards-Version: 3.6.1.0
 
 Package: bibletime
 Architecture: any
-Section: x11
+Section: kde
 Depends: ${shlibs:Depends}
 Recommends: sword-text, sword-dict, sword-comm
 Provides: sword-frontend
-Conflicts: bibletime-doc
 Description: A bible study tool for KDE
- BibleTime 1.1 is a free and easy to use bible study tool for UNIX systems. 
- It requires a working KDE2 environment and SWORD 1.5.3 or later. 
- BibleTime provides easy handling of digitized texts (Bibles, commentaries 
- and lexicons) and powerful features to work with these texts (search in 
+ 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.).
diff --git a/debian/copyright b/debian/copyright
index 7642d5b..ea5a23c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,22 @@
-This package was debianized by Daniel Glassey <danglassey@yahoo.com> on
+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
 
-Upstream Author(s): Bibletime team <bt-devel@crosswire.org>
+Upstream Author(s): Bibletime team <info@bibletime.info>
 
-Copyright:
-   GNU GPL .. see /usr/share/common-licenses/GPL
+Copyright 1999-2003 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
+the Free Software Foundation; either version 2 of the License, 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.
+
+On Debian systems, the complete text of the GNU General Public
+License, version 2, can be found in /usr/share/common-licenses/GPL-2
diff --git a/debian/docs b/debian/docs
index 5502ed8..50bd824 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,3 +1,2 @@
 NEWS
 README
-TODO
diff --git a/debian/menu b/debian/menu
index 8977bdb..153b74b 100644
--- a/debian/menu
+++ b/debian/menu
@@ -2,7 +2,7 @@
     needs=X11\
     hints="KDE"\
 	kderemove="1"\
-    section=Apps/Text\
+    section=Apps/Tools\
     title="BibleTime"\
     icon="/usr/share/pixmaps/bibletime.xpm"\
     command=/usr/bin/bibletime
diff --git a/debian/rules b/debian/rules
index 3f83528..c615873 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,6 @@ configure-stamp:
 	#automake
 	#perl am_edit
 	$(COMPILER_FLAGS) ./configure $(configkde) --disable-maintainer-mode
-	cd bibletime-doc && ./configure $(configkde) --disable-maintainer-mode
 	touch configure-stamp
 
 build: configure build-stamp
@@ -33,7 +32,6 @@ build-stamp:
 
 	# Add here commands to compile the package.
 	$(COMPILER_FLAGS) $(MAKE)
-	cd bibletime-doc && $(MAKE)
 
 	touch build-stamp
 
@@ -47,14 +45,12 @@ clean:
 	# Add here commands to clean up after the build process.
 	#-$(MAKE) distclean
 	-$(MAKE) clean
-	-cd bibletime-doc && $(MAKE) clean
 
 	#-rm -f `find . -name Makefile.in`
 	-rm -f `find . -name Makefile`
 	-rm -f `find . -name *.moc.cpp`
 	-rm -f `find . -name *_meta_unload.cpp`
 	-rm subdirs configure.files config.cache config.log config.status
-	-cd bibletime-doc && rm subdirs configure.files config.cache config.log config.status
 
 	dh_clean
 
@@ -67,7 +63,6 @@ install: build
 	# Add here commands to install the package into debian/tmp.
 	#$(MAKE) install DESTDIR=`pwd`/debian/tmp kde_htmldir=`pwd`/debian/tmp/usr/share/doc/kde/HTML
 	$(MAKE) install DESTDIR=`pwd`/debian/tmp
-	cd bibletime-doc && $(MAKE) install DESTDIR=`pwd`/../debian/tmp
 
 	# Install the pixmap for the debian menu item.
 	install -p -d -o root -g root -m 755 \
@@ -83,7 +78,7 @@ install: build
 
 	#temporary fix to stop things from being executable that shouldn't be?
 	chmod 644 debian/tmp/usr/share/apps/bibletime/pics/*
-	chmod 644 debian/tmp/usr/share/apps/bibletime/printing/*
+	#chmod 644 debian/tmp/usr/share/apps/bibletime/printing/*
 	chmod 644 debian/tmp/usr/share/apps/bibletime/bibletimeui.rc
 
 # Build architecture-independent files here.
@@ -109,7 +104,7 @@ binary-arch: build install
 	dh_installchangelogs ChangeLog
 	dh_link
 	dh_strip
-	dh_compress -Xtipdatabase
+	dh_compress -Xtipdatabase -Xdocbook
 	dh_fixperms
 #	dh_makeshlibs
 	dh_installdeb
diff --git a/debian/undocumented b/debian/undocumented
deleted file mode 100644
index 5d2691d..0000000
--- a/debian/undocumented
+++ /dev/null
@@ -1 +0,0 @@
-bibletime.1