todo in i18n of cdebconf
Hi,
I've just committed the following.
Index: debian/changelog
===================================================================
RCS file: /org/cvs.debian.org/cvs/debian-boot/debian-installer/tools/cdebconf/debian/changelog,v
retrieving revision 1.28
diff -u -r1.28 changelog
--- debian/changelog 16 Sep 2002 23:40:53 -0000 1.28
+++ debian/changelog 19 Sep 2002 17:10:01 -0000
@@ -1,3 +1,13 @@
+cdebconf (0.24) unstable; urgency=low
+
+ * NOT YET RELEASED
+ * Junichi Uekawa:
+ - debconf, debconf-copydb, debconf-loadtemplate, dpkg-reconfigure: call setlocale
+ - link slang frontend against slang-utf8
+ - Build-Depend on slang-utf8-dev
+
+ -- Junichi Uekawa <dancer@debian.org> Fri, 20 Sep 2002 01:37:34 +0900
+
cdebconf (0.23) unstable; urgency=low
* Change the database names to match the names currently used in
Index: debian/control
===================================================================
RCS file: /org/cvs.debian.org/cvs/debian-boot/debian-installer/tools/cdebconf/debian/control,v
retrieving revision 1.15
diff -u -r1.15 control
--- debian/control 7 Sep 2002 02:12:58 -0000 1.15
+++ debian/control 19 Sep 2002 17:10:06 -0000
@@ -1,6 +1,6 @@
Source: cdebconf
Section: utils
-Build-Depends: dpkg-dev (>= 1.7.0), debhelper (>= 2.1.18), slang1-dev, libbogl-dev [!hurd-i386], libperl-dev, d-shlibs (>= 0.3)
+Build-Depends: dpkg-dev (>= 1.7.0), debhelper (>= 2.1.18), slang1-utf8-dev, libbogl-dev [!hurd-i386], libperl-dev, d-shlibs (>= 0.3)
Priority: optional
Maintainer: Randolph Chung <tausq@debian.org>
Standards-Version: 3.5.6.1
Index: src/debconf-copydb.c
===================================================================
RCS file: /org/cvs.debian.org/cvs/debian-boot/debian-installer/tools/cdebconf/src/debconf-copydb.c,v
retrieving revision 1.2
diff -u -r1.2 debconf-copydb.c
--- src/debconf-copydb.c 26 Aug 2002 12:11:37 -0000 1.2
+++ src/debconf-copydb.c 19 Sep 2002 17:10:06 -0000
@@ -45,6 +45,7 @@
#include <getopt.h>
#include <unistd.h>
+#include <locale.h>
static struct option g_dpc_args[] = {
{ "help", 0, NULL, 'h' },
@@ -72,6 +73,8 @@
void *iter;
int c;
+ setlocale(LC_ALL, "");
+
while ((c = getopt_long(argc, argv, "h", g_dpc_args, NULL) > 0))
{
switch (c)
Index: src/debconf-loadtemplate.c
===================================================================
RCS file: /org/cvs.debian.org/cvs/debian-boot/debian-installer/tools/cdebconf/src/debconf-loadtemplate.c,v
retrieving revision 1.6
diff -u -r1.6 debconf-loadtemplate.c
--- src/debconf-loadtemplate.c 7 Aug 2002 16:38:19 -0000 1.6
+++ src/debconf-loadtemplate.c 19 Sep 2002 17:10:11 -0000
@@ -47,6 +47,7 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
+#include <locale.h>
void parsecmdline(struct configuration *config, int argc, char **argv)
{
@@ -79,6 +80,8 @@
struct template *t = NULL;
struct question *q = NULL;
int i = 2;
+
+ setlocale(LC_ALL, "");
config = config_new();
parsecmdline(config, argc, argv);
Index: src/debconf.c
===================================================================
RCS file: /org/cvs.debian.org/cvs/debian-boot/debian-installer/tools/cdebconf/src/debconf.c,v
retrieving revision 1.7
diff -u -r1.7 debconf.c
--- src/debconf.c 1 Jul 2002 06:58:37 -0000 1.7
+++ src/debconf.c 19 Sep 2002 17:10:11 -0000
@@ -6,6 +6,7 @@
#include <signal.h>
#include <string.h>
#include <getopt.h>
+#include <locale.h>
static struct configuration *config = NULL;
static struct frontend *frontend = NULL;
@@ -77,6 +78,7 @@
int main(int argc, char **argv)
{
signal(SIGINT, sighandler);
+ setlocale (LC_ALL, "");
config = config_new();
if (!config) {
Index: src/dpkg-reconfigure.c
===================================================================
RCS file: /org/cvs.debian.org/cvs/debian-boot/debian-installer/tools/cdebconf/src/dpkg-reconfigure.c,v
retrieving revision 1.12
diff -u -r1.12 dpkg-reconfigure.c
--- src/dpkg-reconfigure.c 16 Sep 2002 23:36:09 -0000 1.12
+++ src/dpkg-reconfigure.c 19 Sep 2002 17:10:17 -0000
@@ -47,6 +47,8 @@
#include <signal.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include <locale.h>
+
#include "confmodule.h"
#include "configuration.h"
@@ -377,6 +379,7 @@
int opt, ret;
signal(SIGINT, sighandler);
+ setlocale (LC_ALL, "");
g_config = config_new();
Index: src/modules/frontend/slang/Makefile
===================================================================
RCS file: /org/cvs.debian.org/cvs/debian-boot/debian-installer/tools/cdebconf/src/modules/frontend/slang/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- src/modules/frontend/slang/Makefile 9 Jul 2002 05:25:04 -0000 1.3
+++ src/modules/frontend/slang/Makefile 19 Sep 2002 17:10:19 -0000
@@ -3,5 +3,6 @@
OBJS=slang.opic
MODLDFLAGS=-lslang
+MODCFLAGS=-DUTF8
include ../modules.mak
--
dancer@debian.org : Junichi Uekawa http://www.netfort.gr.jp/~dancer
GPG Fingerprint : 17D6 120E 4455 1832 9423 7447 3059 BF92 CD37 56F4
Libpkg-guide: http://www.netfort.gr.jp/~dancer/column/libpkg-guide/
Reply to: