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

[Robert Millan]

Author: rmh
Date: 2012-06-21 18:17:36 +0000 (Thu, 21 Jun 2012)
New Revision: 4325

Removed:
   trunk/freebsd-utils/debian/kbdcontrol.config
   trunk/freebsd-utils/debian/kbdcontrol.templates
Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/kbdcontrol.init
   trunk/freebsd-utils/debian/kbdcontrol.postinst
   trunk/freebsd-utils/debian/rules
Log:
Remove handling of kbdcontrol.conf, now obsoleted by /etc/init.d/keyboard-setup.  (Closes: #677915)

Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2012-06-21 18:14:29 UTC (rev 4324)
+++ trunk/freebsd-utils/debian/changelog	2012-06-21 18:17:36 UTC (rev 4325)
@@ -1,6 +1,8 @@
 freebsd-utils (9.0+ds1-6) UNRELEASED; urgency=low
 
   * Fix FTBFS (missing libutil.h).
+  * Remove handling of kbdcontrol.conf, now obsoleted by
+    /etc/init.d/keyboard-setup.  (Closes: #677915)
 
  -- Robert Millan <rmh at debian.org>  Thu, 21 Jun 2012 20:07:29 +0200
 

Deleted: trunk/freebsd-utils/debian/kbdcontrol.config
===================================================================
--- trunk/freebsd-utils/debian/kbdcontrol.config	2012-06-21 18:14:29 UTC (rev 4324)
+++ trunk/freebsd-utils/debian/kbdcontrol.config	2012-06-21 18:17:36 UTC (rev 4325)
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -e
-
-choices="be.iso.acc.kbd, be.iso.kbd, bg.bds.ctrlcaps.kbd, bg.phonetic.ctrlcaps.kbd, br275.cp850.kbd, br275.iso.acc.kbd, br275.iso.kbd, by.cp1131.kbd, by.cp1251.kbd, by.iso5.kbd, ce.iso2.kbd, colemak.iso15.acc.kbd, cs.latin2.qwertz.kbd, cz.iso2.kbd, danish.cp865.kbd, danish.iso.acc.kbd, danish.iso.kbd, dutch.iso.acc.kbd, eee_nordic.kbd, el.iso07.kbd, estonian.cp850.kbd, estonian.iso.kbd, estonian.iso15.kbd, finnish.cp850.kbd, finnish.iso.kbd, fr.dvorak.acc.kbd, fr.dvorak.kbd, fr.iso.acc.kbd, fr.iso.kbd, fr.macbook.acc.kbd, fr_CA.iso.acc.kbd, german.cp850.kbd, german.iso.acc.kbd, german.iso.kbd, gr.elot.acc.kbd, gr.us101.acc.kbd, hr.iso.kbd, hu.iso2.101keys.kbd, hu.iso2.102keys.kbd, hy.armscii-8.kbd, icelandic.iso.acc.kbd, icelandic.iso.kbd, it.iso.kbd, iw.iso8.kbd, jp.106.kbd, jp.106x.kbd, jp.pc98.iso.kbd, jp.pc98.kbd, kk.pt154.io.kbd, kk.pt154.kst.kbd, latinamerican.iso.acc.kbd, latinamerican.kbd, lt.iso4.kbd, norwegian.dvorak.kbd, norwegian.iso.kbd, pl_PL.ISO8859-2.kbd, pl_PL.dvorak.kbd, pt.iso.acc.kbd, pt.iso.kbd, ru.cp866.kbd, ru.iso5.kbd, ru.koi8-r.kbd, ru.koi8-r.shift.kbd, ru.koi8-r.win.kbd, si.iso.kbd, sk.iso2.kbd, spanish.iso.acc.kbd, spanish.iso.kbd, spanish.iso15.acc.kbd, swedish.cp850.kbd, swedish.iso.kbd, swissfrench.cp850.kbd, swissfrench.iso.acc.kbd, swissfrench.iso.kbd, swissgerman.cp850.kbd, swissgerman.iso.acc.kbd, swissgerman.iso.kbd, swissgerman.macbook.acc.kbd, tr.iso9.q.kbd, ua.iso5.kbd, ua.koi8-u.kbd, ua.koi8-u.shift.alt.kbd, uk.cp850-ctrl.kbd, uk.cp850.kbd, uk.dvorak.kbd, uk.iso-ctrl.kbd, uk.iso.kbd, us.dvorak.kbd, us.dvorakl.kbd, us.dvorakr.kbd, us.dvorakx.kbd, us.emacs.kbd, us.iso.acc.kbd, us.iso.kbd, us.pc-ctrl.kbd, us.unix.kbd"
-
-. /usr/share/debconf/confmodule
-
-db_subst kbdcontrol/keymap choices "$choices"
-db_input high kbdcontrol/keymap || true
-db_go

Modified: trunk/freebsd-utils/debian/kbdcontrol.init
===================================================================
--- trunk/freebsd-utils/debian/kbdcontrol.init	2012-06-21 18:14:29 UTC (rev 4324)
+++ trunk/freebsd-utils/debian/kbdcontrol.init	2012-06-21 18:17:36 UTC (rev 4325)
@@ -94,18 +94,8 @@
 }
 
 
-do_start() {
-	if test -e /etc/kbdcontrol.conf ; then
-		echo -n "Loading console keymap..."
-		kbdcontrol -l `grep -v ^# /etc/kbdcontrol.conf` < /dev/console
-		echo "done."
-	fi
-}
-
-
 case "$1" in
   start|"")
-	do_start
 	if [ $FLAVOUR = debian ]
 	then
 		alter_to_debian_keymap < /dev/console

Modified: trunk/freebsd-utils/debian/kbdcontrol.postinst
===================================================================
--- trunk/freebsd-utils/debian/kbdcontrol.postinst	2012-06-21 18:14:29 UTC (rev 4324)
+++ trunk/freebsd-utils/debian/kbdcontrol.postinst	2012-06-21 18:17:36 UTC (rev 4325)
@@ -9,16 +9,8 @@
 
 case "$1" in
     configure)
-      db_get kbdcontrol/keymap
-      if [ "$RET" = "none" ] ; then
-        rm -f /etc/kbdcontrol.conf
-      else
-        cat > /etc/kbdcontrol.conf << EOF
-# Do not edit this file!  It is automatically generated by kbdcontrol
-# Use "dpkg-reconfigure kbdcontrol" instead.
-$RET
-EOF
-      fi
+      # Obsoleted by /etc/init.d/keyboard-setup
+      rm -f /etc/kbdcontrol.conf
 
       # TEKEN_XTERM transition
       if test -e /etc/inittab ; then

Deleted: trunk/freebsd-utils/debian/kbdcontrol.templates
===================================================================
--- trunk/freebsd-utils/debian/kbdcontrol.templates	2012-06-21 18:14:29 UTC (rev 4324)
+++ trunk/freebsd-utils/debian/kbdcontrol.templates	2012-06-21 18:17:36 UTC (rev 4325)
@@ -1,9 +0,0 @@
-Template: kbdcontrol/keymap
-Type: select
-Choices: ${choices}
-Default: us.iso.kbd
-_Description: Keymap:
- Please choose the keyboard map.
- .
- If in doubt, don't choose any map. You can always come back to
- this question with "dpkg-reconfigure kbdcontrol".

Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules	2012-06-21 18:14:29 UTC (rev 4324)
+++ trunk/freebsd-utils/debian/rules	2012-06-21 18:17:36 UTC (rev 4325)
@@ -159,8 +159,6 @@
 kbdcontrol: kbdcontrol-stamp
 kbdcontrol-stamp:
 	$(PMAKE) -C usr.sbin/kbdcontrol
-	sed -i -e "s/^choices=.*/choices=\"`cd share/syscons/keymaps && echo *.kbd | sed -e 's/ /, /g'`\"/g" \
-	debian/kbdcontrol.config
 	touch $@
 
 vidcontrol: vidcontrol-stamp