Dear Maintainer, Colin Watson <cjwat...@debian.org> writes:
> On Wed, Apr 25, 2012 at 07:45:18PM +0000, Debian Bug Tracking System wrote: >> B. The Technical Committee affirms the Debian Policy requirement that >> debian/rules must be a makefile. All packages in the archive, >> including leave, are required to follow this requirement. This >> makefile may, as is common practice, delegate implementation of its >> targets to a script. > > I'm reopening this bug and reassigning back to leave for implementation > of this TC resolution, since it seems to have been lost somewhat. I have uploaded to DELAYED/5 an NMU of leave versioned 1.12-2.1 which fixes this issue. I have tried to preserve as much as possible the structure of the original shell script. The debdiff is attached. Don't hesitate to tell me if I should delay the upload longer. Regards,
diff -u leave-1.12/debian/rules leave-1.12/debian/rules
--- leave-1.12/debian/rules
+++ leave-1.12/debian/rules
@@ -1,52 +1,41 @@
-#!/bin/sh -e
+#!/usr/bin/make -f
-tmp=`pwd`/debian/leave
+tmp=$(shell pwd)/debian/leave
-if echo $DEB_BUILD_OPTIONS | grep -vq noopt; then
- optflag="-O2"
-fi
-
-if echo $DEB_BUILD_OPTIONS | grep -vq nostrip; then
- stripflag="-s"
-fi
-
-case "$1" in
- build)
- test -f leave.c || { echo not in the right dir\!; exit 1; }
- test -f leave || { cc -g $optflag -Wall \
- -D__COPYRIGHT\(x\)= -D__RCSID\(x\)= \
- leave.c -o leave
- }
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ optflag=-O2
+endif
+
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ stripflag=-s
+endif
+
+leave: leave.c
+ cc -g $(optflag) -Wall -D__COPYRIGHT\(x\)= -D__RCSID\(x\)= leave.c -o leave
# used to have 'pmake CFLAGS="..." leave' here, but why?
- ;;
- clean)
- test -f leave.c || { echo not in the right dir\!; exit 1; }
- test `id -u` -eq 0 || { echo "don't have (pseudo-)root!"; exit 1; }
- rm -f build-stamp leave leave.o leave.cat1 debian/files debian/substvars
- rm -rf $tmp
- ;;
- binary-arch|binary)
- test -f leave || $0 build
- test `id -u` -eq 0 || { echo "don't have (pseudo-)root!"; exit 1; }
- rm -rf $tmp
- install -d -m 755 $tmp/usr/bin $tmp/usr/share/man/man1 \
- $tmp/DEBIAN $tmp/usr/share/doc/leave
- install $stripflag -m 755 leave $tmp/usr/bin
- gzip -c9 leave.1 > $tmp/usr/share/man/man1/leave.1.gz
- gzip -c9 debian/changelog > $tmp/usr/share/doc/leave/changelog.Debian.gz
- install -m 644 debian/copyright $tmp/usr/share/doc/leave
- dpkg-shlibdeps $tmp/usr/bin/leave
- dpkg-gencontrol -isp -P$tmp
- chown -R root.root $tmp
- chmod -R g-ws $tmp
- dpkg --build $tmp ..
- ;;
- binary-indep)
- # do nothing, successfully!
- exit 0
- ;;
- *)
- echo unknown option: $1
- exit 1
- ;;
-esac
+
+build: leave
+
+clean:
+ test -f leave.c || { echo not in the right dir\!; exit 1; }
+ test `id -u` -eq 0 || { echo "don't have (pseudo-)root!"; exit 1; }
+ rm -f build-stamp leave leave.o leave.cat1 debian/files debian/substvars
+ rm -rf $(tmp)
+
+binary-arch binary: build
+ test `id -u` -eq 0 || { echo "don't have (pseudo-)root!"; exit 1; }
+ rm -rf $(tmp)
+ install -d -m 755 $(tmp)/usr/bin $(tmp)/usr/share/man/man1 \
+ $(tmp)/DEBIAN $(tmp)/usr/share/doc/leave
+ install $(stripflag) -m 755 leave $(tmp)/usr/bin
+ gzip -c9 leave.1 > $(tmp)/usr/share/man/man1/leave.1.gz
+ gzip -c9 debian/changelog > $(tmp)/usr/share/doc/leave/changelog.Debian.gz
+ install -m 644 debian/copyright $(tmp)/usr/share/doc/leave
+ dpkg-shlibdeps $(tmp)/usr/bin/leave
+ dpkg-gencontrol -isp -P$(tmp)
+ chown -R root.root $(tmp)
+ chmod -R g-ws $(tmp)
+ dpkg --build $(tmp) ..
+
+binary-indep:
+# do nothing, successfully!
diff -u leave-1.12/debian/changelog leave-1.12/debian/changelog
--- leave-1.12/debian/changelog
+++ leave-1.12/debian/changelog
@@ -1,3 +1,10 @@
+leave (1.12-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Convert debian/rules to a Makefile (Closes: #640874)
+
+ -- Sébastien Villemot <sebast...@debian.org> Thu, 11 Oct 2012 21:23:51 +0200
+
leave (1.12-2) unstable; urgency=low
* Replaced puts() with printf()+fflush() in order to avoid a newline after
-- .''`. Sébastien Villemot : :' : Debian Developer `. `' http://www.dynare.org/sebastien `- GPG Key: 4096R/381A7594
pgpIvTNzX7OFV.pgp
Description: PGP signature
