Merge lp://qastaging/~noskcaj/ubuntu/trusty/kakasi/2.3.6 into lp://qastaging/ubuntu/trusty/kakasi

Proposed by Jackson Doak
Status: Needs review
Proposed branch: lp://qastaging/~noskcaj/ubuntu/trusty/kakasi/2.3.6
Merge into: lp://qastaging/ubuntu/trusty/kakasi
Diff against target: 4427 lines (+1019/-2685)
61 files modified
.pc/0001-hyphen.patch/man/kakasi.1 (+0/-271)
.pc/0001-hyphen.patch/man/kakasi.1.ja (+0/-472)
.pc/0002-utf8.patch/man/kakasi.1 (+0/-271)
.pc/0002-utf8.patch/man/kakasi.1.ja (+0/-472)
.pc/0003-prefix.patch/man/kakasi.1 (+1/-1)
.pc/0003-prefix.patch/man/kakasi.1.ja (+1/-1)
.pc/applied-patches (+0/-2)
ChangeLog (+54/-1)
NEWS (+22/-0)
TODO (+2/-0)
configure (+65/-6)
configure.in (+17/-7)
debian-orig/changelog (+0/-195)
debian-orig/compat (+0/-1)
debian-orig/control (+0/-68)
debian-orig/copyright (+0/-40)
debian-orig/kakasi-config.1 (+0/-51)
debian-orig/kakasi-dic.install (+0/-1)
debian-orig/kakasi.docs (+0/-10)
debian-orig/kakasi.install (+0/-5)
debian-orig/kakasi.manpages (+0/-2)
debian-orig/libkakasi2-dev.install (+0/-5)
debian-orig/libkakasi2-dev.manpages (+0/-1)
debian-orig/libkakasi2.install (+0/-2)
debian-orig/libkakasi2.postinst (+0/-47)
debian-orig/rules (+0/-33)
debian-orig/source/format (+0/-1)
debian-orig/watch (+0/-2)
debian/changelog (+7/-0)
debian/control (+2/-1)
debian/patches/0001-hyphen.patch (+0/-574)
debian/patches/0002-utf8.patch (+0/-34)
debian/patches/0003-prefix.patch (+7/-2)
debian/patches/0004-multiarch.patch (+5/-1)
debian/patches/series (+0/-2)
doc/CVS/Entries (+8/-0)
doc/CVS/Repository (+1/-0)
doc/CVS/Root (+1/-0)
kakasi.spec (+1/-1)
lib/libdict.c (+2/-2)
lib/libhh2.c (+31/-18)
lib/libkanjiio.c (+5/-5)
man/Makefile.am (+1/-1)
man/Makefile.in (+1/-1)
man/kakasi-config.1 (+51/-0)
man/kakasi.1 (+1/-1)
man/kakasi.1.ja (+1/-1)
src/dict.c (+2/-2)
src/hh2.c (+31/-18)
src/kanjiio.c (+5/-5)
tests/Makefile.am (+3/-1)
tests/Makefile.in (+236/-37)
tests/data/Makefile.am (+4/-0)
tests/data/Makefile.in (+383/-0)
tests/data/hira-first-in.txt (+1/-0)
tests/data/hira-first-out.txt (+1/-0)
tests/kakasi-1 (+10/-2)
tests/kakasi-4 (+11/-2)
tests/kakasi-5 (+3/-3)
tests/kakasi-8 (+9/-3)
tests/kakasi-9 (+33/-0)
To merge this branch: bzr merge lp://qastaging/~noskcaj/ubuntu/trusty/kakasi/2.3.6
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Review via email: mp+212307@code.qastaging.launchpad.net

Description of the change

New upstream bugfix release, required for libtext-kakasi-perl to build

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Thanks. Uploaded.

review: Approve

Unmerged revisions

13. By Jackson Doak

update-maintainer

12. By Jackson Doak

* New upstream release.
* Drop 001-hyphen.patch, 0002-utf8.patch, fixed upstream

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: