The SWORD Project

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

  1. list-missing
  2. Merge into main
Proposed by Dimitri John Ledkov
Status: Merged
Approved by: Jonathan Marsden
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 Approve
Review via email: mp+5473@code.launchpad.net
To post a comment you must log in.
Revision history for this message
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.

Revision history for this message
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
=== modified file 'debian/changelog'
--- debian/changelog 2009-04-11 21:57:36 +0000
+++ debian/changelog 2009-04-11 23:01:41 +0000
@@ -1,3 +1,12 @@
1sword (1.5.11-2) UNRELEASED; urgency=low
2
3 [ Dmitrijs Ledkovs ]
4 * debian/rules: Added utils.mk to use missing-files target.
5 * debian/libsword-dev.install: Added libsword.la, priviosly missing.
6 * debian/libsword7.install: Added missing libicu translit files.
7
8 -- Dmitrijs Ledkovs <dmitrij.ledkov@gmail.com> Sat, 11 Apr 2009 23:00:33 +0000
9
1sword (1.5.11-1) experimental; urgency=low10sword (1.5.11-1) experimental; urgency=low
211
3 [Jonathan Marsden]12 [Jonathan Marsden]
413
=== modified file 'debian/libsword-dev.install'
--- debian/libsword-dev.install 2009-04-11 21:57:36 +0000
+++ debian/libsword-dev.install 2009-04-11 22:51:20 +0000
@@ -2,3 +2,4 @@
2usr/lib/libsword.so2usr/lib/libsword.so
3usr/lib/libsword.a3usr/lib/libsword.a
4usr/lib/pkgconfig4usr/lib/pkgconfig
5usr/lib/libsword.la
56
=== modified file 'debian/libsword7.install'
--- debian/libsword7.install 2009-04-11 21:57:36 +0000
+++ debian/libsword7.install 2009-04-11 23:01:41 +0000
@@ -1,6 +1,7 @@
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/sword
4usr/bin/addld5usr/bin/addld
5usr/bin/imp2ld6usr/bin/imp2ld
6usr/bin/imp2gbs7usr/bin/imp2gbs
78
=== modified file 'debian/rules'
--- debian/rules 2009-04-11 21:57:36 +0000
+++ debian/rules 2009-04-11 22:48:48 +0000
@@ -1,6 +1,7 @@
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
4include /usr/share/cdbs/1/rules/patchsys-quilt.mk5include /usr/share/cdbs/1/rules/patchsys-quilt.mk
56
6DEB_DH_INSTALL_SOURCEDIR := debian/tmp7DEB_DH_INSTALL_SOURCEDIR := debian/tmp

Subscribers

People subscribed via source and target branches