[Pkg-samba-maint] r3005 - trunk/samba/debian

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2009-08-25 18:37:29 +0000 (Tue, 25 Aug 2009)
New Revision: 3005

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/rules
Log:
debian/rules: fix the update-arch target for the case of unversioned
build-deps.

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2009-08-24 21:20:06 UTC (rev 3004)
+++ trunk/samba/debian/changelog	2009-08-25 18:37:29 UTC (rev 3005)
@@ -12,6 +12,8 @@
     message during build.
   * fix up the list of files that need to be removed by hand in the clean
     target; the majority of these are now correctly handled upstream.
+  * debian/rules: fix the update-arch target for the case of unversioned
+    build-deps.
 
  -- Steve Langasek <vorlon at debian.org>  Sun, 23 Aug 2009 22:35:16 -0700
 

Modified: trunk/samba/debian/rules
===================================================================
--- trunk/samba/debian/rules	2009-08-24 21:20:06 UTC (rev 3004)
+++ trunk/samba/debian/rules	2009-08-25 18:37:29 UTC (rev 3005)
@@ -269,9 +269,9 @@
 binary: binary-indep binary-arch
 
 update-archs:
-	sed -i -e "s/libacl1-dev \(([^)]\+)\) \[[^]]\+\]/libacl1-dev \1 [`type-handling any linux-gnu`]/g" \
-	       -e "s/libkeyutils-dev \(([^)]\+)\) \[[^]]\+\]/libkeyutils-dev \1 [`type-handling any linux-gnu`]/g" \
-	       -e "s/libcap2-dev \(([^)]\+)\) \[[^]]\+\]/libcap2-dev \1 [`type-handling any linux-gnu`]/g" \
+	sed -i -e "s/libacl1-dev\( ([^)]\+)\)* \[[^]]\+\]/libacl1-dev \1 [`type-handling any linux-gnu`]/g" \
+	       -e "s/libkeyutils-dev\( ([^)]\+)\)* \[[^]]\+\]/libkeyutils-dev \1 [`type-handling any linux-gnu`]/g" \
+	       -e "s/libcap2-dev\( ([^)]\+)\)* \[[^]]\+\]/libcap2-dev \1 [`type-handling any linux-gnu`]/g" \
 		debian/control
 
 .PHONY: build clean binary-indep binary-arch binary install configure patch unpatch update-archs