[sword-cvs] sword/debian changelog,1.7,1.8 control,1.4,1.5 copyright,1.1,1.2 rules,1.6,1.7

[sword@www.crosswire.org]

Update of /cvs/core/sword/debian
In directory www:/tmp/cvs-serv11158/debian

Modified Files:
	changelog control copyright rules 
Log Message:
mgruner: debian updates from unstable

Index: changelog
===================================================================
RCS file: /cvs/core/sword/debian/changelog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- changelog	27 Dec 2003 20:52:18 -0000	1.7
+++ changelog	17 Jan 2004 21:21:13 -0000	1.8
@@ -1,9 +1,26 @@
+sword (1.5.7-2) unstable; urgency=low
+
+  * Fix problem building with current libcurl2-dev - TRUE has
+      been removed from the curl header, VERBOSE just needs to
+      be 1 now, Closes: #227860
+
+ -- Daniel Glassey <wdg@debian.org>  Thu, 15 Jan 2004 15:50:07 +0000
+
 sword (1.5.7-1) unstable; urgency=low
 
-  * New upstream release: 1.5.7
-  * This is no official package!
+  * New upstream version
+  * set lib version to 4
+  * remove diatheke as it has been removed from upstream source,
+     hopefully it will be released separately soon
+  * improve the copyright file because of post to debian-devel
 
- -- Martin Gruner <mg.pub@gmx.net>  Wed, 12 Nov 2003 14:39:30 +0000
+ -- Daniel Glassey <wdg@debian.org>  Wed,  7 Jan 2004 15:16:30 +0000
+
+sword (1.5.6-9) unstable; urgency=medium
+
+  * Build depend on libcurl2-dev
+
+ -- Daniel Glassey <wdg@debian.org>  Thu, 20 Nov 2003 10:20:11 +0000
 
 sword (1.5.6-8) unstable; urgency=low
 

Index: control
===================================================================
RCS file: /cvs/core/sword/debian/control,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- control	12 Nov 2003 16:38:50 -0000	1.4
+++ control	17 Jan 2004 21:21:13 -0000	1.5
@@ -1,16 +1,16 @@
 Source: sword
-Build-Depends: debhelper (>=4.0.0), libz-dev, autotools-dev, pkg-config
+Build-Depends: debhelper (>=4.0.0), libz-dev, autotools-dev, pkg-config, libcurl2-dev
 Section: libs
 Priority: optional
 Maintainer: Daniel Glassey <wdg@debian.org>
 Standards-Version: 3.6.1.0
 
-Package: libsword3
+Package: libsword4
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
 Recommends: sword-frontend
-Replaces: libsword1, libsword2c102, libsword-runtime, libsword-config
+Replaces: libsword1, libsword2c102, libsword3, libsword-runtime, libsword-config
 Description: API/library for bible software
  The SWORD Project is an open source, cross-platform (Linux, Windows, Solaris,
  MacOSX etc.) API/library for Bible software with a constantly growing list 
@@ -26,17 +26,8 @@
 Package: libsword-dev
 Architecture: any
 Section: libdevel
-Depends: libsword3 (= ${Source-Version}), libc6-dev, libz-dev
+Depends: libsword4 (= ${Source-Version}), libc6-dev, libz-dev, libcurl2-dev
 Provides: sword-dev
 Description: Development files for libsword
  This package contains the static libraries and headers for developing 
  applications that use the sword library.
-
-Package: diatheke
-Architecture: any
-Section: web
-Depends: ${shlibs:Depends}, apache | httpd
-Recommends: libapache-mod-perl | apache-perl
-Description: CGI script for making bible website
- A command line utility for sword, and a cgi perl script that
- uses the utility to produce a bible browsing/searching website.

Index: copyright
===================================================================
RCS file: /cvs/core/sword/debian/copyright,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- copyright	10 Oct 2002 21:52:18 -0000	1.1
+++ copyright	17 Jan 2004 21:21:13 -0000	1.2
@@ -4,6 +4,8 @@
 It was downloaded from www.crosswire.org
 
 Copyright:
+Copyright 1996-2004 CrossWire Bible Society
+
 The SWORD Project is copyrighted under the GNU GPL.
 Note: The GNU GPL is copyrighted by the Free Software Foundation, Inc.,
 but the SWORD Project is copyrighted by the members of the SWORD Project
@@ -11,6 +13,21 @@
                 CrossWire Bible Society
                 P. O. Box 2528
                 Tempe, AZ  85280-2528
--------------------------------------------------------------------------
-  For the GNU GPL .. see /usr/share/common-licenses/GPL
 
+  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.
+
+  You should have received a copy of the GNU General Public License with
+  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
+
+ On Debian systems, the complete text of the GNU General Public
+ License, version 2, can be found in /usr/share/common-licenses/GPL-2.

Index: rules
===================================================================
RCS file: /cvs/core/sword/debian/rules,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- rules	27 Dec 2003 20:43:55 -0000	1.6
+++ rules	17 Jan 2004 21:21:13 -0000	1.7
@@ -34,7 +34,8 @@
 	chmod 755 configure
 	./configure $(confflags) --prefix=/usr --mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info --with-zlib \
-		--sysconfdir=/etc --enable-shared --without-icu --without-lucene
+		--sysconfdir=/etc --enable-shared --without-icu \
+		--without-lucene
 	touch configure.stamp
 
 build: configure-stamp build-stamp
@@ -68,16 +69,16 @@
 
 	dh_movefiles -plibsword-dev usr/lib/lib*so usr/lib/lib*.a \
 		usr/lib/lib*.la usr/include/*
-	dh_movefiles -pdiatheke usr/bin/diatheke
+	#dh_movefiles -pdiatheke usr/bin/diatheke
 	#dh_movefiles -plibsword-runtime usr/bin/*
 	#dh_movefiles -plibsword-config etc/* usr/share/sword/mods.d/globals.conf \
-		usr/share/sword/locales.d/*
+	#	usr/share/sword/locales.d/*
 	#mkdir -p debian/libsword-dev/usr/share/doc/libsword-dev/html
 	#cp -R doc/api-documentation/html debian/libsword-dev/usr/share/doc/libsword-dev
-	mkdir -p debian/diatheke/usr/share/doc/diatheke/examples
-#	cp -a apps/console/diatheke/cgi/index-public.html debian/diatheke/usr/share/doc/diatheke/examples
-#	cp -a apps/console/diatheke/cgi/*.pl debian/diatheke/usr/lib/cgi-bin
-#	cp -a apps/console/diatheke/README debian/diatheke/usr/share/doc/diatheke
+	#mkdir -p debian/diatheke/usr/share/doc/diatheke/examples
+	#cp -a apps/console/diatheke/cgi/index-public.html debian/diatheke/usr/share/doc/diatheke/examples
+	#cp -a apps/console/diatheke/cgi/*.pl debian/diatheke/usr/lib/cgi-bin
+	#cp -a apps/console/diatheke/README debian/diatheke/usr/share/doc/diatheke
 	touch install-stamp
 
 # Build architecture-independent files here.
@@ -90,18 +91,18 @@
 	dh_testroot 
 	dh_installdocs 
 	dh_installexamples 
-	dh_installinfo
+	#dh_installinfo
 	dh_installmenu 
 	#dh_installmanpages
-	dh_installman
-	dh_undocumented
+	#dh_installman
+	#dh_undocumented
 	dh_installchangelogs ChangeLog
 	dh_strip 
 	dh_link 
 	dh_compress 
 	dh_fixperms 
 	dh_installdeb
-	dh_makeshlibs -V 'libsword3 (>=1.5.6-1)'
+	dh_makeshlibs -V 'libsword4 (>=1.5.7-1)'
 	dh_perl 
 	dh_shlibdeps -ldebian/tmp/usr/lib
 	dh_gencontrol