[Pkg-crosswire-devel] [Branch ~pkgcrosswire/libsword/main] Rev 26: Merge libsword/tag branch

noreply at launchpad.net noreply at launchpad.net
Sun Apr 12 01:44:08 BST 2009 

------------------------------------------------------------
revno: 26
committer: Jonathan Marsden <jmarsden at fastmail.fm>
branch nick: main
timestamp: Sat 2009-04-11 17:41:40 -0700
message:
  Merge libsword/tag branch
added:
  debian/libsword7.manpages
renamed:
  debian/libsword-dev.docs => debian/libsword7.docs
  debian/sword-utils.docs => debian/diatheke.docs
  debian/sword-utils.install => debian/diatheke.install
  debian/sword-utils.links => debian/libsword7.links
  debian/sword-utils.manpages => debian/diatheke.manpages
modified:
  debian/changelog
  debian/control
  debian/libsword-dev.install
  debian/libsword7.install
  debian/rules
  debian/diatheke.install
  debian/libsword7.links
  debian/diatheke.manpages
    ------------------------------------------------------------
    revno: 25.1.1
    tags: 1.5.11-1
    committer: Dmitrijs Ledkovs <dmitrij.ledkov at gmail.com>
    branch nick: tag
    timestamp: Sun 2009-04-12 00:57:36 +0300
    message:
      releasing version 1.5.11-1
    added:
      debian/libsword7.manpages
    renamed:
      debian/libsword-dev.docs => debian/libsword7.docs
      debian/sword-utils.docs => debian/diatheke.docs
      debian/sword-utils.install => debian/diatheke.install
      debian/sword-utils.links => debian/libsword7.links
      debian/sword-utils.manpages => debian/diatheke.manpages
    modified:
      debian/changelog
      debian/control
      debian/libsword-dev.install
      debian/libsword7.install
      debian/rules
      debian/diatheke.install
      debian/libsword7.links
      debian/diatheke.manpages

=== modified file 'debian/changelog'
--- debian/changelog	2009-04-11 00:51:30 +0000
+++ debian/changelog	2009-04-11 21:57:36 +0000
@@ -1,6 +1,6 @@
-sword (1.5.11-1) UNRELEASED; urgency=low
+sword (1.5.11-1) experimental; urgency=low
 
-  [ Jonathan Marsden ]
+  [Jonathan Marsden]
   * New upstream release
   * debian/rules:
     - Switch to using more normal CDBS/autotools not tarball in tarball.
@@ -43,35 +43,25 @@
   * debian/tei2mod.1.pod:
     - Add the tei2mod man page source.
 
-  [ Dmitrijs Ledkovs ]
+  [Dmitrijs Ledkovs]
   * debian/*.pod
     - Added manpages for all utilities.
   * debian/rules
     - Added rules to generate manpages from POD.
-    - Added utils.mk to use missing-files hook in pbuilder
-    - Added list-missing target to be run on each build
-    - Added echo statement to identify when the check for missing files is done
   * debian/libsword7.manpages
     - Created manpages list.
   * debian/control
     - Set maintainer to CrossWire Packaging team
     - Set uploaders: Daniel Glassey, Dmitrijs Ledkovs, Jonathan Marsden
     - Extended descriptions of the packages
-    - Added utils package for all /usr/bin
   * debian/changelog
     - updated formatting, sorted by developer
-    - fixed formating to satisfy dch multi-maintainer mode
   * debian/copyrights
     - updated to proposed copyright format
   * debian/patches
     - added patch descriptions
-  * debian/libsword-dev.install
-    - added libsword.la, priviously missing from installation
-  * debian/libsword7.install
-    - added missing libicu translit files
-    - simplified install file 
 
- -- Dmitrijs Ledkovs <dmitrij.ledkov at gmail.com>  Fri, 10 Apr 2009 18:18:50 +0000
+ -- Jonathan Marsden <jmarsden at fastmail.fm>  Sat, 04 Apr 2009 23:09:16 -0700
 
 sword (1.5.9-8.1ubuntu1) intrepid; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2009-04-11 00:51:30 +0000
+++ debian/control	2009-04-11 21:57:36 +0000
@@ -21,7 +21,7 @@
 Package: libsword7
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: sword-frontend, sword-utils
+Recommends: sword-frontend
 Conflicts: libsword6
 Replaces: libsword1, libsword4, libsword4c2, libsword5, libsword5c2a, libsword6, libsword-runtime, libsword-config
 Description: API/library for bible software
@@ -31,6 +31,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.
@@ -49,26 +50,16 @@
  This package contains the static libraries and headers for developing 
  applications that use the sword library.
 
-Package: sword-utils
+Package: diatheke
 Architecture: any
 Section: text
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Command line tools for bible browsing and SWORD module creation
+Description: Command line bible browsing and search tool
  The SWORD Project is an open source, cross-platform (Linux, Windows, Solaris,
  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 command line utilities:
- .
- module creation tools - imp2gbs, imp2ld, imp2vs, mod2imp, addld, osis2mod,
- tei2mod, vpl2mod, vs2osisref, xml2gbs. These are used to create and convert
- SWORD modules in different formats. See manpages of each utility for details.
- .
- diatheke - utility enabling bible browsing and searching. This tool is mostly
- used only for library testing.
- .
- installmgr - utility to add, install and remove bible modules.
- .
- mkfastmod - creates search index of a module.
-
+ This package contains a command line utility for sword, allowing bible browsing
+ and searching. This tool is used mostly only for library testing. Nicer
+ front-ends are Xiphos (Gtk), Bibletime (KDE) and others.

=== renamed file 'debian/sword-utils.docs' => 'debian/diatheke.docs'
=== renamed file 'debian/sword-utils.install' => 'debian/diatheke.install'
--- debian/sword-utils.install	2009-04-11 00:51:30 +0000
+++ debian/diatheke.install	2009-04-11 21:57:36 +0000
@@ -1,3 +1,3 @@
-usr/bin
+usr/bin/diatheke
 ../../utilities/diatheke/cgi/*.pl usr/share/doc/diatheke/examples
 ../../utilities/diatheke/cgi/index-public.html usr/share/doc/diatheke/examples

=== renamed file 'debian/sword-utils.manpages' => 'debian/diatheke.manpages'
--- debian/sword-utils.manpages	2009-04-11 00:51:30 +0000
+++ debian/diatheke.manpages	2009-04-11 21:57:36 +0000
@@ -1,14 +1,1 @@
 debian/diatheke.1
-imp2gbs.1
-imp2ld.1
-imp2vs.1
-installmgr.1
-mod2imp.1
-addld.1
-mkfastmod.1
-osis2mod.1
-tei2mod.1
-vpl2mod.1
-vs2osisref.1
-xml2gbs.1
-

=== modified file 'debian/libsword-dev.install'
--- debian/libsword-dev.install	2009-04-09 20:17:08 +0000
+++ debian/libsword-dev.install	2009-04-11 21:57:36 +0000
@@ -2,4 +2,3 @@
 usr/lib/libsword.so
 usr/lib/libsword.a
 usr/lib/pkgconfig
-usr/lib/libsword.la

=== renamed file 'debian/libsword-dev.docs' => 'debian/libsword7.docs'
=== modified file 'debian/libsword7.install'
--- debian/libsword7.install	2009-04-11 00:51:30 +0000
+++ debian/libsword7.install	2009-04-11 21:57:36 +0000
@@ -1,5 +1,19 @@
 etc/sword.conf
 usr/lib/libsword.so.7.0.0
 usr/lib/libsword.so.7
-usr/lib/sword
+usr/bin/addld
+usr/bin/imp2ld
+usr/bin/imp2gbs
+usr/bin/imp2vs
+usr/bin/installmgr
+usr/bin/mkfastmod
+usr/bin/mod2imp
+usr/bin/mod2osis
+usr/bin/mod2vpl
+usr/bin/mod2zmod
+usr/bin/osis2mod
+usr/bin/tei2mod
+usr/bin/vpl2mod
+usr/bin/vs2osisref
+usr/bin/xml2gbs
 usr/share/sword

=== renamed file 'debian/sword-utils.links' => 'debian/libsword7.links'
--- debian/sword-utils.links	2009-04-11 00:51:30 +0000
+++ debian/libsword7.links	2009-04-11 21:57:36 +0000
@@ -1,3 +1,4 @@
+usr/share/man/man1/mod2imp.1.gz usr/share/man/man1/mod2imp.1.gz
 usr/share/man/man1/mod2imp.1.gz usr/share/man/man1/mod2osis.1.gz
 usr/share/man/man1/mod2imp.1.gz usr/share/man/man1/mod2vpl.1.gz
 usr/share/man/man1/mod2imp.1.gz usr/share/man/man1/mod2zmod.1.gz

=== added file 'debian/libsword7.manpages'
--- debian/libsword7.manpages	1970-01-01 00:00:00 +0000
+++ debian/libsword7.manpages	2009-04-11 21:57:36 +0000
@@ -0,0 +1,13 @@
+imp2gbs.1
+imp2ld.1
+imp2vs.1
+installmgr.1
+mod2imp.1
+addld.1
+mkfastmod.1
+osis2mod.1
+tei2mod.1
+vpl2mod.1
+vs2osisref.1
+xml2gbs.1
+

=== modified file 'debian/rules'
--- debian/rules	2009-04-11 00:51:30 +0000
+++ debian/rules	2009-04-11 21:57:36 +0000
@@ -1,14 +1,13 @@
 #!/usr/bin/make -f
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/utils.mk 
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_DH_INSTALL_SOURCEDIR := debian/tmp
 DEB_CONFIGURE_EXTRA_FLAGS := --with-zlib --with-clucene=/usr --with-icu
 DEB_DH_MAKESHLIBS_ARGS_libsword7 := -V"libsword7 (>= 1.5.11)"
 DEB_SHLIBDEPS_INCLUDE_libsword7 := debian/tmp/usr/lib
-DEB_SHLIBDEPS_INCLUDE_sword-utils := debian/libsword7/usr/lib
+DEB_SHLIBDEPS_INCLUDE_diatheke := debian/libsword7/usr/lib
 #DEB_OPT_FLAG=-g -O0 -Werror
 
 # The next two rules use chrpath to remove unwanted rpath info 
@@ -30,11 +29,8 @@
 	pod2man --release=$(VERSION) --center "" -n VS2OSISREF debian/vs2osisref.1.pod > vs2osisref.1
 	pod2man --release=$(VERSION) --center "" -n XML2GBS debian/xml2gbs.1.pod > xml2gbs.1
 
-build/sword-utils::
+build/diatheke::
 	chrpath -d $(CURDIR)/utilities/diatheke/.libs/diatheke
 
-binary/sword-utils:: list-missing
-	@echo 'Checking for missing files...'
-
 clean/::
 	rm -f *.1



--
Main packaging branch
https://code.launchpad.net/~pkgcrosswire/libsword/main

Your team Crosswire Packaging Team is subscribed to branch lp:libsword.
To unsubscribe from this branch go to https://code.launchpad.net/~pkgcrosswire/libsword/main/+edit-subscription.

More information about the Pkg-crosswire-devel mailing list