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

Proposed by Dimitri John Ledkov on 2009-04-11
Status: Merged
Approved by: Jonathan Marsden on 2009-04-12
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 2009-04-11 Pending
Review via email: mp+5465@code.launchpad.net
To post a comment you must log in.
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.

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

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),
Ледков Дмитрий Юрьевич

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
1=== modified file 'debian/changelog'
2--- debian/changelog 2009-04-11 00:51:30 +0000
3+++ debian/changelog 2009-04-11 21:57:36 +0000
4@@ -1,6 +1,6 @@
5-sword (1.5.11-1) UNRELEASED; urgency=low
6+sword (1.5.11-1) experimental; urgency=low
7
8- [ Jonathan Marsden ]
9+ [Jonathan Marsden]
10 * New upstream release
11 * debian/rules:
12 - Switch to using more normal CDBS/autotools not tarball in tarball.
13@@ -43,35 +43,25 @@
14 * debian/tei2mod.1.pod:
15 - Add the tei2mod man page source.
16
17- [ Dmitrijs Ledkovs ]
18+ [Dmitrijs Ledkovs]
19 * debian/*.pod
20 - Added manpages for all utilities.
21 * debian/rules
22 - Added rules to generate manpages from POD.
23- - Added utils.mk to use missing-files hook in pbuilder
24- - Added list-missing target to be run on each build
25- - Added echo statement to identify when the check for missing files is done
26 * debian/libsword7.manpages
27 - Created manpages list.
28 * debian/control
29 - Set maintainer to CrossWire Packaging team
30 - Set uploaders: Daniel Glassey, Dmitrijs Ledkovs, Jonathan Marsden
31 - Extended descriptions of the packages
32- - Added utils package for all /usr/bin
33 * debian/changelog
34 - updated formatting, sorted by developer
35- - fixed formating to satisfy dch multi-maintainer mode
36 * debian/copyrights
37 - updated to proposed copyright format
38 * debian/patches
39 - added patch descriptions
40- * debian/libsword-dev.install
41- - added libsword.la, priviously missing from installation
42- * debian/libsword7.install
43- - added missing libicu translit files
44- - simplified install file
45
46- -- Dmitrijs Ledkovs <dmitrij.ledkov@gmail.com> Fri, 10 Apr 2009 18:18:50 +0000
47+ -- Jonathan Marsden <jmarsden@fastmail.fm> Sat, 04 Apr 2009 23:09:16 -0700
48
49 sword (1.5.9-8.1ubuntu1) intrepid; urgency=low
50
51
52=== modified file 'debian/control'
53--- debian/control 2009-04-11 00:51:30 +0000
54+++ debian/control 2009-04-11 21:57:36 +0000
55@@ -21,7 +21,7 @@
56 Package: libsword7
57 Architecture: any
58 Depends: ${shlibs:Depends}, ${misc:Depends}
59-Recommends: sword-frontend, sword-utils
60+Recommends: sword-frontend
61 Conflicts: libsword6
62 Replaces: libsword1, libsword4, libsword4c2, libsword5, libsword5c2a, libsword6, libsword-runtime, libsword-config
63 Description: API/library for bible software
64@@ -31,6 +31,7 @@
65 text modules.
66 .
67 This package contains the core libraries for the project.
68+ It also contains utilities for generating data modules.
69 .
70 Please read the README.Debian for more information on how to obtain other
71 modules for sword.
72@@ -49,26 +50,16 @@
73 This package contains the static libraries and headers for developing
74 applications that use the sword library.
75
76-Package: sword-utils
77+Package: diatheke
78 Architecture: any
79 Section: text
80 Depends: ${shlibs:Depends}, ${misc:Depends}
81-Description: Command line tools for bible browsing and SWORD module creation
82+Description: Command line bible browsing and search tool
83 The SWORD Project is an open source, cross-platform (Linux, Windows, Solaris,
84 MacOSX etc.) API/library for Bible software with a constantly growing list
85 of front-ends (GUI, textmode, web-based, etc.) and a library of over 200
86 text modules.
87 .
88- This package contains command line utilities:
89- .
90- module creation tools - imp2gbs, imp2ld, imp2vs, mod2imp, addld, osis2mod,
91- tei2mod, vpl2mod, vs2osisref, xml2gbs. These are used to create and convert
92- SWORD modules in different formats. See manpages of each utility for details.
93- .
94- diatheke - utility enabling bible browsing and searching. This tool is mostly
95- used only for library testing.
96- .
97- installmgr - utility to add, install and remove bible modules.
98- .
99- mkfastmod - creates search index of a module.
100-
101+ This package contains a command line utility for sword, allowing bible browsing
102+ and searching. This tool is used mostly only for library testing. Nicer
103+ front-ends are Xiphos (Gtk), Bibletime (KDE) and others.
104
105=== renamed file 'debian/sword-utils.docs' => 'debian/diatheke.docs'
106=== renamed file 'debian/sword-utils.install' => 'debian/diatheke.install'
107--- debian/sword-utils.install 2009-04-11 00:51:30 +0000
108+++ debian/diatheke.install 2009-04-11 21:57:36 +0000
109@@ -1,3 +1,3 @@
110-usr/bin
111+usr/bin/diatheke
112 ../../utilities/diatheke/cgi/*.pl usr/share/doc/diatheke/examples
113 ../../utilities/diatheke/cgi/index-public.html usr/share/doc/diatheke/examples
114
115=== renamed file 'debian/sword-utils.manpages' => 'debian/diatheke.manpages'
116--- debian/sword-utils.manpages 2009-04-11 00:51:30 +0000
117+++ debian/diatheke.manpages 2009-04-11 21:57:36 +0000
118@@ -1,14 +1,1 @@
119 debian/diatheke.1
120-imp2gbs.1
121-imp2ld.1
122-imp2vs.1
123-installmgr.1
124-mod2imp.1
125-addld.1
126-mkfastmod.1
127-osis2mod.1
128-tei2mod.1
129-vpl2mod.1
130-vs2osisref.1
131-xml2gbs.1
132-
133
134=== modified file 'debian/libsword-dev.install'
135--- debian/libsword-dev.install 2009-04-09 20:17:08 +0000
136+++ debian/libsword-dev.install 2009-04-11 21:57:36 +0000
137@@ -2,4 +2,3 @@
138 usr/lib/libsword.so
139 usr/lib/libsword.a
140 usr/lib/pkgconfig
141-usr/lib/libsword.la
142
143=== renamed file 'debian/libsword-dev.docs' => 'debian/libsword7.docs'
144=== modified file 'debian/libsword7.install'
145--- debian/libsword7.install 2009-04-11 00:51:30 +0000
146+++ debian/libsword7.install 2009-04-11 21:57:36 +0000
147@@ -1,5 +1,19 @@
148 etc/sword.conf
149 usr/lib/libsword.so.7.0.0
150 usr/lib/libsword.so.7
151-usr/lib/sword
152+usr/bin/addld
153+usr/bin/imp2ld
154+usr/bin/imp2gbs
155+usr/bin/imp2vs
156+usr/bin/installmgr
157+usr/bin/mkfastmod
158+usr/bin/mod2imp
159+usr/bin/mod2osis
160+usr/bin/mod2vpl
161+usr/bin/mod2zmod
162+usr/bin/osis2mod
163+usr/bin/tei2mod
164+usr/bin/vpl2mod
165+usr/bin/vs2osisref
166+usr/bin/xml2gbs
167 usr/share/sword
168
169=== renamed file 'debian/sword-utils.links' => 'debian/libsword7.links'
170--- debian/sword-utils.links 2009-04-11 00:51:30 +0000
171+++ debian/libsword7.links 2009-04-11 21:57:36 +0000
172@@ -1,3 +1,4 @@
173+usr/share/man/man1/mod2imp.1.gz usr/share/man/man1/mod2imp.1.gz
174 usr/share/man/man1/mod2imp.1.gz usr/share/man/man1/mod2osis.1.gz
175 usr/share/man/man1/mod2imp.1.gz usr/share/man/man1/mod2vpl.1.gz
176 usr/share/man/man1/mod2imp.1.gz usr/share/man/man1/mod2zmod.1.gz
177
178=== added file 'debian/libsword7.manpages'
179--- debian/libsword7.manpages 1970-01-01 00:00:00 +0000
180+++ debian/libsword7.manpages 2009-04-11 21:57:36 +0000
181@@ -0,0 +1,13 @@
182+imp2gbs.1
183+imp2ld.1
184+imp2vs.1
185+installmgr.1
186+mod2imp.1
187+addld.1
188+mkfastmod.1
189+osis2mod.1
190+tei2mod.1
191+vpl2mod.1
192+vs2osisref.1
193+xml2gbs.1
194+
195
196=== modified file 'debian/rules'
197--- debian/rules 2009-04-11 00:51:30 +0000
198+++ debian/rules 2009-04-11 21:57:36 +0000
199@@ -1,14 +1,13 @@
200 #!/usr/bin/make -f
201 include /usr/share/cdbs/1/rules/debhelper.mk
202 include /usr/share/cdbs/1/class/autotools.mk
203-include /usr/share/cdbs/1/rules/utils.mk
204 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
205
206 DEB_DH_INSTALL_SOURCEDIR := debian/tmp
207 DEB_CONFIGURE_EXTRA_FLAGS := --with-zlib --with-clucene=/usr --with-icu
208 DEB_DH_MAKESHLIBS_ARGS_libsword7 := -V"libsword7 (>= 1.5.11)"
209 DEB_SHLIBDEPS_INCLUDE_libsword7 := debian/tmp/usr/lib
210-DEB_SHLIBDEPS_INCLUDE_sword-utils := debian/libsword7/usr/lib
211+DEB_SHLIBDEPS_INCLUDE_diatheke := debian/libsword7/usr/lib
212 #DEB_OPT_FLAG=-g -O0 -Werror
213
214 # The next two rules use chrpath to remove unwanted rpath info
215@@ -30,11 +29,8 @@
216 pod2man --release=$(VERSION) --center "" -n VS2OSISREF debian/vs2osisref.1.pod > vs2osisref.1
217 pod2man --release=$(VERSION) --center "" -n XML2GBS debian/xml2gbs.1.pod > xml2gbs.1
218
219-build/sword-utils::
220+build/diatheke::
221 chrpath -d $(CURDIR)/utilities/diatheke/.libs/diatheke
222
223-binary/sword-utils:: list-missing
224- @echo 'Checking for missing files...'
225-
226 clean/::
227 rm -f *.1

Subscribers

People subscribed via source and target branches