January 2012 - Olena-patches

olena-2.0-29-g66fab03 Update Debian package configuration.
by Guillaume Lazzara 30 Jan '12

30 Jan '12

* debian/changelog: Use the correct release date. * debian/control: Update architecture and descriptions. * debian/olena-bin.install, * debian/olena-dev.docs, * debian/olena-dev.install: Update list of files. * debian/olena-dev.doc-base: New. * debian/rules: Make it support several packages builds. --- ChangeLog | 16 ++++++++ debian/changelog | 2 +- debian/control | 10 ++-- debian/olena-bin.install | 5 +- debian/olena-dev.doc-base | 9 ++++ debian/olena-dev.docs | 5 ++- debian/olena-dev.install | 5 +- debian/rules | 91 ++++++++++++++++++++++++++++++++++++++------- 8 files changed, 117 insertions(+), 26 deletions(-) create mode 100644 debian/olena-dev.doc-base diff --git a/ChangeLog b/ChangeLog index f5e0b28..cd31dac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2011-12-07 Guillaume Lazzara <z(a)lrde.epita.fr> + + Update Debian package configuration. + + * debian/changelog: Use the correct release date. + + * debian/control: Update architecture and descriptions. + + * debian/olena-bin.install, + * debian/olena-dev.docs, + * debian/olena-dev.install: Update list of files. + + * debian/olena-dev.doc-base: New. + + * debian/rules: Make it support several packages builds. + 2011-12-02 Guillaume Lazzara <z(a)lrde.epita.fr> * debian/HOWTO: How to make .deb package. diff --git a/debian/changelog b/debian/changelog index 51d5b90..6fe7392 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,5 +2,5 @@ olena (2.0-1) unstable; urgency=low * Initial release. - -- Olena Team <olena(a)lrde.epita.fr> Sat, 28 Apr 2007 22:35:27 +0200 + -- Olena Team <olena(a)lrde.epita.fr> Fri, 16 Sep 2011 22:35:27 +0200 diff --git a/debian/control b/debian/control index d7fa9fc..c0e6c58 100644 --- a/debian/control +++ b/debian/control @@ -3,19 +3,19 @@ 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.7.2 +Standards-Version: 3.9.1 Package: olena -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, olena-doc, olena-bin +Architecture: all +Depends: ${shlibs:Depends}, ${misc:Depends}, olena-dev, olena-bin Description: An Image Processing Platform. Install the whole plaform. . This is a meta-package Package: olena-bin -Architecture: all -Description: The documentation of Olena +Architecture: any +Description: Tools based on Olena. It includes several tools for manipulating images. Package: olena-dev diff --git a/debian/olena-bin.install b/debian/olena-bin.install index f016a45..d333438 100644 --- a/debian/olena-bin.install +++ b/debian/olena-bin.install @@ -1,3 +1,2 @@ -usr/bin/ -usr/libexec/ -usr/share/olena/ +usr/bin/* +usr/libexec/scribo/* diff --git a/debian/olena-dev.doc-base b/debian/olena-dev.doc-base new file mode 100644 index 0000000..6965d01 --- /dev/null +++ b/debian/olena-dev.doc-base @@ -0,0 +1,9 @@ +Document: olena +Title: Debian olena Manual +Author: Olena Team <olena(a)lrde.epita.fr> +Abstract: Development files and documentation. +Section: Programming + +Format: HTML +Index: /usr/share/doc/olena/user-refman/index.html +Files: /usr/share/doc/olena/user-refman/**/*.html diff --git a/debian/olena-dev.docs b/debian/olena-dev.docs index 827887a..1aa04e9 100644 --- a/debian/olena-dev.docs +++ b/debian/olena-dev.docs @@ -1 +1,4 @@ -usr/share/doc/olena/ +NEWS +README +AUTHORS +TODO diff --git a/debian/olena-dev.install b/debian/olena-dev.install index 7333dac..6ed6864 100644 --- a/debian/olena-dev.install +++ b/debian/olena-dev.install @@ -1,2 +1,3 @@ -usr/include/milena/ -usr/include/scribo/ +usr/include/mln/* +usr/include/scribo/* +usr/share/doc/olena/* diff --git a/debian/rules b/debian/rules index 9efa49e..4aa335a 100755 --- a/debian/rules +++ b/debian/rules @@ -1,14 +1,4 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. -# -# Modified to make a template file for a multi-binary package with separated -# build-arch and build-indep targets by Bill Allombert 2001 # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -16,10 +6,83 @@ # This has to be exported to make some magic below work. export DH_OPTIONS +# These are used for cross-compiling and for saving the configure script +# 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) -%: - dh $@ +CFLAGS = -Wall -g -override_dh_auto_configure: +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + + +build: build-stamp +build-stamp: + dh_testdir ./bootstrap - dh_auto_configure -- --enable-scribo + ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --enable-scribo --prefix=/usr + $(MAKE) + touch $@ + +clean: + dh_testdir + dh_testroot + rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP# + -$(MAKE) distclean + rm -f config.{sub,guess,status,log} + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + $(MAKE) DESTDIR="$(CURDIR)/debian/tmp" install + +# Build architecture independant packages. +binary-indep: build install + dh_testdir + dh_testroot + dh_installchangelogs -i + dh_installdocs -i + dh_install -i --sourcedir=$(CURDIR)/debian/tmp + dh_link -i + dh_compress -i + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +# Build architecture dependant packages. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs -a + dh_installdocs -a + dh_installexamples -a + dh_install -a --sourcedir=$(CURDIR)/debian/tmp + dh_installmenu -a + install -d $(CURDIR)/debian/hello/usr/share/pixmaps/ + cp debian/*.xpm $(CURDIR)/debian/hello/usr/share/pixmaps/ + install -d $(CURDIR)/debian/hello/usr/share/applications/ + cp debian/*.desktop $(CURDIR)/debian/hello/usr/share/applications/ + #dh_installmime -a + dh_installman -a + dh_link -a + dh_strip -a + dh_compress -a + dh_fixperms -a + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-arch binary-indep + +.PHONY: install build clean binary-indep binary-arch binary -- 1.7.2.5

1 0

olena-2.0-28-g3a925ba demo/viewer/runner.cc: Make detection of scribo-xml2doc more robust.
by Guillaume Lazzara 30 Jan '12

30 Jan '12

--- scribo/ChangeLog | 5 +++++ scribo/demo/viewer/runner.cc | 9 +++++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index eafcc32..70d963f 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,8 @@ +2011-12-07 Guillaume Lazzara <z(a)lrde.epita.fr> + + * demo/viewer/runner.cc: Make detection of scribo-xml2doc more + robust. + 2011-12-06 Guillaume Lazzara <z(a)lrde.epita.fr> * scribo/text/recognition.hh: Restore previous locale. diff --git a/scribo/demo/viewer/runner.cc b/scribo/demo/viewer/runner.cc index da2f3bf..05ddac5 100644 --- a/scribo/demo/viewer/runner.cc +++ b/scribo/demo/viewer/runner.cc @@ -37,14 +37,23 @@ static QString get_pathto(const QString& file, const QString localdirsuffix = QString()) { + // Not installed ? QFile f(SCRIBO_LOCAL_DEMODIR "/" + localdirsuffix + "/" + file); if (f.exists()) return SCRIBO_LOCAL_DEMODIR "/" + localdirsuffix; + // Installed in a specific path ? f.setFileName(SCRIBO_PREFIX_LIBEXECDIR "/" + file); if (f.exists()) return SCRIBO_PREFIX_LIBEXECDIR; + // 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"; + qDebug() << "FATAL ERROR: Can't locate file: " + file; return ""; -- 1.7.2.5

1 0

olena-2.0-27-g1abe3fb debian/HOWTO: How to make .deb package.
by Guillaume Lazzara 30 Jan '12

30 Jan '12

--- ChangeLog | 4 ++++ debian/HOWTO | 12 ++++++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) create mode 100644 debian/HOWTO diff --git a/ChangeLog b/ChangeLog index 5118e50..f5e0b28 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2011-12-02 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/HOWTO: How to make .deb package. + +2011-12-02 Guillaume Lazzara <z(a)lrde.epita.fr> + Add package description files for .deb generation. * README.Debian, diff --git a/debian/HOWTO b/debian/HOWTO new file mode 100644 index 0000000..813a7b1 --- /dev/null +++ b/debian/HOWTO @@ -0,0 +1,12 @@ +Use the following command: +------------------------- + +git-buildpackage --git-export-dir=../build-area/ --git-builder="debuild --preserve-env --prepend-path=/usr/local/bin -i'\.git' -I.git " + + + +--preserve-env should NOT be used. However we enable this option to + use ccache while compiling. + +--prepend-path allows us to use a more recent version of Doxygen + located in /usr/local/bin. \ No newline at end of file -- 1.7.2.5

1 0

olena-2.0-26-g2fb9eaf Add package description files for .deb generation.
by Guillaume Lazzara 30 Jan '12

30 Jan '12

* README.Debian, * changelog, * compat, * control, * copyright, * olena-bin.install, * olena-dev.docs, * olena-dev.install, * olena.1, * olena.desktop, * olena.install, * olena.manpages, * olena.menu, * olena.xpm, * rules: New. --- ChangeLog | 20 ++++++++++++++++++++ debian/README.Debian | 6 ++++++ debian/changelog | 6 ++++++ debian/compat | 1 + debian/control | 24 ++++++++++++++++++++++++ debian/copyright | 2 ++ debian/olena-bin.install | 3 +++ debian/olena-dev.docs | 1 + debian/olena-dev.install | 2 ++ debian/olena.1 | 12 ++++++++++++ debian/olena.desktop | 11 +++++++++++ debian/olena.install | 1 + debian/olena.manpages | 1 + debian/olena.menu | 4 ++++ debian/olena.xpm | 40 ++++++++++++++++++++++++++++++++++++++++ debian/rules | 25 +++++++++++++++++++++++++ 16 files changed, 159 insertions(+), 0 deletions(-) create mode 100644 debian/README.Debian create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/olena-bin.install create mode 100644 debian/olena-dev.docs create mode 100644 debian/olena-dev.install create mode 100644 debian/olena.1 create mode 100644 debian/olena.desktop create mode 100644 debian/olena.install create mode 100644 debian/olena.manpages create mode 100644 debian/olena.menu create mode 100644 debian/olena.xpm create mode 100755 debian/rules diff --git a/ChangeLog b/ChangeLog index 6f2cfc5..5118e50 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +2011-12-02 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add package description files for .deb generation. + + * README.Debian, + * changelog, + * compat, + * control, + * copyright, + * olena-bin.install, + * olena-dev.docs, + * olena-dev.install, + * olena.1, + * olena.desktop, + * olena.install, + * olena.manpages, + * olena.menu, + * olena.xpm, + * rules: New. + 2011-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> * m4/oln-with-lib.m4: Lookup for multiple AND single libraries diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 0000000..13a2616 --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,6 @@ +Olena for Debian +---------------- + +Generic Image Processing Platform. + + -- Olena Team <olena(a)lrde.epita.fr> Sat, 28 Apr 2007 22:35:27 +0200 diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..51d5b90 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,6 @@ +olena (2.0-1) unstable; urgency=low + + * Initial release. + + -- Olena Team <olena(a)lrde.epita.fr> Sat, 28 Apr 2007 22:35:27 +0200 + diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..7ed6ff8 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..d7fa9fc --- /dev/null +++ b/debian/control @@ -0,0 +1,24 @@ +Source: olena +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.7.2 + +Package: olena +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, olena-doc, olena-bin +Description: An Image Processing Platform. + Install the whole plaform. + . + This is a meta-package + +Package: olena-bin +Architecture: all +Description: The documentation of Olena + It includes several tools for manipulating images. + +Package: olena-dev +Architecture: all +Description: Development files for Olena. + It includes HTML documentation and C++ headers. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..fd0dc60 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,2 @@ +All the contents in this package are in the public domain. +You can do whatever you want with them. diff --git a/debian/olena-bin.install b/debian/olena-bin.install new file mode 100644 index 0000000..f016a45 --- /dev/null +++ b/debian/olena-bin.install @@ -0,0 +1,3 @@ +usr/bin/ +usr/libexec/ +usr/share/olena/ diff --git a/debian/olena-dev.docs b/debian/olena-dev.docs new file mode 100644 index 0000000..827887a --- /dev/null +++ b/debian/olena-dev.docs @@ -0,0 +1 @@ +usr/share/doc/olena/ diff --git a/debian/olena-dev.install b/debian/olena-dev.install new file mode 100644 index 0000000..7333dac --- /dev/null +++ b/debian/olena-dev.install @@ -0,0 +1,2 @@ +usr/include/milena/ +usr/include/scribo/ diff --git a/debian/olena.1 b/debian/olena.1 new file mode 100644 index 0000000..8f35692 --- /dev/null +++ b/debian/olena.1 @@ -0,0 +1,12 @@ +.TH "OLENA" "1" "" "" "" +.SH "NAME" +Olena +.SH "DESCRIPTION" +.PP +An Image Processing Platform +.SH "AUTHOR" +.PP +This manual page was written by the Olena Team <olena(a)lrde.epita.fr> for +the \fBDebian\fP system (but may be used by others). +.PP +It is in the public domain, so you can do whatever you want with it. diff --git a/debian/olena.desktop b/debian/olena.desktop new file mode 100644 index 0000000..741b97d --- /dev/null +++ b/debian/olena.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Type=Application +Encoding=UTF-8 +Name=Olena +GenericName=olena +Comment=Olena, a Generic Image Processing Libray. +Comment[fr]=Olena, une bibliothèque de traitement d\'image générique. +Icon=Olena +Exec=olena +Terminal=true +Categories=Application; diff --git a/debian/olena.install b/debian/olena.install new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/olena.install @@ -0,0 +1 @@ + diff --git a/debian/olena.manpages b/debian/olena.manpages new file mode 100644 index 0000000..d0839eb --- /dev/null +++ b/debian/olena.manpages @@ -0,0 +1 @@ +debian/olena.1 diff --git a/debian/olena.menu b/debian/olena.menu new file mode 100644 index 0000000..7993c23 --- /dev/null +++ b/debian/olena.menu @@ -0,0 +1,4 @@ + +?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 diff --git a/debian/olena.xpm b/debian/olena.xpm new file mode 100644 index 0000000..32123cc --- /dev/null +++ b/debian/olena.xpm @@ -0,0 +1,40 @@ +/* XPM */ +static char *hello[]={ +"32 32 5 1", +". c None", +"# c #0058c0", +"b c #800000", +"a c #a8dcff", +"c c #ff0000", +"............########............", +".........###aaaaaaaa###.........", +".......##aaaabcbbaaaaaa##.......", +"......#aaaaaaaaaaaaaaaaaa#......", +".....#aaaaaaaaacbaaaaaaaaa#.....", +"....#aaaaaaaaaaaaaaaaaaaaaa#....", +"...#abbaaaaaaaaaaaaaaabbbaba#...", +"..#aaaaaaaaaaaaaaaaaaaaaaaaaa#..", +"..#bcbbbbbaaaaaaaaaaacbbbbbba#..", +".#aaaaaaaaaaaaaaaaaaaaaaaaaaaa#.", +".#abcbbbaaaaaaaaaaaaacbaaaacba#.", +".#aaaaaaaaaaaaaaaaaaaaaaaaaaaa#.", +"#abcbbaaaaaaaaaaaaaaaabbbbbbbba#", +"#aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa#", +"#acbaaaaaaaaaaaaaaaabcbbbbbacba#", +"#aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa#", +"#aabaaaaaaaaaaaaaaabcbbbbbbbbba#", +"#aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa#", +"#aaabcbbaaaaaaaaaaaaabcbbbbbaaa#", +"#aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa#", +".#aaaabcbbbbaaaaaaaaaabcbbbaaa#.", +".#aaaaaaaaaaaaaaaaaaaaaaaaaaaa#.", +".#aaaaabcbbbbaaaaaaaaabcbbbaaa#.", +"..#aaaaaaaaaaaaaaaaaaaaaaaaaa#..", +"..#aaaaabcbbaaaaaaaaaaacbbaaa#..", +"...#aaaaaaaaaaaaaaaaaaaaaaaa#...", +"....#aaaacbaaaaaaaaaaaaacba#....", +".....#aaaaaaaaaaaaaaaaaaaa#.....", +"......#aaacaaaaaaaaaaaaaa#......", +".......##aaaaaaaaaaaaaa##.......", +".........###aaaaaaaa###.........", +"............########............"}; diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..9efa49e --- /dev/null +++ b/debian/rules @@ -0,0 +1,25 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. +# +# Modified to make a template file for a multi-binary package with separated +# build-arch and build-indep targets by Bill Allombert 2001 + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This has to be exported to make some magic below work. +export DH_OPTIONS + + +%: + dh $@ + +override_dh_auto_configure: + ./bootstrap + dh_auto_configure -- --enable-scribo -- 1.7.2.5

1 0

olena-2.0-25-g39e1152 scribo/text/recognition.hh: Restore previous locale.
by Guillaume Lazzara 30 Jan '12

30 Jan '12

--- scribo/ChangeLog | 4 ++++ scribo/scribo/text/recognition.hh | 6 ++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index a9b71f0..eafcc32 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2011-12-06 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/text/recognition.hh: Restore previous locale. + +2011-12-06 Guillaume Lazzara <z(a)lrde.epita.fr> + Ensure current locale is C while calling Tesseract. * demo/viewer/main.cc: Move call to setLocale... diff --git a/scribo/scribo/text/recognition.hh b/scribo/scribo/text/recognition.hh index e116d58..4795511 100644 --- a/scribo/scribo/text/recognition.hh +++ b/scribo/scribo/text/recognition.hh @@ -207,6 +207,9 @@ namespace scribo delete [] s; } + // Restore default locale. + setlocale(LC_ALL, ""); + trace::exiting("scribo::text::recognition"); } @@ -302,6 +305,9 @@ namespace scribo if (!output_file.empty()) file.close(); + // Restore default locale. + setlocale(LC_ALL, ""); + trace::exiting("scribo::text::recognition"); } -- 1.7.2.5

1 0

branch next updated: olena-2.0-25-g39e1152
by git＠lrde.epita.fr 30 Jan '12

30 Jan '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 next has been updated via 39e1152eceddabf1c61e368c2f7bd477dbc2c46e (commit) from 1a7b4fcf3f2e141a6b59bc39db3ae2298329b379 (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 ----------------------------------------------------------------- No new revisions were added by this update. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 4 ++++ scribo/scribo/text/recognition.hh | 6 ++++++ 2 files changed, 10 insertions(+), 0 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch exp/deb-packages created: olena-2.0-35-gbc0d1bb
by git＠lrde.epita.fr 30 Jan '12

30 Jan '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 created at bc0d1bb356a329bbfeb973f66191fa1b6c0652f9 (commit) - Log ----------------------------------------------------------------- bc0d1bb debian/HOWTO: Add more details. d419030 Makefile.am: Add 'deb' rule. 74260e3 debian/copyright: Set copyright. 7361f55 build-aux/texi2dvi: Fix Dash incompatibility. 3aed89d src/scribo-cli.in: Move shebang on first line. b20c747 Create first draft of manpages for distributed binaries. 66fab03 Update Debian package configuration. 3a925ba demo/viewer/runner.cc: Make detection of scribo-xml2doc more robust. 1abe3fb debian/HOWTO: How to make .deb package. 2fb9eaf Add package description files for .deb generation. 39e1152 scribo/text/recognition.hh: Restore previous locale. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-35-gbc0d1bb debian/HOWTO: Add more details.
by Guillaume Lazzara 30 Jan '12

30 Jan '12

--- ChangeLog | 4 ++++ debian/HOWTO | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index bed7b6f..dda2b9e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-01-30 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/HOWTO: Add more details. + +2012-01-30 Guillaume Lazzara <z(a)lrde.epita.fr> + * Makefile.am: Add 'deb' rule. 2012-01-30 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/debian/HOWTO b/debian/HOWTO index 813a7b1..59e9540 100644 --- a/debian/HOWTO +++ b/debian/HOWTO @@ -1,5 +1,9 @@ -Use the following command: -------------------------- +Use one of the following command: +---------------------------------- + +git-buildpackage --git-export-dir=../build-area/ --git-builder="debuild -i'\.git' -I.git " + +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 " -- 1.7.2.5

1 0

olena-2.0-34-gd419030 Makefile.am: Add 'deb' rule.
by Guillaume Lazzara 30 Jan '12

30 Jan '12

--- ChangeLog | 4 ++++ Makefile.am | 5 +++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index c130337..bed7b6f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-01-30 Guillaume Lazzara <z(a)lrde.epita.fr> + * Makefile.am: Add 'deb' rule. + +2012-01-30 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/copyright: Set copyright. 2012-01-30 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/Makefile.am b/Makefile.am index 66dc10c..e051c68 100644 --- a/Makefile.am +++ b/Makefile.am @@ -115,6 +115,11 @@ CLEANFILES = $(PORTFILE) port: $(PORTFILE) +deb: + git-buildpackage --git-export-dir=../build-area/ \ + --git-builder="debuild -i'\.git' -I.git " + + ## FIXME: Running `build-aux/build_unit_test.sh' just to update ## `milena/tests/unit_test/unit-tests.mk' is overkill: ## -- 1.7.2.5

1 0

olena-2.0-33-g74260e3 debian/copyright: Set copyright.
by Guillaume Lazzara 30 Jan '12

30 Jan '12

--- ChangeLog | 4 ++++ debian/copyright | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6eaa816..c130337 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-01-30 Guillaume Lazzara <z(a)lrde.epita.fr> + * debian/copyright: Set copyright. + +2012-01-30 Guillaume Lazzara <z(a)lrde.epita.fr> + * build-aux/texi2dvi: Fix Dash incompatibility. 2011-12-07 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/debian/copyright b/debian/copyright index fd0dc60..e6130ab 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,2 +1,2 @@ -All the contents in this package are in the public domain. -You can do whatever you want with them. +Copyright (C) 2012 EPITA Research and Development Laboratory (LRDE) +The content of this package is under GPLv2 License. \ No newline at end of file -- 1.7.2.5

1 0