Author: Tavmjong Bah
Author Date: 2019-06-17 12:15:54 UTC

Fix rounding error issues with 'pt' line-height values that prvent using mouse-scroll to change values.
Does not fix problem with other units (which include non-integer values in drop-down menu.

Author: Thomas Holder
Author Date: 2019-06-17 11:28:18 UTC

fix "ld: framework not found -lCocoa"

Author: Jabier Arraiza
Author Date: 2019-06-16 21:16:29 UTC

Fix coding style

Author: Nathan Lee
Author Date: 2019-05-18 02:54:51 UTC

Fix crash after deleting a grouped connection

Fix gitlab.com/inkscape/inkscape/issues/205

(backported from 8374e8516ff52c5b1f487e5123db6f92deb79809)

Author: Tavmjong Bah
Author Date: 2019-06-13 13:29:59 UTC

Add extra data for actions (tooltip, label, etc.).

Author: Jabier Arraiza
Author Date: 2019-06-13 12:52:47 UTC

fix coding style

Author: Jabier Arraiza
Author Date: 2019-06-08 23:42:29 UTC

addpopover to textmenu

Author: Marc Jeanmougin
Author Date: 2019-05-28 13:03:29 UTC

Autotrace test call

Author: Jabiertxof
Author Date: 2019-05-25 02:34:43 UTC

Starting SLICE LPE

Author: Patrick Storz
Author Date: 2019-04-03 21:15:20 UTC

Add double-coversion (new 2geom dependency)

Author: Martin Owens
Author Date: 2019-03-27 03:23:27 UTC

Take selection from selector class

Author: Jabier Arraiza
Author Date: 2019-03-17 21:57:25 UTC

final chance to threaded canvas

Author: Mc
Author Date: 2019-03-06 17:56:45 UTC

Merge branch 'removeUtil' into 'fix_mc_branch'

# Conflicts:
# src/xml/rebase-hrefs.cpp
# src/xml/repr-io.cpp
# src/xml/simple-node.cpp

Author: Jabier Arraiza
Author Date: 2019-02-23 11:40:11 UTC

Skeleton of paned canvas

Author: Tavmjong Bah
Author Date: 2019-02-04 12:00:21 UTC

Trial of converting zoom toolbar to use Gio::Actions.

Author: Jabier Arraiza
Author Date: 2019-02-02 01:14:20 UTC

Add missing new symbolic icons

Author: Thomas Holder
Author Date: 2018-12-23 14:33:22 UTC

refactor: use more std::string in resource.cpp

Author: Tavmjong Bah
Author Date: 2018-12-07 08:58:36 UTC

First attempt at making rendering tests pass when running headless.

Author: Tavmjong Bah
Author Date: 2018-12-04 10:24:44 UTC

Merge branch 'master' of https://gitlab.com/inkscape/inkscape into svg2_to_svg1

Author: Jabier Arraiza
Author Date: 2018-12-03 23:32:24 UTC

Starting navigation canvas

Author: Hachmann
Author Date: 2018-11-07 21:23:49 UTC

Translated using Weblate (German)

Currently translated at 99.9% (8143 of 8145 strings)

Translation: Inkscape/0.92.x
Translate-URL: https://weblate.manuelrecena.com/projects/inkscape/0_92_x/de/

Author: Jabier Arraiza
Author Date: 2018-11-05 21:51:27 UTC

Remove helper lines

Author: Jabier Arraiza
Author Date: 2018-11-03 23:00:27 UTC

Fixing coding style

Author: Thomas Holder
Author Date: 2018-10-16 19:15:20 UTC

no line breaks for data:...;base64 URLs

line breaks in data URLs throw MalformedURIException

Author: Jabiertxof
Author Date: 2018-10-27 14:43:15 UTC

Fix a typo gound in MR by Thomas

Author: jabiertxof
Author Date: 2018-10-23 19:39:58 UTC

Add optionaly allow NDBUG to ignore asserts in debug mode

Author: Jabiertxof
Author Date: 2018-09-11 12:45:20 UTC

Fix a bug emeding

Author: Jabier Arraiza
Author Date: 2018-09-01 15:30:13 UTC

Nore on fixing icon preview

Author: Jabier Arraiza
Author Date: 2018-09-01 01:31:35 UTC

Fixing coding style

Author: Jabier Arraiza
Author Date: 2018-08-26 00:29:11 UTC

Fix coding style

Author: Jabier Arraiza
Author Date: 2018-08-13 20:59:31 UTC

define UI

Author: Jabiertxo Arraiza Cenoz
Author Date: 2018-07-19 09:20:15 UTC

Update inkscape.pot

Author: Jabier Arraiza
Author Date: 2018-06-25 21:17:55 UTC

Fix codding style

Author: Jabiertxo Arraiza Cenoz
Author Date: 2018-06-06 19:51:14 UTC

Fixes to extension system and simplify the code. backport from trunk

Author: Alex Valavanis
Author Date: 2018-05-21 22:24:46 UTC

ArcToolbar: Cleanup

Author: Jabiertxo Arraiza Cenoz
Author Date: 2018-05-10 17:33:19 UTC

Backport from trunk 99f25194657838f3bac55c38dc7edde802c9d2b1 Extension improvements

Author: Alex Valavanis
Author Date: 2018-04-25 21:55:59 UTC

Update translations

Author: Jabier Arraiza
Author Date: 2018-03-27 18:57:17 UTC

Backport from master
Fix bug: 1738504
Title:Measurement tool measures mirrored text in wrong position
https://bugs.launchpad.net/inkscape/+bug/1738504

Author: Jabier Arraiza
Author Date: 2018-03-02 23:10:45 UTC

Add base of code

Author: Yale Zhang
Author Date: 2018-02-16 10:34:12 UTC

multithreaded rendering

Author: Yale Zhang
Author Date: 2018-02-03 01:58:28 UTC

Merge https://gitlab.com/inkscape/inkscape into simdgenius_my

Author: Jabier Arraiza
Author Date: 2017-12-05 18:06:58 UTC

Merge branch 'master' into PowerStrokeSmooth

Author: Alex Valavanis
Author Date: 2017-10-26 19:31:37 UTC

Rebuild for Artful release

Author: Tavmjong Bah
Author Date: 2017-09-25 14:05:29 UTC

Test of new GUI for 'writing-mode' and 'direction'.

Author: Jabier Arraiza
Author Date: 2017-09-13 22:12:33 UTC

End of work of flatten LPE is not posible give user expected results. Branch abandoned

Author: Alex Valavanis
Author Date: 2017-07-30 15:29:33 UTC

Mark a few overrides

Author: Alex Valavanis
Author Date: 2017-07-15 22:55:15 UTC

Merge branch 'kill-gtk-actions' of gitlab.com:inkscape/inkscape into kill-gtk-actions

Author: Tavmjong Bah
Author Date: 2017-07-02 12:41:16 UTC

Allow compiling with recent libraries, etc.

Author: Shlomi Fish
Author Date: 2017-06-03 09:28:18 UTC

Merged.

(bzr r15619)

Author: Max Gaukler
Author Date: 2017-05-31 19:43:13 UTC

Fix PDF+TeX output for text inside groups with clip/mask

Fixed bugs:
  - https://launchpad.net/bugs/1417470

(bzr r15722)

Author: chr <chr>
Author Date: 2017-05-16 16:11:12 UTC

selection chemistry: cancel if we hit top/bottom

avoid unpredictable results in multi selections

(bzr r15432)

Author: Jabier Arraiza Cenoz
Author Date: 2017-05-12 15:12:51 UTC

Fix autoshow grid

(bzr r15689)

Author: Jabiertxof
Author Date: 2017-05-06 18:16:25 UTC

Update to trunk

(bzr r15663)

Author: Martin Owens
Author Date: 2017-04-23 04:22:51 UTC

Add very raw page loading using links

(bzr r15632)

Author: Eman Modnar <mrsdotsubatgmaildotcom>
Author Date: 2017-04-17 12:42:54 UTC

Corrections for r15622: "Rotatable stroke" code improvements; protected variable semantics restored

(bzr r15625)

Author: Yale Zhang
Author Date: 2017-04-08 21:37:49 UTC

touchscreen panning and zooming

(bzr r15621)

Author: Alexander Brock
Author Date: 2017-03-30 00:39:46 UTC

Handle case where clip and object have no intersection

(bzr r15250)

Author: Windell Oskay
Author Date: 2017-03-15 01:50:47 UTC

changes for compatibility with python 3

(bzr r15598)

Author: wixkkomi
Author Date: 2017-03-09 05:33:05 UTC

Fix issue with building test on Arch Linux.

(bzr r15578)

Author: YuGiOhJCJ
Author Date: 2017-03-04 21:36:39 UTC

Fixed bugs:
  - https://launchpad.net/bugs/1578164

(bzr r15566)

Author: Bryce Harrington
Author Date: 2017-01-29 18:42:12 UTC

Bump version to indicate pre-releases of 0.92.1

(bzr r69)

Author: Thomas Weber
Author Date: 2016-12-04 23:25:16 UTC

Ignore non-drawing elements for computeBBox() in simpletransform.py

(bzr r15298)

Author: Jabiertxof
Author Date: 2016-12-03 19:56:33 UTC

Update to trunk

(bzr r14864)

Author: Alexander Brock
Author Date: 2016-11-17 20:41:09 UTC

Add test for ObjectSet::documentBounds()

(bzr r15247)

Author: Alexander Brock
Author Date: 2016-11-15 21:18:02 UTC

Added test for documentBounds, weird results

(bzr r15246)

Author: Adrian Boguszewski
Author Date: 2016-11-06 17:15:53 UTC

Merged trunk

(bzr r15065)

Author: helix84
Author Date: 2016-08-03 12:47:26 UTC

* [INTL:zh_TW] Traditional Chinese translation update (fix)

(bzr r13866)

Author: Stephen Parry
Author Date: 2016-07-10 01:31:50 UTC

Fixed incorrect array refernces causing bug 1600496

Fixed bugs:
  - https://launchpad.net/bugs/1600496

(bzr r15015)

Author: Stephen Parry
Author Date: 2016-07-10 01:31:50 UTC

Fixed incorrect array refernces causing bug 1600496

Fixed bugs:
  - https://launchpad.net/bugs/1600496

(bzr r15015)

Author: Daniel Bailey
Author Date: 2016-07-09 13:51:59 UTC

Merge upstream changes

(bzr r14893)

Author: Martin Owens
Author Date: 2016-04-16 12:42:46 UTC

The notifier widget so far

(bzr r14852)

Author: Peter Lieverdink
Author Date: 2016-03-14 22:12:11 UTC

Add liblcsm2-dev as alternative build-depend for liblcms1-dev.

(bzr r17)

Author: Liam P. White
Author Date: 2016-02-07 03:37:49 UTC

convert SPFactory to a gperf table
undo some earlier stupidity

(bzr r14636)

Author: su_v
Author Date: 2016-02-01 22:04:46 UTC

Extensions. Delete test case extension (not really needed) to reduce diff

(bzr r14485)

Author: Martin Owens
Author Date: 2015-12-08 15:33:15 UTC

Alert init

(bzr r14518)

Author: Krzysztof Kosinski
Author Date: 2015-12-01 06:07:18 UTC

Improve the fix: do not add two -std= options

(bzr r14493)

Author: Cimbali
Author Date: 2015-11-25 23:14:26 UTC

Fix #1417470 by undoing drbild's work to support text being shadowed by partially transparent shapes (#771957)

(bzr r14491)

Author: caldoria
Author Date: 2015-11-21 20:11:35 UTC

Enabled absolute units for clonetiler shift and scale functions. Addressed first reviewer comments, removed some dead code.

(bzr r14483)

Author: su_v
Author Date: 2015-11-20 11:54:36 UTC

packaging/macosx: update comments in launcher scripts about CWD and relocation support

(bzr r14484)

Author: su_v
Author Date: 2015-11-15 10:00:29 UTC

Extensions. Add enhanced extension to modify marker paints (supports SVG2 context paint)

(bzr r14475)

Author: Alicia Boya
Author Date: 2015-09-23 01:24:00 UTC

Comply with test case for join_inside with very wide strokes

(bzr r14343)

Author: Jabier Arraiza Cenoz
Author Date: 2015-08-29 19:06:15 UTC

Basic attemp to splash screen, more work if finaly we implement it. Some code get from Synfig

(bzr r13575)

Author: Alex Valavanis
Author Date: 2015-08-25 16:13:55 UTC

Update C++11 test macro

(bzr r14061)

Author: yai
Author Date: 2015-07-09 19:19:26 UTC

Fix typo in pybind/CMakeLists.txt

(bzr r14214)

Author: Daniel Holbach
Author Date: 2015-07-06 08:19:48 UTC

* Merge from Debian unstable (LP: #1471394). Remaining changes:
  - debian/control:
    + build-depend on dh-translation to handle Ubuntu translation,
    + demote pstoedit from Recommends to Suggests (because it's in
      universe),
  - debian/rules:
    + add dh_translation to handle Ubuntu translation
* debian/control: dh-python b-dep added
* debian/README.source: file dropped (Closes: #696924)
* debian/patches/reproducible-build.patch: add to allow reproducible build.
* debian/rules: enable hardening.
* debian/control: Replace recommends on perlmagick (which is a transitional
  package) by libimage-magick-perl.
  Thanks to Martin Michlmayr <tbm@hp.com> for reporting (Closes: #789232)
* Upload to unstable
* debian/control: set DMM Team as Maintainer
* debian/gbp.conf: git-dch -> dch parameter fixed
* debian/control: add myself to Uploaders
* debian/control: update Vcs-* links to point
  the repo in the pkg-multimedia namespace
* No-change rebuild against new poppler
* Merge from Debian unstable (LP: #1416651). Remaining changes:
  - debian/control:
    + build-depend on dh-translation to handle Ubuntu translation,
    + demote pstoedit from Recommends to Suggests (because it's in
      universe),
  - debian/rules:
    + add dh_translation to handle Ubuntu translation
* debian/patches/0006_add_unity_quicklist_support.patch: dropped, accepted
  upstream.
* Cherry-pick commit from unstable suite
  - debian/control: build-dependencies updated [b4f5c6f]
    - librevenge-dev added
    - libwpd-dev (>= 0.9.0) dropped
    - libwpg-dev (>= 0.2.0) bumped to libwpg-dev (>= 0.3.0)
* debian/rules: override_dh_auto_test dropped (Closes: #776857)
* New upstream release
* New upstream pre-release
* New upstream pre-release
* debian/control: Uploader e-mail address updated
* debian/control: S-V bump 3.9.5 => 3.9.6 (no changes needed)
* New upstream pre-release
* New upstream pre-release
  - debian/control: poppler versioning dropped
  - debian/patches/: patchset updated
    - 0002-Fix_FTBFS_on_poppler-0.26.patch dropped (applied upstream)
* debian/control: libcdr-dev and libvisio-dev b-deps added (Closes: #751090)
* New upstream pre-release
  - debian/control: python-lxml b-dep added
  - debian/rules: dh_auto_test overridden for test purpose
  - debian/patches/: patchset refreshed against v0.91~pre0
    - 0001-Fix_Datamatrix_UI_issue.patch dropped (applied upstream)
    - 0002-Drop_PS_and_PDF_support_in_MimeType.patch => #0001
    - 0003-Fix_LP_-911146.patch dropped (applied upstream)
    - 0004-Fix_FTBFS_on_gcc-4.8.patch dropped (applied upstream)
    - 0005-Fix_FreeType_include.patch dropped (applied upstream)
    - 0006-Fix_FTBFS_on_poppler-0.26.patch updated and => #0002
* debian/control: b-dep bump to use poppler (>= 0.26)
* Merge from Debian unstable. Remaining changes:
  - debian/control:
    + build-depend on dh-translation to handle Ubuntu translation,
    + demote pstoedit from Recommends to Suggests (because it's in universe),
  - debian/patches/0006_add_unity_quicklist_support.patch: add.
  - debian/rules:
    + add dh_translation to handle Ubuntu translation
* debian/patches/: patchset updated
  - 0006-Update_to_new_libwpg.patch refreshed
  - 0007-Fix_API_mismatch.patch added (Closes: #754716)
    Thanks to Pino Toscano (pino) for the patch.
* New upstream pre-release
* No-change rebuild for new poppler
* Rebuild against libmagickcore-6.q16-2.
* Merge with Debian Unstable (LP: #1358863). Fixes several Ubuntu bugs:
  - Illustrator CS SVG won't load: namespace URIs in entities (LP: #166371)
  - inkscape crashed with SIGSEGV in
    sp_dtw_color_profile_event() (LP: #966441)
  - inkscape crashed with SIGSEGV (LP: #1051017)
  - inkscape crashed with SIGSEGV in Inkscape::Preferences::_getNode()
    (LP: #1163241)
  - save a copy reverts to save as (LP: #529843)
  - Extension to braille not working on Xubuntu 12.10 (LP: #1090865)
* 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 in universe),
  - debian/patches/0006_add_unity_quicklist_support.patch: add.
  - debian/patches/series: update.
  - debian/rules:
    + add dh_translation to handle Ubuntu translation
* Drop debian/patches/librevenge.patch (superseded by
    debian/patches/0006-Update_to_new_libwpg.patch)
* debian/patches/: patchset updated
  - 0006-Update_to_new_libwpg.patch added (Closes: #753430)
    Thanks to Rene Engelhard (rene) for the patch.
* debian/control: build-dependencies updated
  - librevenge-dev added
  - libwpd-dev (>= 0.9.0) dropped
  - libwpg-dev (>= 0.2.0) bumped to libwpg-dev (>= 0.3.0)
* debian/: dh-autoreconf usage applied
* debian/rules: fix FTBFS on alpha (Closes: #738155)
* debian/patches/: patchset updated against v0.48.5
  - 0004-Fix_FTBFS_on_gcc-4.8.patch refreshed
  - 0005-Fix_FreeType_include.patch dropped (applied upstream)
  - 0006-Fix_FTBFS_on_poppler-0.26.patch dropped (applied upstream)
  - 0005-Fix_FTBFS_due_to_tests.patch added
* Imported Upstream version 0.48.5
* New upstream pre-release
  - debian/control: poppler versioning dropped
  - debian/patches/: patchset updated
    - 0002-Fix_FTBFS_on_poppler-0.26.patch dropped (applied upstream)
* debian/control: libcdr-dev and libvisio-dev b-deps added (Closes: #751090)
* New upstream pre-release
  - debian/control: python-lxml b-dep added
  - debian/rules: dh_auto_test overridden for test purpose
  - debian/patches/: patchset refreshed against v0.91~pre0
    - 0001-Fix_Datamatrix_UI_issue.patch dropped (applied upstream)
    - 0002-Drop_PS_and_PDF_support_in_MimeType.patch => #0001
    - 0003-Fix_LP_-911146.patch dropped (applied upstream)
    - 0004-Fix_FTBFS_on_gcc-4.8.patch dropped (applied upstream)
    - 0005-Fix_FreeType_include.patch dropped (applied upstream)
    - 0006-Fix_FTBFS_on_poppler-0.26.patch updated and => #0002
* debian/control: b-dep bump to use poppler (>= 0.26)
* Build with experimental patch against librevenge.
* 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.
* debian/patches/: patchset updated
  - 0006-Fix_FTBFS_on_poppler-0.26.patch added
* debian/: python dependency fixed
* debian/control: b-dep bump liblcms1-dev => liblcms2-dev (Closes: #745533)
* 0007-Poppler-0.26-compatibility.patch: Take patch from bug #1315142 to fix
  compatibility with poppler 0.26.
* Rebuild for the new poppler soname
* 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)
* debian/control: S-V bump 3.9.4 => 3.9.5 (no changes needed)
* debian/control: Uploader e-mail address updated
* debian/patches/: patchset updated
  - 0005-Fix_FreeType_include.patch added (Closes: #733118)
    Thanks to Adam Conrad for the patch.
* debian/control: fields update
  - Duplicate Homepage field removed
  - VCS-* fields repositioned
* debian/watch: path updated
* debian/: dh bump 7 => 9
* debian/source/format: 3.0 (quilt) file added
* debian/patches/: patchset re-worked using gbp-pq
  - patches re-worked using gbp-pq (authorships kept)
  - debian/control: quilt b-dep dropped
  - debian/rules: quilt usage dropped
* debian/gbp.conf: file added
* debian/control: autotools-dev b-dep added
* debian/rules: drastic simplification
* debian/control: S-V bump 3.8.3 => 3.9.4 (no changes needed)
* debian/control: python-lxml Suggests => Recommends (Closes: #389540)
* debian/control: python-numpy Suggests => Recommends (Closes: #440566)
* debian/control: libgnomevfs2-extra Suggests => Recommends
  (Closes: #602599)
* debian/control: skencil Suggests dropped.
  The package has been removed from unstable
  on 2010-09-03 and from testing on 2010-09-04. (Closes: #712192)
* debian/control: transfig added to Recommends (Closes: #601770)
* debian/control: python dropped from Suggests (Closes: #628009)
* debian/control: Package description updated.
  Thanks to Phil Bull <philbull@gmail.com> for the new description.
  (Closes: #635244) (LP: #811634)
* 05-freetype-include.patch: Use freetype upstream's recommended include.
* No change rebuild with the new poppler
* Rebuild to pick up new libgc package name
* Merge from Debian Unstable (LP: #1194855)
  - debian/control:
    + Ubuntu maintainers
    + Build against lcms2
    + promote libgnomevfs2-extra to recommends
    + Demote pstoedit to Suggests (universe package).
    + Suggest transfig to allow import of xfig files
    + Drop unnecessary python and skencil suggestions
  - Handle translation tasks for Ubuntu main:
    + debian/rules: Add dh_translations to binary-arch rule
    + debian/control: Build-Depends dh-translations
  - Drop debian/patches/bzr-fix-for-gcc48.patch: Superseded by
    04-Fix_FTBFS_on_gcc-4.8.patch
  - debian/patches/01_add_unity_quicklist_support.patch: add "New Drawing"
    to Unity quicklist
* Upload to unstable
* debian/control: added myself to Uploaders
* debian/patches/: patchset updated
  - 04-Fix_FTBFS_on_gcc-4.8.patch added (Closes: #701297)
* debian/patches/bzr-fix-for-gcc48.patch: fix build with gcc 4.8.
* Rebuild to pick up the new libgc1c3 dependency.
* Merge from Debian Experimental (LP: #1106182). Remaining changes:
  - debian/control:
    + Ubuntu maintainers
    + Build against lcms2 (LP: #885324)
    + Drop build-dependency on specific libwpd/libwpg version.
    + promote libgnomevfs2-extra to recommends (lp: #496223)
    + Demote pstoedit to Suggests (universe package).
    + Suggest transfig to allow import of xfig files (LP: #668300)
    + Drop unnecessary python and skencil suggestions (LP: #762541)
    + Promote python-lxml, python-numpy, python-uniconvertor to Recommends.
  - Handle translation tasks for Ubuntu main (LP: #726850):
    + debian/rules: Add dh_translations to binary-arch rule
    + debian/control: Build-Depends dh-translations
  - debian/patches/01_add_unity_quicklist_support.patch: add "New Drawing"
    to Unity quicklist (LP: #676886)
* Non-maintainer upload.
* New upstream release (Closes: #696181)
  - debian/patches/: patch #03 for CVE-2012-5656
    was merged upstream, so dropped our copy
  - libpng15 incompatibility fixed (Closes: #649975)
  - fixes compatibility with poppler 0.20.x (Closes: #679890)
* debian/changelog: old NMU changelog entry added (Closes: #564022)
* New upstream release (LP: #1091308). Fixes several Ubuntu bugs:
  - Inkscape crashed with SIGSEGV in getObject() (LP: #941317)
  - Inkscape crashed with SIGSEGV in
    Inkscape::Extension::Implementation::Script::effect() (LP: #944077)
  - Inkscape crashed with SIGSEGV in
    Inkscape::Extension::Output::get_extension() (LP: #973174)
  - Overlay scrollbars causing input boxes to be small (LP: #946631)
* Drop 03_track_libpoppler25_abi_changes.patch: applied upstream
* Drop 04_track_libpoppler25_abi_changes_colorspace.patch: applied upstream
* Non-maintainer upload.
* Add Debian patch to fix relative filename vulnerability (Closes: #654341).
* Non-maintainer upload.
* Add Debian patch to fix vulnerability CVE-2012-5656 (Closes: #696485).
* Non-maintainer upload.
* Switch the libpng12-dev build dependency to libpng-dev (closes: #662378)
* Add the libpoppler-private-dev build dependency (closes: #660987)
* No change rebuild for poppler transition.
* No change rebuild for poppler transition.
* No change rebuild for libmagick transition
* No change rebuild for libpoppler26 (poppler 0.20.1-1ubuntu1)
* Follow ABI changes for libpoppler25 (poppler 0.20.0-0ubuntu1).
  (LP: #1005565)
* Merge from Debian Unstable (LP: #966221). Remaining changes:
  - debian/control:
    + Ubuntu maintainers
    + Build against lcms2 (LP: #885324)
    + Drop build-dependency on specific libwpd/libwpg version.
    + promote libgnomevfs2-extra to recommends (lp: #496223)
    + Demote pstoedit to Suggests (universe package).
    + Suggest transfig to allow import of xfig files (LP: #668300)
    + Drop unnecessary python and skencil suggestions (LP: #762541)
    + Promote python-lxml, python-numpy, python-uniconvertor to Recommends.
  - Handle translation tasks for Ubuntu main (LP: #726850):
    + debian/rules: Add dh_translations to binary-arch rule
    + debian/control: Build-Depends dh-translations
  - debian/patches/01_add_unity_quicklist_support.patch: add "New Drawing"
    to Unity quicklist (LP: #676886)
* [cb1a6e2] delete 01-libwpg0.2.dpatch since proper patch appied upstream
* [041bdd7] delete 02-add-shebangs-and-fix-permissions.dpatch (applied upstream)
* [518e31b] delete 03-add-missing-mimetypes.dpatch (applied upstream)
* [df995c3] add datamatrix patch from ubuntu (closes: #618835)
* [169ca97] Imported Upstream version 0.48.3.1, this handles the following
  debian bugs:
  - closes: #665560: inkscape: Including individual glib headers no longer supported
  - closes: #627637: JessyInk: Embedded Javascript Broken
  - closes: #559332: inkscape: Cairo rendering broken for "use" elements with
                               scaling or a viewBox
  - closes: #596836: clipart search spews messages in console
  - closes: #628035: inkscape: in the pdf export dialog a wrong pdf version is
                     reported
  - closes: #651196: French manpage has accents replaced by some garbage
  - closes: #633150: inkscape: New upstream version 0.48.3 is available
* [3f6e27a] use quilt instead of dpatch for patch handling
* [dd10775] Acknowledge NMU, inkscape doesn't register for handling of pdf
  and ps anymore (closes: #613752)
* upload sponsored by Guido Guenther <agx@debian.org>
  Thank you very much!
* promote libgnomevfs2-extra to recommends (lp: #496223)
* New upstream release (LP: #943984)
  - Fixes build errors with glibmm < 2.28
* Build against lcms2 (LP: #885324)
* New upstream release (LP: #933188). Fixes several Ubuntu bugs:
  - inkscape fails to build with glib 2.31 (LP: #898538)
  - ctrl c ctrl v of text in edit mode crashes inkscape (LP: #496793)
  - Completely replace lcms1 by lcms2 in Ubuntu (LP: #885324)
  - parameters ending with '\' causes python to bomb (LP: #168417)
  - Extensions with <check> tags fail to load (LP: #668895)
  - ESC doesn't cancel move when using the Node Tool (LP: #788560)
  - unable to edit attributes in Inkscape XML Editor (LP: #884368)
  - Some layers should be visible by default in Layers dialog (LP: #902054)
  - Path Effect List is hidden (LP: #909958)
  - Input Devices > Hardware > Tree of devices is hidden (LP: #910467)
  - Glyphs Font styles are hidden (LP: #911079)
  - Error messages from Extensions hidden (LP: #911079)
  - Messages dialog doesn't work (LP: #911123)
* Drop 02-add-shebangs-and-fix-permissions.dpatch: Applied upstream.
* Drop build-dependency on specific libwpd/libwpg version.
* No-change rebuild against libpoppler19.
* No-change rebuild to drop spurious libsfgcc1 dependency on armhf.
* No change rebuild for imagemagick4 transition
* New upstream release (LP: #807912). Fixes several Ubuntu bugs:
  - [SVG Font Editor] Crash when kerning an empty pair (LP: #706506)
  - Connector tool crash Inkscake (orthogonal mode) (LP: #771738)
  - Errors printed to console if openclipart search fails (LP: #638844)
  - pdf export with cairo 1.10 defaults to version PDF-1.5 (LP: #664335)
  - Cairo rendering broken for "use" elements when scaling or a viewBox
    (LP: #705345)
  - gimp_xcf.py crashed with TypeError in effect() (LP: #565296)
  - Enable build against libwpg-0.2 (LP: #778951)
  - Please add supported filetypes into MimeType line of inkscape.desktop
    (LP: #278307)
  - Inkscape fails to build with gcc 4.6 (LP: #707205)
* Drop 01-libwpg0.2.dpatch - Applied upstream
* Drop 03-add-missing-mimetypes.dpatch - Applied upstream
* Drop 04-fix-build-with-gcc4.6.dpatch - Applied upstream
* Drop 05-add-missing-includes.dpatch - Applied upstream
* Drop fix-fontforge-glyph-template.dpatch - Applied upstream
* Merge from Debian Unstable (LP: #791728). Remaining changes:
  - debian/control:
    + Ubuntu maintainers
    + Promote python-lxml, python-numpy, python-uniconvertor to Recommends.
    + Demote pstoedit to Suggests (universe package).
    + Suggest transfig to allow import of xfig files (LP: #668300)
    + Drop unnecessary python and skencil suggestions (LP: #762541)
  - Handle translation tasks for Ubuntu main (LP: #726850):
    + debian/rules: Add dh_translations to binary-arch rule
    + debian/control: Build-Depends dh-translations
  - debian/patches/01_add_unity_quicklist_support.patch: add "New Drawing"
    to Unity quicklist (LP: #676886)
  - debian/patches/fix-fontforge-glyph-template.dpatch: Cherry-pick
    patch from uptream trunk to fix layer structure in template (LP: #565296)
  - debian/patches/02-add-shebangs-and-fix-permissions.dpatch: No longer mark
    JavaScript extension files as standalone executables (LP: #602005):
    + share/extensions/*.js: Revert addition of shebangs
    + share/extensions/Makefile.am: Install *.js using _DATA rule rather
      than _SCRIPTS rule to avoid giving executable permission
* debian/patches/fix-datamatrix-ui.dpatch: Prevent invalid input in
  Datamatrix extension dialog (LP: #738108)
* Non-maintainer upload.
* Fix FTBFS with gcc 4.6 (Closes: #624770), Thanks to Alex Valavanis
  for the patch.
  - added 04-fix-build-with-gcc4.6.dpatch
* Fix build issues due to missing includes (Closes: #628226), patch
  taken from upstream.
  - added 05-add-missing-includes.dpatch
* debian/rules: No need to manually call intltool-update on build. This
  is now handled by dh_translations.
* debian/control: No longer suggest python and skencil. They do not
  offer any enhancement to Inkscape (LP: #762541)
* debian/control: Suggest transfig to allow import of xfig files
  (LP: #668300)
* debian/patches/02-add-shebangs-and-fix-permissions.dpatch:
  No longer mark JavaScript extension files as standalone executables
  (LP: #602005):
  - share/extensions/*.js: Revert addition of shebangs
  - share/extensions/Makefile.am: Install *.js using _DATA rule rather
    than _SCRIPTS rule to avoid giving executable permission
* debian/patches/fix-fontforge-glyph-template.dpatch: Cherry-pick
  patch from uptream trunk to fix layer structure in template (LP: #565296)
* debian/rules: Drop broken code to add translation domain to desktop files.
  Replace this with a call to dh_translations. Add dh-translations build
  dependency for this. Thanks to Alex Valavanis for pointing this out, and
  the original patch. (LP: #726850)
* debian/patches/04-fix-gcc4.6-ftbfs.dpatch: Fix build failure with gcc 4.6
  - Backport upstream patch (lp:inkscape:r10071)
  - Add <cstddef> inclusion to src/2geom/utils.h
* debian/patches/01_add_unity_quicklist_support.patch:
  - updated with latest specification
* Merge with Debian unstable (LP: #719648, LP: #278307). Remaining changes:
* debian/control:
  - Ubuntu maintainers
  - Promote python-lxml, python-numpy, python-uniconvertor to Recommends.
  - Demote pstoedit to Suggests (universe package).
* debian/rules:
  - Run intltool-update on build (Ubuntu-specific).
  - Add translation domain to .desktop files (Ubuntu-specific)
* debian/patches/01_add_unity_quicklist_support.patch:
  - add unity quicklist support for a new entry to inkscape (LP: #676886)
* upload to unstable (closes: #611626)
* [d364fdc] link against libwpg0.2/libwpd0.9 (closes: 604825)
  Thanks to Rene Engelhard <rene@debian.org> for his work and the patch!
* upload sponsored by Guido Guenther <agx@debian.org>
  Thank you very much!
* [f6250fa] Imported Upstream version 0.48.1
* [e5b9206] remove debian/patches/01-end-drag-fix.dpatch since applied
  upstream
* [2b6fb5b] add patch to fix shebang lines in extensions scripts
* [f38e3e1] drop dependency upon ttf-bitstream-vera (closes: #597503)
* [0a91fb1] binary depends on ${misc:Depends} as indicated by lintian
* [02b4953] depend on libmagick++-dev instead of libmagick++9-dev
* [ea095c3] Add supported mime types (closes: #596982)
* debian/patches/01_add_unity_quicklist_support.patch:
  - add unity quicklist support for a new entry to inkscape (LP: #676886)
* New upstream version (LP: #710619). Fixes several Ubuntu bugs:
  - Node editing causes segmentation fault (LP: #544599)
  - Cursor position markers are not cleared from rulers (LP: #627134)
  - Crashes when opening document properties (LP: #658055)
  - Export to XCF error with default template (LP: #485032)
  - Editing a connector in a transformed group returns it to original
    position (LP: #533897)
  - Ungrouping objects changes position of arrow lines (LP: #552289)
  - Will not save XCF file (LP: #642417)
  - XCF export fails when exporting from unsaved document (LP: #650890)
* Drop all patches: Applied upstream
* debian/rules: Disable chmod on debian/patches/* in clean rule (no patches used)
* debian/patches/0001-Fix-build-with-Poppler-0.15.1.dpatch: Backport
  upstream patch to fix Poppler build issues in Natty (LP: #676271)
* Bug-fix release (LP: #645888)
* Added 02-fix-binutils-gold-build-failure.dpatch (LP: #662979)
* debian/control: No longer suggest ttf-dejavu (LP: #643371)
* Merge with Debian unstable (LP: #628048, LP: #401567, LP: #456248,
  LP: #463602, LP: #591986)
* debian/control:
  - Ubuntu maintainers
  - Promote python-lxml, python-numpy, python-uniconvertor to Recommends.
  - Demote pstoedit to Suggests (universe package).
  - Suggests ttf-dejavu instead of ttf-bitstream-vera (LP: #513319)
* debian/rules:
  - Run intltool-update on build (Ubuntu-specific).
  - Add translation domain to .desktop files (Ubuntu-specific).
* debian/dirs:
  - Add usr/share/pixmaps. Allow inkscape.xpm installation
* drop 50-poppler-API.dpatch (now upstream)
* drop 51-paste-in-unwritable-directory.dpatch (now upstream)
* [cae07a3] New Upstream version 0.48.0
* [309c498] add patch to fix crash in node tool
* The highlights of this release are:
    - multipath editing
    - improved text tool: subscript, superscript, numerical input for text kerning, tracking and more
    - new Airbrush tool
    - LaTeX export with PDF/PS/EPS
    - JessyInk extension to create presentations
    - numerous bugfixes
* [56702cf] don't build-depend on libssl-dev (closes: #573338)
* [013b235] wrap lines in debian/control. patch by Benjamin Drung,
  many thanks to him (closes: #576357)
* [747d3d1] add README.source adopted from nagios to make lintian a
  bit happier
* [4df0df7] Remove all patches since they are applied upstream
* 51-paste-in-unwritable-directory.dpatch, debian/control: Allow paste
  from clipboard when in unwritable working directory (LP: #211607)
* debian/control: Replaced ttf-bitstream-vera suggestion with ttf-dejavu
  (LP: #513319).
* Merge from debian testing (LP: #533584, LP: #486425). Remaining changes:
  - debian/control:
    - drop libssl-dev, no longer needed (Closes: #573338).
    - promote python-lxml, python-numpy, python-uniconvertor to Recommends.
    - demote pstoedit to Suggests (universe package).
  - debian/rules:
    - Run intltool-update on build (Ubuntu-specific).
    - Add translation domain to .desktop files (Ubuntu-specific).
  - 50-poppler-API.patch, debian/control: poppler 0.12.2 changed the
    GfxColorSpace API (LP: #487038).
* Build depend on libaspell-dev, recommend aspell, add explanation to
  package description (closes: #562060)
* update debian/watch patch by Kees Cook, many thanks to him
  (closes: #562225)
* process DEB_BUILD_OPTIONS for "parallel=N" flag patch by Kees Cook,
  many thanks to him. (Closes: #562226)
* Add patch to update man-page (closes:#570494)
* remove old unneeded patches
* upload sponsored by Guido Guenther <agx@debian.org>
* Brown paper bag update: actually use the correct version of the
  source tree.
* Merge with Debian testing (LP: #498150). Remaining changes:
  - debian/control:
    - promote python-lxml, python-numpy, python-uniconvertor to Recommends.
    - demote pstoedit to Suggests (universe package).
    - drop libssl-dev, no longer needed (Debian bug 484527).
  - debian/rules:
    - Handle parallel builds via -j (Debian bug 562226).
    - Run intltool-update on build (Ubuntu-specific).
    - Add translation domain to .desktop files (Ubuntu-specific).
  - debian/watch:
    - Correctly handle "pre" versions (Debian bug 562225).
* 50-poppler-API.patch, debian/control: poppler 0.12.2 changed the
  GfxColorSpace API (LP: #487038).
* Imported Upstream version 0.47
* This is upstream version 0.47, I added the .0 because
  I forget the ~ in the -pre versions.
* add proper Vcs-fields to debian/control
* upload sponsored by Guido Guenther <agx@debian.org>
* Imported Upstream version 0.47pre4
* upload sponsored by Guido Guenther <agx@debian.org>
* fix installation of usr/share/application-
  registry/inkscape.applications
* upload sponsored by Guido Guenther <agx@debian.org>
* new upstream release (closes: #532277)
  Improvements and new features include:
  - code cleanups and refractoring
  - autosave feature, configurable via Inkscape preferences
  - new and enhanced tools, extensions and filters
  - new path effects
  - enhanced import and export features
  - improved svg support
  - many other improvements and new features. For a better and more
    comprehensive decription of enhancements see the online release notes at
    http://wiki.inkscape.org/wiki/index.php/Release_notes/0.47
* remove 04-only-use-valid-font-families-in-text-tool.dpatch
  since there is a better fix in the code now (closes: #496784)
* remove other patches which are no longer needed:
  - 01_mips.dpatch
  - 02-poppler-0.8.3.dpatch
  - 03-chinese-inkscape.dpatch
  - 05_fix_latex_patch.dpatch
  - 06_gcc-4.4.dpatch
  - 07_cdr2svg.dpatch
  - 08_skip-bad-utf-on-pdf-import.dpatch
  - 09_gtk-clist.dpatch
  - 10_belarussian.dpatch
  - 12_desktop.dpatch
  fix patch permissions in clean target
* upload sponsored by Guido Guenther <agx@debian.org>
* build-depend on libgsl0-dev
* small adations to debian/rules
* New upstream pre-release, bug-fixes only (LP: #432328).
* No-change rebuild against libmagick++2.
* New upstream release.
  - Don't constrain maximization on small resolution devices (pre0)
    (LP: #348842)
  - Fixes segfault on startup (pre0)
    (LP: #391149)

* New upstream release
* debian/control: Adding libgsl0 and removing version specifics on boost
* debian/watch: updated to run uupdate and mangle pre-release versions.
* Dropped patches that have been taken upstream:
  - 01_mips
  - 02-poppler-0.8.3
  - 03-chinese-inkscape
  - 05_fix_latex_patch
  - 06_gcc-4.4
  - 07_cdr2svg
  - 08_skip-bad-utf-on-pdf-import
  - 09_gtk-clist
  - 10_belarussian
  - 11_libpng
  - 12_desktop
  - 13_slider
  - 100_svg_import_improvements
  - 102_sp_pattern_painter_free
  - 103_bitmap_type_print
* Non-maintainer upload.
* 03-gtk-includes.dpatch: patch from Ubuntu to fix FTBFS caused by
  wrong GTK+ includes. Closes: #518633.

Fixed bugs:
  - http://bugs.debian.org/389540
  - http://bugs.debian.org/440566
  - http://bugs.debian.org/496784
  - http://bugs.debian.org/518633
  - http://bugs.debian.org/532277
  - http://bugs.debian.org/559332
  - http://bugs.debian.org/562060
  - http://bugs.debian.org/562225
  - http://bugs.debian.org/562226
  - http://bugs.debian.org/564022
  - http://bugs.debian.org/570494
  - http://bugs.debian.org/573338
  - http://bugs.debian.org/576357
  - http://bugs.debian.org/596836
  - http://bugs.debian.org/596982
  - http://bugs.debian.org/597503
  - http://bugs.debian.org/601770
  - http://bugs.debian.org/602599
  - http://bugs.debian.org/604825
  - http://bugs.debian.org/611626
  - http://bugs.debian.org/613752
  - http://bugs.debian.org/618835
  - http://bugs.debian.org/624770
  - http://bugs.debian.org/627637
  - http://bugs.debian.org/628009
  - http://bugs.debian.org/628035
  - http://bugs.debian.org/628226
  - http://bugs.debian.org/633150
  - http://bugs.debian.org/635244
  - http://bugs.debian.org/649975
  - http://bugs.debian.org/651196
  - http://bugs.debian.org/654341
  - http://bugs.debian.org/660987
  - http://bugs.debian.org/662378
  - http://bugs.debian.org/665560
  - http://bugs.debian.org/679890
  - http://bugs.debian.org/696181
  - http://bugs.debian.org/696485
  - http://bugs.debian.org/696924
  - http://bugs.debian.org/701297
  - http://bugs.debian.org/712192
  - http://bugs.debian.org/733118
  - http://bugs.debian.org/738155
  - http://bugs.debian.org/745533
  - http://bugs.debian.org/751090
  - http://bugs.debian.org/753430
  - http://bugs.debian.org/754716
  - http://bugs.debian.org/776857
  - http://bugs.debian.org/789232
  - https://launchpad.net/bugs/166371
  - https://launchpad.net/bugs/168417
  - https://launchpad.net/bugs/211607
  - https://launchpad.net/bugs/278307
  - https://launchpad.net/bugs/348842
  - https://launchpad.net/bugs/391149
  - https://launchpad.net/bugs/401567
  - https://launchpad.net/bugs/432328
  - https://launchpad.net/bugs/456248
  - https://launchpad.net/bugs/463602
  - https://launchpad.net/bugs/485032
  - https://launchpad.net/bugs/486425
  - https://launchpad.net/bugs/487038
  - https://launchpad.net/bugs/496223
  - https://launchpad.net/bugs/496793
  - https://launchpad.net/bugs/498150
  - https://launchpad.net/bugs/513319
  - https://launchpad.net/bugs/529843
  - https://launchpad.net/bugs/533584
  - https://launchpad.net/bugs/533897
  - https://launchpad.net/bugs/544599
  - https://launchpad.net/bugs/552289
  - https://launchpad.net/bugs/565296
  - https://launchpad.net/bugs/591986
  - https://launchpad.net/bugs/602005
  - https://launchpad.net/bugs/627134
  - https://launchpad.net/bugs/628048
  - https://launchpad.net/bugs/638844
  - https://launchpad.net/bugs/642417
  - https://launchpad.net/bugs/643371
  - https://launchpad.net/bugs/645888
  - https://launchpad.net/bugs/650890
  - https://launchpad.net/bugs/658055
  - https://launchpad.net/bugs/662979
  - https://launchpad.net/bugs/664335
  - https://launchpad.net/bugs/668300
  - https://launchpad.net/bugs/668895
  - https://launchpad.net/bugs/676271
  - https://launchpad.net/bugs/676886
  - https://launchpad.net/bugs/705345
  - https://launchpad.net/bugs/706506
  - https://launchpad.net/bugs/707205
  - https://launchpad.net/bugs/710619
  - https://launchpad.net/bugs/719648
  - https://launchpad.net/bugs/726850
  - https://launchpad.net/bugs/738108
  - https://launchpad.net/bugs/762541
  - https://launchpad.net/bugs/771738
  - https://launchpad.net/bugs/778951
  - https://launchpad.net/bugs/788560
  - https://launchpad.net/bugs/791728
  - https://launchpad.net/bugs/807912
  - https://launchpad.net/bugs/811634
  - https://launchpad.net/bugs/884368
  - https://launchpad.net/bugs/885324
  - https://launchpad.net/bugs/898538
  - https://launchpad.net/bugs/902054
  - https://launchpad.net/bugs/909958
  - https://launchpad.net/bugs/910467
  - https://launchpad.net/bugs/911079
  - https://launchpad.net/bugs/911123
  - https://launchpad.net/bugs/933188
  - https://launchpad.net/bugs/941317
  - https://launchpad.net/bugs/943984
  - https://launchpad.net/bugs/944077
  - https://launchpad.net/bugs/946631
  - https://launchpad.net/bugs/966221
  - https://launchpad.net/bugs/966441
  - https://launchpad.net/bugs/973174
  - https://launchpad.net/bugs/1005565
  - https://launchpad.net/bugs/1051017
  - https://launchpad.net/bugs/1090865
  - https://launchpad.net/bugs/1091308
  - https://launchpad.net/bugs/1106182
  - https://launchpad.net/bugs/1163241
  - https://launchpad.net/bugs/1194855
  - https://launchpad.net/bugs/1225013
  - https://launchpad.net/bugs/1358863
  - https://launchpad.net/bugs/1416651
  - https://launchpad.net/bugs/1471394

(bzr r5)

Author: Alexander Brock
Author Date: 2015-06-06 16:04:19 UTC

Add feature: Break path at given nodes apart

(bzr r13770)

Author: Alexander Brock
Author Date: 2015-06-02 05:07:50 UTC

Fixed removal of overlap and intersection with clipping paths

(bzr r13769)

Author: Johncoswell
Author Date: 2015-05-23 17:35:37 UTC

Speed up touch select using cached flattened SVG DOM list.

(bzr r14170)

Author: Johncoswell
Author Date: 2015-05-23 17:35:37 UTC

Speed up touch select using cached flattened SVG DOM list.

(bzr r14170)

Author: jabiertxof
Author Date: 2015-05-07 10:06:13 UTC

update to trunk

(bzr r14077)

Author: jabiertxof
Author Date: 2015-04-29 16:23:49 UTC

Fix a bug finded on HackFest

(bzr r14049)

Author: Heiko Becker
Author Date: 2015-04-02 23:34:49 UTC

configure: Use PKG_PROG_PKG_CONFIG macro

It has the advantage that it respects the PKG_CONF environment
variable which comes in handy when you're using a prefixed pkg-config
(e.g arch-prefix) executable.

(bzr r14042)

Author: JIghtuse
Author Date: 2015-03-19 16:37:02 UTC

cppcheck: fix copy-paste typo

(bzr r13999)

Author: Liam P. White
Author Date: 2015-03-01 20:03:59 UTC

Add ArenaDrawable implementation

(bzr r13956)

Author: Liam P. White
Author Date: 2015-02-19 04:05:17 UTC

CtrlRect dance

(bzr r13516)

Author: Vitaly Lipatov
Author Date: 2015-02-18 12:22:04 UTC

update spec to new build 0.91 (with rpmrb script)

(bzr r64)

Author: Alexander Brock
Author Date: 2014-11-21 23:49:55 UTC

Made things const in src/document.*

(bzr r13746)

Author: Christoffer Holmstedt
Author Date: 2014-11-19 18:48:54 UTC

Updated Swedish translation to 41%

(bzr r13652)

Author: Shlomi Fish
Author Date: 2014-11-03 16:51:07 UTC

cmake fixes.

(bzr r13309)

Author: Samuel Chase
Author Date: 2014-09-23 18:23:31 UTC

Merge with trunk

(bzr r11592)