Merge lp:~pkgcrosswire/sword/using-examples into lp:sword/debian

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

Cosmetic change: using foo.examples to install examples

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

Works for me.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2009-05-25 01:12:22 +0000
+++ debian/changelog 2009-05-25 01:56:56 +0000
@@ -37,8 +37,9 @@
37 * debian/libsword8.lintian-overrides: added override for module37 * debian/libsword8.lintian-overrides: added override for module
38 installation directory.38 installation directory.
39 * debian/copyright: Updated with information about everyfile.39 * debian/copyright: Updated with information about everyfile.
4040 * debian/diatheke.examples: moved examples here from the diatheke.install
41 -- Dmitrijs Ledkovs <dmitrij.ledkov@gmail.com> Sat, 23 May 2009 02:18:34 +000041
42 -- Dmitrijs Ledkovs <dmitrij.ledkov@gmail.com> Sun, 24 May 2009 23:26:50 +0000
4243
43sword (1.5.11-1) experimental; urgency=low44sword (1.5.11-1) experimental; urgency=low
4445
4546
=== added file 'debian/diatheke.examples'
--- debian/diatheke.examples 1970-01-01 00:00:00 +0000
+++ debian/diatheke.examples 2009-05-25 01:56:56 +0000
@@ -0,0 +1,2 @@
1utilities/diatheke/cgi/*.pl
2utilities/diatheke/cgi/index-public.html
03
=== modified file 'debian/diatheke.install'
--- debian/diatheke.install 2009-04-11 21:57:36 +0000
+++ debian/diatheke.install 2009-05-25 01:56:56 +0000
@@ -1,3 +1,1 @@
1usr/bin/diatheke1usr/bin/diatheke
2../../utilities/diatheke/cgi/*.pl usr/share/doc/diatheke/examples
3../../utilities/diatheke/cgi/index-public.html usr/share/doc/diatheke/examples

Subscribers

People subscribed via source and target branches