Merge lp:~pkgcrosswire/sword/list-missing into lp:sword/debian

Proposed by Dimitri John Ledkov on 2009-04-12
Status: Merged
Approved by: Jonathan Marsden on 2009-04-20
Approved revision: 29
Merged at revision: not available
Proposed branch: lp:~pkgcrosswire/sword/list-missing
Merge into: lp:sword/debian
Diff against target: None lines
To merge this branch: bzr merge lp:~pkgcrosswire/sword/list-missing
Reviewer Review Type Date Requested Status
Jonathan Marsden 2009-04-12 Approve on 2009-04-20
Review via email: mp+5473@code.launchpad.net
To post a comment you must log in.
Dimitri John Ledkov (xnox) wrote :

Started new changelog entry 1.5.11-2 UNRELEASED.

2009-04-12 Dmitrijs Ledkovs <email address hidden>

 debian/libsword7.install: Added missing libicu translit files.

2009-04-12 Dmitrijs Ledkovs <email address hidden>

 debian/libsword-dev.install: Added libsword.la, priviosly missing.

2009-04-12 Dmitrijs Ledkovs <email address hidden>

 debian/rules: Added utils.mk to use missing-files target.

Jonathan Marsden (jmarsden) wrote :

Looks fine. Jonathan

review: Approve

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 21:57:36 +0000
3+++ debian/changelog 2009-04-11 23:01:41 +0000
4@@ -1,3 +1,12 @@
5+sword (1.5.11-2) UNRELEASED; urgency=low
6+
7+ [ Dmitrijs Ledkovs ]
8+ * debian/rules: Added utils.mk to use missing-files target.
9+ * debian/libsword-dev.install: Added libsword.la, priviosly missing.
10+ * debian/libsword7.install: Added missing libicu translit files.
11+
12+ -- Dmitrijs Ledkovs <dmitrij.ledkov@gmail.com> Sat, 11 Apr 2009 23:00:33 +0000
13+
14 sword (1.5.11-1) experimental; urgency=low
15
16 [Jonathan Marsden]
17
18=== modified file 'debian/libsword-dev.install'
19--- debian/libsword-dev.install 2009-04-11 21:57:36 +0000
20+++ debian/libsword-dev.install 2009-04-11 22:51:20 +0000
21@@ -2,3 +2,4 @@
22 usr/lib/libsword.so
23 usr/lib/libsword.a
24 usr/lib/pkgconfig
25+usr/lib/libsword.la
26
27=== modified file 'debian/libsword7.install'
28--- debian/libsword7.install 2009-04-11 21:57:36 +0000
29+++ debian/libsword7.install 2009-04-11 23:01:41 +0000
30@@ -1,6 +1,7 @@
31 etc/sword.conf
32 usr/lib/libsword.so.7.0.0
33 usr/lib/libsword.so.7
34+usr/lib/sword
35 usr/bin/addld
36 usr/bin/imp2ld
37 usr/bin/imp2gbs
38
39=== modified file 'debian/rules'
40--- debian/rules 2009-04-11 21:57:36 +0000
41+++ debian/rules 2009-04-11 22:48:48 +0000
42@@ -1,6 +1,7 @@
43 #!/usr/bin/make -f
44 include /usr/share/cdbs/1/rules/debhelper.mk
45 include /usr/share/cdbs/1/class/autotools.mk
46+include /usr/share/cdbs/1/rules/utils.mk
47 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
48
49 DEB_DH_INSTALL_SOURCEDIR := debian/tmp

Subscribers

People subscribed via source and target branches