[Build-common-hackers] Bug#295250: cdbs: dpatch.mk has syntax errors

Bastian Kleineidam Bastian Kleineidam <calvin@debian.org>, 295250@bugs.debian.org
Sun, 20 Mar 2005 23:48:43 +0100


--cmJC7u66zC7hs+87
Content-Type: multipart/mixed; boundary="HlL+5n6rz5pIUxbD"
Content-Disposition: inline


--HlL+5n6rz5pIUxbD
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi,

here is a patch that fixes the error.


--=20
  ,''`.                  Bastian Kleineidam
 : :' :                    GnuPG Schl=FCssel
 `. `'    gpg --keyserver wwwkeys.pgp.net --recv-keys 32EC6F3E
   `-


--HlL+5n6rz5pIUxbD
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="dpatch.diff"

--- dpatch.mk.orig	2005-03-20 23:45:05.927667227 +0100
+++ dpatch.mk	2005-03-20 23:45:19.973550974 +0100
@@ -46,8 +46,10 @@
 CDBS_BUILD_DEPENDS    := $(CDBS_BUILD_DEPENDS), patchutils
 evil_patches_that_do_nasty_things := $(shell\
 if lsdiff=`which lsdiff` ; then \
+  if [ "x$(DEB_PATCHES)" != x ]; then \
   $$lsdiff -H $(DEB_PATCHES) \
-  | egrep "/config\.(guess|sub|rpath)$" | tr "\n" " " ; \
+  | egrep "/config\.(guess|sub|rpath)$$" | tr "\n" " " ; \
+  fi; \
 fi)
 ifneq (, $(evil_patches_that_do_nasty_things))
 $(warning WARNING:  The following patches are modifiing auto-updated files.  This can result in serious trouble:  $(evil_patches_that_do_nasty_things))

--HlL+5n6rz5pIUxbD--

--cmJC7u66zC7hs+87
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCPf3KeBwlBDLsbz4RAqtXAJ9g2dlzu+bjSpAWpXKZNZHOcONqsQCeJ8Oe
tBLrZNpI3Flvnn7KRPw4Imw=
=xv9q
-----END PGP SIGNATURE-----

--cmJC7u66zC7hs+87--