[Pkg-phototools-devel] hugin patch - fix debian/rules deps.

[Cyril Brulebois]

Andreas Metzler <ametzler at downhill.at.eu.org> (25/04/2009):
> Hello,

Heya,

> When misreading #525494 I tried building hugin with dpkg-buildpackage
> -j3. It fails to build because the dependencies are not correct.
> Suggested patch attached.

commenting inline.

> cu andreas

> diff --git a/debian/changelog b/debian/changelog
> index 91a1a76..fb94d5c 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,3 +1,10 @@
> +hugin (0.7.0-3) unstable; urgency=low
> +
> +  * Fix dependencies in debian/rules to correctly build with
> +    dpkg-buildpackage -j3.
> +
> + -- Andreas Metzler <ametzler at debian.org>  Sat, 25 Apr 2009 12:47:00 +0200
> +
>  hugin (0.7.0-2) unstable; urgency=low
>  
>    * Upload to unstable.
> diff --git a/debian/rules b/debian/rules
> index 684d9b9..185fe32 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -50,8 +50,8 @@ maint-svn-snapshot:
>  	echo "../hugin_$(UVERSION).orig.tar.gz ready"
>  	rm -rf debian/svn
>  
> -configure: patch configure-stamp
> -configure-stamp:
> +configure: patch configure-stamp 
              ^^^^^

Please make that $(QUILT_STAMPFN) to avoid a possible re-./configure,
stamp being always out of date.

> +configure-stamp: debian/stamp-patched
>  	dh_testdir
>  	# Configure the package.
>  	mkdir $(BUILD_DIR)
> @@ -61,14 +61,15 @@ configure-stamp:
>  
>  build: build-arch build-indep
>  
> -build-arch:  build-stamp
> -build-indep: build-stamp
> -
> -build-stamp: configure
> +build-arch:  build-arch-stamp
> +build-indep: build-indep-stamp
>  
> +build-arch-stamp: configure-stamp
>  	# Compile the package.
>  	$(MAKE) -C $(BUILD_DIR)
> +	touch $@
>  
> +build-indep-stamp: configure-stamp
>  	# Build manpages.
>  	for i in doc/*.pod ; do \
>  		if [ ! -f $${i%%.pod}.1 ] ; then \
> @@ -78,14 +79,14 @@ build-stamp: configure
>  			echo $${i%%.pod}.1 >> $(GENERATED_MANPAGES) ; \
>  		fi ; \
>  	done
> -
>  	touch $@
>  
>  clean: clean-patched unpatch
>  clean-patched:
>  	dh_testdir
>  	dh_testroot
> -	rm -f build-stamp install-stamp configure-stamp
> +	rm -f build-indep-stamp build-arch-stamp install-arch-stamp \
> +		install-indep-stamp configure-stamp
>  
>  	# Clean up after the build process.
>  	rm -rf $(BUILD_DIR)
> @@ -101,30 +102,23 @@ clean-patched:
>  	dh_clean
>  
>  install: install-indep install-arch
> -install-indep:
> -	dh_testdir
> -	dh_testroot
> -	dh_installdirs -i
>  
> -	# Install the indep part of the package
> -	$(MAKE) -f debian/rules DH_OPTIONS=-i install-stamp
> -
> -	dh_install --sourcedir=debian/tmp -i
> +install-indep: install-indep-stamp
> +install-arch: install-arch-stamp
>  
> -install-arch:
> +install-indep-stamp: build-indep-stamp install-arch-stamp
>  	dh_testdir
>  	dh_testroot
> -	dh_installdirs -s
> -
> -	# Install the arch part of the package
> -	$(MAKE) -f debian/rules DH_OPTIONS=-s install-stamp
> +	dh_installdirs -i
>  
> -	dh_install --sourcedir=debian/tmp -s
> +	dh_install --sourcedir=debian/tmp -i
> +	touch $@
>  
> -install-stamp:
> +install-arch-stamp: build-arch-stamp
>  	dh_testdir
>  	dh_testroot
>  	dh_clean -k
> +	dh_installdirs -s

I know it used to be -s, but why not use -a? We have no binaries that
are built on a subset of architectures only.

>  	# Install the package into debian/tmp.
>  	$(MAKE) install -C $(BUILD_DIR) DESTDIR=$(CURDIR)/debian/tmp
> @@ -135,6 +129,7 @@ install-stamp:
>  	# Get rid of .so, which aren't actually needed
>  	find debian/tmp -name '*.so' -delete
>  
> +	dh_install --sourcedir=debian/tmp -s

Same comment here.

>  	touch $@
>  
>  binary-common:

Thanks for looking into it.

Mraw,
KiBi.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-phototools-devel/attachments/20090425/0430bbcf/attachment.pgp>