[Pkg-kbd-commit] r218 - people/zinoviev/console-setup/debian

[Anton Zinoviev]

Author: zinoviev
Date: 2006-10-18 18:26:32 +0000 (Wed, 18 Oct 2006)
New Revision: 218

Modified:
   people/zinoviev/console-setup/debian/changelog
   people/zinoviev/console-setup/debian/config.proto
   people/zinoviev/console-setup/debian/console-setup.postinst
   people/zinoviev/console-setup/debian/rules
Log:
console-setup: debconf of console-setup-mini do not ask questions about the encoding


Modified: people/zinoviev/console-setup/debian/changelog
===================================================================
--- people/zinoviev/console-setup/debian/changelog	2006-10-18 17:41:02 UTC (rev 217)
+++ people/zinoviev/console-setup/debian/changelog	2006-10-18 18:26:32 UTC (rev 218)
@@ -6,8 +6,10 @@
   * New mini-font georgian16.bdf to be used for the Georgian letters in
     Fixed16, author: Gia Shervashidze.  Thanks to Vladimer Sichinava.
   * Add FAQ.  Thanks to Thue Janus Kristensen, closes: #389963, #389970.
+  * Remove the udebs in order to make the migration from unstable to
+    testing automatical.
 
- -- Anton Zinoviev <zinoviev at debian.org>  Mon,  2 Oct 2006 20:43:03 +0300
+ -- Anton Zinoviev <zinoviev at debian.org>  Wed, 18 Oct 2006 20:41:28 +0300
 
 console-setup (1.8) unstable; urgency=low
 

Modified: people/zinoviev/console-setup/debian/config.proto
===================================================================
--- people/zinoviev/console-setup/debian/config.proto	2006-10-18 17:41:02 UTC (rev 217)
+++ people/zinoviev/console-setup/debian/config.proto	2006-10-18 18:26:32 UTC (rev 218)
@@ -65,6 +65,10 @@
 
 CONFIGFILE=/etc/default/console-setup
 
+## PACKAGE ## Will be replaced by assignment for $package
+
+# package=console-setup
+
 ## FONTSETS ## Will be replaced by assignment for $fontsets:
 
 # fontsets='Arabic-Fixed15
@@ -1521,20 +1525,29 @@
 	    fi
 	    ;;		    
 	5)
-	    # add commas
-	    choices=`echo "$charmaps" | sed -e 's/$/,/g' | sort `
-	    # remove newlines
-	    choices=`echo $choices | sed -e 's/,$//' `
-	    db_subst console-setup/charmap CHOICES "$choices"
-	    db_default console-setup/charmap "$default_charmap"
-	    db_input $charmap_priority console-setup/charmap || true
-	    if db_go; then
-		STATE=$(($STATE + 1))
+	    if [ "$package" = console-setup-mini ]; then
+		if [ "$STATE" -ge "$old_state" ]; then
+		    STATE=$(($STATE + 1))
+		else
+		    STATE=$(($STATE - 1))
+		fi
+		charmap=UTF-8
 	    else
-		STATE=$(($STATE - 1))
+		# add commas
+		choices=`echo "$charmaps" | sed -e 's/$/,/g' | sort `
+		# remove newlines
+		choices=`echo $choices | sed -e 's/,$//' `
+		db_subst console-setup/charmap CHOICES "$choices"
+		db_default console-setup/charmap "$default_charmap"
+		db_input $charmap_priority console-setup/charmap || true
+		if db_go; then
+		    STATE=$(($STATE + 1))
+		else
+		    STATE=$(($STATE - 1))
+		fi
+		db_get console-setup/charmap
+		charmap=$RET
 	    fi
-	    db_get console-setup/charmap
-	    charmap=$RET
 	    ;;
 	6)
 	    db_default console-setup/codeset "$default_codeset"

Modified: people/zinoviev/console-setup/debian/console-setup.postinst
===================================================================
--- people/zinoviev/console-setup/debian/console-setup.postinst	2006-10-18 17:41:02 UTC (rev 217)
+++ people/zinoviev/console-setup/debian/console-setup.postinst	2006-10-18 18:26:32 UTC (rev 218)
@@ -45,8 +45,12 @@
 
     fontname=$codeset-$fontface$fontsize.psf.gz
     
-    db_get console-setup/charmap
-    charmap="$RET"
+    if which ckbcomp-mini >/dev/null; then
+	charmap=UTF-8
+    else
+	db_get console-setup/charmap
+	charmap="${RET:-UTF-8}"
+    fi
 
     db_get console-setup/ttys
     ttys="$RET"

Modified: people/zinoviev/console-setup/debian/rules
===================================================================
--- people/zinoviev/console-setup/debian/rules	2006-10-18 17:41:02 UTC (rev 217)
+++ people/zinoviev/console-setup/debian/rules	2006-10-18 18:26:32 UTC (rev 218)
@@ -12,6 +12,10 @@
 
 debian/console-setup.config debian/console-setup-mini.config: debian/config.proto main_build
 	awk ' \
+/## *PACKAGE *##/ { \
+    printf "package=$(notdir $(basename $@))"; \
+    next; \
+} \
 /## *FONTSETS *##/ { \
     printf "fontsets='\''"; \
     system("cd Fonts && ls *.psf | sed '\''s/.psf$$//'\''"); \
@@ -32,8 +36,7 @@
 } \
 { \
    print; \
-}' debian/config.proto >debian/console-setup.config
-	cp debian/console-setup.config debian/console-setup-mini.config
+}' debian/config.proto >$@
 
 build: main_build debian/console-setup.config debian/console-setup-mini.config