From: Ralph Janke Date: Sat, 10 May 2008 14:18:16 +0000 (+0100) Subject: Imported Debian patch 1.6.5.1-1 X-Git-Tag: archive/raspbian/3.0-3+rpi1~1^2~91 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6ed97a6d0985089a37a7395c43661418ffa4f49b;p=bibletime.git Imported Debian patch 1.6.5.1-1 --- 6ed97a6d0985089a37a7395c43661418ffa4f49b diff --cc debian/changelog index f3537e1,0000000..31317aa mode 100644,000000..100644 --- a/debian/changelog +++ b/debian/changelog @@@ -1,223 -1,0 +1,234 @@@ ++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 Sat, 10 May 2008 15:18:16 +0100 ++ +bibletime (1.6.4.dfsg-1) unstable; urgency=low + + * New upstream version + + -- Daniel Glassey Fri, 22 Jun 2007 18:47:48 +0100 + +bibletime (1.6.2.dfsg-1) unstable; urgency=low + + * New upstream release using sword 1.5.9, Closes: #401068 + * upstream now allows build without howto (which has been declared + non-DFSG free), Closes: #331547 + * DFSG free source tarball created from upstream by + rm docs/howto/unicode/*.docbook + * "Highlight words of Jesus" fixed, Closes: #329244 + * recommend bibletime-i18n, Closes: #375905 + * don't need custom kde.mk for cdbs anymore (see bug #284428) + + -- Daniel Glassey Thu, 7 Dec 2006 19:03:21 +0000 + +bibletime (1.6.1-1) unstable; urgency=low + + * New upstream release + * debian/control: Uses sword 1.5.9 - build depends + standards version 3.7.2.2 (no changes) + + -- Daniel Glassey Thu, 23 Nov 2006 22:50:46 +0000 + +bibletime (1.5.3-1) unstable; urgency=low + + * New upstream release + * rebuild against transistion sword and KDE + * Don't autogenerate debian/control using cdbs + fix generated file build-deps + + -- Daniel Glassey Sat, 10 Dec 2005 21:39:54 +0000 + +bibletime (1.5.1-1) unstable; urgency=low + + * New upstream release + + -- Daniel Glassey Mon, 12 Sep 2005 22:39:30 +0100 + +bibletime (1.5-1) unstable; urgency=low + + * New upstream release + * Use cdbs + use a local kde.mk because the supplied one is broken for tarballs + bug #284428 + * cdbs will update config.sub/guess (Closes: #304632) + * Acknowledge NMU, thanks (Closes: #279471) + * Manpage is included upstream now + Thanks to Erik Schanze for it (Closes: #259948) + not installed upstream so install from the debian dir + * debian/menu: quote the strings, remove kderemove + set the section to Education (Closes: #297873) + * debian/copyright: Upstream Authors fix + * clean up the debian dir, override not needed any more + + -- Daniel Glassey Fri, 12 Aug 2005 09:33:45 +0100 + +bibletime (1.4.1-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Switched to libcurl3-dev (closes: #279471). + + -- Domenico Andreoli Wed, 22 Dec 2004 18:34:21 +0100 + +bibletime (1.4.1-2) unstable; urgency=low + + * Rebuild for KDE 3.3, Closes: #237905 + + -- Daniel Glassey Wed, 31 Mar 2004 16:29:26 +0100 + +bibletime (1.4.1-1) unstable; urgency=low + + * 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 + + -- Daniel Glassey Thu, 29 Jan 2004 22:10:38 +0000 + +bibletime (1.4-1) unstable; urgency=low + + * New upstream version + * depend on sword 1.5.7 + + -- Daniel Glassey 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 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 Wed, 12 Nov 2003 17:59:31 +0000 + +bibletime (1.3-1) experimental; urgency=low + + * 1.3 is released :) + * depend on sword 1.5.6 + * Upload to experimental for now + + -- Daniel Glassey 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 Fri, 18 Jul 2003 18:39:40 +0100 + +bibletime (1.2.99-1) unstable; urgency=low + + * New upstream release + + -- Daniel Glassey Fri, 13 Jul 2003 21:33:55 +0100 + +bibletime (1.0.99b-1) unstable; urgency=low + + * New upstream release + + -- Daniel Glassey Tue, 2 Apr 2002 21:33:55 +0100 + +bibletime (1.0.3-1) unstable; urgency=low + + * New upstream release + * build against autotooled sword + * correct spelling error, Closes: #124449 + * not uploading til sword 1.5.2-8 is in + * bulid depend on sword >=1.5.2-9 + + -- Daniel Glassey Fri, 1 Feb 2002 23:01:55 +0000 + +bibletime (1.0.2-2) unstable; urgency=low + + * Remove debian/controly which shouldn't be there + * stop configure from being run twice to fix alpha build, Closes: #121674 + * build-depend on kdelibs-dev >= 2.2.2-8 to catch libfam-dev dependency, see bug 124264 + * Update description for bibletime 1.0.2 + * Update to policy version 3.5.6.0, no necessary changes noticed yet + * modify clean target in debian/rules to use clean instead of distclean + and remove */Makefile and */*.moc.cpp + + -- Daniel Glassey Sat, 15 Dec 2001 21:40:18 +0000 + +bibletime (1.0.2-1) unstable; urgency=low + + * New upstream release - see www.bibletime.de for changes + * Using latest config.sub and config.guess, Closes #105779 + * may compile on ia64 now (cswordbackendmanager.* does not exist now), Closes #110187 + * Change maintainer to wdg@debian.org + * Depend on sword >= 1.5.2-4 (new libsword1 shlibs) + * use AM_MAINTAINER_MODE in configure.in - try to stop automake etc + from running while building + so don't build depend on automake, autoconf + * fixes for alpha compilation in debian/rules, Closes: #121674 + * .xvpics has been removed from source, Closes: #112706 + * in debian/rules use dh_compress -X to stop tipsdatabase from being installed compressed, Closes #110847 + + -- Daniel Glassey Fri, 30 Nov 2001 19:41:44 +0000 + +bibletime (1.0.1-1) unstable; urgency=low + + * New upstream release - see www.bibletime.de for changes + * patched bibletime/pics/Makefile.am to allow install to $DESTDIR + * removed AUTHORS from debian/docs + + -- Daniel Glassey Sat, 25 Aug 2001 13:47:36 +0000 + +bibletime (1.0-1) unstable; urgency=low + + * New upstream release - see www.bibletime.de for changes + + -- Daniel Glassey Mon, 25 Jun 2001 22:22:30 +0000 + +bibletime (0.31-3.1) unstable; urgency=low + + * Non-maintainer upload (Ben Burton ). + * Rebuilt with new Qt libs (closes: #89789). + * Build-Depends: Replaced kdebase-dev with kdelibs-dev; removed + autoconf (redundant); added libtool. + * Replaced admin/debianrules with a newer version and modified + debian/rules to use admin/debianrules; this way everything gets + installed into the correct directory; this also required modifying + $(localedir) in po/Makefile.am. + * Added debian menu item, lintian overrides file and doc-base registration. + * In debian/rules, using configure-stamp instead of configure.stamp + (this stops ./configure being run again and again and again). + * In debian/rules, deletes Makefile.ins on "make clean" and recreates + them during "make configure"; this removes some unnecessary junk + from the debian diff.gz file. + + -- Ben Burton Thu, 17 May 2001 13:02:11 -0500 + +bibletime (0.31-3) unstable; urgency=low + + * Standards version now 3.2.1 + * Added build-depends + + -- Daniel Glassey Mon, 22 Jan 2001 22:19:43 +0000 + +bibletime (0.31-2) unstable; urgency=low + + * Add dependencies on modules. + + -- Daniel Glassey Mon, 4 Dec 2000 22:34:34 +0000 + +bibletime (0.31-1) unstable; urgency=low + + * Initial Release. + + -- Daniel Glassey Thu, 23 Nov 2000 20:57:31 +0000 + +Local variables: +mode: debian-changelog +End: diff --cc debian/control index 677ee35,0000000..b5a2b37 mode 100644,000000..100644 --- a/debian/control +++ b/debian/control @@@ -1,20 -1,0 +1,21 @@@ +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 - Standards-Version: 3.7.2.2 ++Maintainer: Ralph Janke ++Standards-Version: 3.7.3 ++Homepage: http://www.bibletime.info/ + +Package: bibletime +Architecture: any +Section: kde +Depends: ${shlibs:Depends} +Recommends: sword-text, sword-dict, sword-comm +Suggests: bibletime-i18n +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 --cc debian/copyright index 17657a6,0000000..c256c74 mode 100644,000000..100644 --- a/debian/copyright +++ b/debian/copyright @@@ -1,22 -1,0 +1,27 @@@ +This package was initially debianized by +Daniel Glassey on +Thu, 23 Nov 2000 20:57:31 +0000. + +It was downloaded from www.bibletime.de + +Upstream Authors: Bibletime team + +Copyright 1999-2005 BibleTime team + +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 ++ ++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 --cc debian/menu index 1faa46d,0000000..3dc1566 mode 100644,000000..100644 --- a/debian/menu +++ b/debian/menu @@@ -1,7 -1,0 +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 --cc debian/patches/00-fix-desktop-file.patch index 0000000,0000000..b4d65fd new file mode 100644 --- /dev/null +++ b/debian/patches/00-fix-desktop-file.patch @@@ -1,0 -1,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 --cc debian/rules index 1a9fefc,0000000..782e2a8 mode 100755,000000..100755 --- a/debian/rules +++ b/debian/rules @@@ -1,21 -1,0 +1,18 @@@ +#!/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/* + chmod 644 debian/bibletime/usr/share/apps/bibletime/bibletimeui.rc + chmod 644 debian/bibletime/usr/share/apps/bibletime/tips