* 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@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. 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@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 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@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@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