Merge lp://qastaging/~noskcaj/ubuntu/trusty/subtitleripper/merge into lp://qastaging/ubuntu/trusty/subtitleripper
Proposed by
Jackson Doak
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~noskcaj/ubuntu/trusty/subtitleripper/merge |
| Merge into: | lp://qastaging/ubuntu/trusty/subtitleripper |
| Diff against target: |
2544 lines (+2083/-210) 32 files modified
.pc/.quilt_patches (+1/-0) .pc/.quilt_series (+1/-0) .pc/.version (+1/-0) .pc/01_pgm2txt.patch/pgm2txt (+178/-0) .pc/02_Makefile.patch/Makefile (+116/-0) .pc/03_binutils-gold.patch/Makefile (+116/-0) .pc/03_getline.diff/vobsub.c (+1264/-0) .pc/applied-patches (+4/-0) Makefile (+5/-5) debian/README.source (+2/-0) debian/changelog (+29/-0) debian/compat (+1/-1) debian/control (+7/-5) debian/copyright (+1/-1) debian/docs (+1/-0) debian/install (+7/-0) debian/manpages (+1/-0) debian/patches/00list (+0/-3) debian/patches/01_pgm2txt.dpatch (+0/-59) debian/patches/01_pgm2txt.patch (+51/-0) debian/patches/02_Makefile.dpatch (+0/-29) debian/patches/02_Makefile.patch (+67/-0) debian/patches/03_binutils-gold.dpatch (+0/-33) debian/patches/03_binutils-gold.patch (+34/-0) debian/patches/03_getline.diff (+13/-0) debian/patches/series (+4/-0) debian/rules (+6/-66) debian/source/format (+1/-0) debian/subtitle2pgm.1 (+163/-0) debian/watch (+1/-0) pgm2txt (+7/-7) vobsub.c (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~noskcaj/ubuntu/trusty/subtitleripper/merge |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel Holbach (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Merge from deb-multimedia. Ignore the bzr log.
To post a comment you must log in.
Unmerged revisions
- 11. By Jackson Doak
-
Fix typo with noticeable in changelog
- 10. By Jackson Doak
-
* Change noticable to noticeable in manpage
* Diable silent building - 9. By Jackson Doak
-
add quilt's files
- 8. By Jackson Doak
-
Add files from merge
- 7. By Jackson Doak
-
Merge from deb-multimedia
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Uploaded. Thanks.