- Olena-patches

[Olena] #254: algebra::h_mat should not inherit from algebra::mat
by Olena Trac 28 May '12

28 May '12

#254: algebra::h_mat should not inherit from algebra::mat ---------------------+------------------------------------------------------ Reporter: lazzara | Owner: Olena Team Type: defect | Status: new Priority: major | Milestone: Olena 2.1 Component: Milena | Version: 2.0 Keywords: | ---------------------+------------------------------------------------------ Currently, there is the following hierarchy: {{{ Object<algebra::mat> ^ | algebra::mat ^ | algebra::h_mat }}} It works except when using exact() which returns algebra::mat instead of algebra::h_mat causing compilation errors. We should change the hierarchy to the following: {{{ Object<algebra::mat> ^ | algebra::internal::mat_base ^ ^ | | algebra::h_mat algebra::mat }}} -- Ticket URL: <https://trac.lrde.org/olena/ticket/254> Olena <http://olena.lrde.epita.fr> Olena, a software platform dedicated to image processing.

1 0

olena-2.0-50-g1c20ebd Fix access to xsl templates.
by Guillaume Lazzara 23 May '12

23 May '12

* demo/xml2doc/Makefile.am: Add templates in distribution. * demo/xml2doc/datarootdir.hh.in: Fix path. --- scribo/ChangeLog | 8 ++++++++ scribo/demo/xml2doc/Makefile.am | 18 ++++++++++++++++-- scribo/demo/xml2doc/datarootdir.hh.in | 2 +- 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index a6d9e17..e8d0b70 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,13 @@ 2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix access to xsl templates. + + * demo/xml2doc/Makefile.am: Add templates in distribution. + + * demo/xml2doc/datarootdir.hh.in: Fix path. + +2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * demo/viewer/runner.cc: Fix libexec path. 2012-05-22 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/demo/xml2doc/Makefile.am b/scribo/demo/xml2doc/Makefile.am index c3e0d1c..ff37fa2 100644 --- a/scribo/demo/xml2doc/Makefile.am +++ b/scribo/demo/xml2doc/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2010, 2011 EPITA Research and Development Laboratory -# (LRDE). +# Copyright (C) 2010, 2011, 2012 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -71,3 +71,17 @@ EXTRA_DIST = \ README \ datarootdir.hh.in +templatedir = $(pkgdatadir)/scribo/ +nobase_dist_template_DATA = \ + $(srcdir)/templates/bin/ooconvert \ + $(srcdir)/templates/html/css.css \ + $(srcdir)/templates/html/main.xsl \ + $(srcdir)/templates/html/main_base64.xsl \ + $(srcdir)/templates/opendoc/css.css \ + $(srcdir)/templates/opendoc/xsl.xsl \ + $(srcdir)/templates/pdf/line.xsl \ + $(srcdir)/templates/pdf/main.xsl \ + $(srcdir)/templates/pdf/regions.xsl \ + $(srcdir)/templates/svg/line.xsl \ + $(srcdir)/templates/svg/main.xsl \ + $(srcdir)/templates/svg/regions.xsl \ No newline at end of file diff --git a/scribo/demo/xml2doc/datarootdir.hh.in b/scribo/demo/xml2doc/datarootdir.hh.in index 88371f9..056381f 100644 --- a/scribo/demo/xml2doc/datarootdir.hh.in +++ b/scribo/demo/xml2doc/datarootdir.hh.in @@ -27,7 +27,7 @@ # define SCRIBO_DEMO_XML2DOC_DATAROOTDIR_HH -# define SCRIBO_PREFIX_DATAROOTDIR "@datarootdir@/scribo" +# define SCRIBO_PREFIX_DATAROOTDIR "@datarootdir@/olena/scribo" # define SCRIBO_LOCAL_DATAROOTDIR "@abs_srcdir@" -- 1.7.2.5

2 1

olena-2.0-48-gbce5897 debian/source/options: Disable bzip2 compression.
by Guillaume Lazzara 23 May '12

23 May '12

--- ChangeLog | 4 ++++ debian/source/options | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d2f6f58..24e72e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/source/options: Disable bzip2 compression. + +2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/control: Update maintainer name. 2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/debian/source/options b/debian/source/options index c42801e..5d68209 100644 --- a/debian/source/options +++ b/debian/source/options @@ -2,7 +2,7 @@ # This file is part of the distribution. # Bzip2 compression for debian.tar -compression = "bzip2" -compression-level = 7 +#compression = "bzip2" +#compression-level = 7 # Do not generate diff for changes in config.(sub|guess) extend-diff-ignore = "(^|/)config.(sub|guess)$" \ No newline at end of file -- 1.7.2.5

2 1

olena-2.0-37-ge230d44 Add options for dpkg-source.
by Guillaume Lazzara 23 May '12

23 May '12

* debian/source/format: Force dpkg-source 3.0. * debian/source/local-options, * debian/source/options: New. --- ChangeLog | 9 +++++++++ debian/source/format | 3 +++ debian/source/local-options | 4 ++++ debian/source/options | 8 ++++++++ 4 files changed, 24 insertions(+), 0 deletions(-) create mode 100644 debian/source/format create mode 100644 debian/source/local-options create mode 100644 debian/source/options diff --git a/ChangeLog b/ChangeLog index 87179d9..f5d9933 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2012-05-22 Guillaume Lazzara <z(a)lrde.epita.fr> + Add options for dpkg-source. + + * debian/source/format: Force dpkg-source 3.0. + + * debian/source/local-options, + * debian/source/options: New. + +2012-05-22 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/control: Add dependencies. 2012-01-30 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..8404db8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1,3 @@ +# Switch to dpkg-source 3.0 (quilt) format +# See http://wiki.debian.org/Projects/DebSrc3.0 +3.0 (quilt) \ No newline at end of file diff --git a/debian/source/local-options b/debian/source/local-options new file mode 100644 index 0000000..2e7226b --- /dev/null +++ b/debian/source/local-options @@ -0,0 +1,4 @@ +# Options passed to dpkg-source while building the package. +# This file is NOT part of the distribution. + +abort-on-upstream-changes \ No newline at end of file diff --git a/debian/source/options b/debian/source/options new file mode 100644 index 0000000..c42801e --- /dev/null +++ b/debian/source/options @@ -0,0 +1,8 @@ +# Options passed to dpkg-source while building the package +# This file is part of the distribution. + +# Bzip2 compression for debian.tar +compression = "bzip2" +compression-level = 7 +# Do not generate diff for changes in config.(sub|guess) +extend-diff-ignore = "(^|/)config.(sub|guess)$" \ No newline at end of file -- 1.7.2.5

2 1

branch exp/deb-packages updated: olena-2.0-51-g07dea83
by git＠lrde.epita.fr 23 May '12

23 May '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch exp/deb-packages has been updated discards faaecfd2d463729324c7aa4e69643463938c509d (commit) discards f51e0526ea66999a00f9f6281a82fecd8dfed9b3 (commit) discards abcd89d3fb4463d4fdd5f31a06552f8107e367c6 (commit) discards a84e5122a3538c77efe52029a2609f36e273a6d7 (commit) discards bce58971a038ba44669597cabfb8e95886411b34 (commit) via 07dea83cb87e65be67e7fa5f5d7e280b024416d8 (commit) via 1c20ebd37e9918e623d21217823906df1a60da38 (commit) via 63beebcf5d6f9c9de39ff24dbb7d5d990d9f32ae (commit) via ee9f7de75ef0c03cce72d235596c7df86b5c5d3b (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (faaecfd2d463729324c7aa4e69643463938c509d) \ N -- N -- N (07dea83cb87e65be67e7fa5f5d7e280b024416d8) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 07dea83 debian/olena-bin.install: Add shared files in olena-bin. 1c20ebd Fix access to xsl templates. 63beebc debian/changelog: Change distribution. ee9f7de demo/viewer/runner.cc: Fix libexec path. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 ---- debian/source/options | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch exp/deb-packages updated: olena-2.0-52-gfaaecfd
by git＠lrde.epita.fr 23 May '12

23 May '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch exp/deb-packages has been updated via faaecfd2d463729324c7aa4e69643463938c509d (commit) via f51e0526ea66999a00f9f6281a82fecd8dfed9b3 (commit) via abcd89d3fb4463d4fdd5f31a06552f8107e367c6 (commit) via a84e5122a3538c77efe52029a2609f36e273a6d7 (commit) via bce58971a038ba44669597cabfb8e95886411b34 (commit) via 0a0e2ab12827eca0737b9cbff6f78edede209c2f (commit) via 838cf6567d036d11748d68497a474e6b1fe3d9a4 (commit) via 2c9c14db40ebcae1a02515acf248bfe8c5d49a29 (commit) via 6a781e89295a40735c7c757d7ce67eae945266ab (commit) via 492f1386b812c449e58d03db95bee38e619ab2f2 (commit) via 22cfe450d1f6e9d1cc6dd489daf23facaee02abe (commit) via bac711460ecce65688a40c95582439e51f653e72 (commit) via 7293e084b1fc0578709dd6c791ced5fd6f475acd (commit) via 7c61b3943c10a71dcb8ea012125066fc077010bd (commit) via 8b07f49b4bc829852ad589cea1bb1572be557a9a (commit) via e230d446b202654eeac29210fd038c9694126bf0 (commit) via c3a81b53a572a5a3c8bd68e9a4fc2d43ca99638c (commit) from 90618429f66472a36923c03e8d27489914ed97e7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- faaecfd debian/olena-bin.install: Add shared files in olena-bin. f51e052 Fix access to xsl templates. abcd89d debian/changelog: Change distribution. a84e512 demo/viewer/runner.cc: Fix libexec path. bce5897 debian/source/options: Disable bzip2 compression. 0a0e2ab debian/control: Update maintainer name. 838cf65 debian/copyright: Update commiter name. 2c9c14d debian/control: Set packages as optional. 6a781e8 debian/rules: Handles '-j' option for make. 492f138 debian/control: Update Standards-Version. 22cfe45 debian/rules: Update deprecated dh_clean -k command. bac7114 debian/rules: Add missing required rules. 7293e08 demo/viewer/runner.cc: Make xml2doc binary lookup more robust. 7c61b39 Add missing description in manpages. 8b07f49 Fix Lintian warnings. e230d44 Add options for dpkg-source. c3a81b5 debian/control: Add dependencies. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 82 +++++++++++++++++++++ debian/changelog | 5 +- debian/compat | 5 +- debian/control | 34 +++++++- debian/copyright | 2 +- debian/gbp.conf | 7 ++ debian/olena-bin.install | 3 +- debian/{olena-dev.manpages => olena-bin.manpages} | 0 debian/olena.menu | 3 +- debian/rules | 17 +++-- debian/scribo-cli.1 | 2 +- debian/scribo-viewer.1 | 2 +- debian/source/format | 3 + debian/source/local-options | 4 + debian/source/options | 8 ++ debian/watch | 5 + scribo/ChangeLog | 16 ++++ scribo/demo/viewer/runner.cc | 20 +++-- scribo/demo/xml2doc/Makefile.am | 18 ++++- scribo/demo/xml2doc/datarootdir.hh.in | 2 +- 20 files changed, 207 insertions(+), 31 deletions(-) create mode 100644 debian/gbp.conf rename debian/{olena-dev.manpages => olena-bin.manpages} (100%) create mode 100644 debian/source/format create mode 100644 debian/source/local-options create mode 100644 debian/source/options create mode 100644 debian/watch hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-52-gfaaecfd debian/olena-bin.install: Add shared files in olena-bin.
by Guillaume Lazzara 23 May '12

23 May '12

--- ChangeLog | 4 ++++ debian/olena-bin.install | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index a5ca0af..92f62e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/olena-bin.install: Add shared files in olena-bin. + +2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/changelog: Change distribution. 2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/debian/olena-bin.install b/debian/olena-bin.install index 34b2678..423557d 100644 --- a/debian/olena-bin.install +++ b/debian/olena-bin.install @@ -1,2 +1,3 @@ usr/bin/* usr/lib/scribo/* +usr/share/olena/scribo/* -- 1.7.2.5

1 0

olena-2.0-51-g07dea83 debian/olena-bin.install: Add shared files in olena-bin.
by Guillaume Lazzara 23 May '12

23 May '12

--- ChangeLog | 4 ++++ debian/olena-bin.install | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8570ad8..603e70c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/olena-bin.install: Add shared files in olena-bin. + +2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/changelog: Change distribution. 2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/debian/olena-bin.install b/debian/olena-bin.install index 34b2678..423557d 100644 --- a/debian/olena-bin.install +++ b/debian/olena-bin.install @@ -1,2 +1,3 @@ usr/bin/* usr/lib/scribo/* +usr/share/olena/scribo/* -- 1.7.2.5

1 0

olena-2.0-51-gf51e052 Fix access to xsl templates.
by Guillaume Lazzara 23 May '12

23 May '12

* demo/xml2doc/Makefile.am: Add templates in distribution. * demo/xml2doc/datarootdir.hh.in: Fix path. --- scribo/ChangeLog | 8 ++++++++ scribo/demo/xml2doc/Makefile.am | 18 ++++++++++++++++-- scribo/demo/xml2doc/datarootdir.hh.in | 2 +- 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index a6d9e17..e8d0b70 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,13 @@ 2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix access to xsl templates. + + * demo/xml2doc/Makefile.am: Add templates in distribution. + + * demo/xml2doc/datarootdir.hh.in: Fix path. + +2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * demo/viewer/runner.cc: Fix libexec path. 2012-05-22 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/demo/xml2doc/Makefile.am b/scribo/demo/xml2doc/Makefile.am index c3e0d1c..ff37fa2 100644 --- a/scribo/demo/xml2doc/Makefile.am +++ b/scribo/demo/xml2doc/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2010, 2011 EPITA Research and Development Laboratory -# (LRDE). +# Copyright (C) 2010, 2011, 2012 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -71,3 +71,17 @@ EXTRA_DIST = \ README \ datarootdir.hh.in +templatedir = $(pkgdatadir)/scribo/ +nobase_dist_template_DATA = \ + $(srcdir)/templates/bin/ooconvert \ + $(srcdir)/templates/html/css.css \ + $(srcdir)/templates/html/main.xsl \ + $(srcdir)/templates/html/main_base64.xsl \ + $(srcdir)/templates/opendoc/css.css \ + $(srcdir)/templates/opendoc/xsl.xsl \ + $(srcdir)/templates/pdf/line.xsl \ + $(srcdir)/templates/pdf/main.xsl \ + $(srcdir)/templates/pdf/regions.xsl \ + $(srcdir)/templates/svg/line.xsl \ + $(srcdir)/templates/svg/main.xsl \ + $(srcdir)/templates/svg/regions.xsl \ No newline at end of file diff --git a/scribo/demo/xml2doc/datarootdir.hh.in b/scribo/demo/xml2doc/datarootdir.hh.in index 88371f9..056381f 100644 --- a/scribo/demo/xml2doc/datarootdir.hh.in +++ b/scribo/demo/xml2doc/datarootdir.hh.in @@ -27,7 +27,7 @@ # define SCRIBO_DEMO_XML2DOC_DATAROOTDIR_HH -# define SCRIBO_PREFIX_DATAROOTDIR "@datarootdir@/scribo" +# define SCRIBO_PREFIX_DATAROOTDIR "@datarootdir@/olena/scribo" # define SCRIBO_LOCAL_DATAROOTDIR "@abs_srcdir@" -- 1.7.2.5

1 0

olena-2.0-50-gabcd89d debian/changelog: Change distribution.
by Guillaume Lazzara 23 May '12

23 May '12

--- ChangeLog | 4 ++++ debian/changelog | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 24e72e1..a5ca0af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/changelog: Change distribution. + +2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/source/options: Disable bzip2 compression. 2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/debian/changelog b/debian/changelog index 1b5cd4d..10b1e68 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -olena (2.0-1) testing; urgency=low +olena (2.0-1) wheezy; urgency=low * Initial release. -- 1.7.2.5

1 0