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

[Robert Millan]

Author: rmh
Date: 2006-04-01 12:53:15 +0000 (Sat, 01 Apr 2006)
New Revision: 1418

Added:
   trunk/freebsd-utils/debian/kbdcontrol.templates.in
Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/kbdcontrol.config
   trunk/freebsd-utils/debian/kbdcontrol.dirs
   trunk/freebsd-utils/debian/kbdcontrol.install
   trunk/freebsd-utils/debian/rules
Log:
  * Embed kbdcontrol choices string in templates file rather than
    obtaining it dynamicaly in config script.
  * s/kldutils/kbdcontrol/g fix in kbdcontrol.templates.in.

Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2006-03-31 18:30:29 UTC (rev 1417)
+++ trunk/freebsd-utils/debian/changelog	2006-04-01 12:53:15 UTC (rev 1418)
@@ -1,3 +1,11 @@
+freebsd-utils (6.0-2.really.5.4-0.3) unreleased; urgency=low
+
+  * Embed kbdcontrol choices string in templates file rather than
+    obtaining it dynamicaly in config script.
+  * s/kldutils/kbdcontrol/g fix in kbdcontrol.templates.in.
+
+ -- Robert Millan <rmh at aybabtu.com>  Sat,  1 Apr 2006 14:53:27 +0200
+
 freebsd-utils (6.0-2.really.5.4-0.2) unreleased; urgency=low
 
   * Automatic, (sort of) user-friendly setup for kbdcontrol.

Modified: trunk/freebsd-utils/debian/kbdcontrol.config
===================================================================
--- trunk/freebsd-utils/debian/kbdcontrol.config	2006-03-31 18:30:29 UTC (rev 1417)
+++ trunk/freebsd-utils/debian/kbdcontrol.config	2006-04-01 12:53:15 UTC (rev 1418)
@@ -4,6 +4,5 @@
 
 . /usr/share/debconf/confmodule
 
-db_subst kbdcontrol/keymap choices "`cd /usr/share/syscons/keymaps/ && echo *.kbd | sed -e "s/ /, /g"`"
 db_input high kbdcontrol/keymap || true
 db_go

Modified: trunk/freebsd-utils/debian/kbdcontrol.dirs
===================================================================
--- trunk/freebsd-utils/debian/kbdcontrol.dirs	2006-03-31 18:30:29 UTC (rev 1417)
+++ trunk/freebsd-utils/debian/kbdcontrol.dirs	2006-04-01 12:53:15 UTC (rev 1418)
@@ -1 +1 @@
-usr/share/syscons
+usr/share/syscons/keymaps

Modified: trunk/freebsd-utils/debian/kbdcontrol.install
===================================================================
--- trunk/freebsd-utils/debian/kbdcontrol.install	2006-03-31 18:30:29 UTC (rev 1417)
+++ trunk/freebsd-utils/debian/kbdcontrol.install	2006-04-01 12:53:15 UTC (rev 1418)
@@ -1,2 +1,2 @@
 build-tree/src/usr.sbin/kbdcontrol/kbdcontrol		/bin
-build-tree/src/share/syscons/keymaps			/usr/share/syscons
+build-tree/src/share/syscons/keymaps/*.kbd		/usr/share/syscons

Copied: trunk/freebsd-utils/debian/kbdcontrol.templates.in (from rev 1417, trunk/freebsd-utils/debian/kbdcontrol.templates)
===================================================================
--- trunk/freebsd-utils/debian/kbdcontrol.templates	2006-03-31 18:30:29 UTC (rev 1417)
+++ trunk/freebsd-utils/debian/kbdcontrol.templates.in	2006-04-01 12:53:15 UTC (rev 1418)
@@ -0,0 +1,9 @@
+Template: kbdcontrol/keymap
+Type: select
+Choices: none, @choices@
+Default: none
+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
+ this question with "dpkg-reconfigure kbdcontrol".

Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules	2006-03-31 18:30:29 UTC (rev 1417)
+++ trunk/freebsd-utils/debian/rules	2006-04-01 12:53:15 UTC (rev 1418)
@@ -35,11 +35,17 @@
 	done
 # FIXME: enable in debian/control
 
+clean::
+	rm -f debian/kbdcontrol.templates
+
 build/kbdcontrol:: apply-patches
 	set -e ; for i in usr.sbin/kbdcontrol \
 	; 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
 
 include /usr/share/cdbs/1/rules/tarball.mk
 pre-build:: $(_cdbs_tarball_stamps)