Imported Debian patch 1.6.5.1-1

7 files changed, 43 insertions, 31 deletions

diff --git a/debian/changelog b/debian/changelog
index f3537e1..31317aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+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
diff --git a/debian/control b/debian/control
index 677ee35..b5a2b37 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,10 @@
 Source: bibletime
 Section: kde
-Build-Depends: bzip2, autotools-dev, quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27-1), debhelper (>= 4.1.0), kdelibs4-dev (>= 3.4.3-2), libsword-dev (>= 1.5.9-2), libsword-dev (<< 1.5.9.90-1)
+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
 Priority: optional
-Maintainer: Daniel Glassey <wdg@debian.org>
-Standards-Version: 3.7.2.2
+Maintainer: Ralph Janke <txwikinger@ubuntu.com>
+Standards-Version: 3.7.3
+Homepage: http://www.bibletime.info/
 
 Package: bibletime
 Architecture: any
diff --git a/debian/control.in b/debian/control.in
deleted file mode 100644
index 0b598b2..0000000
--- a/debian/control.in
+++ /dev/null
@@ -1,19 +0,0 @@
-Source: bibletime
-Section: kde
-Build-Depends: @cdbs@, kdelibs4-dev (>= 3.4.3-2), libsword-dev (>= 1.5.8-7), libsword-dev (<< 1.5.8.90-1)
-Priority: optional
-Maintainer: Daniel Glassey <wdg@debian.org>
-Standards-Version: 3.6.2.0
-
-Package: bibletime
-Architecture: any
-Section: kde
-Depends: ${shlibs:Depends}
-Recommends: sword-text, sword-dict, sword-comm
-Provides: sword-frontend
-Description: A bible study tool for KDE
- 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 17657a6..c256c74 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -20,3 +20,8 @@ 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
+
+The "howto" document was originally created by Mr. Bob Harman and
+is licensed under the terms of the license
+http://creativecommons.org/licenses/by-sa/3.0/
+"Creative Commons Attribution-Share Alike".
diff --git a/debian/menu b/debian/menu
index 1faa46d..3dc1566 100644
--- a/debian/menu
+++ b/debian/menu
@@ -1,7 +1,7 @@
 ?package(bibletime):\
     needs="X11"\
     hints="KDE,Bible"\
-    section="Apps/Education"\
+    section="Applications/Education"\
     title="BibleTime"\
     icon="/usr/share/pixmaps/bibletime.xpm"\
     command="/usr/bin/bibletime"
diff --git a/debian/patches/00-fix-desktop-file.patch b/debian/patches/00-fix-desktop-file.patch
new file mode 100644
index 0000000..b4d65fd
--- /dev/null
+++ b/debian/patches/00-fix-desktop-file.patch
@@ -0,0 +1,17 @@
+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/rules b/debian/rules
index 1a9fefc..782e2a8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +1,16 @@
 #!/usr/bin/make -f
 
-#DEB_AUTO_UPDATE_DEBIAN_CONTROL:=yes
-
-DEB_TAR_SRCDIR := bibletime-1.6.4.dfsg
-
-include /usr/share/cdbs/1/rules/tarball.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
 
-#include /usr/share/cdbs/1/rules/patchsys-quilt.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)
-#include debian/kde.mk
-DEB_CONFIGURE_EXTRA_FLAGS := --disable-howto
+
+DEB_CONFIGURE_EXTRA_FLAGS := 
 
 binary-install/bibletime::
 	chmod 644 debian/bibletime/usr/share/apps/bibletime/pics/*