* Makefile.am: Install pixmaps and include debian/ in
distribution.
* debian/olena-bin.menu,
* debian/olena.desktop: Rename as...
* debian/olena.menu,
* debian/olena-bin.desktop: ... this. Update to use scribo-viewer.
* debian/olena-bin.install: Include pixmap in package.
* debian/olena.1: Fix description.
* debian/olena.xpm: New.
* debian/rules: Set path to libexec.
* debian/control: Update minimal version of debhelper.
* debian/compat: Set to debhelper v7.
* debian/source/lintian-overrides: Remove.
---
ChangeLog | 27 ++++
Makefile.am | 37 +++++-
debian/compat | 2 +-
debian/control | 4 +-
debian/olena-bin.desktop | 11 ++
debian/olena-bin.install | 1 +
debian/olena-bin.menu | 3 +
debian/olena.1 | 2 +-
debian/olena.desktop | 11 --
debian/olena.menu | 3 -
debian/olena.xpm | 332 ++++++++++++++++++++++++++++++++++++++++------
debian/rules | 9 ++
12 files changed, 383 insertions(+), 59 deletions(-)
create mode 100644 debian/olena-bin.desktop
create mode 100644 debian/olena-bin.menu
delete mode 100644 debian/olena.desktop
delete mode 100644 debian/olena.menu
mode change 100644 => 100755 debian/rules
diff --git a/ChangeLog b/ChangeLog
index da6320d..f707206 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2012-06-07 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Fix last warnings with Lintian.
+
+ * Makefile.am: Install pixmaps and include debian/ in
+ distribution.
+
+ * debian/olena-bin.menu,
+ * debian/olena.desktop: Rename as...
+
+ * debian/olena.menu,
+ * debian/olena-bin.desktop: ... this. Update to use scribo-viewer.
+
+ * debian/olena-bin.install: Include pixmap in package.
+
+ * debian/olena.1: Fix description.
+
+ * debian/olena.xpm: New.
+
+ * debian/rules: Set path to libexec.
+
+ * debian/control: Update minimal version of debhelper.
+
+ * debian/compat: Set to debhelper v7.
+
+ * debian/source/lintian-overrides: Remove.
+
2012-06-06 Guillaume Lazzara <z(a)lrde.epita.fr>
* debian/rules: Cleanup.
diff --git a/Makefile.am b/Makefile.am
index e051c68..5e1cb78 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
-# Copyright (C) 2006, 2007, 2008, 2009, 2010 EPITA Research and Development
-# Laboratory (LRDE).
+# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2012 EPITA Research and
+# Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -169,3 +169,36 @@ snapshot:
&& $(MAKE) $(AM_MAKEFLAGS) dist \
&& mv -f $(srcdir)/configure.ac.old $(srcdir)/configure.ac
#>>
+
+
+# Extra files for debian package generation.
+pixmapsdir = $(datarootdir)/pixmaps
+dist_pixmaps_DATA = debian/olena.xpm
+
+EXTRA_DIST = \
+ debian/olena.install \
+ debian/olena-dev.doc-base \
+ debian/watch \
+ debian/gbp.conf \
+ debian/compat \
+ debian/README.Debian \
+ debian/rules \
+ debian/olena.manpages \
+ debian/changelog \
+ debian/olena-bin.menu \
+ debian/HOWTO \
+ debian/olena-bin.desktop \
+ debian/control \
+ debian/olena-dev.install \
+ debian/scribo-cli.1 \
+ debian/olena-bin.install \
+ debian/olena-dev.docs \
+ debian/scribo-viewer.1 \
+ debian/olena.1 \
+ debian/copyright \
+ debian/source \
+ debian/source/local-options \
+ debian/source/options \
+ debian/source/format \
+ debian/source/lintian-overrides\
+ debian/olena-bin.manpages
\ No newline at end of file
diff --git a/debian/compat b/debian/compat
index ec63514..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+7
diff --git a/debian/control b/debian/control
index 7ac892b..fca6d09 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: olena
Section: devel
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)
+Build-Depends: debhelper (>= 7.0.50), autotools-dev, dpkg-dev (>= 1.13.19)
Standards-Version: 3.9.3
Vcs-Browser: http://git.lrde.epita.fr/?p=olena.git;a=summary
Vcs-Git: git://git.lrde.epita.fr/olena
@@ -30,7 +30,7 @@ Description: Generic image processing platform written in C++
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.
+ This is a metapackage installing the whole platform.
Package: olena-bin
diff --git a/debian/olena-bin.desktop b/debian/olena-bin.desktop
new file mode 100644
index 0000000..e6dba20
--- /dev/null
+++ b/debian/olena-bin.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=Scribo-viewer
+GenericName=Scribo-viewer
+Comment=Document Image Analysis tool.
+Comment[fr]=Outil d\'analyse d\'images de documents.
+Icon=Scribo-viewer
+Exec=scribo-viewer
+Terminal=true
+Categories=Application;
diff --git a/debian/olena-bin.install b/debian/olena-bin.install
index 423557d..28c3273 100644
--- a/debian/olena-bin.install
+++ b/debian/olena-bin.install
@@ -1,3 +1,4 @@
usr/bin/*
usr/lib/scribo/*
usr/share/olena/scribo/*
+usr/share/pixmaps/olena.xpm
\ No newline at end of file
diff --git a/debian/olena-bin.menu b/debian/olena-bin.menu
new file mode 100644
index 0000000..a04e8f0
--- /dev/null
+++ b/debian/olena-bin.menu
@@ -0,0 +1,3 @@
+?package(olena-bin):needs="text" section="Applications/Graphics" \
+ title="Scribo-viewer" command="/usr/bin/scribo-viewer" \
+ icon="/usr/share/pixmaps/olena.xpm"
diff --git a/debian/olena.1 b/debian/olena.1
index 8f35692..ef7654f 100644
--- a/debian/olena.1
+++ b/debian/olena.1
@@ -1,6 +1,6 @@
.TH "OLENA" "1" "" "" ""
.SH "NAME"
-Olena
+Olena \- An Image Processing Platform.
.SH "DESCRIPTION"
.PP
An Image Processing Platform
diff --git a/debian/olena.desktop b/debian/olena.desktop
deleted file mode 100644
index 741b97d..0000000
--- a/debian/olena.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[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.menu b/debian/olena.menu
deleted file mode 100644
index 99165ab..0000000
--- a/debian/olena.menu
+++ /dev/null
@@ -1,3 +0,0 @@
-?package(olena):needs="text" section="Apps/Tools" \
- title="Olena" command="/usr/bin/olena" \
- icon="/usr/share/pixmaps/olena.xpm"
diff --git a/debian/olena.xpm b/debian/olena.xpm
index 32123cc..0f18949 100644
--- a/debian/olena.xpm
+++ b/debian/olena.xpm
@@ -1,40 +1,294 @@
/* 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###.........",
-"............########............"};
+static char *olena[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 256 2",
+" c black",
+". c #150008",
+"X c #1E0012",
+"o c #111313",
+"O c #172020",
+"+ c #220014",
+"@ c #2A011B",
+"# c #24011B",
+"$ c #2E1513",
+"% c #30071D",
+"& c #2F0624",
+"* c #2C1022",
+"= c #350726",
+"- c #3D152C",
+"; c #232222",
+": c #3E2123",
+"> c #383A39",
+", c #460E2F",
+"< c #45182E",
+"1 c #481334",
+"2 c #531739",
+"3 c #412D2C",
+"4 c #4B2639",
+"5 c #592B39",
+"6 c #5C3B39",
+"7 c #713F34",
+"8 c #6C3933",
+"9 c #592842",
+"0 c #583944",
+"q c #593658",
+"w c #613B46",
+"e c #723F43",
+"r c #603A63",
+"t c #754337",
+"y c #4F4C4C",
+"u c #585655",
+"i c #6A4048",
+"p c #6A4857",
+"a c #794E56",
+"s c #74575A",
+"d c #7D594A",
+"f c #684267",
+"g c #714A6F",
+"h c #754D76",
+"j c #785967",
+"k c #7E547B",
+"l c #6F6869",
+"z c #7A666A",
+"x c #8A4C3D",
+"c c #914D3E",
+"v c #98702E",
+"b c #8E6B39",
+"n c #8C4F40",
+"m c #864F51",
+"M c #8D5542",
+"N c #8B5859",
+"B c #99574B",
+"V c #975951",
+"C c #805C7C",
+"Z c #83674F",
+"A c #95625D",
+"S c #876065",
+"D c #877A7D",
+"F c #9C7B67",
+"G c #90727D",
+"H c #986C7B",
+"J c #A55C4B",
+"K c #A35F51",
+"L c #A8614A",
+"P c #A76258",
+"I c #A27F46",
+"U c #B46452",
+"Y c #BA6A53",
+"T c #A96A63",
+"R c #A77078",
+"E c #B66F61",
+"W c #BB7467",
+"Q c #A27969",
+"! c #C36A55",
+"~ c #CA725D",
+"^ c #C27C58",
+"/ c #CB7965",
+"( c #D27A65",
+") c #D37D69",
+"_ c #855D84",
+"` c #8E6689",
+"' c #926A8F",
+"] c #9B6D88",
+"[ c #976D93",
+"{ c #9D798D",
+"} c #9A7B96",
+"| c #A17B8F",
+" . c #A07A9D",
+".. c #A98D5A",
+"X. c #B68C77",
+"o. c #B79567",
+"O. c #AB947D",
+"+. c #D18555",
+"@. c #CE8A6D",
+"#. c #C98976",
+"$. c #C49875",
+"%. c #D3826E",
+"&. c #D98F6C",
+"*. c #DA8C74",
+"=. c #D98E7B",
+"-. c #D58A77",
+";. c #DD9574",
+":. c #DA927D",
+">. c #D59379",
+",. c #C4AA7D",
+"<. c #E9A172",
+"1. c #8C8786",
+"2. c #8B9191",
+"3. c #9E809B",
+"4. c #9E8687",
+"5. c #A6838B",
+"6. c #A68499",
+"7. c #B68B8B",
+"8. c #B08699",
+"9. c #B99388",
+"0. c #B09899",
+"q. c #AA88A7",
+"w. c #AE90AB",
+"e. c #B796A6",
+"r. c #B494B2",
+"t. c #BA9CB7",
+"y. c #B6A8A7",
+"u. c #BCB7B6",
+"i. c #B2A7AB",
+"p. c #C68986",
+"a. c #C79785",
+"s. c #C59894",
+"d. c #D59982",
+"f. c #DB9B8B",
+"g. c #DA9988",
+"h. c #DC9D98",
+"j. c #D3868D",
+"k. c #CD97A1",
+"l. c #C8A688",
+"z. c #C9A895",
+"x. c #CDB48C",
+"c. c #CCB597",
+"v. c #DCA28C",
+"b. c #D2A98B",
+"n. c #DCA492",
+"m. c #DBAD9D",
+"M. c #D6A797",
+"N. c #DBB39C",
+"B. c #D1B79C",
+"V. c #C1A1A9",
+"C. c #C2A7BF",
+"Z. c #CDB9AC",
+"A. c #C4B0B5",
+"S. c #DAABA4",
+"D. c #D6AFB9",
+"F. c #DDB2A3",
+"G. c #DCB9AC",
+"H. c #D9B7A7",
+"J. c #D7BAB6",
+"K. c #E3978C",
+"L. c #E49593",
+"P. c #E09F90",
+"I. c #E99794",
+"U. c #E58985",
+"Y. c #EE9FA1",
+"T. c #E9A788",
+"R. c #E2A394",
+"E. c #E2AC9C",
+"W. c #E2AA97",
+"Q. c #EAB28D",
+"!. c #E5B49C",
+"~. c #EBB999",
+"^. c #F2A19E",
+"/. c #E3AEA2",
+"(. c #E8ABA9",
+"). c #E3AEB0",
+"_. c #E3B4A4",
+"`. c #E4BAAC",
+"'. c #EABDAB",
+"]. c #E7B7A9",
+"[. c #E3BCB5",
+"{. c #E9BCB2",
+"}. c #EDBBBA",
+"|. c #E8B5B4",
+" X c #F5AEAC",
+".X c #F2B9B8",
+"XX c #C1ABC0",
+"oX c #C9B2C7",
+"OX c #D1BDCF",
+"+X c #D2BCD0",
+"@X c #D9C6A9",
+"#X c #DFCCB4",
+"$X c #DDCBBA",
+"%X c #D9C6B4",
+"&X c #EBC2AD",
+"*X c #EFC2A6",
+"=X c #E5C1B2",
+"-X c #E3CABD",
+";X c #EBC4B5",
+":X c #EBC4BC",
+">X c #EDC8B3",
+",X c #ECC9BC",
+"<X c #E3C5BA",
+"1X c #E0D1B9",
+"2X c #F0C6AA",
+"3X c #F0C4BD",
+"4X c #F1CAB6",
+"5X c #F7D0BE",
+"6X c #D8C7C8",
+"7X c #D5C4D8",
+"8X c #DFD2C0",
+"9X c #DEDBDB",
+"0X c #CBCBCB",
+"qX c #DCDFE0",
+"wX c #E3CDC4",
+"eX c #ECCDC4",
+"rX c #E9C7C6",
+"tX c #E7DBCB",
+"yX c #EBD2C5",
+"uX c #EED4CB",
+"iX c #EBDECE",
+"pX c #E3D7C6",
+"aX c #EDD6D2",
+"sX c #EEDED9",
+"dX c #EFD9D3",
+"fX c #F3C3C2",
+"gX c #F6CBC8",
+"hX c #F3D3C4",
+"jX c #F1D4CC",
+"kX c #F6DCCD",
+"lX c #FAD1CF",
+"zX c #F7D8C8",
+"xX c #F3D5D2",
+"cX c #F3DAD4",
+"vX c #F3DDDA",
+"bX c #FCD3D3",
+"nX c #FDD9DB",
+"mX c #F9DCD3",
+"MX c #F3D6E0",
+"NX c #EDE5D9",
+"BX c #EDE5D9",
+"VX c #F5E3DC",
+"CX c #F9E6DB",
+"ZX c #EBE7E7",
+"AX c #F3EAE3",
+"SX c #F6ECEA",
+"DX c #FBECE3",
+"FX c #FBEDEB",
+"GX c #F9E5E3",
+"HX c #F6F4EC",
+"JX c #FDF3ED",
+"KX c #F8F1E6",
+"LX c #FCF6F4",
+"PX c #FBFAF4",
+"IX c #FEFDFD",
+"UX c #F7F6F3",
+/* pixels */
+"kXCXCXDX!.( W.;XeXeXjXjXeXxXcXcXjXuX;X:XCXAXIXLXJX`.%.g.-.%.*.K ",
+"VXDXDXkXM.~ f.{.:XeXeXjXjXjXcXcXxXcX:XeXDXCXwXPXPXLXeX=.R.n.e , ",
+"CXJXkXzXm.! W.].:XeXeXeXeXjXcXxXcXVX:X:XCXJXf.f.VXJXJXCXp.5 = 2 ",
+"JX<XN.DXm.! W.{.=X,XyXyXyX:X:XjXvXVX:X:XAXHXS.P.M.$XDXuX5 = 1 H ",
+"CXU M.DXm./ ].H.pXNXAXHXAXsXeX[.rXjX{.;XDXJXF.b.B.tXpXa @ , 7.4X",
+">.! !.CXM./ E.@XiXiXAXNXsXFXVXAXvX,X{.|.VXiXH.#XUXIX4.@ 1 s.;Xn.",
+"v.=.!.CXz./ n.pX1X-X$XwXAXGXSXFXLXsXG.%XtXNXLXIXIXIXa # 5.5Xf.n.",
+"/.f._.CXF.( n.AX@Xc.H.sXvXAXFXNX$X8XNXHXIXIXIXPXIXtX@ w hX_.v.v.",
+"_.W.&XDX].( :.HXtXB.rXeXyXcX%X@XtXUXUXUXUXNXtXSXIXs X Z.hXF.>.$.",
+"/./.>XJX`.( =.yXAXyXrXA.t.z.x.tXtX%Xz.s.o.B.KXHXj . s zXm.H.@Xc.",
+"R.W.;XJX].) P.n.8XSX6Xt.` ..b.S.G.[.}.fXF.%X%X0 + * J.&XH.NX@Xx.",
+"g.R.,XJX`.%.E./.S.6XoXh Z $.rXGXJXLXLXAXFXS.t @ + j CXF.NXNXB.l.",
+"=.f.,XJXG.%._.;Xk.w.k 0 a.nXLXIXIXIXIXIXLXcX6 & * %XmX=XNXiXB.H.",
+":.g.>XDX`.%.].=Xt.w.q A gXUXIXSXu.ZXUX9XIXIXj @ w VXuX<XNX#XeX[.",
+"*.U.>XCX&X%.S.e.q.w.p X.bXGXLXi.o 1.6Xy ZXIX5.+ 0.kX[.z.Z.VXuXX.",
+") -.>XVX&X;.S.{ } q.6 Q nXxXFXA.u 6XFX9XIXIXe.4 DXGXVXwX%XCXB.o.",
+") =.>XkX&Xg.F.6.q.D.}.j.).lXbXLXIXFXFXIXIXIXi.D LXcXVXwXwXc.c.,.",
+"%.:.>XkX&Xn.{.7.q.IX(.M h.fXfXxXVXFXFXAXLXIXA.y.DXuXvXaXz.%X#Xd.",
+"%.*.>XkX'.].a.d t.MX9.F fX|..XfXlXJ.y.1.l y.A.J.CXuXVX-Xc.#Xm.(.",
+"*.%._.hX4Xm.b F 7X[ p S.:X).|. Xp.` qXu.> z VXjXuXcX%X(a)Xc.}.L.",
+"%.%.!.>XhXX.v O.7X' k 8.;XfX(.^.6 2.ZX0X; z FXeXkX-X1Xo.wX}.U.",
+"( / W.*X,X$.I Q w.r._ e.;XfX.XL.3 O 1.IX> 0.DXyXeX$XB.b aXgXL.",
+"( ~ v.*X'.{.G.w.XXr.' | }.].}..Xp.$ o u.u X 6XVXuXG.Z.l.l.rXbXI.",
+"~ ~ ;.2X!.}.rXe.oXw.' 8.'._.(.gXP.U n : * 9 ZXVXuXdX-XeX:X<XxXI.",
+"Y Y &.2X'._.kXJ.} XXg ` /.n.P.gXW c J 5 & 0 yXjXiXAXVXuX;X<XcXL.",
+"L Y ;.~.&XW.3XV.3.+X' r R R.j..Xp.x x < @ p yX`.`.{.;X=X`.`.cX.X",
+"J U ;.~.'.].3X[.6.oX[ f 0 #.( f.[.7 t - X j DXuXuXyX;X_.n.d.xXgX",
+"J U ;.~.!./.5XD.r.oX` q 4 T Y E rXT t 1 + G CX-XeXuXeX=Xm.n.dXxX",
+"U U ;.Q.!.P.].{ q.OX` q w Y L P rXbXe & # N '.`.eXuXyX,X_.E.vXD.",
+"J J @.<.T.g.p.[ 6.7X' q m B J B }.lXS % # A >.>.d.v.n._.;XeXjX] ",
+"x x ..<.*.( / k ` r. .q m P J p.nX.XS.2 # 9.&X`._.d.%.W A /.S.C ",
+"t t L +.U B m f g } q.f N B P fXGX(.|.2 @ 9.&X_.;X=XW.>.S (.k.C "
+};
diff --git a/debian/rules b/debian/rules
old mode 100644
new mode 100755
index cbe925d..c5accbe
--- a/debian/rules
+++ b/debian/rules
@@ -1,3 +1,12 @@
#!/usr/bin/make -f
+
%:
dh $@
+
+override_dh_auto_configure:
+ ./bootstrap
+ dh_auto_configure -- --enable-scribo --libexecdir=/usr/lib
+
+override_dh_auto_install:
+ dh_auto_install
+ find $(CURDIR)/debian/tmp -type d -empty -delete
\ No newline at end of file
--
1.7.2.5