Merge lp://qastaging/~noskcaj/ubuntu/wily/easytag/merge into lp://qastaging/ubuntu/wily/easytag
Proposed by
Jackson Doak
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~noskcaj/ubuntu/wily/easytag/merge |
| Merge into: | lp://qastaging/ubuntu/wily/easytag |
| Diff against target: |
15376 lines (+11296/-1727) 87 files modified
ChangeLog (+580/-1) Makefile.am (+4/-2) Makefile.in (+54/-37) NEWS (+29/-0) aclocal.m4 (+50/-43) build-aux/compile (+1/-1) build-aux/config.guess (+8/-7) build-aux/config.sub (+14/-5) build-aux/depcomp (+1/-1) build-aux/install-sh (+170/-196) build-aux/missing (+1/-1) build-aux/test-driver (+12/-3) configure (+35/-34) configure.ac (+2/-2) data/easytag.appdata.xml.in (+3/-4) debian/changelog (+22/-4) debian/control (+1/-1) debian/copyright (+0/-22) debian/rules (+1/-1) help/Makefile.am (+1/-1) help/Makefile.in (+19/-7) help/cs/cddb-search.page (+50/-0) help/cs/cs.po (+1314/-0) help/cs/file-rename.page (+50/-0) help/cs/file-select.page (+22/-0) help/cs/format-specifier.page (+174/-0) help/cs/image-delete.page (+25/-0) help/cs/image-export.page (+23/-0) help/cs/image.page (+37/-0) help/cs/index.page (+41/-0) help/cs/introduction.page (+23/-0) help/cs/keyboard-shortcuts.page (+69/-0) help/cs/legal.xml (+4/-0) help/cs/playlist-generate.page (+52/-0) help/cs/problems-id3.page (+44/-0) help/cs/problems-ogg-split.page (+45/-0) help/cs/scanner.page (+58/-0) help/cs/starting.page (+26/-0) help/cs/tag-field.page (+42/-0) help/cs/tag.page (+23/-0) help/de/cddb-search.page (+62/-0) help/de/de.po (+1278/-0) help/de/file-rename.page (+62/-0) help/de/file-select.page (+34/-0) help/de/format-specifier.page (+187/-0) help/de/image-delete.page (+37/-0) help/de/image-export.page (+35/-0) help/de/image.page (+49/-0) help/de/index.page (+53/-0) help/de/introduction.page (+35/-0) help/de/keyboard-shortcuts.page (+81/-0) help/de/legal.xml (+4/-0) help/de/playlist-generate.page (+79/-0) help/de/problems-id3.page (+56/-0) help/de/problems-ogg-split.page (+57/-0) help/de/scanner.page (+94/-0) help/de/starting.page (+38/-0) help/de/tag-field.page (+58/-0) help/de/tag.page (+39/-0) po/LINGUAS (+1/-0) po/nb.po (+4889/-0) src/about.c (+4/-5) src/browser.c (+65/-75) src/cddb.c (+250/-154) src/easytag.c (+24/-10) src/gio_wrapper.cc (+1/-2) src/id3_tag.c (+9/-3) src/id3lib/c_wrapper.cpp (+20/-26) src/id3lib/id3_bugfix.h (+24/-37) src/id3v24_tag.c (+4/-7) src/libapetag/COPYING.LGPL (+0/-510) src/libapetag/README.apetag (+1/-1) src/libapetag/apetaglib.c (+17/-20) src/libapetag/apetaglib.h (+17/-21) src/libapetag/id3v2_read.c (+17/-21) src/libapetag/id3v2_read.h (+17/-21) src/libapetag/info_mac.c (+17/-20) src/libapetag/info_mac.h (+17/-21) src/libapetag/info_mpc.c (+18/-20) src/libapetag/info_mpc.h (+17/-21) src/libapetag/is_tag.c (+17/-20) src/libapetag/is_tag.h (+17/-21) src/mp4_tag.cc (+10/-1) src/ogg_tag.c (+93/-134) src/vcedit.c (+38/-20) src/vcedit.h (+17/-8) src/wavpack_tag.c (+207/-155) |
| To merge this branch: | bzr merge lp://qastaging/~noskcaj/ubuntu/wily/easytag/merge |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel Holbach (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Merge from debian
To post a comment you must log in.
Unmerged revisions
- 20. By Jackson Doak
-
* Merge from debian. Remaining changes:
- Change appdata-tools b-dep to appstream-util
- Recommend gnome-icon-theme-full on ubuntu systems.
- Convert upstream translations into a patch to silence debuild errors.
* New upstream release.
* debian/rules:
- Enable parallel build.
* Change libapetag license to GPL-2+.
* Use cgit Vcs-Browser URL.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks. Uploaded.