[Xenomai] [PATCH 1/2] debian: add autoreconf to build rules

[Xenomai] [PATCH 1/2] debian: add autoreconf to build rules

[Henning Schild]

Add autoreconf steps to debian/rules and add required tools to build deps.

Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 debian/control | 2 +-
 debian/rules   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 2225648..54fc898 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xenomai
 Section: devel
 Priority: extra
 Maintainer: Xenomai <xenomai@xenomai.org>
-Build-Depends: debhelper (>= 8), findutils (>= 4.2.28), autotools-dev, autoconf, automake, libtool
+Build-Depends: debhelper (>= 8), findutils (>= 4.2.28), autotools-dev, autoconf, automake, dh-autoreconf
 Standards-Version: 3.9.3
 Homepage: http://www.xenomai.org/
 
diff --git a/debian/rules b/debian/rules
index f91a621..a5d2e32 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,11 +39,13 @@ build-indep-stamp: config.status
 
 config.status: configure-stamp
 configure-stamp:
+	dh_autoreconf
 	dh_testdir
 	./configure $(CONFIG_OPTS)
 	touch configure-stamp
 
 clean:
+	dh_autoreconf_clean
 	dh_testdir
 	dh_testroot
 	rm -f configure-stamp build-indep-stamp build-arch-stamp
-- 
1.9.1

[Xenomai] [PATCH 2/2] debian: change version number in changelog

[Henning Schild]

Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 666b446..b518815 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xenomai (2.99.0) UNRELEASED; urgency=low
+xenomai (3.0-rc4) UNRELEASED; urgency=low
 
   * Prepare Debian packaging for Xenomai-forge
 
-- 
1.9.1

Re: [Xenomai] [PATCH 1/2] debian: add autoreconf to build rules

[Gilles Chanteperdrix]

On Wed, Apr 29, 2015 at 11:32:42AM +0200, Henning Schild wrote:
> Add autoreconf steps to debian/rules and add required tools to build deps.
> 
> Signed-off-by: Henning Schild <henning.schild@siemens.com>
> ---
>  debian/control | 2 +-
>  debian/rules   | 2 ++
>  2 files changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/debian/control b/debian/control
> index 2225648..54fc898 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -2,7 +2,7 @@ Source: xenomai
>  Section: devel
>  Priority: extra
>  Maintainer: Xenomai <xenomai@xenomai.org>
> -Build-Depends: debhelper (>= 8), findutils (>= 4.2.28), autotools-dev, autoconf, automake, libtool
> +Build-Depends: debhelper (>= 8), findutils (>= 4.2.28),
> autotools-dev, autoconf, automake, dh-autoreconf

is dh-autoreconf available on wheezy ?

If people work from a release, autoreconf is useless and has chances
to do more harm than good.

If people do not work from a release, can we not expect them to run
autoreconf by themselves ?

-- 
					    Gilles.

Re: [Xenomai] [PATCH 1/2] debian: add autoreconf to build rules

[Henning Schild]

On Wed, 29 Apr 2015 11:39:43 +0200
Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org> wrote:

> is dh-autoreconf available on wheezy ?

Sure.
 
> If people work from a release, autoreconf is useless and has chances
> to do more harm than good.

So releases will contain the Makefiles and configure-scripts again?

> If people do not work from a release, can we not expect them to run
> autoreconf by themselves ?

You are right, that is another way of looking at it. I was assuming
that the rules should contain all necessary build steps, but i am not
sure what the best practice is for debian-directories.

Henning

Re: [Xenomai] [PATCH 1/2] debian: add autoreconf to build rules

[Gilles Chanteperdrix]

On Wed, Apr 29, 2015 at 01:53:38PM +0200, Henning Schild wrote:
> On Wed, 29 Apr 2015 11:39:43 +0200
> Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org> wrote:
> 
> > is dh-autoreconf available on wheezy ?
> 
> Sure.
>  
> > If people work from a release, autoreconf is useless and has chances
> > to do more harm than good.
> 
> So releases will contain the Makefiles and configure-scripts again?

No, Makefiles are generated by running the configure script. But the
configure script yes, only the git repository does not contain it or
maybe I misunderstood something.

> 
> > If people do not work from a release, can we not expect them to run
> > autoreconf by themselves ?
> 
> You are right, that is another way of looking at it. I was assuming
> that the rules should contain all necessary build steps, but i am not
> sure what the best practice is for debian-directories.

The thing is that debian allows to install very old versions of the
autotools. I would not want the default rule, to simply wreck the
autotools file because the user made the mistake of having old
versions of the autotools used by default, whereas the shipped ones
are fine.

-- 
					    Gilles.

Re: [Xenomai] [PATCH 1/2] debian: add autoreconf to build rules

[Henning Schild]

On Wed, 29 Apr 2015 13:59:38 +0200
Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org> wrote:

> > You are right, that is another way of looking at it. I was assuming
> > that the rules should contain all necessary build steps, but i am
> > not sure what the best practice is for debian-directories.
> 
> The thing is that debian allows to install very old versions of the
> autotools. I would not want the default rule, to simply wreck the
> autotools file because the user made the mistake of having old
> versions of the autotools used by default, whereas the shipped ones
> are fine.

Ok, thats a valid argument. So people working against git have to
autoreconf manually before being able to use the debian-stuff.

Henning