fix-1358863 : Utopic (14.10) : Code : inkscape package : Ubuntu

Get this branch:: bzr branch lp:~valavanisalex/ubuntu/utopic/inkscape/fix-1358863

Only Alex Valavanis can upload to this branch. If you are Alex Valavanis please log in for upload directions.

Branch merges

No branches dependent on this one.

Merged into lp:ubuntu/utopic/inkscape at revision 87

Daniel Holbach (community): Approve on 2014-08-22

Diff: 83978 lines (+9530/-59871)

289 files modified

.pc/0001-Fix_Datamatrix_UI_issue.patch/share/extensions/render_barcode_datamatrix.inx (+0/-20)
.pc/0001-Fix_Datamatrix_UI_issue.patch/share/extensions/render_barcode_datamatrix.py (+0/-654)
.pc/0002-Drop_PS_and_PDF_support_in_MimeType.patch/inkscape.desktop.in (+0/-14)
.pc/0003-Fix_LP_-911146.patch/src/extension/implementation/script.cpp (+0/-1034)
.pc/0004-Fix_FTBFS_on_gcc-4.8.patch/src/connector-context.cpp (+0/-2041)
.pc/0004-Fix_FTBFS_on_gcc-4.8.patch/src/extension/effect.cpp (+0/-409)
.pc/0004-Fix_FTBFS_on_gcc-4.8.patch/src/gradient-drag.cpp (+0/-2216)
.pc/0004-Fix_FTBFS_on_gcc-4.8.patch/src/libavoid/vpsc.cpp (+0/-1301)
.pc/0004-Fix_FTBFS_on_gcc-4.8.patch/src/libcola/straightener.cpp (+0/-361)
.pc/0004-Fix_FTBFS_on_gcc-4.8.patch/src/libcroco/cr-parser.c (+0/-4409)
.pc/0004-Fix_FTBFS_on_gcc-4.8.patch/src/libvpsc/block.cpp (+0/-422)
.pc/0004-Fix_FTBFS_on_gcc-4.8.patch/src/widgets/desktop-widget.h (+0/-268)
.pc/0004-Fix_FTBFS_on_gcc-4.8.patch/src/widgets/toolbox.cpp (+0/-8503)
.pc/0005-Fix_FreeType_include.patch/src/libnrtype/FontFactory.h (+0/-163)
.pc/0006-Fix_FTBFS_on_poppler-0.26.patch/configure.ac (+0/-1065)
.pc/0006-Fix_FTBFS_on_poppler-0.26.patch/src/extension/internal/pdfinput/pdf-parser.cpp (+0/-3399)
.pc/0006_add_unity_quicklist_support.patch/inkscape.desktop.in (+0/-14)
.pc/applied-patches (+0/-8)
.pc/librevenge.patch/configure.ac (+0/-1070)
.pc/librevenge.patch/src/extension/internal/wpg-input.cpp (+0/-145)
ChangeLog (+775/-10714)
Info.plist (+3/-3)
Info.plist.in (+1/-1)
Makefile.in (+183/-167)
NEWS (+9/-17)
aclocal.m4 (+406/-348)
build.xml (+1/-1)
compile (+68/-31)
config.guess (+106/-78)
config.h.in (+3/-3)
config.sub (+66/-48)
configure (+520/-358)
configure.ac (+28/-38)
debian/changelog (+55/-0)
debian/control (+3/-3)
debian/patches/0004-Fix_FTBFS_on_gcc-4.8.patch (+10/-139)
debian/patches/0005-Fix_FTBFS_due_to_tests.patch (+482/-0)
debian/patches/0005-Fix_FreeType_include.patch (+0/-23)
debian/patches/0006-Fix_FTBFS_on_poppler-0.26.patch (+0/-150)
debian/patches/0006-Update_to_new_libwpg.patch (+111/-0)
debian/patches/librevenge.patch (+0/-80)
debian/patches/series (+2/-3)
debian/rules (+2/-2)
depcomp (+296/-193)
doc/Makefile.in (+75/-37)
inkscape.1 (+51/-42)
inkscape.desktop.in (+1/-7)
inkscape.el.1 (+74/-65)
inkscape.fr.1 (+63/-54)
inkscape.ja.1 (+33/-24)
inkscape.sk.1 (+58/-49)
inkscape.spec (+1/-1)
inkscape.zh_TW.1 (+31/-22)
install-sh (+7/-7)
missing (+159/-275)
mkinstalldirs (+2/-2)
packaging/macosx/Resources/MenuBar.nib/classes.nib (+0/-4)
packaging/macosx/Resources/MenuBar.nib/info.nib (+0/-23)
packaging/macosx/Resources/MenuBar.nib/objects.xib (+0/-73)
packaging/macosx/Resources/ProgressWindow.nib/classes.nib (+0/-4)
packaging/macosx/Resources/ProgressWindow.nib/info.nib (+0/-18)
packaging/macosx/Resources/ProgressWindow.nib/objects.xib (+0/-53)
packaging/macosx/Resources/bin/getdisplay.sh (+0/-9)
packaging/macosx/Resources/bin/inkscape (+0/-158)
packaging/macosx/Resources/etc/fonts/fonts.conf (+0/-155)
packaging/macosx/Resources/openDoc (+0/-17)
packaging/macosx/Resources/script (+0/-54)
packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/copy-slider.sh (+0/-7)
packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/copy-slider.sh (+0/-7)
packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc (+0/-547)
packaging/macosx/ScriptExec/English.lproj/main.nib/classes.nib (+0/-4)
packaging/macosx/ScriptExec/English.lproj/main.nib/info.nib (+0/-19)
packaging/macosx/ScriptExec/English.lproj/main.nib/objects.xib (+0/-271)
packaging/macosx/ScriptExec/Info.plist (+0/-39)
packaging/macosx/ScriptExec/MenuBar.nib/classes.nib (+0/-4)
packaging/macosx/ScriptExec/MenuBar.nib/info.nib (+0/-23)
packaging/macosx/ScriptExec/MenuBar.nib/objects.xib (+0/-73)
packaging/macosx/ScriptExec/ScriptExec.xcode/project.pbxproj (+0/-451)
packaging/macosx/ScriptExec/ScriptExec.xcodeproj/project.pbxproj (+0/-351)
packaging/macosx/ScriptExec/ScriptExec_Prefix.pch (+0/-5)
packaging/macosx/ScriptExec/main.c (+0/-789)
packaging/macosx/ScriptExec/openDoc (+0/-4)
packaging/macosx/ScriptExec/script (+0/-4)
packaging/macosx/ScriptExec/version.plist (+0/-16)
packaging/macosx/osx-app.sh (+0/-499)
packaging/macosx/osx-build.sh (+0/-410)
packaging/macosx/osx-dmg.sh (+0/-178)
packaging/win32/AdvUninstLog.nsh (+0/-437)
packaging/win32/AdvUninstLog.txt (+0/-121)
packaging/win32/MessageBox.txt (+0/-186)
packaging/win32/RequireLatestNSIS.nsh (+0/-9)
packaging/win32/VersionCompleteXXXX.nsh (+0/-47)
packaging/win32/header.svg (+0/-516)
packaging/win32/ifexist.nsh (+0/-21)
packaging/win32/inkscape.nsi (+0/-1032)
packaging/win32/inkscape.nsi.uninstall (+0/-20)
packaging/win32/languages/Breton.nsh (+0/-113)
packaging/win32/languages/Catalan.nsh (+0/-113)
packaging/win32/languages/Czech.nsh (+0/-113)
packaging/win32/languages/Dutch.nsh (+0/-113)
packaging/win32/languages/English.nsh (+0/-113)
packaging/win32/languages/Finnish.nsh (+0/-113)
packaging/win32/languages/French.nsh (+0/-113)
packaging/win32/languages/Galician.nsh (+0/-113)
packaging/win32/languages/German.nsh (+0/-113)
packaging/win32/languages/Indonesian.nsh (+0/-113)
packaging/win32/languages/Italian.nsh (+0/-113)
packaging/win32/languages/Japanese.nsh (+0/-113)
packaging/win32/languages/Polish.nsh (+0/-113)
packaging/win32/languages/Romanian.nsh (+0/-113)
packaging/win32/languages/Russian.nsh (+0/-113)
packaging/win32/languages/SimpChinese.nsh (+0/-113)
packaging/win32/languages/Slovak.nsh (+0/-113)
packaging/win32/languages/Slovenian.nsh (+0/-113)
packaging/win32/languages/Spanish.nsh (+0/-113)
packaging/win32/languages/TradChinese.nsh (+0/-113)
packaging/win32/languages/Ukrainian.nsh (+0/-113)
packaging/win32/md5dll.txt (+0/-68)
packaging/win32/portable/App/AppInfo/appinfo.ini (+0/-26)
packaging/win32/portable/App/AppInfo/installer.ini (+0/-15)
packaging/win32/portable/App/readme.txt (+0/-1)
packaging/win32/portable/Other/Source/InkscapePortable.ini (+0/-6)
packaging/win32/portable/Other/Source/InkscapePortable.nsi (+0/-130)
packaging/win32/portable/Other/Source/License.txt (+0/-344)
packaging/win32/portable/Other/Source/PortableApps.comInstallerCustom.nsh (+0/-12)
packaging/win32/portable/Other/Source/PortableApps.comLauncherLANG_ENGLISH.nsh (+0/-6)
packaging/win32/portable/Other/Source/Readme.txt (+0/-67)
packaging/win32/portable/Other/Source/ReplaceInFileWithTextReplace.nsh (+0/-64)
packaging/win32/portable/help.html (+0/-178)
packaging/win32/portable/readme.packaging.txt (+0/-29)
packaging/win32/welcomefinish.svg (+0/-3510)
po/fi.po (+1866/-2720)
po/nl.po (+2/-2)
share/Makefile.in (+145/-126)
share/clipart/Makefile.am (+0/-1)
share/clipart/Makefile.in (+75/-38)
share/clipart/inkscape.logo.svg (+0/-9)
share/examples/Makefile.in (+75/-37)
share/examples/blend_modes.svg (+12/-12)
share/examples/lighting_filters.svg (+12/-12)
share/extensions/Barcode/Makefile.in (+75/-37)
share/extensions/Makefile.in (+147/-128)
share/extensions/Poly3DObjects/Makefile.in (+76/-39)
share/extensions/alphabet_soup/Makefile.in (+76/-39)
share/extensions/dxf_outlines.py (+6/-1)
share/extensions/inkex.py (+8/-2)
share/extensions/inkscape_help_reportabug.inx (+1/-1)
share/extensions/printing-marks.inx (+5/-5)
share/extensions/render_barcode_datamatrix.inx (+4/-34)
share/extensions/render_barcode_datamatrix.py (+3/-46)
share/extensions/scour.py (+6/-3)
share/extensions/simplestyle.py (+1/-1)
share/extensions/test/Makefile.in (+75/-37)
share/extensions/text_braille.py (+1/-1)
share/extensions/xaml2svg/Makefile.in (+76/-39)
share/extensions/yocto_css.py (+6/-3)
share/filters/Makefile.in (+76/-38)
share/fonts/Makefile.in (+76/-38)
share/gradients/Makefile.in (+76/-38)
share/icons/Makefile.in (+146/-127)
share/icons/application/16x16/Makefile.in (+76/-38)
share/icons/application/22x22/Makefile.in (+76/-38)
share/icons/application/24x24/Makefile.in (+76/-38)
share/icons/application/256x256/Makefile.in (+76/-38)
share/icons/application/32x32/Makefile.in (+76/-38)
share/icons/application/48x48/Makefile.in (+76/-38)
share/icons/application/Makefile.in (+147/-128)
share/icons/inkscape.file.svg (+14/-16)
share/icons/inkscape.svg (+14/-16)
share/keys/Makefile.in (+76/-38)
share/keys/right-handed-illustration.xml (+0/-1)
share/keys/xara.xml (+0/-1)
share/markers/Makefile.in (+76/-38)
share/palettes/Makefile.in (+76/-38)
share/palettes/Tango-Palette.gpl (+2/-0)
share/patterns/Makefile.in (+76/-38)
share/screens/Makefile.in (+76/-38)
share/templates/Makefile.in (+75/-37)
share/tutorials/Makefile.in (+75/-37)
share/ui/Makefile.in (+76/-38)
src/2geom/basic-intersection.cpp (+11/-1)
src/2geom/interval.h (+1/-1)
src/2geom/rect.h (+1/-1)
src/2geom/sbasis.h (+24/-6)
src/2geom/solve-bezier-parametric.cpp (+22/-5)
src/Makefile.am (+1/-5)
src/Makefile.in (+574/-817)
src/box3d-context.cpp (+1/-1)
src/color-profile.cpp (+8/-10)
src/cxxtests.cpp (+62/-62)
src/dialogs/export.cpp (+1/-1)
src/dialogs/spellcheck.cpp (+1/-1)
src/display/canvas-grid.cpp (+5/-0)
src/display/nr-filter-gaussian.cpp (+2/-2)
src/display/sodipodi-ctrl.cpp (+7/-2)
src/display/sp-canvas.cpp (+9/-7)
src/dom/io/uristream.cpp (+24/-25)
src/dom/io/uristream.h (+38/-38)
src/dom/svgimpl.cpp (+3/-3)
src/dropper-context.cpp (+1/-1)
src/extension/effect.cpp (+1/-1)
src/extension/implementation/script.cpp (+1/-8)
src/extension/init.cpp (+1/-1)
src/extension/internal/cairo-renderer.cpp (+1/-1)
src/extension/internal/filter/filter-file.cpp (+1/-1)
src/extension/internal/filter/filter.cpp (+1/-1)
src/extension/internal/pdfinput/svg-builder.cpp (+13/-13)
src/extension/internal/wpg-input.cpp (+17/-10)
src/extension/system.cpp (+2/-1)
src/file.cpp (+1/-1)
src/gc-core.h (+1/-1)
src/gc.cpp (+13/-5)
src/gradient-drag.cpp (+1/-1)
src/helper/pixbuf-ops.cpp (+1/-1)
src/helper/sp-marshal.cpp (+7/-7)
src/helper/sp-marshal.h (+6/-6)
src/inkscape-version.cpp (+1/-1)
src/inkscape.rc (+5/-5)
src/inkview.rc (+5/-5)
src/interface.cpp (+11/-9)
src/io/inkjar.cpp (+17/-9)
src/io/inkjar.h (+4/-2)
src/io/inkscapestream.h (+1/-0)
src/io/uristream.cpp (+29/-31)
src/io/uristream.h (+40/-40)
src/io/xsltstream.cpp (+8/-11)
src/io/xsltstream.h (+19/-21)
src/libavoid/vpsc.cpp (+1/-1)
src/libcola/straightener.cpp (+3/-3)
src/libcroco/cr-parser.c (+1/-1)
src/libcroco/cr-rgb.c (+2/-2)
src/libgdl/gdl-dock-object.c (+1/-1)
src/libgdl/gdl-dock-object.h (+2/-2)
src/libgdl/gdl-tools.h (+1/-1)
src/libnrtype/FontFactory.cpp (+1/-1)
src/libnrtype/Layout-TNG-OutIter.cpp (+26/-5)
src/libvpsc/Makefile_insert (+0/-2)
src/libvpsc/block.cpp (+1/-1)
src/libvpsc/csolve_VPSC.cpp (+0/-126)
src/libvpsc/csolve_VPSC.h (+0/-60)
src/live_effects/lpe-bendpath.cpp (+6/-3)
src/live_effects/lpe-perp_bisector.h (+2/-2)
src/main.cpp (+3/-0)
src/pencil-context.cpp (+16/-9)
src/preferences.cpp (+3/-0)
src/prefix.cpp (+0/-3)
src/registrytool.cpp (+1/-1)
src/remove-last.h (+3/-2)
src/select-context.cpp (+2/-2)
src/selection-chemistry.cpp (+1/-1)
src/selection.cpp (+2/-0)
src/seltrans.cpp (+1/-1)
src/sp-conn-end.cpp (+1/-1)
src/sp-flowregion.cpp (+2/-2)
src/sp-guide.cpp (+4/-4)
src/sp-image.cpp (+4/-6)
src/sp-item-group.cpp (+2/-0)
src/sp-item-rm-unsatisfied-cns.cpp (+2/-2)
src/sp-namedview.cpp (+4/-4)
src/sp-polygon.cpp (+7/-4)
src/splivarot.cpp (+15/-5)
src/spray-context.cpp (+22/-32)
src/trace/imagemap-gdk.cpp (+8/-6)
src/trace/imagemap-gdk.h (+2/-2)
src/trace/siox.cpp (+3/-12)
src/trace/siox.h (+1/-11)
src/trace/trace.cpp (+2/-2)
src/tweak-context.cpp (+1/-1)
src/ui/dialog/filedialogimpl-gtkmm.cpp (+10/-5)
src/ui/dialog/filedialogimpl-win32.cpp (+10/-12)
src/ui/dialog/filedialogimpl-win32.h (+12/-0)
src/ui/dialog/inkscape-preferences.cpp (+5/-2)
src/ui/dialog/layers.cpp (+4/-3)
src/ui/dialog/print.cpp (+4/-3)
src/ui/tool/multi-path-manipulator.cpp (+13/-3)
src/ui/tool/node-tool.cpp (+4/-0)
src/ui/tool/node.h (+8/-0)
src/ui/tool/path-manipulator.cpp (+5/-1)
src/ui/tool/transform-handle-set.cpp (+1/-1)
src/ui/widget/registered-widget.h (+0/-3)
src/verbs.cpp (+5/-0)
src/widgets/desktop-widget.cpp (+12/-14)
src/widgets/eek-preview.cpp (+1/-1)
src/widgets/ege-paint-def.cpp (+1/-1)
src/widgets/sp-color-icc-selector.cpp (+3/-3)
src/widgets/toolbox.cpp (+1/-1)
src/xml/repr-io.cpp (+75/-15)
src/xml/repr-util.cpp (+3/-3)
test-driver (+139/-0)

Related bugs

Bug #166371: Illustrator CS SVG won't load: namespace URIs in entities	High	Fix Released
Bug #529843: save a copy reverts to save as	Low	Fix Released
Bug #966441: inkscape crashed with SIGSEGV in sp_dtw_color_profile_event()	Medium	Fix Released
Bug #1051017: inkscape crashed with SIGSEGV	Medium	Fix Released
Bug #1090865: Extension to braille not working on Xubuntu 12.10	Low	Fix Released
Bug #1163241: inkscape crashed with SIGSEGV in Inkscape::Preferences::_getNode()	Medium	Fix Released
Bug #1358863: Please merge inkscape 0.48.5-2 from Debian testing (main)	Undecided	Fix Released

Link a bug report

Related blueprints

Branch information

Owner:: Alex Valavanis

Status:: Development

Recent revisions

88. By Alex Valavanis on 2014-08-19: Merge with 0.48.5-2 from Debian Unstable
87. By Alex Valavanis on 2014-08-19: Merging shared upstream rev into target branch.
86. By Dimitri John Ledkov on 2014-07-28: Build with experimental patch against librevenge.
85. By Iain Lane on 2014-06-20: * Merge with Debian unstable. Remaining changes:
  - debian/control:
    + Set Ubuntu Developer as maintainer,
    + build-depend on dh-translation to handle Ubuntu translation,
    + demote pstoedit from Recommends to Suggests (because it's on universe),
  - debian/patches/0006_add_unity_quicklist_support.patch: add.
  - debian/patches/series: update.
  - debian/rules:
    + add dh_translation to handle Ubuntu translation,
    + add python2 to dh addon.
84. By Iain Lane on 2014-05-27: 0007-Poppler-0.26-compatibility.patch: Take patch from bug #1315142 to fix
compatibility with poppler 0.26.
83. By Sebastien Bacher on 2014-01-22: Rebuild for the new poppler soname
82. By Mattia Rizzolo on 2014-01-14: * Merge from Debian unstable (LP: #1225013). Remaining changes:
  - debian/control:
    + Set Ubuntu Developer as maintainer,
    + build-depend on dh-translation to handle Ubuntu translation,
    + build against liblcsm2 instead of liblcsm1,
    + demote pstoedit from Recommends to Suggests (because it's on universe),
    + add a ${python:Depends}.
  - debian/patches/0006_add_unity_quicklist_support.patch: add.
  - debian/patches/series: update.
  - debian/rules:
    + add dh_translation to handle Ubuntu translation,
    + add python2 to dh addon.
* Debian changes:
  - debian/control: make description more user-friendly (LP: #811634)
81. By Adam Conrad on 2013-12-25: 05-freetype-include.patch: Use freetype upstream's recommended include.
80. By Sebastien Bacher on 2013-07-30: No change rebuild with the new poppler
79. By Matthias Klose on 2013-07-03: Rebuild to pick up new libgc package name

»

Branch metadata

Branch format:: Branch format 7

Repository format:: Bazaar repository format 2a (needs bzr 1.16 or later)

Stacked on:: lp:ubuntu/utopic/inkscape

Ubuntu
inkscape package

lp:~valavanisalex/ubuntu/utopic/inkscape/fix-1358863

Branch merges

Related bugs

Related blueprints

Branch information

Recent revisions

Branch metadata

Subscribers

Ubuntuinkscape package

lp:~valavanisalex/ubuntu/utopic/inkscape/fix-1358863

Branch merges

Related source package recipes

Related snap packages

Related bugs

Related blueprints

Branch information

Recent revisions

Branch metadata

Nearby

Subscribers

Ubuntu
inkscape package