Merge lp://qastaging/~noskcaj/ubuntu/vivid/librsvg/2.40.7 into lp://qastaging/ubuntu/vivid/librsvg

Proposed by Jackson Doak
Status: Needs review
Proposed branch: lp://qastaging/~noskcaj/ubuntu/vivid/librsvg/2.40.7
Merge into: lp://qastaging/ubuntu/vivid/librsvg
Diff against target: 11375 lines (+3949/-4433)
69 files modified
.pc/20_rsvg_compat.patch/rsvg-convert.c (+23/-5)
ChangeLog (+265/-0)
Makefile.in (+7/-15)
NEWS (+7/-0)
README (+1/-3)
aclocal.m4 (+38/-116)
config.guess (+247/-99)
config.h.in (+4/-1)
config.sub (+16/-26)
configure (+173/-357)
configure.ac (+294/-0)
configure.in (+0/-319)
debian/changelog (+6/-0)
debian/control (+2/-1)
debian/control.in (+2/-1)
debian/patches/20_rsvg_compat.patch (+11/-9)
doc/Makefile.in (+16/-32)
doc/html/RsvgHandle.html (+972/-1287)
doc/html/annotation-glossary.html (+25/-25)
doc/html/api-index-2-14.html (+34/-31)
doc/html/api-index-2-22.html (+22/-19)
doc/html/api-index-2-32.html (+26/-23)
doc/html/api-index-2-36.html (+20/-15)
doc/html/api-index-2-4.html (+15/-12)
doc/html/api-index-2-8.html (+28/-23)
doc/html/api-index-2-9.html (+23/-18)
doc/html/api-index-deprecated.html (+69/-64)
doc/html/api-index-full.html (+213/-208)
doc/html/index.html (+4/-4)
doc/html/index.sgml (+26/-29)
doc/html/licence.html (+9/-9)
doc/html/object-tree.html (+15/-15)
doc/html/rsvg-Using-RSVG-with-GIO.html (+258/-315)
doc/html/rsvg-Using-RSVG-with-GdkPixbuf.html (+270/-367)
doc/html/rsvg-Using-RSVG-with-cairo.html (+76/-101)
doc/html/rsvg-Version-check-and-feature-tests.html (+37/-77)
doc/html/rsvg.devhelp2 (+59/-55)
doc/html/rsvg.html (+9/-9)
doc/html/style.css (+107/-317)
doc/version.xml (+1/-1)
gdk-pixbuf-loader/Makefile.in (+4/-5)
gdk-pixbuf-loader/io-svg.c (+6/-8)
gtk-doc.make (+11/-24)
librsvg-features.h (+2/-2)
librsvg.doap (+10/-11)
m4/gtk-doc.m4 (+15/-32)
m4/libtool.m4 (+4/-14)
missing (+2/-2)
rsvg-base-file-util.c (+4/-4)
rsvg-base.c (+12/-12)
rsvg-convert.c (+23/-5)
rsvg-css.c (+1/-1)
rsvg-defs.c (+2/-2)
rsvg-file-util.c (+3/-3)
rsvg-filter.c (+59/-73)
rsvg-image.c (+3/-3)
rsvg-io.c (+12/-12)
rsvg-io.h (+6/-6)
rsvg-marker.c (+3/-3)
rsvg-marker.h (+2/-2)
rsvg-paint-server.c (+297/-159)
rsvg-path.c (+1/-1)
rsvg-private.h (+5/-5)
rsvg-shapes.c (+13/-1)
rsvg-styles.c (+3/-4)
test-driver (+4/-16)
tests/Makefile.in (+4/-5)
tests/pdiff/Makefile.in (+4/-5)
tools/Makefile.in (+4/-5)
To merge this branch: bzr merge lp://qastaging/~noskcaj/ubuntu/vivid/librsvg/2.40.7
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Needs Fixing
Review via email: mp+249879@code.qastaging.launchpad.net

Description of the change

New upstream bugfix release

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

Text conflict in rsvg-convert.c
1 conflicts encountered.

review: Needs Fixing

Unmerged revisions

39. By Jackson Doak

New upstream release.

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: