[sword-cvs] sword/debian libsword-config.conffiles,NONE,1.1 libsword-config.dirs,NONE,1.1 Makefile.am,1.1,1.2 changelog,1.3,1.4 control,1.2,1.3 libsword3c102.dirs,1.1,1.2 rules,1.2,1.3 libsword3c102.conffiles,1.1,NONE

sword@www.crosswire.org sword@www.crosswire.org
Wed, 16 Jul 2003 07:34:34 -0700


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

Modified Files:
	Makefile.am changelog control libsword3c102.dirs rules 
Added Files:
	libsword-config.conffiles libsword-config.dirs 
Removed Files:
	libsword3c102.conffiles 
Log Message:

dglassey: split version independent files into separate package
that means sword.conf globals.conf and locales.d/


--- NEW FILE: libsword-config.conffiles ---
/etc/sword.conf

--- NEW FILE: libsword-config.dirs ---
etc/
usr/share/sword
usr/share/sword/mods.d
usr/share/sword/modules
usr/share/sword/locales.d


Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/sword/debian/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.am	11 Jul 2003 17:14:34 -0000	1.1
+++ Makefile.am	16 Jul 2003 14:34:31 -0000	1.2
@@ -2,18 +2,16 @@
 
 EXTRA_DIST += $(swdebdir)/README.Debian
 EXTRA_DIST += $(swdebdir)/changelog
-EXTRA_DIST += $(swdebdir)/conffiles
 EXTRA_DIST += $(swdebdir)/control
 EXTRA_DIST += $(swdebdir)/copyright
 EXTRA_DIST += $(swdebdir)/diatheke.dirs
 EXTRA_DIST += $(swdebdir)/diatheke.undocumented
-EXTRA_DIST += $(swdebdir)/dirs
-EXTRA_DIST += $(swdebdir)/docs
 EXTRA_DIST += $(swdebdir)/libsword-dev.dirs
 EXTRA_DIST += $(swdebdir)/libsword-dev.doc-base
 EXTRA_DIST += $(swdebdir)/libsword-runtime.dirs
 EXTRA_DIST += $(swdebdir)/libsword-runtime.undocumented
-EXTRA_DIST += $(swdebdir)/libsword3c102.conffiles
+EXTRA_DIST += $(swdebdir)/libsword-config.conffiles
+EXTRA_DIST += $(swdebdir)/libsword-config.dirs
 EXTRA_DIST += $(swdebdir)/libsword3c102.dirs
 EXTRA_DIST += $(swdebdir)/libsword3c102.docs
 EXTRA_DIST += $(swdebdir)/libsword3c102.shlibs

Index: changelog
===================================================================
RCS file: /usr/local/cvsroot/sword/debian/changelog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- changelog	12 Jul 2003 21:22:41 -0000	1.3
+++ changelog	16 Jul 2003 14:34:31 -0000	1.4
@@ -1,8 +1,10 @@
-sword (1.5.6-1) unstable; urgency=low
+sword (1.5.5.99-2) unstable; urgency=low
 
-  * Bump version to 1.5.6 ready for release
+  * Another prerelease build
+  * split config files out into separate package so we can have different
+    sword libs installed at the same time later on
 
- -- Daniel Glassey <wdg@debian.org>  Sat, 12 Jul 2003 22:17:28 +0100
+ -- Daniel Glassey <wdg@debian.org>  Wed, 16 Jul 2003 14:48:22 +0100
 
 sword (1.5.5.99-1) unstable; urgency=low
 

Index: control
===================================================================
RCS file: /usr/local/cvsroot/sword/debian/control,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- control	11 Jul 2003 17:14:34 -0000	1.2
+++ control	16 Jul 2003 14:34:31 -0000	1.3
@@ -8,7 +8,7 @@
 Package: libsword3c102
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, libsword-config (>=1.5.5.99-2)
 Recommends: sword-frontend
 Conflicts: libsword1
 Description: API/library for bible software
@@ -46,6 +46,13 @@
 Section: text
 Depends: ${shlibs:Depends}
 Conflicts: libsword-dev (<< 1.5.3-1)
-Description: Utilities for sword
+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: libsword3c102.dirs
===================================================================
RCS file: /usr/local/cvsroot/sword/debian/libsword3c102.dirs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libsword3c102.dirs	11 Jul 2003 17:14:34 -0000	1.1
+++ libsword3c102.dirs	16 Jul 2003 14:34:32 -0000	1.2
@@ -1,6 +1 @@
 usr/lib
-etc/
-usr/share/sword
-usr/share/sword/mods.d
-usr/share/sword/modules
-usr/share/sword/locales.d

Index: rules
===================================================================
RCS file: /usr/local/cvsroot/sword/debian/rules,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- rules	11 Jul 2003 17:14:34 -0000	1.2
+++ rules	16 Jul 2003 14:34:32 -0000	1.3
@@ -70,6 +70,8 @@
 		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/global.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
 	mkdir -p debian/diatheke/usr/share/doc/diatheke/examples

--- libsword3c102.conffiles DELETED ---