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.

Signed-off-by: Roland Levillain <roland@lrde.epita.fr>

ChangeLog

+2012-05-22  Guillaume Lazzara  <z@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@lrde.epita.fr>
 
 	Add options for dpkg-source.

debian/changelog

-olena (2.0-1) unstable; urgency=low
+olena (2.0-1) testing; urgency=low
 
   * Initial release.
 
- -- Olena Team <olena@lrde.epita.fr>  Fri, 16 Sep 2011 22:35:27 +0200
+ -- Olena Team <olena@lrde.epita.fr>  Fri, 22 May 2012 22:35:27 +0200
 

debian/compat

-5
+8
+# Specifies the "compatibility level" for the debhelper tool
+# See http://wiki.debian.org/IntroDebianPackaging
+

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.

debian/copyright

 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.

debian/gbp.conf

+[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

debian/olena-bin.install

 usr/bin/*
-usr/libexec/scribo/*
+usr/lib/scribo/*

debian/olena.menu

-
 ?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"

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

debian/source/format

+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

debian/watch

+# 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