[sword-cvs] sword/debian Makefile.am,NONE,1.1 libsword3c102.conffiles,NONE,1.1 libsword3c102.dirs,NONE,1.1 libsword3c102.docs,NONE,1.1 libsword3c102.shlibs,NONE,1.1 README.Debian,1.1,1.2 changelog,1.1,1.2 control,1.1,1.2 diatheke.dirs,1.1,1.2 rules,1.1,1.2 conffiles,1.1,NONE dirs,1.1,NONE docs,1.1,NONE shlibs,1.1,NONE
sword@www.crosswire.org
sword@www.crosswire.org
Fri, 11 Jul 2003 10:14:36 -0700
Update of /usr/local/cvsroot/sword/debian
In directory www:/tmp/cvs-serv4127
Modified Files:
README.Debian changelog control diatheke.dirs rules
Added Files:
Makefile.am libsword3c102.conffiles libsword3c102.dirs
libsword3c102.docs libsword3c102.shlibs
Removed Files:
conffiles dirs docs shlibs
Log Message:
dglassey: update debian packaging files preparing for 1.5.6
--- NEW FILE: Makefile.am ---
swdebdir = $(top_srcdir)/debian
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)/libsword3c102.dirs
EXTRA_DIST += $(swdebdir)/libsword3c102.docs
EXTRA_DIST += $(swdebdir)/libsword3c102.shlibs
EXTRA_DIST += $(swdebdir)/rules
EXTRA_DIST += $(swdebdir)/sword.conf
--- NEW FILE: libsword3c102.conffiles ---
/etc/sword.conf
--- NEW FILE: libsword3c102.dirs ---
usr/lib
etc/
usr/share/sword
usr/share/sword/mods.d
usr/share/sword/modules
usr/share/sword/locales.d
--- NEW FILE: libsword3c102.docs ---
doc/greektrans.txt
doc/translation-template.conf
--- NEW FILE: libsword3c102.shlibs ---
libsword 2 libsword2 (>> 1.5.5-2)
Index: README.Debian
===================================================================
RCS file: /usr/local/cvsroot/sword/debian/README.Debian,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- README.Debian 10 Oct 2002 21:52:18 -0000 1.1
+++ README.Debian 11 Jul 2003 17:14:34 -0000 1.2
@@ -20,7 +20,7 @@
Alternatively, for use on a user by user basis install them to
~/.sword
-Also, feel free to join us on irc.openprojects.net #sword
+Also, feel free to join us on IRC at irc.freenode.net #sword
:)
Daniel
Index: changelog
===================================================================
RCS file: /usr/local/cvsroot/sword/debian/changelog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- changelog 10 Oct 2002 21:52:18 -0000 1.1
+++ changelog 11 Jul 2003 17:14:34 -0000 1.2
@@ -1,3 +1,52 @@
+sword (1.5.5.99-1) unstable; urgency=low
+
+ * Build a pre-release from a make dist from cvs
+ * change lib version for imminent 1.5.6
+ * depend on icu 2.6 to test that
+ * api docs have been moved out into separate source
+
+ -- Daniel Glassey <wdg@debian.org> Thu, 10 Jul 2003 12:45:18 +0100
+
+sword (1.5.5-4) unstable; urgency=low
+
+ * debian/control remove extra blank line that stops building on woody
+
+ -- Daniel Glassey <wdg@debian.org> Thu, 1 May 2003 09:59:14 +0100
+
+sword (1.5.5-3) unstable; urgency=low
+
+ * libsword-dev now depends on icu stuff so apps that build with it don't
+ have to
+ * conflict with libsword1 since both include config files (may split these
+ out into separate package for 1.5.6), Closes #189647
+
+ -- Daniel Glassey <wdg@debian.org> Sat, 19 Apr 2003 16:01:05 +0100
+
+sword (1.5.5-2) unstable; urgency=low
+
+ * Close the new upstream bug, Closes: #175322
+ * uses autotools-dev to get the uptodate config.guess and
+ config.sub, hopefully will sort out mips problem, Closes: #187703
+ * Utilities are now really included - bug 157115 tagged for woody
+ * debian/control - change section of libsword-dev to libdevel
+ * debian/rules -
+ remove alpha compiler flags since it is ok with gcc3.2, Closes: #142703
+ use confflags like autotools-dev says
+ copy the config.guess and .sub from autotools-dev
+
+ -- Daniel Glassey <wdg@debian.org> Sat, 5 Apr 2003 12:53:06 +0100
+
+sword (1.5.5-1) unstable; urgency=low
+
+ * New upstream release
+ * Rename library package to libsword2c102 since it is a new
+ libver from 1.5.3 and it is part of the gcc3.2 transition
+ * build with icu support now that icu has made the transition
+ so build-depend on libicu21-dev and icu
+ * build depend on debhelper >= 4.0.0
+
+ -- Daniel Glassey <wdg@debian.org> Tue, 26 Mar 2003 18:42:28 +0000
+
sword (1.5.4+cvs20021008-1) unstable; urgency=low
* try and build a package from cvs
Index: control
===================================================================
RCS file: /usr/local/cvsroot/sword/debian/control,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- control 10 Oct 2002 21:52:18 -0000 1.1
+++ control 11 Jul 2003 17:14:34 -0000 1.2
@@ -1,20 +1,21 @@
Source: sword
-Build-Depends: debhelper, libz-dev, php4-dev, perl (>= 5.6.0-16)
+Build-Depends: debhelper (>=4.0.0), libz-dev, libicu26-dev, icu, autotools-dev
Section: libs
Priority: optional
Maintainer: Daniel Glassey <wdg@debian.org>
Standards-Version: 3.5.6.0
-Package: libsword2
+Package: libsword3c102
Architecture: any
Section: libs
Depends: ${shlibs:Depends}
Recommends: sword-frontend
+Conflicts: libsword1
Description: API/library for bible software
The SWORD Project is an open source, cross-platform (Linux, Windows, Solaris,
- etc.) API/library for Bible software with a constantly growing list of
- front-ends (GUI, textmode, web-based, etc.) and a library of over 100 text
- modules.
+ MacOSX etc.) API/library for Bible software with a constantly growing list
+ of front-ends (GUI, textmode, web-based, etc.) and a library of over 200
+ text modules.
.
This package contains the core libraries for the project.
.
@@ -23,22 +24,14 @@
Package: libsword-dev
Architecture: any
-Section: devel
-Depends: libsword1 (= ${Source-Version}), libc6-dev, libz-dev
+Section: libdevel
+Depends: libsword3c102 (= ${Source-Version}), libc6-dev, libz-dev, icu, libicu26-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.
-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: diatheke
Architecture: any
Section: web
@@ -48,16 +41,11 @@
A command line utility for sword, and a cgi perl script that
uses the utility to produce a bible browsing/searching website.
-Package: libsword-perl
+Package: libsword-runtime
Architecture: any
-Section: web
-Depends: ${shlibs:Depends}, ${perl:Depends}
-Description: Perl bindings for sword
- incorporate bible related texts into your perl scripts
+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: php4-sword
-Architecture: any
-Section: web
-Depends: ${shlibs:Depends}, php4 | php4-cgi
-Description: PHP bindings for sword
- incorporate bible related texts into your php4 scripts
Index: diatheke.dirs
===================================================================
RCS file: /usr/local/cvsroot/sword/debian/diatheke.dirs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- diatheke.dirs 10 Oct 2002 21:52:18 -0000 1.1
+++ diatheke.dirs 11 Jul 2003 17:14:34 -0000 1.2
@@ -1,3 +1,4 @@
usr/bin
usr/lib/cgi-bin
usr/share/doc/diatheke/examples
+
Index: rules
===================================================================
RCS file: /usr/local/cvsroot/sword/debian/rules,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rules 10 Oct 2002 21:52:18 -0000 1.1
+++ rules 11 Jul 2003 17:14:34 -0000 1.2
@@ -17,31 +17,24 @@
# This is the debhelper compatability version to use.
#export DH_COMPAT=2
-ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-ifeq ($(ARCH),alpha)
- COMPILER_FLAGS=CFLAGS="-O0 -mieee" CXXFLAGS="-O0 -mieee"
+export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+confflags =
+# FOR AUTOCONF 2.52 AND NEWER ONLY
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+ confflags += --build $(DEB_HOST_GNU_TYPE)
+else
+ confflags += "--build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)"
endif
-PHPENV=EXTRA_INCLUDES="-I../../../include -DSWIG"
-PHPEXTDIR=`php-config --extension-dir`
configure: configure-stamp
configure-stamp:
dh_testdir
- #autoheader
- #autoconf
chmod 755 configure
- #chmod 755 apps/console/diatheke/configure
- chmod 755 bindings/swig/configure
- $(COMPILER_FLAGS) ./configure --prefix=/usr --mandir=\$${prefix}/share/man \
+ ./configure $(confflags) --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info --with-zlib \
--sysconfdir=/etc --enable-shared --with-icu
- #cd apps/console/diatheke && ./configure --prefix=/usr
- cd bindings/swig && $(COMPILER_FLAGS) ./configure --prefix=/usr \
- --with-sword-dir=`pwd`/../.. --without-swigbin
- cd bindings/swig && $(MAKE) perl_makebuild \
- && $(MAKE) php_makebuild
- cd bindings/swig/php && phpize && \
- $(COMPILER_FLAGS) ./configure --prefix=/usr --enable-Sword
touch configure.stamp
build: configure-stamp build-stamp
@@ -49,19 +42,16 @@
dh_testdir
$(MAKE)
- cd bindings/swig && $(MAKE) perl_makebuild
- cd bindings/swig/perl && perl Makefile.PL INSTALLDIRS=vendor && \
- $(MAKE) OPTIMIZE="-O2 -g -Wall"
- cd bindings/swig/php && $(PHPENV) $(MAKE)
touch build-stamp
clean:
dh_testdir
dh_testroot
+ -test -r /usr/share/misc/config.sub && \
+ cp -f /usr/share/misc/config.sub config.sub
+ -test -r /usr/share/misc/config.guess && \
+ cp -f /usr/share/misc/config.guess config.guess
-$(MAKE) distclean
- -cd bindings/swig/perl && $(MAKE) clean
- -cd bindings/swig/php && $(MAKE) distclean && rm -rf modules
- -cd bindings/swig && $(MAKE) distclean
rm -f build-stamp configure-stamp install-stamp lib/lib* \
config.h config.status config.log config.cache
dh_clean
@@ -75,19 +65,13 @@
# Add here commands to install the package into debian/tmp.
\$(MAKE) install DESTDIR=`pwd`/debian/tmp
- cd bindings/swig/perl && \
- $(MAKE) install PREFIX=`pwd`/../../../debian/libsword-perl/usr
- #cd bindings/swig/php && \
- $(MAKE) install DESTDIR=`pwd`/../../../debian/php-sword
- dh_install bindings/swig/php/modules/*.so $(PHPEXTDIR)
- dh_movefiles -pphp4-sword usr/lib/php4/*
dh_movefiles -plibsword-dev usr/lib/lib*so usr/lib/lib*.a \
- usr/include/*
+ usr/lib/lib*.la usr/include/*
dh_movefiles -pdiatheke usr/bin/diatheke
dh_movefiles -plibsword-runtime usr/bin/*
- 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/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
@@ -115,7 +99,7 @@
dh_compress
dh_fixperms
dh_installdeb
- dh_makeshlibs -V 'libsword1 (>=1.5.3-1)'
+ dh_makeshlibs -V 'libsword3c102 (>=1.5.5.99-1)'
dh_perl
dh_shlibdeps -ldebian/tmp/usr/lib
dh_gencontrol
--- conffiles DELETED ---
--- dirs DELETED ---
--- docs DELETED ---
--- shlibs DELETED ---