[Glibc-bsd-commits] r1419 - trunk/freebsd-utils/debian

[Robert Millan]

Author: rmh
Date: 2006-04-01 13:07:03 +0000 (Sat, 01 Apr 2006)
New Revision: 1419

Modified:
   trunk/freebsd-utils/debian/kbdcontrol.templates.in
   trunk/freebsd-utils/debian/rules
Log:
Fix kbdcontrol.templates generation.

Modified: trunk/freebsd-utils/debian/kbdcontrol.templates.in
===================================================================
--- trunk/freebsd-utils/debian/kbdcontrol.templates.in	2006-04-01 12:53:15 UTC (rev 1418)
+++ trunk/freebsd-utils/debian/kbdcontrol.templates.in	2006-04-01 13:07:03 UTC (rev 1419)
@@ -2,7 +2,7 @@
 Type: select
 Choices: none, @choices@
 Default: none
-Description: Select keyboard map
+Description: Select keyboard map:
  Select a map file for your keyboard.
  .
  Note: If you don't know, don't select any yet.  You can always come back to

Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules	2006-04-01 12:53:15 UTC (rev 1418)
+++ trunk/freebsd-utils/debian/rules	2006-04-01 13:07:03 UTC (rev 1419)
@@ -43,9 +43,8 @@
 	; do \
 		$(PMAKE) -C $(DEB_SRCDIR)/$$i ; \
 	done
-	cd $(DEB_SRCDIR)/share/syscons/keymaps && \
-		sed -e s/@choices@/`echo * | sed -e "s/ /, /g"`/g \
-		< debian/kbdcontrol.templates.in > debian/kbdcontrol.templates
+	sed -e "s/@choices@/`cd $(DEB_SRCDIR)/share/syscons/keymaps && echo *.kbd | sed -e \"s/ /, /g\"`/g" \
+	< debian/kbdcontrol.templates.in > debian/kbdcontrol.templates
 
 include /usr/share/cdbs/1/rules/tarball.mk
 pre-build:: $(_cdbs_tarball_stamps)