OpenLP

Merge lp:~suutari-olli/openlp/ftw-add-songbook-to-fi-sample into lp:openlp/ftw-data

  1. ftw-add-songbook-to-fi-sample
  2. Merge into ftw-data
Proposed by Azaziah
Status: Merged
Merged at revision: 19
Proposed branch: lp:~suutari-olli/openlp/ftw-add-songbook-to-fi-sample
Merge into: lp:openlp/ftw-data
Diff against target: 17 lines (+1/-1)
1 file modified
download.cfg (+1/-1)
To merge this branch: bzr merge lp:~suutari-olli/openlp/ftw-add-songbook-to-fi-sample
Reviewer Review Type Date Requested Status
Raoul Snyman Approve
Tomas Groth Approve
Review via email: mp+320744@code.launchpad.net

Description of the change

-NOT TO BE MERGED BEFORE 2.4.6 IS RELEASED-

- Added all of the Finnish songs to a songbook
- Removed one duplicated song
- A couple of typos fixed in the song titles

This is to be merged at the same time or after 2.4.6 is released,
which fixes the following bugs related to the OpenLP importer:

Bug #1652003: OpenLP Importer 2 fails to import song numbers 2.4 >
Bug #1632567: OpenLP importer can't handle new song songbook DB structure
(AttributeError: 'OldSong' object has no attribute 'book')
(Bug #652004: OpenLP Importer 2 does not support author types)

To post a comment you must log in.
Revision history for this message
Tomas Groth (tomasgroth) wrote :

Looks ok. Haven't tested though...

review: Approve
Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

I've tested, it works.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'download.cfg'
2--- download.cfg 2017-03-07 20:21:43 +0000
3+++ download.cfg 2017-03-23 01:35:53 +0000
4@@ -24,7 +24,7 @@
5 [songs_fi]
6 title = Suomi
7 filename = songs_fi.sqlite
8-sha256 = 103c42b450382ae1b8ad59f45ea6fe5173fa0f316755b837fa5aba29246e34a0
9+sha256 = 601ac772d9a9a685059456186437aae128d5da30573ff08595c7f8752613a851
10
11 [songs_hu]
12 title = Magyar
13
14=== added file 'songs/songs_fi.sqlite'
15Binary files songs/songs_fi.sqlite 1970-01-01 00:00:00 +0000 and songs/songs_fi.sqlite 2017-03-23 01:35:53 +0000 differ
16=== removed file 'songs/songs_fi.sqlite'
17Binary files songs/songs_fi.sqlite 2016-12-22 13:12:46 +0000 and songs/songs_fi.sqlite 1970-01-01 00:00:00 +0000 differ

Subscribers

People subscribed via source and target branches

to all changes: