[sword-cvs] sword/debian libsword3.conffiles,NONE,1.1 libsword3.dirs,NONE,1.1 libsword3.docs,NONE,1.1 libsword3.shlibs,NONE,1.1 changelog,1.4,1.5 control,1.3,1.4 rules,1.4,1.5 diatheke.undocumented,1.1,NONE libsword-config.conffiles,1.1,NONE libsword-config.dirs,1.1,NONE libsword-runtime.dirs,1.1,NONE libsword-runtime.undocumented,1.1,NONE libsword3c102.dirs,1.2,NONE libsword3c102.docs,1.1,NONE libsword3c102.shlibs,1.1,NONE

sword@www.crosswire.org sword@www.crosswire.org
Wed, 12 Nov 2003 09:38:52 -0700


Update of /usr/local/cvsroot/sword/debian
In directory www:/tmp/cvs-serv11004

Modified Files:
	changelog control rules 
Added Files:
	libsword3.conffiles libsword3.dirs libsword3.docs 
	libsword3.shlibs 
Removed Files:
	diatheke.undocumented libsword-config.conffiles 
	libsword-config.dirs libsword-runtime.dirs 
	libsword-runtime.undocumented libsword3c102.dirs 
	libsword3c102.docs libsword3c102.shlibs 
Log Message:

dglassey: update debian directory


--- NEW FILE: libsword3.conffiles ---
/etc/sword.conf

--- NEW FILE: libsword3.dirs ---
usr/lib
usr/bin
etc/
usr/share/sword
usr/share/sword/mods.d
usr/share/sword/modules
usr/share/sword/locales.d

--- NEW FILE: libsword3.docs ---
doc/greektrans.txt
doc/translation-template.conf

--- NEW FILE: libsword3.shlibs ---
libsword 3 libsword3 (>> 1.5.6-1)

Index: changelog
===================================================================
RCS file: /usr/local/cvsroot/sword/debian/changelog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- changelog	16 Jul 2003 14:34:31 -0000	1.4
+++ changelog	12 Nov 2003 16:38:50 -0000	1.5
@@ -1,3 +1,61 @@
+sword (1.5.6-8) unstable; urgency=low
+
+  * Remove the recommends of libsword-runtime from libsword-dev, Closes:
+    #220411
+  * That'd better be the last of the control file mistakes :/
+
+ -- Daniel Glassey <wdg@debian.org>  Wed, 12 Nov 2003 14:39:30 +0000
+
+sword (1.5.6-7) unstable; urgency=low
+
+  * Also Replaces libsword-runtime and libsword-config, Closes #220408
+
+ -- Daniel Glassey <wdg@debian.org>  Wed, 12 Nov 2003 14:00:34 +0000
+
+sword (1.5.6-6) unstable; urgency=low
+
+  * Rerun libtool/autoconf/automake, Closes: #220250
+
+ -- Daniel Glassey <wdg@debian.org>  Tue, 11 Nov 2003 19:20:16 +0000
+
+sword (1.5.6-5) unstable; urgency=low
+
+  * libsword3 replaces libsword2c103, Closes: #219463
+  * libsword3 replaces libsword1, Closes: #219463
+  * no libsword-runtime package now so description is irrelevant, Closes: #209977
+
+ -- Daniel Glassey <wdg@debian.org>  Fri,  7 Nov 2003 13:53:46 +0000
+
+sword (1.5.6-4) unstable; urgency=low
+
+  * The 'ok, forget about the config package' release
+  * now at policy 3.6.1.0
+  * add a build-dep for pkg-config
+  * ready to upload to unstable
+
+ -- Daniel Glassey <wdg@debian.org>  Wed,  5 Nov 2003 17:04:44 +0000
+
+sword (1.5.6-3) experimental; urgency=low
+
+  * -runtime package is unnecessary so merge it into lib
+
+ -- Daniel Glassey <wdg@debian.org>  Wed,  3 Sep 2003 20:49:58 +0100
+
+sword (1.5.6-2) experimental; urgency=low
+
+  * Brown paper bug - get shlibs right
+
+ -- Daniel Glassey <wdg@debian.org>  Fri, 29 Aug 2003 11:25:55 +0100
+
+sword (1.5.6-1) experimental; urgency=low
+
+  * Release is done now
+  * Upload to experimental for now til gs and bt are ready
+  * don't need the c102 suffix now
+  * don't build with icu til we get 2.6 packaged and into experimental
+
+ -- Daniel Glassey <wdg@debian.org>  Thu, 28 Aug 2003 17:38:40 +0100
+
 sword (1.5.5.99-2) unstable; urgency=low
 
   * Another prerelease build

Index: control
===================================================================
RCS file: /usr/local/cvsroot/sword/debian/control,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- control	16 Jul 2003 14:34:31 -0000	1.3
+++ control	12 Nov 2003 16:38:50 -0000	1.4
@@ -1,16 +1,16 @@
 Source: sword
-Build-Depends: debhelper (>=4.0.0), libz-dev, libicu26-dev, icu, autotools-dev
+Build-Depends: debhelper (>=4.0.0), libz-dev, autotools-dev, pkg-config
 Section: libs
 Priority: optional
 Maintainer: Daniel Glassey <wdg@debian.org>
-Standards-Version: 3.5.6.0
+Standards-Version: 3.6.1.0
 
-Package: libsword3c102
+Package: libsword3
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}, libsword-config (>=1.5.5.99-2)
+Depends: ${shlibs:Depends}
 Recommends: sword-frontend
-Conflicts: libsword1
+Replaces: libsword1, libsword2c102, 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 
@@ -18,6 +18,7 @@
  text modules.
  .
  This package contains the core libraries for the project.
+ It also contains utilities for generating data modules.
  .
  Please read the README.Debian for more information on how to obtain other
  modules for sword.
@@ -25,9 +26,8 @@
 Package: libsword-dev
 Architecture: any
 Section: libdevel
-Depends: libsword3c102 (= ${Source-Version}), libc6-dev, libz-dev, icu, libicu26-dev
+Depends: libsword3 (= ${Source-Version}), libc6-dev, libz-dev
 Provides: sword-dev
-Recommends: libsword-runtime
 Description: Development files for libsword
  This package contains the static libraries and headers for developing 
  applications that use the sword library.
@@ -40,19 +40,3 @@
 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.
-
-Package: libsword-runtime
-Architecture: any
-Section: text
-Depends: ${shlibs:Depends}
-Conflicts: libsword-dev (<< 1.5.3-1)
-Description: Utilities for Sword
- This package contains utilities for generating data modules.
-
-Package: libsword-config
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}
-Description: Config files for Sword
- Version independent config files for Sword.
-

Index: rules
===================================================================
RCS file: /usr/local/cvsroot/sword/debian/rules,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- rules	16 Jul 2003 17:39:51 -0000	1.4
+++ rules	12 Nov 2003 16:38:50 -0000	1.5
@@ -34,7 +34,7 @@
 	chmod 755 configure
 	./configure $(confflags) --prefix=/usr --mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info --with-zlib \
-		--sysconfdir=/etc --enable-shared --with-icu
+		--sysconfdir=/etc --enable-shared --without-icu
 	touch configure.stamp
 
 build: configure-stamp build-stamp
@@ -69,8 +69,8 @@
 	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 -plibsword-runtime usr/bin/*
-	dh_movefiles -plibsword-config etc/* usr/share/sword/mods.d/globals.conf \
+	#dh_movefiles -plibsword-runtime usr/bin/*
+	#dh_movefiles -plibsword-config etc/* usr/share/sword/mods.d/globals.conf \
 		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
@@ -101,7 +101,7 @@
 	dh_compress 
 	dh_fixperms 
 	dh_installdeb
-	dh_makeshlibs -V 'libsword3c102 (>=1.5.5.99-1)'
+	dh_makeshlibs -V 'libsword3 (>=1.5.6-1)'
 	dh_perl 
 	dh_shlibdeps -ldebian/tmp/usr/lib
 	dh_gencontrol 

--- diatheke.undocumented DELETED ---

--- libsword-config.conffiles DELETED ---

--- libsword-config.dirs DELETED ---

--- libsword-runtime.dirs DELETED ---

--- libsword-runtime.undocumented DELETED ---

--- libsword3c102.dirs DELETED ---

--- libsword3c102.docs DELETED ---

--- libsword3c102.shlibs DELETED ---