- Olena-patches

branch skewness deleted: olena-2.0-117-gba5badd
by git＠lrde.epita.fr 22 Aug '12

22 Aug '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 skewness has been deleted was ba5badd9d9719afaea44bd06716cb27462ad4e18 ----------------------------------------------------------------------- ba5badd9d9719afaea44bd06716cb27462ad4e18 Make the area value depends on the first scale ratio. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-52-gaeafa4a debian/compat: Upgrade to debhelper 9.
by Guillaume Lazzara 22 Aug '12

22 Aug '12

--- ChangeLog | 4 ++++ debian/compat | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 603e70c..6cdb1ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-05-29 Guillaume Lazzara <z(a)lrde.epita.fr> + + * debian/compat: Upgrade to debhelper 9. + 2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> * debian/olena-bin.install: Add shared files in olena-bin. diff --git a/debian/compat b/debian/compat index 0251a88..c24f333 100644 --- a/debian/compat +++ b/debian/compat @@ -1,4 +1,4 @@ -8 +9 # Specifies the "compatibility level" for the debhelper tool # See http://wiki.debian.org/IntroDebianPackaging -- 1.7.2.5

1 0

olena-2.0-53-g7d60b36 debian/rules: Add hardening flags according to Debian policy.
by Guillaume Lazzara 22 Aug '12

22 Aug '12

--- ChangeLog | 4 ++++ debian/rules | 6 +++++- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6cdb1ed..f28c7b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-05-29 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/rules: Add hardening flags according to Debian policy. + +2012-05-29 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/compat: Upgrade to debhelper 9. 2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/debian/rules b/debian/rules index a94b647..c71eb5d 100755 --- a/debian/rules +++ b/debian/rules @@ -22,10 +22,14 @@ endif build: build-stamp + +# Add Hardening flags during configure according to Debian policy. +# See: http://wiki.debian.org/HardeningWalkthrough +# http://wiki.debian.org/Hardening build-stamp: dh_testdir ./bootstrap - ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --enable-scribo --prefix=/usr --libexecdir=/usr/lib + ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --enable-scribo --prefix=/usr --libexecdir=/usr/lib $(shell dpkg-buildflags --export=configure) $(MAKE) -j$(CPU_COUNT) touch $@ -- 1.7.2.5

1 0

olena-2.0-54-ga2d3c40 debian/control: Fix file. Remove comments.
by Guillaume Lazzara 22 Aug '12

22 Aug '12

--- ChangeLog | 4 ++++ debian/compat | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index f28c7b4..618abb0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-06-04 Guillaume Lazzara <z(a)lrde.epita.fr> + + * debian/compat: Fix file. Remove comments. + 2012-05-29 Guillaume Lazzara <z(a)lrde.epita.fr> * debian/rules: Add hardening flags according to Debian policy. diff --git a/debian/compat b/debian/compat index c24f333..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1,4 +1 @@ 9 -# Specifies the "compatibility level" for the debhelper tool -# See http://wiki.debian.org/IntroDebianPackaging - -- 1.7.2.5

1 0

olena-2.0-55-g791c07a demo/xml2doc/Makefile.am: Fix installation of ooconvert.
by Guillaume Lazzara 22 Aug '12

22 Aug '12

--- scribo/ChangeLog | 4 ++++ scribo/demo/xml2doc/Makefile.am | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index e8d0b70..64c9e21 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2012-06-04 Guillaume Lazzara <z(a)lrde.epita.fr> + + * demo/xml2doc/Makefile.am: Fix installation of ooconvert. + 2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> Fix access to xsl templates. diff --git a/scribo/demo/xml2doc/Makefile.am b/scribo/demo/xml2doc/Makefile.am index ff37fa2..83ef02a 100644 --- a/scribo/demo/xml2doc/Makefile.am +++ b/scribo/demo/xml2doc/Makefile.am @@ -73,7 +73,6 @@ EXTRA_DIST = \ 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 \ @@ -84,4 +83,6 @@ nobase_dist_template_DATA = \ $(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 + $(srcdir)/templates/svg/regions.xsl + +nobase_dist_template_SCRIPTS = $(srcdir)/templates/bin/ooconvert \ No newline at end of file -- 1.7.2.5

1 0

olena-2.0-56-gbe1c40a debian/control: Improve descriptions and update Git browser URL.
by Guillaume Lazzara 22 Aug '12

22 Aug '12

--- ChangeLog | 4 +++ debian/control | 57 +++++++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 52 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 618abb0..951de97 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-06-04 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/control: Improve descriptions and update Git browser URL. + +2012-06-04 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/compat: Fix file. Remove comments. 2012-05-29 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/debian/control b/debian/control index d3a3e1f..7ac892b 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Olena Team - EPITA Research and Development Laboratory (LRDE) <olena(a)lrde.epita.fr> Build-Depends: debhelper (>= 5), autotools-dev, dpkg-dev (>= 1.13.19) Standards-Version: 3.9.3 -Vcs-Browser: https://trac.lrde.epita.fr/olena/browser +Vcs-Browser: http://git.lrde.epita.fr/?p=olena.git;a=summary Vcs-Git: git://git.lrde.epita.fr/olena Homepage: http://olena.lrde.epita.fr @@ -12,10 +12,25 @@ Homepage: http://olena.lrde.epita.fr Package: olena Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, olena-dev, olena-bin -Description: Image Processing Platform written in C++. - Install the whole plaform. +Description: Generic image processing platform written in C++ + Olena is a platform dedicated to image processing and pattern + recognition. Its core component is a generic and efficient C++ library + called Milena. Milena provides a framework to implement simple, fast, + safe, reusable and extensible image processing tool chains. The + library provides many ready-to-use image data structures (regular 1D, + 2D, 3D images, graph-based images, etc.) and algorithms. Milena's + algorithms are built upon classical entities from the image processing + field (images, points/sites, domains, neighborhoods, etc.). This + design allows image processing developers and practitioners to easily + understand, modify, develop and extend new algorithms while retaining + the core traits of Milena: genericity and efficiency. . - This is a meta-package. + On top of Milena, the Olena platform also features optional modules + such as Swilena, a component exposing Milena to other languages thanks + to the Simplified Wrapper and Interface Generator (SWIG); and the + SCRIBO module for Document Image Analysis. + . + This is a meta-package installing the whole platform. Package: olena-bin @@ -29,9 +44,21 @@ Depends: libqt4-dev, xsltproc, fop -Description: Tools based on Olena. - It includes several tools for manipulating images. - +Description: Set of tools based on Olena + Several tools for manipulating images. It includes document image + analysis tools, several binarization algorithms and text detection in + pictures. + . + A graphical user interface is also provided on top of the command + line tools. It allows the user to analyze image document layout, + recognize text through an OCR and export them as PDF or HTML. The + document produced preserve the layout, make the text selectable and + preserve images. + . + Several implementations of Sauvola's binarization is provided. This + is a binarization algorithm well suited for documents. + . + A tool finding and recognizing text in pictures is also provided. Package: olena-dev @@ -44,5 +71,17 @@ Recommends: Suggests: libqt4-dev, libtesseract-dev (>= 3.02) -Description: Development files for Olena. - It includes HTML documentation and C++ headers. +Description: Development files for Olena + This package includes all the development files needed to use Olena, + a C++ generic image processing platform. + . + It includes headers files for Milena, the core image processing + library of Olena and header files for Scribo, a document image + analysis framework. + . + Headers provide core algorithms, image data structures, input/output + routines and working toolchains to perform full treatments on + specific data like finding text in pictures, analyze document image + structure or working with mathematical morphology. + . + It also includes the full HTML documentation. -- 1.7.2.5

1 0

olena-2.0-57-g19a00e7 debian/changelog: Close ITP bug.
by Guillaume Lazzara 22 Aug '12

22 Aug '12

--- ChangeLog | 4 ++++ debian/changelog | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 951de97..b66ce50 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-06-04 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/changelog: Close ITP bug. + +2012-06-04 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/control: Improve descriptions and update Git browser URL. 2012-06-04 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/debian/changelog b/debian/changelog index 10b1e68..e24a020 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ olena (2.0-1) wheezy; urgency=low - * Initial release. + * Initial release (Closes: #657974) -- Olena Team - EPITA Research and Development Laboratory (LRDE) <olena(a)lrde.epita.fr> Wed, 23 May 2012 11:19:13 +0200 -- 1.7.2.5

1 0

olena-2.0-58-ge4240b3 debian/HOWTO: update.
by Guillaume Lazzara 22 Aug '12

22 Aug '12

--- ChangeLog | 4 ++++ debian/HOWTO | 17 ++++++----------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index b66ce50..f6eac5f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-06-04 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/HOWTO: update. + +2012-06-04 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/changelog: Close ITP bug. 2012-06-04 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/debian/HOWTO b/debian/HOWTO index 0ecf9ad..3bdbf3c 100644 --- a/debian/HOWTO +++ b/debian/HOWTO @@ -3,12 +3,11 @@ * Use one of the following command: ---------------------------------- -git-buildpackage --git-export-dir=../build-area/ --git-builder="debuild -i'\.git' -I.git " +git-buildpackage or, if you need to keep environment variables : -git-buildpackage --git-export-dir=../build-area/ --git-builder="debuild --preserve-env --prepend-path=/usr/local/bin -i'\.git' -I.git " - +git-buildpackage --preserve-env --prepend-path=/usr/local/bin --preserve-env should NOT be used. However we enable this option to @@ -18,15 +17,11 @@ git-buildpackage --git-export-dir=../build-area/ --git-builder="debuild --prese located in /usr/local/bin. +* More documentation -* .git/gbp.conf: setting default config - -cat <<EOF > .git/gbp.conf -[DEFAULT] -# Force running lintian to check .deb files validity. -postbuild=lintian $GBP_CHANGES_FILE -EOF +** "compatibility level" for the debhelper tool +http://wiki.debian.org/IntroDebianPackaging -* More documentation +** Git Build Package http://honk.sigxcpu.org/projects/git-buildpackage/manual-html/gbp.html -- 1.7.2.5

1 0

olena-2.0-59-g42c9aed debian/rules: Remove empty directories in package.
by Guillaume Lazzara 22 Aug '12

22 Aug '12

--- ChangeLog | 4 ++++ debian/rules | 3 +++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index f6eac5f..aa964f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-06-04 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/rules: Remove empty directories in package. + +2012-06-04 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/HOWTO: update. 2012-06-04 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/debian/rules b/debian/rules index c71eb5d..f7869d2 100755 --- a/debian/rules +++ b/debian/rules @@ -41,12 +41,15 @@ clean: rm -f config.{sub,guess,status,log} dh_clean +# Remove empty directories shipped with doxygen after installation in +# order to cleanup packages. install: build dh_testdir dh_testroot dh_prep dh_installdirs $(MAKE) DESTDIR="$(CURDIR)/debian/tmp" install + find $(CURDIR)/debian/tmp -type d -empty -delete # Build architecture independant packages. build-indep: build -- 1.7.2.5

1 0

olena-2.0-60-g34d31a3 debian/rules: Limit simultaneous compilations.
by Guillaume Lazzara 22 Aug '12

22 Aug '12

--- ChangeLog | 4 ++++ debian/rules | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index aa964f2..d996687 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-06-04 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/rules: Limit simultaneous compilations. + +2012-06-04 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/rules: Remove empty directories in package. 2012-06-04 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/debian/rules b/debian/rules index f7869d2..b5f41bb 100755 --- a/debian/rules +++ b/debian/rules @@ -10,7 +10,7 @@ export DH_OPTIONS # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -CPU_COUNT ?= $(shell grep -c processor /proc/cpuinfo) +CPU_COUNT ?= $(shell echo "`grep -c processor /proc/cpuinfo` / 2" | bc) CFLAGS = -Wall -g -- 1.7.2.5

1 0