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.

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

ChangeLog

+2011-12-07  Guillaume Lazzara  <z@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@lrde.epita.fr>
 
 	* debian/HOWTO: How to make .deb package.

debian/changelog

@@ -2,5 +2,5 @@ olena (2.0-1) unstable; urgency=low
 
   * Initial release.
 
- -- Olena Team <olena@lrde.epita.fr>  Sat, 28 Apr 2007 22:35:27 +0200
+ -- Olena Team <olena@lrde.epita.fr>  Fri, 16 Sep 2011 22:35:27 +0200
 

debian/control

@@ -3,19 +3,19 @@ Section: devel
 Priority: extra
 Maintainer: Olena Team <olena@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

debian/olena-bin.install

-usr/bin/
-usr/libexec/
-usr/share/olena/
+usr/bin/*
+usr/libexec/scribo/*

debian/olena-dev.doc-base

+Document: olena
+Title: Debian olena Manual
+Author: Olena Team <olena@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

debian/olena-dev.docs

-usr/share/doc/olena/
+NEWS
+README
+AUTHORS
+TODO

debian/olena-dev.install

-usr/include/milena/
-usr/include/scribo/
+usr/include/mln/*
+usr/include/scribo/*
+usr/share/doc/olena/*

debian/rules

 #!/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