The SWORD Project

Merge lp:~pkgcrosswire/sword/tag into lp:sword/debian

  1. tag
  2. Merge into main
Proposed by Dimitri John Ledkov
Status: Merged
Approved by: Jonathan Marsden
Approved revision: 26
Merged at revision: not available
Proposed branch: lp:~pkgcrosswire/sword/tag
Merge into: lp:sword/debian
Diff against target: None lines
To merge this branch: bzr merge lp:~pkgcrosswire/sword/tag
Reviewer Review Type Date Requested Status
CrossWire Packaging Team Pending
Review via email: mp+5465@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

Reverting all commits since -r 20.

Change changelog top entry from "UNRELEASED" to "experimental".

Tagged 1.5.11-1 so that we can start -2 afresh.

Revision history for this message
Jonathan Marsden (jmarsden) wrote :

Looks good.

Sorry to force all this extra rework, I should have tagged what I sent to mentors.debian.net I suppose... but since it wasn't accepted and might have needed more change, I left it until it was approved...!

Jonathan

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

2009/4/12 Jonathan Marsden <email address hidden>:
> Looks good.
>
> Sorry to force all this extra rework, I should have tagged what I sent to mentors.debian.net I suppose... but since it wasn't accepted and might have needed more change, I left it until it was approved...!
>
> Jonathan
> --
> https://code.edge.launchpad.net/~pkgcrosswire/libsword/tag/+merge/5465
> You are subscribed to branch lp:libsword.
>

Now i think it is a good idea to consider "main" frozen after RFS and
before accepted into archieve....

But don't worry I had fun learning difference between bzr revert and
cherrypicking with merge.

--
With best regards

Dmitrijs Ledkovs (for short Dima),
Ледков Дмитрий Юрьевич

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

LinkedIn
------------

I'd like to add you to my professional network on LinkedIn.

- Dmitrijs Ledkovs

Confirm that you know Dmitrijs Ledkovs
https://www.linkedin.com/e/isd/1067432959/D_O_45qm/

------
(c) 2010, LinkedIn Corporation

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1sword (1.5.11-1) UNRELEASED; urgency=low1sword (1.5.11-1) experimental; urgency=low
22
3 [ Jonathan Marsden ]3 [Jonathan Marsden]
4 * New upstream release4 * New upstream release
5 * debian/rules:5 * debian/rules:
6 - Switch to using more normal CDBS/autotools not tarball in tarball.6 - Switch to using more normal CDBS/autotools not tarball in tarball.
@@ -43,35 +43,25 @@
43 * debian/tei2mod.1.pod:43 * debian/tei2mod.1.pod:
44 - Add the tei2mod man page source.44 - Add the tei2mod man page source.
4545
46 [ Dmitrijs Ledkovs ]46 [Dmitrijs Ledkovs]
47 * debian/*.pod47 * debian/*.pod
48 - Added manpages for all utilities.48 - Added manpages for all utilities.
49 * debian/rules49 * debian/rules
50 - Added rules to generate manpages from POD.50 - Added rules to generate manpages from POD.
51 - Added utils.mk to use missing-files hook in pbuilder
52 - Added list-missing target to be run on each build
53 - Added echo statement to identify when the check for missing files is done
54 * debian/libsword7.manpages51 * debian/libsword7.manpages
55 - Created manpages list.52 - Created manpages list.
56 * debian/control53 * debian/control
57 - Set maintainer to CrossWire Packaging team54 - Set maintainer to CrossWire Packaging team
58 - Set uploaders: Daniel Glassey, Dmitrijs Ledkovs, Jonathan Marsden55 - Set uploaders: Daniel Glassey, Dmitrijs Ledkovs, Jonathan Marsden
59 - Extended descriptions of the packages56 - Extended descriptions of the packages
60 - Added utils package for all /usr/bin
61 * debian/changelog57 * debian/changelog
62 - updated formatting, sorted by developer58 - updated formatting, sorted by developer
63 - fixed formating to satisfy dch multi-maintainer mode
64 * debian/copyrights59 * debian/copyrights
65 - updated to proposed copyright format60 - updated to proposed copyright format
66 * debian/patches61 * debian/patches
67 - added patch descriptions62 - added patch descriptions
68 * debian/libsword-dev.install
69 - added libsword.la, priviously missing from installation
70 * debian/libsword7.install
71 - added missing libicu translit files
72 - simplified install file
7363
74 -- Dmitrijs Ledkovs <dmitrij.ledkov@gmail.com> Fri, 10 Apr 2009 18:18:50 +000064 -- Jonathan Marsden <jmarsden@fastmail.fm> Sat, 04 Apr 2009 23:09:16 -0700
7565
76sword (1.5.9-8.1ubuntu1) intrepid; urgency=low66sword (1.5.9-8.1ubuntu1) intrepid; urgency=low
7767
7868
=== 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 @@
21Package: libsword721Package: libsword7
22Architecture: any22Architecture: any
23Depends: ${shlibs:Depends}, ${misc:Depends}23Depends: ${shlibs:Depends}, ${misc:Depends}
24Recommends: sword-frontend, sword-utils24Recommends: sword-frontend
25Conflicts: libsword625Conflicts: libsword6
26Replaces: libsword1, libsword4, libsword4c2, libsword5, libsword5c2a, libsword6, libsword-runtime, libsword-config26Replaces: libsword1, libsword4, libsword4c2, libsword5, libsword5c2a, libsword6, libsword-runtime, libsword-config
27Description: API/library for bible software27Description: API/library for bible software
@@ -31,6 +31,7 @@
31 text modules.31 text modules.
32 .32 .
33 This package contains the core libraries for the project.33 This package contains the core libraries for the project.
34 It also contains utilities for generating data modules.
34 .35 .
35 Please read the README.Debian for more information on how to obtain other36 Please read the README.Debian for more information on how to obtain other
36 modules for sword.37 modules for sword.
@@ -49,26 +50,16 @@
49 This package contains the static libraries and headers for developing 50 This package contains the static libraries and headers for developing
50 applications that use the sword library.51 applications that use the sword library.
5152
52Package: sword-utils53Package: diatheke
53Architecture: any54Architecture: any
54Section: text55Section: text
55Depends: ${shlibs:Depends}, ${misc:Depends}56Depends: ${shlibs:Depends}, ${misc:Depends}
56Description: Command line tools for bible browsing and SWORD module creation57Description: Command line bible browsing and search tool
57 The SWORD Project is an open source, cross-platform (Linux, Windows, Solaris,58 The SWORD Project is an open source, cross-platform (Linux, Windows, Solaris,
58 MacOSX etc.) API/library for Bible software with a constantly growing list 59 MacOSX etc.) API/library for Bible software with a constantly growing list
59 of front-ends (GUI, textmode, web-based, etc.) and a library of over 200 60 of front-ends (GUI, textmode, web-based, etc.) and a library of over 200
60 text modules.61 text modules.
61 .62 .
62 This package contains command line utilities:63 This package contains a command line utility for sword, allowing bible browsing
63 .64 and searching. This tool is used mostly only for library testing. Nicer
64 module creation tools - imp2gbs, imp2ld, imp2vs, mod2imp, addld, osis2mod,65 front-ends are Xiphos (Gtk), Bibletime (KDE) and others.
65 tei2mod, vpl2mod, vs2osisref, xml2gbs. These are used to create and convert
66 SWORD modules in different formats. See manpages of each utility for details.
67 .
68 diatheke - utility enabling bible browsing and searching. This tool is mostly
69 used only for library testing.
70 .
71 installmgr - utility to add, install and remove bible modules.
72 .
73 mkfastmod - creates search index of a module.
74
7566
=== 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 @@
1usr/bin1usr/bin/diatheke
2../../utilities/diatheke/cgi/*.pl usr/share/doc/diatheke/examples2../../utilities/diatheke/cgi/*.pl usr/share/doc/diatheke/examples
3../../utilities/diatheke/cgi/index-public.html usr/share/doc/diatheke/examples3../../utilities/diatheke/cgi/index-public.html usr/share/doc/diatheke/examples
44
=== 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 @@
1debian/diatheke.11debian/diatheke.1
2imp2gbs.1
3imp2ld.1
4imp2vs.1
5installmgr.1
6mod2imp.1
7addld.1
8mkfastmod.1
9osis2mod.1
10tei2mod.1
11vpl2mod.1
12vs2osisref.1
13xml2gbs.1
14
152
=== 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 @@
2usr/lib/libsword.so2usr/lib/libsword.so
3usr/lib/libsword.a3usr/lib/libsword.a
4usr/lib/pkgconfig4usr/lib/pkgconfig
5usr/lib/libsword.la
65
=== 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 @@
1etc/sword.conf1etc/sword.conf
2usr/lib/libsword.so.7.0.02usr/lib/libsword.so.7.0.0
3usr/lib/libsword.so.73usr/lib/libsword.so.7
4usr/lib/sword4usr/bin/addld
5usr/bin/imp2ld
6usr/bin/imp2gbs
7usr/bin/imp2vs
8usr/bin/installmgr
9usr/bin/mkfastmod
10usr/bin/mod2imp
11usr/bin/mod2osis
12usr/bin/mod2vpl
13usr/bin/mod2zmod
14usr/bin/osis2mod
15usr/bin/tei2mod
16usr/bin/vpl2mod
17usr/bin/vs2osisref
18usr/bin/xml2gbs
5usr/share/sword19usr/share/sword
620
=== 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 @@
1usr/share/man/man1/mod2imp.1.gz usr/share/man/man1/mod2imp.1.gz
1usr/share/man/man1/mod2imp.1.gz usr/share/man/man1/mod2osis.1.gz2usr/share/man/man1/mod2imp.1.gz usr/share/man/man1/mod2osis.1.gz
2usr/share/man/man1/mod2imp.1.gz usr/share/man/man1/mod2vpl.1.gz3usr/share/man/man1/mod2imp.1.gz usr/share/man/man1/mod2vpl.1.gz
3usr/share/man/man1/mod2imp.1.gz usr/share/man/man1/mod2zmod.1.gz4usr/share/man/man1/mod2imp.1.gz usr/share/man/man1/mod2zmod.1.gz
45
=== 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 @@
1imp2gbs.1
2imp2ld.1
3imp2vs.1
4installmgr.1
5mod2imp.1
6addld.1
7mkfastmod.1
8osis2mod.1
9tei2mod.1
10vpl2mod.1
11vs2osisref.1
12xml2gbs.1
13
014
=== 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 @@
1#!/usr/bin/make -f1#!/usr/bin/make -f
2include /usr/share/cdbs/1/rules/debhelper.mk2include /usr/share/cdbs/1/rules/debhelper.mk
3include /usr/share/cdbs/1/class/autotools.mk3include /usr/share/cdbs/1/class/autotools.mk
4include /usr/share/cdbs/1/rules/utils.mk
5include /usr/share/cdbs/1/rules/patchsys-quilt.mk4include /usr/share/cdbs/1/rules/patchsys-quilt.mk
65
7DEB_DH_INSTALL_SOURCEDIR := debian/tmp6DEB_DH_INSTALL_SOURCEDIR := debian/tmp
8DEB_CONFIGURE_EXTRA_FLAGS := --with-zlib --with-clucene=/usr --with-icu7DEB_CONFIGURE_EXTRA_FLAGS := --with-zlib --with-clucene=/usr --with-icu
9DEB_DH_MAKESHLIBS_ARGS_libsword7 := -V"libsword7 (>= 1.5.11)"8DEB_DH_MAKESHLIBS_ARGS_libsword7 := -V"libsword7 (>= 1.5.11)"
10DEB_SHLIBDEPS_INCLUDE_libsword7 := debian/tmp/usr/lib9DEB_SHLIBDEPS_INCLUDE_libsword7 := debian/tmp/usr/lib
11DEB_SHLIBDEPS_INCLUDE_sword-utils := debian/libsword7/usr/lib10DEB_SHLIBDEPS_INCLUDE_diatheke := debian/libsword7/usr/lib
12#DEB_OPT_FLAG=-g -O0 -Werror11#DEB_OPT_FLAG=-g -O0 -Werror
1312
14# The next two rules use chrpath to remove unwanted rpath info 13# The next two rules use chrpath to remove unwanted rpath info
@@ -30,11 +29,8 @@
30 pod2man --release=$(VERSION) --center "" -n VS2OSISREF debian/vs2osisref.1.pod > vs2osisref.129 pod2man --release=$(VERSION) --center "" -n VS2OSISREF debian/vs2osisref.1.pod > vs2osisref.1
31 pod2man --release=$(VERSION) --center "" -n XML2GBS debian/xml2gbs.1.pod > xml2gbs.130 pod2man --release=$(VERSION) --center "" -n XML2GBS debian/xml2gbs.1.pod > xml2gbs.1
3231
33build/sword-utils::32build/diatheke::
34 chrpath -d $(CURDIR)/utilities/diatheke/.libs/diatheke33 chrpath -d $(CURDIR)/utilities/diatheke/.libs/diatheke
3534
36binary/sword-utils:: list-missing
37 @echo 'Checking for missing files...'
38
39clean/::35clean/::
40 rm -f *.136 rm -f *.1

Subscribers

People subscribed via source and target branches