On 2009-04-26 Cyril Brulebois <[email protected]> wrote:
> Andreas Metzler <[email protected]> (26/04/2009):
[...]
>> I wonder if I shouldn't simply delete this line? Iirc having a
>> configure target serves no purpose, all the deps are on -stamp. Its
>> only use is in being able to run "debian/rules configure"
> then, agreed.
>>>> +configure-stamp: debian/stamp-patched
>> ^^^^^^^^^^^^^^^^^^^^
>> Should I use $(QUILT_STAMPFN) here instead?
> Yes, please. That looks like dpatch's stamp filename, and indeed:
> | $ grep 'STAMPFN.*=' /usr/share/{dpatch/dpatch,quilt/quilt}.make
> | /usr/share/dpatch/dpatch.make:DPATCH_STAMPFN ?= patch-stamp
> | /usr/share/quilt/quilt.make:QUILT_STAMPFN ?= debian/stamp-patched
>> No reason from my, I did not want to do unrelated changes. ;-)
There you go. Now with unrelated changes. ;-)
cu andreas
--
`What a good friend you are to him, Dr. Maturin. His other friends are
so grateful to you.'
`I sew his ears on from time to time, sure'
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 <[email protected]> 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..91e1083 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,8 +50,7 @@ maint-svn-snapshot:
echo "../hugin_$(UVERSION).orig.tar.gz ready"
rm -rf debian/svn
-configure: patch configure-stamp
-configure-stamp:
+configure-stamp: $(QUILT_STAMPFN)
dh_testdir
# Configure the package.
mkdir $(BUILD_DIR)
@@ -61,14 +60,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 +78,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 +101,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
+install-indep: install-indep-stamp
+install-arch: install-arch-stamp
- dh_install --sourcedir=debian/tmp -i
-
-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 -a
# Install the package into debian/tmp.
$(MAKE) install -C $(BUILD_DIR) DESTDIR=$(CURDIR)/debian/tmp
@@ -135,6 +128,7 @@ install-stamp:
# Get rid of .so, which aren't actually needed
find debian/tmp -name '*.so' -delete
+ dh_install --sourcedir=debian/tmp -a
touch $@
binary-common:
@@ -163,7 +157,7 @@ binary-indep: build-indep install-indep
# Build architecture dependant packages using the common target.
binary-arch: build-arch install-arch
- $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
+ $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
binary: binary-arch binary-indep
.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch
_______________________________________________
Pkg-phototools-devel mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-phototools-devel
