Merge lp://qastaging/~noskcaj/ubuntu/trusty/ogmrip-oggz/merge into lp://qastaging/ubuntu/trusty/ogmrip-oggz
Proposed by
Jackson Doak
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~noskcaj/ubuntu/trusty/ogmrip-oggz/merge |
| Merge into: | lp://qastaging/ubuntu/trusty/ogmrip-oggz |
| Diff against target: |
19417 lines (+6926/-4035) 25 files modified
ChangeLog (+28/-4) Makefile.in (+23/-10) aclocal.m4 (+50/-43) config.guess (+253/-269) config.sub (+177/-72) configure (+2173/-1249) configure.in (+7/-3) data/Makefile.am (+1/-1) data/Makefile.in (+16/-4) debian/changelog (+20/-0) debian/compat (+1/-1) debian/control (+5/-4) debian/rules (+16/-73) debian/source/format (+1/-0) ltmain.sh (+2631/-1408) m4/intltool.m4 (+48/-27) m4/libtool.m4 (+1277/-809) m4/ltoptions.m4 (+7/-6) m4/ltversion.m4 (+6/-6) m4/lt~obsolete.m4 (+9/-3) po/Makefile.in.in (+9/-4) po/fr.po (+7/-2) src/Makefile.am (+2/-2) src/Makefile.in (+17/-5) src/ogmrip-oggz.c (+142/-30) |
| To merge this branch: | bzr merge lp://qastaging/~noskcaj/ubuntu/trusty/ogmrip-oggz/merge |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel Holbach (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Merge from deb-multimedia
To post a comment you must log in.
Unmerged revisions
- 5. By Jackson Doak
-
* Merge from deb-multimedia
* Add -f to rm in debian/rules, fixes ftbfs
* Use dh-autoreconf - 4. By Jackson Doak
-
Sync from deb-multimedia
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks. Uploaded.