May 2012 - Olena-patches

olena-2.0-47-g0a0e2ab debian/control: Update maintainer name.
by Guillaume Lazzara 23 May '12

23 May '12

--- ChangeLog | 4 ++++ debian/control | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index c49e457..d2f6f58 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 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> + * debian/copyright: Update commiter name. 2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/debian/control b/debian/control index 1c77abb..d3a3e1f 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: olena Section: devel Priority: optional -Maintainer: Olena Team <olena(a)lrde.epita.fr> +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 -- 1.7.2.5

1 0

olena-2.0-46-g838cf65 debian/copyright: Update commiter name.
by Guillaume Lazzara 23 May '12

23 May '12

--- ChangeLog | 4 ++++ debian/changelog | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a5c7bb7..c49e457 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/copyright: Update commiter name. + +2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/control: Set packages as optional. 2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/debian/changelog b/debian/changelog index c0656c4..1b5cd4d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,5 +2,4 @@ olena (2.0-1) testing; urgency=low * Initial release. - -- Olena Team <olena(a)lrde.epita.fr> Fri, 22 May 2012 22:35:27 +0200 - + -- 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-45-g2c9c14d debian/control: Set packages as optional.
by Guillaume Lazzara 23 May '12

23 May '12

--- ChangeLog | 4 ++++ debian/control | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index df0d01b..a5c7bb7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/control: Set packages as optional. + +2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/rules: Handles '-j' option for make. 2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/debian/control b/debian/control index a971a88..1c77abb 100644 --- a/debian/control +++ b/debian/control @@ -1,6 +1,6 @@ Source: olena Section: devel -Priority: extra +Priority: optional Maintainer: Olena Team <olena(a)lrde.epita.fr> Build-Depends: debhelper (>= 5), autotools-dev, dpkg-dev (>= 1.13.19) Standards-Version: 3.9.3 -- 1.7.2.5

1 0

olena-2.0-44-g6a781e8 debian/rules: Handles '-j' option for make.
by Guillaume Lazzara 23 May '12

23 May '12

--- ChangeLog | 4 ++++ debian/rules | 3 ++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index ce898e2..df0d01b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/rules: Handles '-j' option for make. + +2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/control: Update Standards-Version. 2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/debian/rules b/debian/rules index 7b915a8..a94b647 100755 --- a/debian/rules +++ b/debian/rules @@ -10,6 +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) CFLAGS = -Wall -g @@ -25,7 +26,7 @@ build-stamp: dh_testdir ./bootstrap ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --enable-scribo --prefix=/usr --libexecdir=/usr/lib - $(MAKE) + $(MAKE) -j$(CPU_COUNT) touch $@ clean: -- 1.7.2.5

1 0

olena-2.0-43-g492f138 debian/control: Update Standards-Version.
by Guillaume Lazzara 23 May '12

23 May '12

--- ChangeLog | 4 ++++ debian/control | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 119abb9..ce898e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/control: Update Standards-Version. + +2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/rules: Update deprecated dh_clean -k command. 2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/debian/control b/debian/control index d74f69b..a971a88 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: extra Maintainer: Olena Team <olena(a)lrde.epita.fr> Build-Depends: debhelper (>= 5), autotools-dev, dpkg-dev (>= 1.13.19) -Standards-Version: 3.9.1 +Standards-Version: 3.9.3 Vcs-Browser: https://trac.lrde.epita.fr/olena/browser Vcs-Git: git://git.lrde.epita.fr/olena Homepage: http://olena.lrde.epita.fr -- 1.7.2.5

1 0

olena-2.0-42-g22cfe45 debian/rules: Update deprecated dh_clean -k command.
by Guillaume Lazzara 23 May '12

23 May '12

--- ChangeLog | 4 ++++ debian/rules | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index cc786c2..119abb9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/rules: Update deprecated dh_clean -k command. + +2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/rules: Add missing required rules. 2012-05-22 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/debian/rules b/debian/rules index b682f74..7b915a8 100755 --- a/debian/rules +++ b/debian/rules @@ -39,7 +39,7 @@ clean: install: build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs $(MAKE) DESTDIR="$(CURDIR)/debian/tmp" install -- 1.7.2.5

1 0

olena-2.0-41-gbac7114 debian/rules: Add missing required rules.
by Guillaume Lazzara 23 May '12

23 May '12

--- ChangeLog | 4 ++++ debian/rules | 12 ++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 928d28e..cc786c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> + + * debian/rules: Add missing required rules. + 2012-05-22 Guillaume Lazzara <z(a)lrde.epita.fr> Add missing description in manpages. diff --git a/debian/rules b/debian/rules index 8e0f6d5..b682f74 100755 --- a/debian/rules +++ b/debian/rules @@ -44,7 +44,9 @@ install: build $(MAKE) DESTDIR="$(CURDIR)/debian/tmp" install # Build architecture independant packages. -build-indep: build install +build-indep: build + +binary-indep: build-indep install dh_testdir dh_testroot dh_installchangelogs -i @@ -59,7 +61,9 @@ build-indep: build install dh_builddeb -i # Build architecture dependant packages. -build-arch: build install +build-arch: build + +binary-arch: build-arch install dh_testdir dh_testroot dh_installchangelogs -a @@ -83,6 +87,6 @@ build-arch: build install dh_md5sums -a dh_builddeb -a -binary: build-arch build-indep +binary: binary-arch binary-indep -.PHONY: install build clean build-indep build-arch binary +.PHONY: install build clean binary-indep binary-arch binary -- 1.7.2.5

1 0

olena-2.0-40-g7293e08 demo/viewer/runner.cc: Make xml2doc binary lookup more robust.
by Guillaume Lazzara 23 May '12

23 May '12

--- scribo/ChangeLog | 4 ++++ scribo/demo/viewer/runner.cc | 16 +++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index bd888be..d01f048 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2012-05-22 Guillaume Lazzara <z(a)lrde.epita.fr> + + * demo/viewer/runner.cc: Make xml2doc binary lookup more robust. + 2011-12-07 Guillaume Lazzara <z(a)lrde.epita.fr> * src/scribo-cli.in: Move shebang on first line. diff --git a/scribo/demo/viewer/runner.cc b/scribo/demo/viewer/runner.cc index 05ddac5..fe6732f 100644 --- a/scribo/demo/viewer/runner.cc +++ b/scribo/demo/viewer/runner.cc @@ -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. // @@ -50,9 +50,15 @@ QString get_pathto(const QString& file, // Installed in a specific path but moved elsewhere ? QDir dir(QCoreApplication::applicationDirPath()); dir.cdUp(); // move from prefix/bin to prefix/ - f.setFileName(dir.currentPath() + "/libexec/scribo" + file); - if (f.exists()) - return dir.currentPath() + "/libexec/scribo"; + + const char *path[] = { "lib", "libexec", 0 }; + + for (int i = 0; path[i]; ++i) + { + f.setFileName(dir.currentPath() + QString("/%1/scribo").arg(path[i]) + file); + if (f.exists()) + return dir.currentPath() + QString("/%1/scribo").arg(path[i]); + } qDebug() << "FATAL ERROR: Can't locate file: " + file; -- 1.7.2.5

1 0

olena-2.0-39-g7c61b39 Add missing description in manpages.
by Guillaume Lazzara 22 May '12

22 May '12

* debian/scribo-cli.1, * debian/scribo-viewer.1: Here. --- ChangeLog | 7 +++++++ debian/scribo-cli.1 | 2 +- debian/scribo-viewer.1 | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 21cf8ee..928d28e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2012-05-22 Guillaume Lazzara <z(a)lrde.epita.fr> + Add missing description in manpages. + + * debian/scribo-cli.1, + * debian/scribo-viewer.1: Here. + +2012-05-22 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix Lintian warnings. * debian/changelog: Update date. diff --git a/debian/scribo-cli.1 b/debian/scribo-cli.1 index df5cc0e..5ba7e26 100644 --- a/debian/scribo-cli.1 +++ b/debian/scribo-cli.1 @@ -1,6 +1,6 @@ .TH "SCRIBO-CLI" "1" "" "" "" .SH "NAME" -Scribo-cli +Scribo-cli \- Command line Inteface for Scribo. .SH "DESCRIPTION" .PP Olena's Scribo module commande-line utilities to analyse, segment and diff --git a/debian/scribo-viewer.1 b/debian/scribo-viewer.1 index e621cc5..10fb55e 100644 --- a/debian/scribo-viewer.1 +++ b/debian/scribo-viewer.1 @@ -1,6 +1,6 @@ .TH "SCRIBO-VIEWER" "1" "" "" "" .SH "NAME" -Scribo-viewer +Scribo-viewer \- Graphical Interface for Document Image Analysis .SH "DESCRIPTION" .PP Graphical User Interface for segmenting, analysing and reconstructing -- 1.7.2.5

1 0

olena-2.0-38-g8b07f49 Fix Lintian warnings.
by Guillaume Lazzara 22 May '12

22 May '12

* debian/changelog: Update date. * debian/compat: Increase minimum required version of debhelper. * debian/control: Add dependencies and fix description. * debian/olena.menu, * debian/copyright: Add a missing endline. * debian/gbp.conf: New. * debian/olena-dev.manpages: Rename to... * debian/olena-bin.manpages: ... this. * debian/rules: Use standard target names. * debian/watch: New. --- ChangeLog | 22 +++++++++++++++++++ debian/changelog | 4 +- debian/compat | 5 +++- debian/control | 24 +++++++++++++------- debian/copyright | 2 +- debian/gbp.conf | 7 ++++++ debian/olena-bin.install | 2 +- debian/{olena-dev.manpages => olena-bin.manpages} | 0 debian/olena.menu | 3 +- debian/rules | 12 +++++----- debian/source/format | 4 +- debian/watch | 5 ++++ 12 files changed, 66 insertions(+), 24 deletions(-) create mode 100644 debian/gbp.conf rename debian/{olena-dev.manpages => olena-bin.manpages} (100%) create mode 100644 debian/watch diff --git a/ChangeLog b/ChangeLog index f5d9933..21cf8ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,27 @@ 2012-05-22 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix Lintian warnings. + + * debian/changelog: Update date. + + * debian/compat: Increase minimum required version of debhelper. + + * debian/control: Add dependencies and fix description. + + * debian/olena.menu, + * debian/copyright: Add a missing endline. + + * debian/gbp.conf: New. + + * debian/olena-dev.manpages: Rename to... + * debian/olena-bin.manpages: ... this. + + * debian/rules: Use standard target names. + + * debian/watch: New. + +2012-05-22 Guillaume Lazzara <z(a)lrde.epita.fr> + Add options for dpkg-source. * debian/source/format: Force dpkg-source 3.0. diff --git a/debian/changelog b/debian/changelog index 6fe7392..c0656c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -olena (2.0-1) unstable; urgency=low +olena (2.0-1) testing; urgency=low * Initial release. - -- Olena Team <olena(a)lrde.epita.fr> Fri, 16 Sep 2011 22:35:27 +0200 + -- Olena Team <olena(a)lrde.epita.fr> Fri, 22 May 2012 22:35:27 +0200 diff --git a/debian/compat b/debian/compat index 7ed6ff8..0251a88 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1,4 @@ -5 +8 +# Specifies the "compatibility level" for the debhelper tool +# See http://wiki.debian.org/IntroDebianPackaging + diff --git a/debian/control b/debian/control index 8e91275..d74f69b 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Homepage: http://olena.lrde.epita.fr Package: olena Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, olena-dev, olena-bin -Description: An Image Processing Platform. +Description: Image Processing Platform written in C++. Install the whole plaform. . This is a meta-package. @@ -21,10 +21,14 @@ Description: An Image Processing Platform. Package: olena-bin Architecture: any Depends: - libtesseract-dev (>= 3.02), - libgraphicsmagick++1-dev, - graphicsmagick-libmagick-dev-compat, - libqt4-dev + ${shlibs:Depends}, + ${misc:Depends}, + libtesseract-dev (>= 3.02), + libgraphicsmagick++1-dev, + graphicsmagick-libmagick-dev-compat, + libqt4-dev, + xsltproc, + fop Description: Tools based on Olena. It includes several tools for manipulating images. @@ -32,11 +36,13 @@ Description: Tools based on Olena. Package: olena-dev Architecture: all +Depends: + ${misc:Depends} Recommends: - libgraphicsmagick++1-dev, - graphicsmagick-libmagick-dev-compat, + libgraphicsmagick++1-dev, + graphicsmagick-libmagick-dev-compat, Suggests: - libqt4-dev, - libtesseract-dev (>= 3.02) + libqt4-dev, + libtesseract-dev (>= 3.02) Description: Development files for Olena. It includes HTML documentation and C++ headers. diff --git a/debian/copyright b/debian/copyright index e6130ab..dc2134d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,2 +1,2 @@ Copyright (C) 2012 EPITA Research and Development Laboratory (LRDE) -The content of this package is under GPLv2 License. \ No newline at end of file +The content of this package is under GPLv2 License. diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..27e3b6a --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,7 @@ +[DEFAULT] +# this is the upstream-branch: +upstream-branch=next + +[git-buildpackage] +export-dir = ../build-area/ +builder = debuild -i'\.git' -I.git \ No newline at end of file diff --git a/debian/olena-bin.install b/debian/olena-bin.install index d333438..34b2678 100644 --- a/debian/olena-bin.install +++ b/debian/olena-bin.install @@ -1,2 +1,2 @@ usr/bin/* -usr/libexec/scribo/* +usr/lib/scribo/* diff --git a/debian/olena-dev.manpages b/debian/olena-bin.manpages similarity index 100% rename from debian/olena-dev.manpages rename to debian/olena-bin.manpages diff --git a/debian/olena.menu b/debian/olena.menu index 7993c23..99165ab 100644 --- a/debian/olena.menu +++ b/debian/olena.menu @@ -1,4 +1,3 @@ - ?package(olena):needs="text" section="Apps/Tools" \ title="Olena" command="/usr/bin/olena" \ - icon="/usr/share/pixmaps/olena.xpm" \ No newline at end of file + icon="/usr/share/pixmaps/olena.xpm" diff --git a/debian/rules b/debian/rules index 4aa335a..8e0f6d5 100755 --- a/debian/rules +++ b/debian/rules @@ -24,7 +24,7 @@ build: build-stamp build-stamp: dh_testdir ./bootstrap - ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --enable-scribo --prefix=/usr + ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --enable-scribo --prefix=/usr --libexecdir=/usr/lib $(MAKE) touch $@ @@ -32,7 +32,7 @@ clean: dh_testdir dh_testroot rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP# - -$(MAKE) distclean + [ ! -f Makefile ] || $(MAKE) distclean rm -f config.{sub,guess,status,log} dh_clean @@ -44,7 +44,7 @@ install: build $(MAKE) DESTDIR="$(CURDIR)/debian/tmp" install # Build architecture independant packages. -binary-indep: build install +build-indep: build install dh_testdir dh_testroot dh_installchangelogs -i @@ -59,7 +59,7 @@ binary-indep: build install dh_builddeb -i # Build architecture dependant packages. -binary-arch: build install +build-arch: build install dh_testdir dh_testroot dh_installchangelogs -a @@ -83,6 +83,6 @@ binary-arch: build install dh_md5sums -a dh_builddeb -a -binary: binary-arch binary-indep +binary: build-arch build-indep -.PHONY: install build clean binary-indep binary-arch binary +.PHONY: install build clean build-indep build-arch binary diff --git a/debian/source/format b/debian/source/format index 8404db8..a671065 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1,3 +1,3 @@ +3.0 (quilt) # 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 +# See http://wiki.debian.org/Projects/DebSrc3.0 \ No newline at end of file diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..2235b96 --- /dev/null +++ b/debian/watch @@ -0,0 +1,5 @@ +# Used to check for newer versions of upstream software is available +# and to download it if necessary. +# See http://wiki.debian.org/debian/watch/ +version=3 +http://www.lrde.epita.fr/dload/olena/olena-(.+).tar.bz2 \ No newline at end of file -- 1.7.2.5

1 0