[Glibc-bsd-commits] r1407 - in trunk/freebsd-utils/debian: . patches

[Robert Millan]

Author: rmh
Date: 2006-03-29 18:53:17 +0000 (Wed, 29 Mar 2006)
New Revision: 1407

Removed:
   trunk/freebsd-utils/debian/patches/012_declare_static_usage.diff
Modified:
   trunk/freebsd-utils/debian/rules
Log:
Fix regexp (use s///g instead of //d) and remove 012_declare_static_usage.diff, which consequently is no longer needed.

Deleted: trunk/freebsd-utils/debian/patches/012_declare_static_usage.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/012_declare_static_usage.diff	2006-03-29 18:48:06 UTC (rev 1406)
+++ trunk/freebsd-utils/debian/patches/012_declare_static_usage.diff	2006-03-29 18:53:17 UTC (rev 1407)
@@ -1,10 +0,0 @@
---- src/sbin/mount_nullfs/mount_nullfs.c~	2006-03-19 20:36:49.000000000 +0100
-+++ src/sbin/mount_nullfs/mount_nullfs.c	2006-03-19 20:38:22.000000000 +0100
-@@ -63,6 +63,7 @@
- };
- 
- int	subdir(const char *, const char *);
-+static void	usage();
- 
- int
- main(argc, argv)

Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules	2006-03-29 18:48:06 UTC (rev 1406)
+++ trunk/freebsd-utils/debian/rules	2006-03-29 18:53:17 UTC (rev 1407)
@@ -45,7 +45,7 @@
 pre-build:: $(_cdbs_tarball_stamps)
 	find $(DEB_SRCDIR) -type f | (set -e ; while read i ; do sed -i $$i \
 		-e "/^__FBSDID/d" \
-		-e "/[ \t]*__\(dead2\|unused\|result\)[ \t]*/d" \
+		-e "s/[ \t]*__\(dead2\|unused\|result\)[ \t]*//g" \
 		-e "s,<sys/queue\.h>,<bsd/queue.h>,g" \
 		-e "s,<sys/iconv\.h>,<iconv.h>,g" \
 		-e "s/^LDADD=/LDADD+=/g" \