diff -Nru picard-1.2+bzr1492~ppa9~oneiric1/debian/bzr-builder.manifest picard-1.2+bzr1493~ppa9~oneiric1/debian/bzr-builder.manifest --- picard-1.2+bzr1492~ppa9~oneiric1/debian/bzr-builder.manifest 2013-04-25 20:21:41.000000000 +0000 +++ picard-1.2+bzr1493~ppa9~oneiric1/debian/bzr-builder.manifest 2013-04-26 20:21:28.000000000 +0000 @@ -1,3 +1,3 @@ -# bzr-builder format 0.3 deb-version 1.2+bzr1492~ppa9 -lp:picard revid:git-v1:49bacdebd3f209aa43b14cf59993cf65aa93dbd7 +# bzr-builder format 0.3 deb-version 1.2+bzr1493~ppa9 +lp:picard revid:git-v1:e16b2533c27b738b250e81f7aad003934b6318d5 nest packaging lp:~musicbrainz-developers/picard/packaging debian revid:ph.wolfer@gmail.com-20130424193158-tjka7cpc532go03t diff -Nru picard-1.2+bzr1492~ppa9~oneiric1/debian/changelog picard-1.2+bzr1493~ppa9~oneiric1/debian/changelog --- picard-1.2+bzr1492~ppa9~oneiric1/debian/changelog 2013-04-25 20:21:41.000000000 +0000 +++ picard-1.2+bzr1493~ppa9~oneiric1/debian/changelog 2013-04-26 20:21:28.000000000 +0000 @@ -1,8 +1,8 @@ -picard (1.2+bzr1492~ppa9~oneiric1) oneiric; urgency=low +picard (1.2+bzr1493~ppa9~oneiric1) oneiric; urgency=low * Auto build. - -- Launchpad Package Builder Thu, 25 Apr 2013 20:21:41 +0000 + -- Launchpad Package Builder Fri, 26 Apr 2013 20:21:28 +0000 picard (0.14.0-1~ppa1) lucid; urgency=low diff -Nru picard-1.2+bzr1492~ppa9~oneiric1/picard/mbxml.py picard-1.2+bzr1493~ppa9~oneiric1/picard/mbxml.py --- picard-1.2+bzr1492~ppa9~oneiric1/picard/mbxml.py 2013-04-25 20:21:34.000000000 +0000 +++ picard-1.2+bzr1493~ppa9~oneiric1/picard/mbxml.py 2013-04-26 20:21:27.000000000 +0000 @@ -77,11 +77,7 @@ attribs = [] if 'attribute_list' in relation.children: attribs = [a.text for a in relation.attribute_list[0].attribute] - if reltype == 'vocal': - name = 'performer:' + ' '.join([_parse_attributes(attribs), 'vocal']).strip() - elif reltype == 'instrument': - name = 'performer:' + _parse_attributes(attribs) - elif reltype == 'performer': + if reltype in ('vocal', 'instrument', 'performer'): name = 'performer:' + _parse_attributes(attribs) elif reltype == 'mix-DJ' and len(attribs) > 0: if not hasattr(m, "_djmix_ars"):