lp:~zorba-coders/zorba/zorba-2.5-prep

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:zorba at revision 10863

Matthias Brantner: Approve on 2012-05-22

Chris Hillery: Approve on 2012-05-22

Diff: 154 lines (+39/-44)

4 files modified

CMakeLists.txt (+1/-1)
ChangeLog (+19/-24)
NOTICE.txt (+1/-1)
modules/ExternalModules.conf (+18/-18)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

10860. By Matthias Brantner on 2012-05-22

changed tag name for modules

10859. By Matthias Brantner on 2012-05-21

merge + changelog update

10858. By Matthias Brantner on 2012-05-21

bumped up versino numbers

10857. By Paul J. Lucas on 2012-05-19

Fixed a couple of warnings. Approved: Matthias Brantner, Paul J. Lucas

10856. By Matthias Brantner on 2012-05-19

- fetch:content-binary
- fetch:content#3 (with encoding parameter)
- StreamResource::isStreamSeekable to make sure the streamable strings returned by fetch are seekable.
- fixed two warnings in nodes_impl.cpp
- extended the C++ api to be symmetric to the fetch module Approved: Till Westmann, Chris Hillery, Matthias Brantner

10855. By Chris Hillery on 2012-05-18

Allow modules to specify their own libs for their Config file, in addition to the automatically-added libs from DECLARE_ZORBA_MODULE().
 Approved: Matthias Brantner, Chris Hillery

10854. By Sorin Marian Nasoi <email address hidden> on 2012-05-18

Update modules_svg generation target. Add mechanism for core build to detect whether a given non-core module exists (by URI). Use that method to check for graphviz before generating modules_svg. Approved: Sorin Marian Nasoi, Chris Hillery

10853. By William Candillon on 2012-05-18

Fix PHP build Approved: Paul J. Lucas, William Candillon

10852. By Paul J. Lucas on 2012-05-18

Getting in another public API change for 2.5 for the full-text module since now's the time to do it. Renamed tokenize() to tokenize-node() for 2 reasons:

1. There already exists tokenize-string() and therefore tokenize-node() is a better name than just plain tokenize().

2. The forthcoming addition of the black & white tokenization function will most likely be called tokenize-nodes() -- plural. Approved: Matthias Brantner, Paul J. Lucas

10851. By Paul J. Lucas on 2012-05-17

Fixed the build error and also fixed several warnings that are new with Xcode 4.3.2. Approved: Matthias Brantner, Paul J. Lucas