Package: zzuf
Version: 0.13-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu lucid ubuntu-patch
Hey
While trying to build zzuf with dpkg-buildpackage -j2, I noticed that
there was a typo in the dependencies across targets. Reviewing rules,
I found some other minor fixes notably support for nocheck in
DEB_BUILD_OPTIONS. Please find attached a patch to fix these and
cleanup rules slightly.
Thanks,
--
Loïc Minier
=== modified file 'debian/changelog'
--- debian/changelog 2010-02-15 22:26:37 +0000
+++ debian/changelog 2010-03-28 10:18:38 +0000
@@ -1,3 +1,12 @@
+zzuf (0.13.svn20100215-2) UNRELEASED; urgency=low
+
+ * Make rules -j safe (fix dependencies on configure-stamp).
+ * Use $@ instead of stamp filenames.
+ * Split $(MAKE) check in its own target with a separate stamp.
+ * Honor nocheck in DEB_BUILD_OPTIONS.
+
+ -- Loïc Minier <l...@dooz.org> Sun, 28 Mar 2010 12:18:27 +0200
+
zzuf (0.13.svn20100215-1) unstable; urgency=low
* New SVN snapshot. Renames zzcat into zzat to avoid an unfortunate
=== modified file 'debian/rules'
--- debian/rules 2009-12-12 23:42:57 +0000
+++ debian/rules 2010-03-28 10:18:22 +0000
@@ -17,21 +17,27 @@
configure-stamp:
dh_testdir
./configure $(confflags) --prefix=/usr
- touch configure-stamp
+ touch $@
-build: configure-stamp build-stamp
-build-stamp:
+build: build-stamp
+build-stamp: configure-stamp
dh_testdir
$(MAKE)
+ touch $@
+
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+maybe_check = $(if $(findstring nocheck,$(DEB_BUILD_OPTIONS)),,check)
+
+check: check-stamp
+check-stamp: build-stamp
$(MAKE) check
+ touch $@
endif
- touch build-stamp
clean:
dh_testdir
dh_testroot
- rm -f build-stamp configure-stamp
+ rm -f check-stamp build-stamp configure-stamp
[ ! -f Makefile ] || $(MAKE) distclean
dh_clean
@@ -40,13 +46,13 @@
dh_testroot
dh_clean -k
dh_installdirs usr/bin usr/share/man/man1
- $(MAKE) install DESTDIR=`pwd`/debian/tmp
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
dh_install --sourcedir=debian/tmp --list-missing
-binary-indep: build install
+binary-indep: build $(maybe_check) install
# Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: build $(maybe_check) install
dh_testdir
dh_testroot
dh_installdocs -A README TODO NEWS
