rpms/Canna/devel Canna-3.6-bonobo.patch, NONE, 1.1 Canna-3.6-cannadic.patch, NONE, 1.1 Canna-3.6-dont-grab-ctrl-o.patch, NONE, 1.1 Canna-3.6-fix-warnings.patch, NONE, 1.1 Canna-3.6-sharedir.patch, NONE, 1.1 Canna-3.6-shion.patch, NONE, 1.1 Canna-3.6-wconv.patch, NONE, 1.1 Canna-3.7p1-fix-duplicated-strings.patch, NONE, 1.1 Canna-3.7p1-notimeout.patch, NONE, 1.1 Canna-3.7p3-fix-gcc4-warning.patch, NONE, 1.1 Canna-3.7p3-redecl.patch, NONE, 1.1 Canna-3.7p3-yenbs.patch, NONE, 1.1 Canna-conf.patch, NONE, 1.1 Canna-oldsock.patch, NONE, 1.1 Canna-x86_64.patch, NONE, 1.1 Canna.spec, NONE, 1.1 canna.init, NONE, 1.1 cannaping.c, NONE, 1.1 dot-canna, NONE, 1.1 skk-dictionaries.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Akira Tagoh (tagoh)
fedora-extras-commits at redhat.com
Mon Sep 26 09:29:17 UTC 2005
Author: tagoh
Update of /cvs/extras/rpms/Canna/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3685/devel
Modified Files:
.cvsignore sources
Added Files:
Canna-3.6-bonobo.patch Canna-3.6-cannadic.patch
Canna-3.6-dont-grab-ctrl-o.patch Canna-3.6-fix-warnings.patch
Canna-3.6-sharedir.patch Canna-3.6-shion.patch
Canna-3.6-wconv.patch Canna-3.7p1-fix-duplicated-strings.patch
Canna-3.7p1-notimeout.patch Canna-3.7p3-fix-gcc4-warning.patch
Canna-3.7p3-redecl.patch Canna-3.7p3-yenbs.patch
Canna-conf.patch Canna-oldsock.patch Canna-x86_64.patch
Canna.spec canna.init cannaping.c dot-canna
skk-dictionaries.patch
Log Message:
auto-import Canna-3.7p3-13 on branch devel from Canna-3.7p3-13.src.rpm
Canna-3.6-bonobo.patch:
--- NEW FILE Canna-3.6-bonobo.patch ---
--- Canna36/dic/ideo/words/dics.dir.orig Tue Apr 2 18:08:49 2002
+++ Canna36/dic/ideo/words/dics.dir Tue Apr 2 18:09:06 2002
@@ -54,3 +54,6 @@
pub.cld(pub.mwd) -pub---
scien.cld(scien.mwd) -scien---
sup.cld(sup.mwd) -sup---
+
+bonobo.cbd(bonobo.mwd) -bonobo---
+bonobo.cld(bonobo.mwd) -bonobo---
Canna-3.6-cannadic.patch:
--- NEW FILE Canna-3.6-cannadic.patch ---
--- Canna36/dic/ideo/words/dics.dir.orig Sat Jan 5 23:03:06 2002
+++ Canna36/dic/ideo/words/dics.dir Sat Jan 5 23:04:54 2002
@@ -40,3 +40,7 @@
software.ctd(.mwd) -software---
zipcode.ctd(.mwd) -zipcode---
geo.ctd(.mwd) -geo---
+gcanna.cbd(gcanna.mwd) -gcanna---
+gcanna.cld(gcanna.mwd) -gcanna---
+gcannaf.cbd(gcannaf.swd) -gcannaf---
+gcannaf.cld(gcannaf.swd) -gcannaf---
Canna-3.6-dont-grab-ctrl-o.patch:
--- NEW FILE Canna-3.6-dont-grab-ctrl-o.patch ---
diff -ruN Canna36p3.orig/lib/canna/alphamap.h Canna36p3/lib/canna/alphamap.h
--- Canna36p3.orig/lib/canna/alphamap.h 2003-04-21 18:44:26.000000000 +0900
+++ Canna36p3/lib/canna/alphamap.h 2003-04-21 18:46:01.000000000 +0900
@@ -65,7 +65,7 @@
/* C-l */ CANNA_FN_SelfInsert,
/* C-m */ CANNA_FN_SelfInsert,
/* C-n */ CANNA_FN_SelfInsert,
-/* C-o */ CANNA_FN_JapaneseMode,
+/* C-o */ CANNA_FN_SelfInsert,
/* C-p */ CANNA_FN_SelfInsert,
/* C-q */ CANNA_FN_SelfInsert,
/* C-r */ CANNA_FN_SelfInsert,
Canna-3.6-fix-warnings.patch:
--- NEW FILE Canna-3.6-fix-warnings.patch ---
diff -ruN Canna36p3.orig/lib/canna/kctrl.c Canna36p3/lib/canna/kctrl.c
--- Canna36p3.orig/lib/canna/kctrl.c 2003-04-21 18:44:26.000000000 +0900
+++ Canna36p3/lib/canna/kctrl.c 2003-04-21 19:03:24.000000000 +0900
@@ -27,6 +27,7 @@
#include "canna.h"
#include <errno.h>
+#include <string.h>
#include <sys/types.h>
#include <canna/mfdef.h>
Canna-3.6-sharedir.patch:
--- NEW FILE Canna-3.6-sharedir.patch ---
diff -ruN Canna36p3.orig/lib/canna/romaji.c Canna36p3/lib/canna/romaji.c
--- Canna36p3.orig/lib/canna/romaji.c 2003-03-25 18:41:14.000000000 +0900
+++ Canna36p3/lib/canna/romaji.c 2003-03-26 17:11:58.000000000 +0900
@@ -438,7 +438,6 @@
}
}
-#if 0 /* currently CANNASHAREDDIR is not defined */
if (retval == (struct RkRxDic *)NULL) { /* added for Debian by ISHIKAWA Mutsumi <ishikawa at linux.or.jp> */
extern jrUserInfoStruct *uinfo;
@@ -463,7 +462,6 @@
}
}
}
-#endif
if (retval == (struct RkRxDic *)NULL) { /* Á´Éô¥ª¡¼¥×¥ó¤Ç¤¤Ê¤¤ */
sprintf(rdic,
Canna-3.6-shion.patch:
--- NEW FILE Canna-3.6-shion.patch ---
--- Canna36/dic/ideo/words/dics.dir.shion Wed Jan 9 18:00:33 2002
+++ Canna36/dic/ideo/words/dics.dir Wed Jan 9 18:02:04 2002
@@ -44,4 +44,15 @@
gcanna.cbd(gcanna.mwd) -gcanna---
gcanna.cld(gcanna.mwd) -gcanna---
gcannaf.cbd(gcannaf.swd) -gcannaf---
gcannaf.cld(gcannaf.swd) -gcannaf---
+
+basho.cbd(basho.mwd) -basho---
+keisan.cbd(keisan.mwd) -keisan---
+pub.cbd(pub.mwd) -pub---
+scien.cbd(scien.mwd) -scien---
+sup.cbd(sup.mwd) -sup---
+basho.cld(basho.mwd) -basho---
+keisan.cld(keisan.mwd) -keisan---
+pub.cld(pub.mwd) -pub---
+scien.cld(scien.mwd) -scien---
+sup.cld(sup.mwd) -sup---
Canna-3.6-wconv.patch:
--- NEW FILE Canna-3.6-wconv.patch ---
--- Canna36/server/wconvert.c.orig 2002-11-01 17:21:49.000000000 +0900
+++ Canna36/server/wconvert.c 2002-11-01 17:23:25.000000000 +0900
@@ -2096,12 +2096,12 @@
char *buf = (char *)0;
if (validcontext(cxnum, client, wThrough)) {
- buf = malloc((int)Request.type20.bufsize);
+ content_size = Request.type20.datalen - (SIZEOFINT * 2 + SIZEOFSHORT);
+ buf = malloc(content_size);
if (buf) {
- content_size = Request.type20.datalen - (SIZEOFINT * 2 + SIZEOFSHORT);
bcopy(Request.type20.buf, buf, content_size);
stat = size = RkThrough(cxnum, Request.type20.command,
- buf, content_size, (int)Request.type20.bufsize);
+ buf, content_size, content_size);
}
}
retval = SendType6Reply(client, wThrough, EXTPROTO, stat, buf, size);
Canna-3.7p1-fix-duplicated-strings.patch:
--- NEW FILE Canna-3.7p1-fix-duplicated-strings.patch ---
diff -ruN Canna37p1.orig/lib/canna/romaji.c Canna37p1/lib/canna/romaji.c
--- Canna37p1.orig/lib/canna/romaji.c 2004-03-17 17:56:42.651277000 +0900
+++ Canna37p1/lib/canna/romaji.c 2004-03-17 17:57:23.207908504 +0900
@@ -21,7 +21,7 @@
*/
#if !defined(lint) && !defined(__CODECENTER__)
-static char rcs_id[] = "@(#) 102.1 $Id: romaji.c,v 1.10 2003/09/17 08:50:53 aida_s Exp $";
+static char rcs_id[] = "@(#) 102.1 $Id: romaji.c,v 1.11 2004/03/15 04:33:23 aida_s Exp $";
#endif /* lint */
#include "canna.h"
@@ -2626,6 +2626,7 @@
yc->englishtype = CANNA_ENG_KANA;
yc->cStartp = yc->cRStartp = 0;
yc->jishu_kEndp = 0;
+ yc->n_susp_chars = 0;
}
static int
@@ -2782,8 +2783,13 @@
}
yc->last_rule = 0;
howManyDelete = howFarToGoBackward(yc);
- if (howManyDelete > 0 && (yc->generalFlags & CANNA_YOMI_BREAK_ROMAN)) {
- yc->generalFlags &= ~CANNA_YOMI_BREAK_ROMAN;
+ if (howManyDelete > 0 && (yc->generalFlags & CANNA_YOMI_BREAK_ROMAN)
+ && (yc->kAttr[yc->kCurs] & SENTOU)) {
+ /*
+ * ¥í¡¼¥Þ»ú1ʸ»ú¤ËÂбþ¤¹¤ë²¾Ì¾¤ò¾Ã¤·¤¿»þ¤Ï¥í¡¼¥Þ»ú¡¢²¾Ì¾¤È¤â
+ * SENTOU¥Õ¥é¥°¤¬1¸Ä¸º¤ë¡£
+ * ¤½¤¦¤Ç¤Ê¤¤¤È¤¤ÏSENTOU¥Õ¥é¥°¤Î¸Ä¿ô¤ÏÊѤï¤é¤Ê¤¤
+ */
yc->rStartp = yc->rCurs - 1;
while ( yc->rStartp > 0 && !(yc->rAttr[yc->rStartp] & SENTOU) ) {
yc->rStartp--;
@@ -2792,16 +2798,23 @@
yc->kRStartp = yc->kCurs - 1;
while ( yc->kRStartp > 0 && !(yc->kAttr[yc->kRStartp] & SENTOU) )
yc->kRStartp--;
+ /* ¤³¤ìɬ¤º¿¿¤Ç¤Ï? */
prevflag = (yc->kAttr[yc->kRStartp] & SENTOU);
kanaReplace(yc->kRStartp - yc->kCurs,
yc->romaji_buffer + yc->rStartp,
yc->rCurs - yc->rStartp,
0);
+ /* ¥í¡¼¥Þ»ú1ʸ»ú¤ËÂбþ¤¹¤ë²¾Ì¾¤ò¾Ã¤·¤¿¤È¤¤ÏºÇ½é¤«¤éSENTOU¤Ç¤¢¤ë */
yc->kAttr[yc->kRStartp] |= prevflag;
yc->n_susp_chars = 0; /* ¤È¤ê¤¢¤¨¤º¥¯¥ê¥¢¤·¤Æ¤ª¤¯ */
makePhonoOnBuffer(d, yc, (unsigned char)0, 0, 0);
+ /* °ÊÁ°¤Ï¾ï¤Ë¥Õ¥é¥°¤ò²¼¤²¤Æ¤¤¤¿¤¬¡¢Ì¤ÊÑ´¹¥í¡¼¥Þ»ú¤¬»Ä¤Ã¤Æ¤¤¤ë¤È¤¤Ï
+ * ¥Õ¥é¥°¤ò²¼¤²¤Ê¤¤¤³¤È¤Ë¤¹¤ë */
+ if (yc->kRStartp == yc->kCurs)
+ yc->generalFlags &= ~CANNA_YOMI_BREAK_ROMAN;
}
else {
+ yc->generalFlags &= ~CANNA_YOMI_BREAK_ROMAN;
if ( yc->kAttr[yc->kCurs - howManyDelete] & HENKANSUMI ) {
if (yc->kAttr[yc->kCurs - howManyDelete] & SENTOU) {
/* ¥í¡¼¥Þ»ú¤«¤ÊÊÑ´¹¤ÎÀèƬ¤À¤Ã¤¿¤é */
@@ -2821,6 +2834,12 @@
yc->rEndp -= n;
}
else {
+ /* ²¾Ì¾¤Î¥«¡¼¥½¥ë°ÌÃÖ¤ÏÀèƬ¤Ë¤Ê¤ë¤Î¤Ç¥í¡¼¥Þ»ú¤Î¥«¡¼¥½¥ë¤âÆ°¤«¤¹*/
+ while ( yc->rCurs > 0 && !(yc->rAttr[--yc->rCurs] & SENTOU) )
+ ;
+ if (yc->rCurs < yc->rStartp) {
+ yc->rStartp = yc->rCurs;
+ }
yc->kAttr[yc->kCurs] |= SENTOU;
}
}
@@ -2829,6 +2848,12 @@
romajiReplace(-howManyDelete, (wchar_t *)NULL, 0, 0);
}
kanaReplace(-howManyDelete, (wchar_t *)NULL, 0, 0);
+ if ((yc->rAttr[yc->rCurs] & SENTOU) && yc->kRStartp == yc->kCurs) {
+ /* ̤ÊÑ´¹¤Î¥í¡¼¥Þ»ú¤ò¾Ã¤·¤Æ¤·¤Þ¤Ã¤¿¤Î¤Ç¡¢¼¡¤ËÆþÎϤ·¤¿¥í¡¼¥Þ»ú¤Ï
+ * SENTOU¤Ë¤Ê¤ëÊý¤¬¼«Á³¤À¤í¤¦
+ */
+ yc->rStartp = yc->rCurs;
+ }
}
debug_yomi(yc);
return(0);
@@ -2944,6 +2969,7 @@
currentModeInfo(d);
}
makeYomiReturnStruct(d);
+ debug_yomi(yc);
return 0;
}
Canna-3.7p1-notimeout.patch:
--- NEW FILE Canna-3.7p1-notimeout.patch ---
ãƒã‚¤ãƒŠãƒªãƒ¼ãƒ»ãƒ•ã‚¡ã‚¤ãƒ«Canna37p1.orig/lib/RKC/.wconvert.c.swpã¨Canna37p1/lib/RKC/.wconvert.c.swpã¯é•ã„ã¾ã™
diff -ruN Canna37p1.orig/lib/RKC/conf.c Canna37p1/lib/RKC/conf.c
--- Canna37p1.orig/lib/RKC/conf.c 2003-12-28 02:15:24.000000000 +0900
+++ Canna37p1/lib/RKC/conf.c 2004-02-19 22:24:48.882713989 +0900
@@ -1496,7 +1496,7 @@
};
const NumberDefaultRec host_num_defaults[] = {
- { CONF_SERVER_TIMEOUT, 1500u },
+ { CONF_SERVER_TIMEOUT, 0u },
};
const char *
Canna-3.7p3-fix-gcc4-warning.patch:
--- NEW FILE Canna-3.7p3-fix-gcc4-warning.patch ---
diff -ruN Canna37p3.orig/cmd/crxgram/crxgram.c Canna37p3/cmd/crxgram/crxgram.c
--- Canna37p3.orig/cmd/crxgram/crxgram.c 2003-03-24 13:04:25.000000000 +0900
+++ Canna37p3/cmd/crxgram/crxgram.c 2005-03-02 17:15:28.000000000 +0900
@@ -485,7 +485,7 @@
int j;
nextS = scanToken(nextS, namevec, sizeof(namevec));
- name = strtok(namevec, SEP);
+ name = strtok((char *)namevec, SEP);
for (j = 0; name && j < 255;) {
if (r = probeIdent(Row, name))
rdata[i][j++] = r->rownum;
diff -ruN Canna37p3.orig/cmd/cshost/cshost.c Canna37p3/cmd/cshost/cshost.c
--- Canna37p3.orig/cmd/cshost/cshost.c 2003-12-28 02:15:22.000000000 +0900
+++ Canna37p3/cmd/cshost/cshost.c 2005-03-02 17:15:28.000000000 +0900
@@ -152,12 +152,12 @@
goto protoerr;
assert(wp + 2 <= endp);
printf("HOST NAME:%s\n", wp ) ;
- wp += strlen( wp ) + 1 ;
+ wp += strlen((char *) wp ) + 1 ;
if( *wp ) {
printf("USER NAME:" ) ;
while( *wp ) {
printf("%s ", wp ) ;
- wp += strlen( wp ) + 1 ;
+ wp += strlen((char *) wp ) + 1 ;
}
} else
printf("ALL USER" ) ;
diff -ruN Canna37p3.orig/cmd/wtoc/wtoc.c Canna37p3/cmd/wtoc/wtoc.c
--- Canna37p3.orig/cmd/wtoc/wtoc.c 2003-12-28 02:15:23.000000000 +0900
+++ Canna37p3/cmd/wtoc/wtoc.c 2005-03-02 17:15:28.000000000 +0900
@@ -144,8 +144,8 @@
int hindo;
{
if( !strcmp((char *)hinshi,"#kxuru") || !strcmp((char *)hinshi,"#sxuru")){
- strcat(yomi,"¤ë");
- strcat(kouho,"¤ë");
+ strcat((char *)yomi,"¤ë");
+ strcat((char *)kouho,"¤ë");
}
if( hindo == 0 )
fprintf( fp, "%s %s %s \n", yomi, hinshi, kouho );
diff -ruN Canna37p3.orig/lib/canna/ebind.c Canna37p3/lib/canna/ebind.c
--- Canna37p3.orig/lib/canna/ebind.c 2003-09-17 17:50:53.000000000 +0900
+++ Canna37p3/lib/canna/ebind.c 2005-03-02 17:15:28.000000000 +0900
@@ -364,7 +364,7 @@
/* list_cb¤ÏKC_setListCallback¤Çd->elistcb¤Ë°ú¤Ã±Û¤¹ */
list_cb.client_data = (char *)arg;
list_cb.callback_func = &EUCListCallback;
- ret = XwcKanjiControl2(display, window, request, (char *)&list_cb);
+ ret = XwcKanjiControl2(display, window, request, (BYTE *)&list_cb);
goto return_ret;
/* FALLTHROUGH */
default: /* ¥ï¥¤¥É¤Ç¤âEUC¤Ç¤âÊѤï¤é¤Ê¤¤¤â¤Î */
diff -ruN Canna37p3.orig/lib/canna/obind.c Canna37p3/lib/canna/obind.c
--- Canna37p3.orig/lib/canna/obind.c 2004-04-27 07:49:21.000000000 +0900
+++ Canna37p3/lib/canna/obind.c 2005-03-02 17:15:28.000000000 +0900
@@ -500,7 +500,7 @@
/* list_cb¤ÏKC_setListCallback¤Çd->elistcb¤Ë°ú¤Ã±Û¤¹ */
list_cb.client_data = (char *)arg;
list_cb.callback_func = &owcListCallback;
- ret = XwcKanjiControl2(display, window, request, (char *)&list_cb);
+ ret = XwcKanjiControl2(display, window, request, (BYTE *)&list_cb);
goto return_ret;
default: /* ¿·¥ï¥¤¥É¤ÈÊѤï¤é¤Ê¤¤¤â¤Î */
ret = XwcKanjiControl2(display, window, request, arg);
diff -ruN Canna37p3.orig/server/convert.c Canna37p3/server/convert.c
--- Canna37p3.orig/server/convert.c 2003-12-28 02:15:24.000000000 +0900
+++ Canna37p3/server/convert.c 2005-03-02 17:15:28.000000000 +0900
@@ -1506,7 +1506,7 @@
const char *username;
const char *hostname;
{
- int (*ReqCallFunc) pro((char *, int)) ;
+ int (*ReqCallFunc) pro((BYTE *, int)) ;
register Req0 *req0 = &Request.Request0 ;
const char *username0 = username ? username : "";
const char *hostname0 = hostname ? hostname : "";
diff -ruN Canna37p3.orig/server/wconvert.c Canna37p3/server/wconvert.c
--- Canna37p3.orig/server/wconvert.c 2005-03-02 17:15:05.000000000 +0900
+++ Canna37p3/server/wconvert.c 2005-03-02 17:15:28.000000000 +0900
@@ -189,7 +189,7 @@
size_t size;
{
ir_debug( Dmsg(10, "WriteClient:") );
- ir_debug( DebugDump( 10, buf, size ) );
+ ir_debug( DebugDump( 10, (const char *)buf, size ) );
return ClientBuf_store_reply(client->client_buf, buf, size);
}
#else
@@ -1372,8 +1372,8 @@
/* °Ê²¼¡¢¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¤Î¥Á¥§¥Ã¥¯ */
stat = ACCES;
if (checkPermissionToRead(client, dirname, (char *)0) >= 0) {
- stat = RkwListDic(cxnum, (unsigned char *)dirname,
- (unsigned char *)dicnames, requestsize);
+ stat = RkwListDic(cxnum, (char *)dirname,
+ (char *)dicnames, requestsize);
}
listdicdone:
@@ -1403,7 +1403,7 @@
ir_debug( Dmsg(5, "dicname = %s\n",
(req->dicname)?req->dicname:null) );
- stat = (char)RkwCreateDic(cxnum, (unsigned char *)req->dicname,
+ stat = (char)RkwCreateDic(cxnum, (char *)req->dicname,
req->mode);
}
@@ -1438,7 +1438,7 @@
ir_debug( Dmsg(5, "dicname = %s\n",
(req->dicname)?req->dicname:null) );
- stat = (char)RkwRemoveDic(cxnum, (unsigned char *)req->dicname,
+ stat = (char)RkwRemoveDic(cxnum, (char *)req->dicname,
req->mode);
}
@@ -1456,8 +1456,8 @@
if (validcontext(cxnum, client, wRenameDictionary)) {
diclen = strlen(req->dicname) + 1 ;
- stat = RkwRenameDic(cxnum, (unsigned char *)req->dicname,
- (unsigned char *)&(req->dicname)[diclen],
+ stat = RkwRenameDic(cxnum, (char *)req->dicname,
+ (char *)&(req->dicname)[diclen],
req->mode);
}
return SendType2Reply(client, wRenameDictionary, EXTPROTO, stat);
@@ -1950,8 +1950,8 @@
ir_debug( Dmsg(5, "dicname = %s\n", Request.type15.dicname) );
ir_debug( Dmsg(5, "username = %s\n", username) );
- stat = (RkwQueryDic(cxnum, (unsigned char *)username,
- (unsigned char *)Request.type15.dicname,
+ stat = (RkwQueryDic(cxnum, (char *)username,
+ (char *)Request.type15.dicname,
dicinfo) < 0) ? -1 : 0;
if (stat < 0) {
Canna-3.7p3-redecl.patch:
--- NEW FILE Canna-3.7p3-redecl.patch ---
--- Canna37p3/lib/canna/lisp.c.redecl 2004-11-24 00:08:05.429789120 +0100
+++ Canna37p3/lib/canna/lisp.c 2004-11-24 00:08:30.246016480 +0100
@@ -1355,8 +1355,6 @@
static int
tyi()
{
- char *gets(), *fgets();
-
if (untyibuf) {
int ret = untyibuf[--untyip];
if (untyip == 0) {
Canna-3.7p3-yenbs.patch:
--- NEW FILE Canna-3.7p3-yenbs.patch ---
--- Canna37p3/lib/RK/RkGetDic.man.yenbs 2004-11-23 23:01:21.908416880 +0100
+++ Canna37p3/lib/RK/RkGetDic.man 2004-11-23 23:02:00.867494200 +0100
@@ -41,7 +41,7 @@
Dictionary names are got in the area \f2dics\f1 in the following format:
.P
.RS 0.2c
-dictionary-name-1 ¡ï0 dictionary-name-2 ¡ï0 ... dictionary-name-n ¡ï0 ¡ï0
+dictionary-name-1 \\0 dictionary-name-2 \\0 ... dictionary-name-n \\0 \\0
.RE
.P
The size of the area \f2dics\f1 is given in bytes by \f2maxdics\f1. The dictionary list is truncated in character strings when it exceeds this size.
Canna-conf.patch:
--- NEW FILE Canna-conf.patch ---
diff -ruN Canna37p1.orig/Canna.conf Canna37p1/Canna.conf
--- Canna37p1.orig/Canna.conf 2004-01-02 21:26:27.000000000 +0900
+++ Canna37p1/Canna.conf 2004-04-30 17:45:30.268087408 +0900
@@ -109,12 +109,12 @@
# define DefErrDir $(cannaPrefix)/log
# define DefLibCannaDir $(cannaExecPrefix)/lib
#else
-# define DefCannaPrefix /usr/local/canna
+# define DefCannaPrefix /usr
# ifdef ObsoleteInstallDir
# define DefErrDir /usr/spool/canna
# define DefLibCannaDir /usr/lib
# else
-# define DefErrDir /var/log
+# define DefErrDir /var/log/canna
# define DefLibCannaDir $(cannaExecPrefix)/lib
# endif
#endif
@@ -123,7 +123,7 @@
# define DefCannaLibDir $(cannaPrefix)/lib
#else
# define DefCannaSrvDir $(cannaExecPrefix)/sbin
-# define DefCannaLibDir $(cannaPrefix)/share/canna
+# define DefCannaLibDir $(cannaPrefix)/lib
#endif
#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) \
@@ -146,9 +146,11 @@
cannaSrvDir = DefCannaSrvDir
XCOMM cannaLibDir = /var/lib/canna
XCOMM cannaLibDir = /var/db/canna
-cannaLibDir = DefCannaLibDir
+cannaLibDir = /etc/canna
+cannaEtcDir = /etc/canna
+cannaShareDir = $(cannaPrefix)/share/canna
XCOMM cannaManDir = $(cannaPrefix)/share/man
-cannaManDir = $(cannaPrefix)/man
+cannaManDir = $(cannaPrefix)/share/man
cannaIncDir = $(cannaPrefix)/include/canna
libCannaDir = DefLibCannaDir
@@ -158,7 +160,7 @@
#define SupportOldWchar 1
/* IPv6¤òÍѤ¤¤ë¾ì¹ç¤Ï1¤ÈÄêµÁ¤·¤Æ¤¯¤À¤µ¤¤ */
-#define UseInet6 0 /* requires newer IPv6 implementation */
+#define UseInet6 1 /* requires newer IPv6 implementation */
/* 3.2·Ï¤«¤é3.6·Ï¤Þ¤Ç¤Î·Á¼°¤Î¼½ñ¤òºî¤ë¾ì¹ç¤Ï¤³¤ì¤òÄêµÁ¤·¤Æ¤¯¤À¤µ¤¤ */
/* #define DIC_3_6_COMPAT */
@@ -175,10 +177,10 @@
#ifdef InstallAsUser
cannaOwnerGroup =
#else
-cannaOwnerGroup = -o $(cannaOwner) -g $(cannaGroup)
+cannaOwnerGroup =
#endif
-cannaDsoRev = 1.2
+cannaDsoRev = 1.2.0
#if defined(cygwinArchitecture)
/* import library¤ÎÊý¤ò»ØÄꤷ¤Æ¤ª¤¯¡£DLLËÜÂΤÏ/usr/X11R6/bin¤ËÆþ¤ë¡£ */
@@ -199,8 +201,8 @@
CHGRP = :
CHMOD = :
#else
-CHOWN = chown
-CHGRP = chgrp
+CHOWN = echo
+CHGRP = echo
CHMOD = chmod
#endif
@@ -237,7 +239,7 @@
/* #define UseInstalledLibCanna YES */
#define UseInstalledLibCanna NO
-DicDir = $(cannaLibDir)/dic
+DicDir = /var/lib/canna/dic
/* ¤³¤³¤«¤é²¼¤ÏÊѹ¹ÉÔÍפǤ¹ */
@@ -339,10 +341,10 @@
#endif
#ifdef InstallAsUser
-UnixSockDir = $(cannaPrefix)/tmp/.iroha_unix
+UnixSockDir = $(cannaPrefix)/var/run/.iroha_unix
AccessFile = $(cannaPrefix)/etc/hosts.canna
#else
-UnixSockDir = /tmp/.iroha_unix
+UnixSockDir = /var/run/.iroha_unix
AccessFile = /etc/hosts.canna
#endif
UnixSockName = IROHA
diff -ruN Canna37p1.orig/Imakefile Canna37p1/Imakefile
--- Canna37p1.orig/Imakefile 2003-12-28 02:15:20.000000000 +0900
+++ Canna37p1/Imakefile 2004-04-30 17:45:01.586886913 +0900
@@ -58,6 +58,7 @@
@echo "#define CANNAHOSTFILE '$(cannaLibDir)/cannahost'" >> junkjunk
@echo "/* for lib/canna */" >> junkjunk
@echo "#define CANNALIBDIR '$(cannaLibDir)'" >> junkjunk
+ @echo "#define CANNASHAREDIR '$(cannaShareDir)'" >> junkjunk
@echo "#define SUPPORT_OLD_WCHAR '$(supportOldWchar)'" >> junkjunk
@echo "/* for scripts */" >> junkjunk
@echo "#define CANNABINDIR $(cannaBinDir)" >> junkjunk
@@ -89,6 +90,7 @@
echo "#define CANNAHOSTFILE \"$(cannaLibDir)/cannahost\"";\
echo "/* for lib/canna */";\
echo "#define CANNALIBDIR \"$(cannaLibDir)\""; \
+ echo "#define CANNASHAREDIR \"$(cannaShareDir)\""; \
echo "#define SUPPORT_OLD_WCHAR $(supportOldWchar)"; \
echo "/* for scripts */";\
echo "#define CANNABINDIR $(cannaBinDir)"; \
diff -ruN Canna37p1.orig/dic/phono/Imakefile Canna37p1/dic/phono/Imakefile
--- Canna37p1.orig/dic/phono/Imakefile 2002-10-19 17:27:40.000000000 +0900
+++ Canna37p1/dic/phono/Imakefile 2004-04-30 17:45:01.587886780 +0900
@@ -28,6 +28,7 @@
ROMAJI_DIC_DEF = -DSHIFT
DICDIR = $(cannaLibDir)/dic
+ CANNASHAREDIR = $(cannaShareDir)
SAMPLEDIR = $(cannaLibDir)/sample
SAMPLESRCDIR = $(cannaLibDir)/sample/src
@@ -69,7 +70,7 @@
MakeDirectories(install,$(DICDIR))
MakeDirectories(install,$(SAMPLESRCDIR))
-InstallMultiple($(ROMKANA_TABLES),$(DICDIR))
+InstallMultiple($(ROMKANA_TABLES),$(CANNASHAREDIR))
#ifdef USE_OBSOLETE_STYLE_FILENAME
InstallNonExec(default.kpdef,$(SAMPLESRCDIR))
diff -ruN Canna37p1.orig/misc/initfiles/Imakefile Canna37p1/misc/initfiles/Imakefile
--- Canna37p1.orig/misc/initfiles/Imakefile 2003-02-04 05:13:01.000000000 +0900
+++ Canna37p1/misc/initfiles/Imakefile 2004-04-30 17:45:01.587886780 +0900
@@ -6,7 +6,7 @@
#endif
CANNAROOT = ../..
- SAMPLEDIR = $(cannaLibDir)/sample
+ SAMPLEDIR = $(cannaShareDir)
all::
Canna-oldsock.patch:
--- NEW FILE Canna-oldsock.patch ---
diff -ruN Canna37p1.orig/lib/RKC/wconvert.c Canna37p1/lib/RKC/wconvert.c
--- Canna37p1.orig/lib/RKC/wconvert.c 2003-09-24 23:50:40.000000000 +0900
+++ Canna37p1/lib/RKC/wconvert.c 2004-04-30 19:10:18.762882047 +0900
@@ -150,8 +150,25 @@
if ((ServerFD = socket((int) addr->sa_family, SOCK_STREAM, 0)) >= 0){
if( try_connect( ServerFD, addr, sizeof unaddr ) < 0 ) {
close( ServerFD ) ;
- return( -1 ) ;
+ ServerFD = -1;
+ }
+ }
+ if (ServerFD < 0) {
+ /* for the backward compatibility */
+#define OLD_IR_UNIX_PATH "/tmp/.iroha_unix/IROHA"
+
+ if (number)
+ sprintf (unaddr.sun_path, "%s:%d", OLD_IR_UNIX_PATH, number);
+ else
+ strcpy (unaddr.sun_path, OLD_IR_UNIX_PATH);
+
+ if ((ServerFD = socket ((int) addr->sa_family, SOCK_STREAM, 0)) >= 0) {
+ if (try_connect (ServerFD, addr, sizeof (unaddr)) < 0) {
+ close (ServerFD);
+ return -1;
+ }
}
+#undef OLD_IR_UNIX_PATH
}
return( ServerFD ) ;
}
Canna-x86_64.patch:
--- NEW FILE Canna-x86_64.patch ---
diff -ruN Canna37.orig/Canna.conf Canna37/Canna.conf
--- Canna37.orig/Canna.conf 2003-12-24 13:20:19.000000000 +0900
+++ Canna37/Canna.conf 2003-12-24 13:20:48.000000000 +0900
@@ -112,7 +112,7 @@
# define DefCannaPrefix /usr
# ifdef ObsoleteInstallDir
# define DefErrDir /usr/spool/canna
-# define DefLibCannaDir /usr/lib
+# define DefLibCannaDir /usr/lib64
# else
# define DefErrDir /var/log/canna
# define DefLibCannaDir $(cannaExecPrefix)/lib
--- NEW FILE Canna.spec ---
%define pubdicrhver 20021028
%define zipcodever 20030204
%define cannadicver 0.95c
%define cannadir Canna37p3
Summary: A Japanese character set input system.
Name: Canna
Version: 3.7p3
Release: 13
License: Distributable
Group: System Environment/Libraries
URL: http://www.nec.co.jp/japanese/product/computer/soft/canna/
Source0: http://prdownloads.sourceforge.jp/canna/7240/%{cannadir}.tar.bz2
Source1: http://cannadic.oucrc.org/cannadic-%{cannadicver}.tar.gz
Source2: pubdic-bonobo-%{pubdicrhver}.tar.bz2
Source3: http://www.coolbrain.net/dl/shion/shion.tar.gz
Source4: http://bonobo.gnome.gr.jp/~nakai/canna/zipcode-%{zipcodever}.tar.bz2
Source20: canna.init
Source21: dot-canna
Source22: cannaping.c
Patch0: Canna-conf.patch
Patch2: Canna-3.6-sharedir.patch
Patch4: Canna-3.6-dont-grab-ctrl-o.patch
Patch5: Canna-3.6-fix-warnings.patch
## some dictionaries were ported from SKK-JISYO.*
Patch17: skk-dictionaries.patch
Patch18: Canna-3.6-cannadic.patch
Patch19: Canna-3.6-shion.patch
Patch21: Canna-3.6-bonobo.patch
# Fix for buffer overrun
Patch23: Canna-3.6-wconv.patch
Patch25: Canna-x86_64.patch
Patch27: Canna-3.7p1-notimeout.patch
Patch28: Canna-oldsock.patch
# Patch from the upstream
Patch40: Canna-3.7p1-fix-duplicated-strings.patch
Patch41: Canna-3.7p3-yenbs.patch
Patch42: Canna-3.7p3-redecl.patch
Patch43: Canna-3.7p3-fix-gcc4-warning.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
Prereq: /sbin/chkconfig, /etc/services, /bin/grep, /bin/cp
BuildPrereq: XFree86-devel,cpp,gawk
Obsoletes: tamago
%description
Canna provides a user interface for inputting Japanese characters.
Canna supports Nemacs (Mule), kinput2, and canuum. All of these tools
can then use a single customization file, Romaji-to-Kana conversion
rules and dictionaries, and input Japanese in the same way. Canna
automatically supports Kana-to-Kanji conversions; the conversions are
based on a client-server model.
%package devel
Summary: Header file and library for developing programs which use Canna.
Group: Development/Libraries
Requires: Canna-libs >= %{version}-%{release}
%package libs
Summary: The runtime library for Canna.
Group: System Environment/Libraries
%description devel
The Canna-devel package contains the development files needed to build
programs that will use the Canna Japanese character input system.
%description libs
The Canna-libs package contains the runtime library for running
programs with the Canna Japanese input system.
%prep
%setup -q -c -a 1 -a 2 -a 3 -a 4
cd %{cannadir}
%patch0 -p1 -b .conffix
%patch2 -p1 -b .share
%patch4 -p1 -b .ctrl-o
%patch5 -p1 -b .warnings
%patch17 -p1 -b .skk
%patch18 -p1 -b .cannadic
%patch19 -p1 -b .shion
%patch21 -p1 -b .bonobo
%patch23 -p1 -b .wconv
%ifarch x86_64
%patch25 -p1 -b .x86_64
%endif
%patch27 -p1 -b .notimeout
%patch28 -p1 -b .oldsock
%patch40 -p1 -b .duplicate
%patch41 -p1 -b .yenbs
%patch42 -p1 -b .redecl
%patch43 -p1 -b .gcc4
cd ..
for file in %{cannadir}/{cmd/mkromdic/mkromdic.man,lib/RK/RkIntro.man}; do
iconv -f euc-jp -t utf-8 < "$file" > "${file}_"
mv "${file}_" "$file"
done
cat $RPM_BUILD_DIR/Canna-%{version}/zipcode-%{zipcodever}/zipcode.t \
$RPM_BUILD_DIR/Canna-%{version}/zipcode-%{zipcodever}/jigyosyo.t | sort \
> $RPM_BUILD_DIR/Canna-%{version}/%{cannadir}/dic/ideo/words/zipcode.t
cat $RPM_BUILD_DIR/Canna-%{version}/pubdic-bonobo/*.p | sort >> \
$RPM_BUILD_DIR/Canna-%{version}/%{cannadir}/dic/ideo/pubdic/y.p
# find CVS files and remove it.
find $RPM_BUILD_DIR/%{name}-%{version} -name .cvsignore -exec rm -f {} \;
%build
function builddic() {
dic=$1
dicname=`echo $dic | sed -e 's/\(.*\)\..*\$/\1/'`
case $2 in
mwd)
mode="mwd";
flag="-m";
;;
swd)
mode="swd";
flag="-s";
;;
*)
echo "unknown dictionary type: $2";
exit 1;
;;
esac
export buildcannadir=$RPM_BUILD_DIR/%{name}-%{version}/%{cannadir}
if [ "x$3" = "xsort" ]; then
$buildcannadir/cmd/splitwd/splitword $dic | $buildcannadir/cmd/forsort/forsort -7 | sort | $buildcannadir/cmd/forsort/forsort -8 | $buildcannadir/cmd/mergewd/mergeword > $dicname.$mode
else
cat $dic > $dicname.$mode
fi
$buildcannadir/cmd/crxdic/crxdic -D $buildcannadir/dic/ideo/grammar/cnj.bits $flag -o $dicname.cbd -n $dicname $dicname.$mode
$buildcannadir/cmd/crfreq/crfreq -div 512 -o $dicname.cld $dicname.cbd $dicname.$mode
rm $dicname.$mode
}
cd %{cannadir}
xmkmf
make Makefile
pushd lib/canna
xmkmf
make sglobal.h
popd
%ifarch ia64
sed 's/-O2//' Makefile > Makefile.tmp
mv Makefile.tmp Makefile
%endif
# ugly hack to avoid X.Org: no such file or directory issue
TMP_MAKEFILE=`mktemp /tmp/Canna-build-makefile.XXXXXX`
sed -e 's/$(VENDOR_DEFINES)//' Makefile > $TMP_MAKEFILE && cp $TMP_MAKEFILE Makefile
rm $TMP_MAKEFILE
make canna
gcc -o ./misc/cannaping %{SOURCE22} -I./include -L./lib/canna -lcanna
cd ..
cd cannadic-%{cannadicver}
for i in $RPM_BUILD_DIR/Canna-%{version}/%{cannadir}/cmd/*; do \
if [ -d $i ]; then \
export PATH=$PATH:$i; \
fi \
done;
export RPM_CANNAIDEO_DIR=$RPM_BUILD_DIR/Canna-%{version}/%{cannadir}/dic/ideo
export RPM_CANNACMD_DIR=$RPM_BUILD_DIR/Canna-%{version}/%{cannadir}/cmd
export RPM_CANNA_POD=$RPM_BUILD_DIR/Canna-%{version}/%{cannadir}/dic/ideo/pubdic/pod
builddic gcanna.ctd mwd none
builddic gcannaf.ctd swd none
cd ..
cd pubdic-bonobo
cat *.p | $RPM_CANNA_POD - -p -i -2 > bonobo.spl
$RPM_CANNACMD_DIR/mergewd/mergeword< bonobo.spl > bonobo.t
rm -rf bonobo.spl
builddic bonobo.t mwd sort
cd ..
cd shion
builddic basho.ctd mwd sort
builddic keisan.ctd mwd sort
builddic pub.ctd mwd sort
builddic scien.ctd mwd none
builddic sup.ctd mwd sort
cd ..
%install
[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
cd %{cannadir}
make libCannaDir=%{_libdir} DESTDIR=$RPM_BUILD_ROOT install
make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} MANSUFFIX=1 LIBMANSUFFIX=3 install.man
for i in `find $RPM_BUILD_ROOT%{_mandir}/ja -type f`; do
iconv -f euc-jp -t utf-8 $i > $i.new && mv -f $i.new $i && chmod 444 $i
done
%{__install} -c -s -m755 ./misc/cannaping $RPM_BUILD_ROOT%{_bindir}/cannaping
cd ..
cd %{cannadir}
%{__mv} misc/manual.sed .
%{__rm} -fr misc
%{__mkdir} misc
%{__mv} manual.sed misc
cd ..
cd cannadic-%{cannadicver}
%{__mkdir_p} $RPM_BUILD_ROOT%{_localstatedir}/lib/canna/dic/canna
%{__install} -m 644 gcanna*.c[bl]d \
$RPM_BUILD_ROOT%{_localstatedir}/lib/canna/dic/canna
cd ..
cd pubdic-bonobo
%{__install} -m 644 bonobo*.c[bl]d \
$RPM_BUILD_ROOT%{_localstatedir}/lib/canna/dic/canna
cd ..
cd shion
%{__install} -m 644 basho.cld basho.cbd kaom.ctd keisan.cld keisan.cbd \
pub.cld pub.cbd scien.cld scien.cbd sup.cld sup.cbd \
$RPM_BUILD_ROOT%{_localstatedir}/lib/canna/dic/canna
cd ..
%{__mkdir_p} $RPM_BUILD_ROOT/etc/rc.d/init.d
%{__mkdir_p} $RPM_BUILD_ROOT/etc/skel
%{__install} -m 755 %SOURCE20 $RPM_BUILD_ROOT/etc/rc.d/init.d/canna
%{__cp} %SOURCE21 $RPM_BUILD_ROOT/etc/skel/.canna
%{__cp} -f %SOURCE21 $RPM_BUILD_ROOT/etc/canna/default.canna
## chmod 755 $RPM_BUILD_ROOT/etc/rc.d/init.d/canna
cat > $RPM_BUILD_ROOT%{_sysconfdir}/hosts.canna << EOF
unix
EOF
cat > $RPM_BUILD_ROOT%{_sysconfdir}/canna/cannahost << EOF
unix
EOF
for bin in addwords cpdic delwords lsdic mkdic mvdic rmdic syncdic ; do
ln -sf catdic $RPM_BUILD_ROOT%{_bindir}/${bin}
done
ln -sf ../bin/catdic $RPM_BUILD_ROOT%{_sbindir}/cannakill
mv $RPM_BUILD_ROOT%{_sysconfdir}/canna/sample $RPM_BUILD_DIR/%{name}-%{version}
%{__mkdir_p} $RPM_BUILD_ROOT%{_localstatedir}/run/.iroha_unix
%clean
[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -fr $RPM_BUILD_ROOT
%pre
if %{__grep} -q '^canna:' /etc/passwd
then
%{_sbindir}/userdel canna
fi
%{_sbindir}/useradd -c "Canna Service User" -r \
-s /sbin/nologin -u 39 -d %{_localstatedir}/lib/canna canna 2>/dev/null || :
%post
if ! grep -q canna /etc/services
then
echo "canna 5680/tcp" >>/etc/services
fi
/sbin/chkconfig --add canna
chown -R canna:canna /var/lib/canna
%preun
if [ "$1" = "0" ]; then
/sbin/service canna stop > /dev/null 2>&1 || :
/sbin/chkconfig --del canna
fi
%postun
if [ "$1" -ge "1" ]; then
/sbin/service canna condrestart >/dev/null 2>&1 || :
fi
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%files
%defattr (-,root,root)
%doc %{cannadir}/CHANGES.jp %{cannadir}/ChangeLog
%doc %{cannadir}/OCHANGES.jp %{cannadir}/RKCCONF.jp
%doc %{cannadir}/README %{cannadir}/README.jp %{cannadir}/WHATIS
%doc %{cannadir}/WHATIS.jp %{cannadir}/Canna.conf
%doc $RPM_BUILD_DIR/%{name}-%{version}/sample
%config %{_sysconfdir}/rc.d/init.d/canna
%config %{_sysconfdir}/skel/.canna
%config(noreplace) %{_sysconfdir}/hosts.canna
%config(noreplace) %{_sysconfdir}/canna/cannahost
%config %{_sysconfdir}/canna/default.canna
%{_bindir}/*
%{_datadir}/canna/*
%{_mandir}/man1/*
%{_mandir}/ja/man1/*
%defattr (0755,root,root)
%{_sbindir}/cannaserver
%{_sbindir}/cannakill
%defattr (-,canna,canna)
%dir %{_localstatedir}/run/.iroha_unix
%{_localstatedir}/lib/canna
%{_localstatedir}/log/canna
%files devel
%defattr (-,root,root)
%{_includedir}/canna/
%{_mandir}/man3/*
%{_mandir}/ja/man3/*
%{_libdir}/libRKC.a
%{_libdir}/libRKC.so
%{_libdir}/libRKC16.a
%{_libdir}/libRKC16.so
%{_libdir}/libcanna.a
%{_libdir}/libcanna.so
%{_libdir}/libcanna16.a
%{_libdir}/libcanna16.so
%files libs
%defattr (-,root,root)
%{_libdir}/libRKC.so.*
%{_libdir}/libRKC16.so.*
%{_libdir}/libcanna.so.*
%{_libdir}/libcanna16.so.*
%changelog
* Mon Mar 7 2005 Akira TAGOH <tagoh at redhat.com> - 3.7p3-13
- stop to sort the words on some dictionaries during making the binary
dictionaries.
* Wed Mar 2 2005 Akira TAGOH <tagoh at redhat.com> - 3.7p3-12
- rebuild for gcc4.
- Canna-3.7p3-fix-gcc4-warning.patch: applied to fix more compiler warnings.
* Tue Feb 22 2005 Akira TAGOH <tagoh at redhat.com> - 3.7p3-11
- updates to cannadic-0.95c
* Mon Jan 3 2005 Bill Nottingham <notting at redhat.com> - 3.7p3-10
- don't use initlog
* Tue Nov 23 2004 Miloslav Trmac <mitr at redhat.com> - 3.7p3-9
- Convert man pages to UTF-8
- Don't use Yen symbol instead of backspace in RkGetDicList man page
- Fix build failure when redeclaring glibc functions
* Thu Nov 4 2004 Akira TAGOH <tagoh at redhat.com> - 3.7p3-8
- rebuilt
* Thu Oct 21 2004 Akira TAGOH <tagoh at redhat.com> - 3.7p3-7
- dot.canna: assigned quit to Escape key to escape with Escape key from
the mode. (#135039)
* Tue Sep 21 2004 Warren Togami <wtogami at redhat.com> - 3.7p3-6
- remove unnecessary docs
* Wed Sep 08 2004 Akira TAGOH <tagoh at redhat.com> 3.7p3-5
- fixed default.canna to get usability and improve the default behavior without
proper .canna file.
NOTE: you must always have proper .canna file however, since your .canna file
is prior than the default behavior and it probably overrides the default thing.
* Thu Jun 24 2004 Akira TAGOH <tagoh at redhat.com> 3.7p3-4
- Canna-conf.patch: updated to change the socket file directory under /var/run.
- Canna-oldsock.patch: applied to ensure that restarting the daemon works during upgrading.
- made /var/run/.iroha_unix at the build time.
* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Sun Jun 06 2004 Florian La Roche <Florian.LaRoche at redhat.de>
- use /var/lib/canna in filelist to also include that dir
in the rpm listing and set proper ownership from rpm and
not only via the post script
* Mon May 24 2004 Akira TAGOH <tagoh at redhat.com> 3.7p3-1
- New upstream release.
- Canna-3.7p1-pod-fix-wrongparam.patch: removed.
* Wed Apr 14 2004 Akira TAGOH <tagoh at redhat.com> 3.7p1-7
- updates cannadic-0.95b
* Sun Mar 21 2004 Florian La Roche <Florian.LaRoche at redhat.de> 3.7p1-6
- apps owned by root instead of bin
* Wed Mar 17 2004 Akira TAGOH <tagoh at redhat.com> 3.7p1-5
- Canna-3.7p1-fix-duplicated-strings.patch: applied a backport patch from CVS.
when the characters like 'bbb...' is deleted, the preedit strings is
duplicated. (#117140)
* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com> 3.7p1-4.1
- rebuilt
* Thu Feb 19 2004 Akira TAGOH <tagoh at redhat.com> 3.7p1-4
- Canna-3.7p1-notimeout.patch: applied to avoid cant-mount-the-dictionaries issue. (#114886)
* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Wed Jan 14 2004 Akira TAGOH <tagoh at redhat.com> 3.7p1-2
- fix broken dictionaries on ia64.
- Canna-3.7p1-pod-fix-wrongparam.patch: applied to fix the wrong function parameter. (#113662)
* Fri Jan 09 2004 Akira TAGOH <tagoh at redhat.com> 3.7p1-1
- New upstream release.
* Mon Dec 24 2003 Akira TAGOH <tagoh at redhat.com> 3.7-1
- New upstream release.
- Canna-3.6-cannadic.patch: updated to fix the warning.
- Canna-3.6-fix-warnings.patch: updated.
- Canna-3.6-sleep.patch: removed because it's unnecessary anymore.
- Canna-3.6-fix-ia64-unaligned-access.patch: removed. should be unnecessary.
- canna.init: correct path for cannakill.
- dot-canna: re-enabled fuzokugo entry.
* Wed Dec 10 2003 Akira TAGOH <tagoh at redhat.com> 3.6-25
- updated to cannadic-0.95a
* Fri Oct 10 2003 Akira TAGOH <tagoh at redhat.com> 3.6-24
- Canna-3.6-fix-ia64-unaligned-access.patch: fixed unaligned access on ia64. (#101762)
* Tue Sep 30 2003 Akira TAGOH <tagoh at redhat.com> 3.6-22
- converted Japanese manpages to UTF-8.
* Wed Sep 24 2003 Akira TAGOH <tagoh at redhat.com> 3.6-21
- updates to Canna-3.6p4
- Canna-3.6-fix-segv-amd64.patch: removed.
- dot-canna: comment "fuzokugo" dictionary out. it isn't contained anymore.
* Wed Sep 17 2003 Akira TAGOH <tagoh at redhat.com> 3.6-20.1
- rebuilt
* Wed Sep 17 2003 Akira TAGOH <tagoh at redhat.com> 3.6-20
- Canna-3.6-fix-segv-amd64.patch: applied to fix segfault on x86-64. (#104539)
* Wed Jul 09 2003 Akira TAGOH <tagoh at redhat.com> 3.6-19
- updates to cannadic-0.95
* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Wed Apr 23 2003 Akira TAGOH <tagoh at redhat.com> 3.6-17
- updates to cannadic-0.94g
* Mon Apr 21 2003 Akira TAGOH <tagoh at redhat.com> 3.6-16
- rebuild.
* Mon Apr 21 2003 Akira TAGOH <tagoh at redhat.com> 3.6-15
- Canna-3.6-dont-grab-ctrl-o.patch: applied to not grab ctrl-o. (#75865)
- Canna-3.6-fix-warnings.patch: applied to fix some compiler warnings. (#80639)
* Tue Apr 01 2003 Akira TAGOH <tagoh at redhat.com> 3.6-14
- don't ship .cvsignore files.
* Tue Mar 25 2003 Akira TAGOH <tagoh at redhat.com> 3.6-13
- updates to 3.6p3
- clean up
- Canna-3.6-Imakefile.patch: removed an unnecessary patch.
- Canna-3.6-sharedir.patch: find the dictionary files from /usr/share/canna
- Canna-3.6-sleep.patch: to fix very strange problem. when the child process
tries to kill the parent process, the parent process isn't terminated, and
it seems that the parent process doesn't still return from fork() and waiting
on SYS_futex.
- moved cannahost and default.canna to /etc/canna so that config files should be
moved on /etc.
- moved sample files to /usr/share/doc/Canna-<version>/
* Tue Feb 4 2003 Yukihiro Nakai <ynakai at redhat.com> 3.6-9
- Add cannaping command for init script (#82163)
- Update canna init script (#82163)
* Thu Jan 23 2003 Tim Powers <timp at redhat.com> 3.6-8
- rebuild
* Sat Dec 21 2002 Yukihiro Nakai <ynakai at redhat.com> 3.6-7
- Change shell to /sbin/nologin (#80175)
* Thu Dec 12 2002 Yukihiro Nakai <ynakai at redhat.com> 3.6-5
- Update to 3.6p1
* Thu Nov 28 2002 Yukihiro Nakai <ynakai at redhat.com> 3.6-4
- Disable -O2 on ia64
* Wed Nov 27 2002 Yukihiro Nakai <ynakai at redhat.com> 3.6-3
- Update bonobo
- Update zipcode
- Update cannadic
* Tue Nov 19 2002 Yukihiro Nakai <ynakai at redhat.com> 3.6-1
- Update to 3.6
* Tue Nov 12 2002 Elliot Lee <sopwith at redhat.com> 3.5b2-71
- Remove/fix ldconfig usage in scripts
- _smp_mflags
- Rebuild
* Mon Nov 11 2002 Yukihiro Nakai <ynakai at redhat.com> 3.5b2-70.8.0.1
- Add CANNA-2002-01 patch
* Fri Nov 01 2002 Yukihiro Nakai <ynakai at redhat.com> 3.5b2-70.8.0
- Add wconvert.c buffer overrun fix patch
* Tue Aug 06 2002 Yukihiro Nakai <ynakai at redhat.com> 3.5b2-70
- Delete -inet option from canna.init script (#67217)
- Obsolete tamago with this version (#67217)
- Delete localhost from /etc/hosts.canna
* Fri Aug 02 2002 Yukihiro Nakai <ynakai at redhat.com> 3.5b2-69
- Update zipcode
- Update pubdic-bonobo
* Thu Jul 18 2002 Akira TAGOH <tagoh at redhat.com> 3.5b2-68
- Canna-3.5b2-nonstrip.patch: applied to fix the stripped binary.
* Tue Jul 09 2002 Yukihiro Nakai <ynakai at redhat.com>
- Update zipcode
- Update pubdic-bonobo
- Update Cannadic
* Thu Jun 27 2002 Yukihiro Nakai <ynakai at redhat.com>
- Make users at install(%%pre) (#66306)
* Wed Jun 26 2002 Yukihiro Nakai <ynakai at redhat.com>
- Update pubdic-bonobo
* Thu Jun 06 2002 Yukihiro Nakai <ynakai at redhat.com>
- Update pubdic-bonobo
- Update zipcode
* Thu May 23 2002 Tim Powers <timp at redhat.com>
- automated rebuild
* Tue Mar 28 2002 Yukihiro Nakai <ynakai at redhat.com> 3.5b2-62
- Update cannadic to 0.94b to fix pubdic wrong entry
- Update pubdic-bonobo
- Remove refer to pubdic
- celebrate pubdic-bonobo indepence day
* Tue Feb 26 2002 Yukihiro Nakai <ynakai at redhat.com> 3.5b2-61
- Update cannadic to 0.94
* Wed Jan 30 2002 Yukihiro Nakai <ynakai at redhat.com> 3.5b2-58
- Update zipcode dic
- Update pubdic-bonobo
* Mon Jan 21 2002 Yukihiro Nakai <ynakai at redhat.com> 3.5b2-56
- Update pubdic-bonobo(renamed from pubdic-redhat)
* Sat Jan 12 2002 Yukihiro Nakai <ynakai at redhat.com> 3.5b2-55
- Minor fix for shion
- Update cannadic to 0.93
* Wed Jan 9 2002 Yukihiro Nakai <ynakai at redhat.com> 3.5b2-52
- %%doc fix
- Add pubdic-redhat
- Add dictionary 'shion'
* Sun Jan 6 2002 Yukihiro Nakai <ynakai at redhat.com> 3.5b2-51
- Add cannadic, GPL dictionary
* Thu Aug 30 2001 Yukihiro Nakai <ynakai at redhat.com>
- Set -inet option by default in canna init script and add localhost
to hosts.canna. It affects to tamago/emacs problem(#52886)
* Wed Aug 29 2001 Yukihiro Nakai <ynakai at redhat.com>
- Apply patch3 in all case
* Thu Aug 23 2001 Jens Petersen <petersen at redhat.com> - 3.5b2-48
- Add defattr before /var/lib/canna, so that files therein not made executable.
* Wed Aug 22 2001 SATO Satoru <ssato at redhat.com> - 3.5b2-47
- cleaned up SPEC (remove meaningless 'Prefix:' tag, use macros, etc.)
- added BuildPrereq: XFree86-devel (xmkmf)
- added some dictionaries ported from skk (#52248)
- added %%config(noreplace) /var/lib/canna/cannahost
* Tue Aug 21 2001 Yukihiro Nakai <ynakai at redhat.com> - 3.5b2-46
- Build fix with (#52088)
* Wed Aug 15 2001 Jens Petersen <petersen at redhat.com> - 3.5b2-45
- Added patch by Ishikawa to make cannaserver listen only on a unix domain
socket by default (#33420) and create "/var/lib/canna/cannahost" to help
kinput2 find it.
- Added fix from Ishikawa for "typo" in malloc call in lib/RK/dd.c.
* Tue Aug 9 2001 Yukihiro Nakai <ynakai at redhat.com> - 3.5b2-44
- Off the S bit (#13135)
* Sun Jun 24 2001 Elliot Lee <sopwith at redhat.com>
- Bump release + rebuild.
* Mon Apr 23 2001 Yukihiro Nakai <ynakai at redhat.com>
- Add complete ia64 patch
* Tue Apr 17 2001 Bill Nottingham <notting at redhat.com>
- build on ia64 so that dependencies work
* Tue Feb 6 2001 Matt Wilson <msw at redhat.com>
- changed requires on Canna-devel to require Canna-libs, not Canna
* Tue Feb 6 2001 Trond Eivind Glomsrd <teg at redhat.com>
- Display OK or FAILED from initscript (#26111)
* Fri Jan 26 2001 Yukihiro Nakai <ynakai at redhat.com>
- More fix to reduce warning
* Fri Jan 26 2001 Yukihiro Nakai <ynakai at redhat.com>
- Capitalize summary
- Add Requires to Canna-devel
- Minor fix for %%files
* Wed Jan 24 2001 Adrian Havill <havill at redhat.com>
- changed dangerous suid bin/bin uid/gid of server to canna/canna
* Tue Jan 23 2001 Yukihiro Nakai <ynakai at redhat.com>
- Update canna.init (teg at redhat.com>
* Tue Jan 23 2001 Yukihiro Nakai <ynakai at redhat.com>
- Add defattr
- Add post and postun for -libs to ldconfig
* Mon Jan 22 2001 Yukihiro Nakai <ynakai at redhat.com>
- Split the runtime library
- bzip2
* Fri Jan 19 2001 Yukihiro Nakai <ynakai at redhat.com>
- Disable IA64 patch. It seems to cause serious problem.
(Such IA64 fix is not needed with the newer compiler?)
* Fri Jan 19 2001 Matt Wilson <msw at redhat.com>
- use -DCANNA_WCHAR (revert the the part of the ia64 patch that disables
-DCANNA_WCHAR
* Tue Dec 19 2000 Yukihiro Nakai <ynakai at redhat.com>
- Add IA64 patch (Not complete)
* Wed Sep 13 2000 ISHIKAWA Mutsumi <ishikawa at redhat.com>
- spcfile typo fix (doc-canna -> dot-canna)
* Wed Sep 13 2000 ISHIKAWA Mutsumi <ishikawa at redhat.com>
- add /etc/skel/.canna
* Thu Sep 12 2000 ISHIKAWA Mutsumi <ishikawa at redhat.com>
- fix initscript
* Mon Sep 11 2000 ISHIKAWA Mutsumi <ishikawa at redhat.com>
- chown bin.bin /usr/sbin/{cannaserver,cannakill},/var/lib/canna
and /var/log/canna
* Mon Sep 11 2000 ISHIKAWA Mutsumi <ishikawa at redhat.com>
- hosts.canna read bug fix.
* Thu Sep 7 2000 ISHIKAWA Mutsumi <ishikawa at redhat.com>
- move back /etc/init.d -> /etc/rc.d/init.d
* Thu Aug 24 2000 ISHIKAWA Mutsumi <ishikawa at redhat.com>
- chmod +x /etc/init.d/canna
* Fri Aug 4 2000 ISHIKAWA Mutsumi <ishikawa at redhat.com>
- move /etc/rc.d/init.d -> /etc/init.d
* Thu Aug 3 2000 ISHIKAWA Mutsumi <ishikawa at redhat.com>
- rebuilt for RedHat 7.0.
- man directory ja_JP.UJIS -> ja
- Canna-3.5b2.conf.patch modified to install manpages to /usr/share/man
- remove Canna-3.5b2-fhs.patch to install manpages to /usr/share/man
* Tue Jul 18 2000 Nalin Dahyabhai <nalin at redhat.com>
- fix syntax error in postun
- no need to remove the services entry in postun
- make all symlinks to catdic relative instead of absolute
* Fri Jul 14 2000 Bill Nottingham <notting at redhat.com>
- move initscript back
* Wed Jul 12 2000 Prospector <bugzilla at redhat.com>
- automatic rebuild
* Tue Jul 11 2000 Bill Nottingham <notting at redhat.com>
- don't run by default
- add buffer overflow patch
- add configuration that should in theory only accept connections
from localhost or unix socket
* Mon Jun 26 2000 Preston Brown <pbrown at redhat.com>
- initscript to /etc/init.d, and updated for new initscript stds.
* Mon Jun 19 2000 Preston Brown <pbrown at redhat.com>
- FHS paths
* Mon Jun 12 2000 Matt Wilson <msw at redhat.com>
- don't redefine bcopy
- add defattr
* Sun Mar 26 2000 Chris Ding <cding at redhat.com>
- ja -> ja_JP.eucJP
* Tue Mar 21 2000 Chris Ding <cding at redhat.com>
- ja_JP.eucJP -> ja
* Thu Mar 9 2000 Matt Wilson <msw at redhat.com>
- build for 6.2, gzip manpages
* Sat Mar 4 2000 Chris Ding <cding at redhat.com>
- ja -> ja_JP.eucJP
- changed group
* Thu Oct 21 1999 Matt Wilson <msw at redhat.com>
- added prereq for grep and cp
* Wed Oct 20 1999 Matt Wilson <msw at redhat.com>
- added prereq for /sbin/chkconfig and /etc/services
* Tue Oct 12 1999 Matt Wilson <msw at redhat.com>
- fixed redirection path for 4 man pages
* Thu Oct 7 1999 Matt Wilson <msw at redhat.com>
- rebuilt against 6.1
* Thu Jun 24 1999 Japanese LinuxPPC Users' Group <jrpm at ppc.linux.or.jp>
- build against Linuxppc R5
- add Oe's stdin patch in Canna-3.5b2-3rh.src.rpm
- change canna.init and spec file for safty shutdown cannaserver. Thanks to Shoichiro Nagata.
* Sun May 30 1999 FURUSAWA,Kazuhisa <kazu at linux.or.jp>
- 4th Release for i386 (glibc2.1).
- Original Packager: Atsushi Yamagata <yamagata at plathome.co.jp>
* Fri Jan 22 1999 Atsushi Yamagata <yamagata at plathome.co.jp>
- 4th release
- changed installed directories (See Canna.conf and INSTALL.jp)
- added post-{un}install scripts for Canna and Canna-devel packages
- added URL, Distribution, Vendor, and Prefix tags
* Tue Nov 04 1997 Atsushi Yamagata <yamagata at jwu.ac.jp>
- 3rd release
- patched for glibc. Thanks Mr. Daisuke Sato <densuke at ga2.so-net.or.jp>
- divided the Canna packege into Canna and Canna-devel
* Sun Jul 27 1997 Atsushi Yamagata <yamagata at jwu.ac.jp>
- 2nd release
* Fri Jul 11 1997 Atsushi Yamagata <yamagata at jwu.ac.jp>
- 1st release
--- NEW FILE canna.init ---
#!/bin/bash
#
# chkconfig: 2345 90 12
# description: Canna Japanese Conversion Engine
#
# canna Canna server
#
# Author Manabe Takashi <manabe at Roy.dsl.tutics.tut.ac.jp>
# Modifier Atsushi Yamagata <yamagata at jwu.ac.jp>
# Modifier 22 Jan 1999 Atsushi Yamagata <yamagata at plathome.co.jp>
# Modifier 23 Jun 1999 Shoichiro Nagata <nagata at mach.ee.miyazaki-u.ac.jp>
# Modifier 04 Feb 2003 Yukihiro Nakai <ynakai at redhat.com>
# Source function library.
. /etc/init.d/functions
PATH=$PATH:/usr/sbin
SERVER=/usr/sbin/cannaserver
KILLER=/usr/sbin/cannakill
prog="Canna server"
[ -f $SERVER ] || exit 0
start() {
rm -f /tmp/.iroha_unix/IROHA
rm -f /var/run/.iroha_unix/IROHA
echo -n $"Starting $prog: "
$SERVER -syslog -u canna
cannaping && success || failure
RETVAL=$?
[ "$RETVAL" = 0 ] && touch /var/lock/subsys/canna
echo
}
stop() {
action "Stopping $prog:" $KILLER 2> /dev/null
rm -f /tmp/.iroha_unix/IROHA
rm -f /var/run/.iroha_unix/IROHA
rm -f /var/lock/subsys/canna
}
case "$1" in
start)
start
;;
stop)
stop
;;
status)
status cannaserver
;;
restart|reload)
stop
start
;;
condrestart)
if [ -f /var/lock/subsys/canna ]; then
stop
start
fi
;;
*)
echo $"Usage: $0 {start|stop|restart|condrestart|status}"
exit 1
esac
exit 0
--- NEW FILE cannaping.c ---
/*
* cannaping - the minimal cannaserver check program
*
* Copyright (C) 2003 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
/*
* Bugs & suggestions about this program are welcome:
* http://bugzilla.redhat.com/
*
* 2003/02/04
* Yukihiro Nakai <ynakai at redhat.com>
*/
#include <stdio.h>
#include <stdlib.h>
#include <canna/jrkanji.h>
int main() {
char** warning = NULL;
int res = jrKanjiControl(0, KC_INITIALIZE, (char*)&warning);
if( res != 0 ) {
exit(-1);
} else if( warning ) {
exit(-1);
}
jrKanjiControl(0, KC_FINALIZE, 0);
return 0;
}
--- NEW FILE dot-canna ---
;; Copyright 1992 NEC Corporation, Tokyo, Japan.
;;
;; Permission to use, copy, modify, distribute and sell this software
;; and its documentation for any purpose is hereby granted without
;; fee, provided that the above copyright notice appear in all copies
;; and that both that copyright notice and this permission notice
;; appear in supporting documentation, and that the name of NEC
;; Corporation not be used in advertising or publicity pertaining to
;; distribution of the software without specific, written prior
;; permission. NEC Corporation makes no representations about the
;; suitability of this software for any purpose. It is provided "as
;; is" without express or implied warranty.
;;
;; NEC CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
;; INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
;; NO EVENT SHALL NEC CORPORATION BE LIABLE FOR ANY SPECIAL, INDIRECT OR
;; CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
;; USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
;; OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
;; PERFORMANCE OF THIS SOFTWARE.
;; $Id: unix.canna,v 1.4 1996/10/25 05:23:02 kon Exp $
;; µ¹æÃÖ¤´¹¤¨ÊÑ´¹¤òÍøÍѤ¹¤ë¤«¡£
(setq use-symbolic-definition t)
;;; ¥í¡¼¥Þ»ú¤«¤ÊÊÑ´¹¤ÎÀßÄê
;
; ¥í¡¼¥Þ»ú¤«¤ÊÊÑ´¹¥Æ¡¼¥Ö¥ë¤ò»ØÄꤷ¤Þ¤¹¡£¥í¡¼¥Þ»ú¤«¤ÊÊÑ´¹¥Æ¡¼¥Ö¥ë¤Ï
; (1) ¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê
; (2) ¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê
; (3) /usr/lib/canna/dic
; ¤Î½ç¤Ë¥µ¡¼¥Á¤µ¤ì¤Þ¤¹¡£
;
;(setq romkana-table "unix.cbp")
(setq romkana-table "default.cbp")
;; ³°Íè¸ìÊÑ´¹
;(setq english-table "canna/english.cbp")
;;; ÍøÍѤ¹¤ë¼½ñ
;
; ¤¿¤Àñ¤Ë½ñ¤Ê¤٤Ƥ¤¤ë¤Î¤Ïñ¸ìÅÐÏ¿¤ò¹Ô¤ï¤Ê¤¤¼½ñ¤Ç¥·¥¹¥Æ¥à¼½ñ¤Ê¤É¤¬
; ¤³¤ì¤ËÅö¤¿¤ê¤Þ¤¹¡£
;
; Éô¼ó¼½ñ¤Ë´Ø¤·¤Æ¤Ï :bushu ¤òÀè¹Ô¤µ¤»¤Æµ½Ò¤·¤Þ¤¹¡£
;
; ñ¸ìÅÐÏ¿¤ò¤·¤¿¤¤¼½ñ¤Ë´Ø¤·¤Æ¤Ï :user ¤òÀè¹Ô¤µ¤»¤Æµ½Ò¤·¤Þ¤¹¡£Ã±¸ìÅÐ
; Ï¿¤ò¤¹¤ë¼½ñ¤Ï¥Æ¥¥¹¥È·Á¼°¼½ñ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£Ã±¸ìÅÐÏ¿¤µ¤»¤¿¤¤
; ¼½ñ¤Ï mkdic user ¤ÎÍͤʥ³¥Þ¥ó¥É¤òÂǤĤ³¤È¤Ç¤Ç´Êñ¤ËºîÀ®¤¹¤ë¤³¤È¤¬¤Ç
; ¤¤Þ¤¹¡£
;
(use-dictionary
"gcanna"
"gcannaf"
"chimei"
; "iroha"
"fuzokugo"
"hojomwd"
"hojoswd"
"software"
"keishiki"
"zipcode"
"geo"
; "zip99"
"basho"
"keisan"
"pub"
"scien"
"sup"
"bonobo"
:bushu "bushu"
:user "user"
)
;;; ¤µ¤Þ¤¶¤Þ¤Ê¥Ñ¥é¥á¥¿¤ÎÀßÄê
;
; ¿¿ÍýÃͤòÀßÄꤹ¤ë¤â¤Î¤Ë¤Ä¤¤¤Æ¤Ï¿¿¤Ë¤Ä¤¤¤Æ¤Ï t ¡¢µ¶¤Ë¤Ä¤¤¤Æ¤Ï nil ¤òÀß
; Äꤷ¤Þ¤¹¡£
; °ìÈÖ±¦¤Ç±¦¤Ë¹Ô¤³¤¦¤È¤¹¤ë¤Èº¸Ã¼¤Ë¤¤¤¯¤è¤¦¤Ë¤¹¤ë¤«
(setq cursor-wrap t) ; default t
; °ìÍ÷ɽ¼¨¤Ç¿ô»ú¤òÂǤ俤Ȥ¤Ë¥«¡¼¥½¥ë°ÜÆ°¤Ëα¤á¤ë(nil)¤«ÁªÂò¤Þ¤Ç¤·¤Æ
; ¤·¤Þ¤¦¤«(t)
(setq select-direct t) ; default t
; °ìÍ÷ɽ¼¨¤Ç¿ô»ú¤ÇÁªÂò¤¹¤ë¤«(t)¡£nil¤Î»þ¤Ï¿ô»ú¤¬É½¼¨¤µ¤ì¤Þ¤»¤ó
(setq numerical-key-select t) ; default t
; ¸õÊäɽ¼¨»þ¤ËʸÀá¤Î¶èÀÚ¤ê¤Ë¶õÇò¤ò¤¤¤ì¤ë¤«
(setq bunsetsu-kugiri nil) ; default nil
; ʸ»ú¥Ù¡¼¥¹¤Î°ÜÆ°¤ò¤¹¤ë¤«(t)¡£ nil¤Î»þ¤Ï¥í¡¼¥Þ»ú¤«¤ÊÊÑ´¹¤Îñ°Ì¤Ç¥«¡¼
; ¥½¥ë°ÜÆ°¤¬¹Ô¤ï¤ì¤Þ¤¹¡£
(setq character-based-move t) ; default t
; ÆþÎÏÃæ¤ÎÆɤßÁ´ÂΤò¥ê¥Ð¡¼¥¹¤¹¤ë¤«
(setq reverse-widely nil) ; default nil
; ÉÑÅٳؽ¬¤ò¤¹¤ë¤«
(setq gakushu t) ; default t
; °ìÍ÷¤ÎºÇ¸å¤Þ¤Ç¤¤¤Ã¤¿¤é°ìö°ìÍ÷ɽ¼¨¤ò¤ä¤á¤ë¤«
(setq quit-if-end-of-ichiran nil); default nil
; ʸÀá¤Î±¦Ã¼¤Ç±¦°ÜÆ°¤ò¤¹¤ë¤ÈÁ´ÂΤ¬³ÎÄꤷ¤Æ¤·¤Þ¤¦¤«
(setq kakutei-if-end-of-bunsetsu nil) ; default nil
; °ìÍ÷ÁªÂò¸åƱ¤¸Ê¸Àá¤Ë¤È¤É¤Þ¤ë¤«(t)¡£nil¤Î»þ¤Ï°ìÍ÷ÁªÂò¤ò¹Ô¤¦¤È¤Ò¤È¤ÄÀè
; ¤ÎʸÀá¤Ë°ÜÆ°¤·¤Þ¤¹¡£
(setq stay-after-validate t) ; default t
; ÆɤߤòÆþÎÏÃæ¤Ë¥Ð¥Ã¥¯¥¹¥Ú¡¼¥¹¤òÂÇ¤Ä¤È¥í¡¼¥Þ»ú¤Þ¤Ç¥Ð¥é¥Ð¥é¤Ë¤¹¤ë¤«
(setq break-into-roman t) ; default nil
; ²¿²ó¤ÎÊÑ´¹¥¡¼¤Ç°ìÍ÷ɽ¼¨¤ò¹Ô¤¦¤«¡££°¤òÆþ¤ì¤ë¤ÈÊÑ´¹¥¡¼¤À¤±¤Ç¤Ï
; °ìÍ÷ɽ¼¨¤Ë¤Ï°Ü¤ê¤Þ¤»¤ó¡£¤½¤Î¾ì¹ç¤Ë¤Ï C-w ¤òÆþÎϤ·¤Æ°ìÍ÷ɽ¼¨¤·¤Æ
; ²¼¤µ¤¤¡£
(setq n-henkan-for-ichiran 2) ; default 2
; ñ¸ìÅÐÏ¿»þ¤Ëʸˡ´ØÏ¢¤Î¼ÁÌä¤ò¤¹¤ë¤«(t)¡£nil¤Î»þ¤ÏŬÅö¤ÊÉÊ»ì¤òÉÕ¤±¤Æ¤·
; ¤Þ¤¤¤Þ¤¹¡£
(setq gramatical-question t) ; default t
; ¸õÊ䤬Á´ÂΤβ¿ÈÖÌܤ«¤òɽ¼¨¤¹¤ë¤«
(setq kouho-count t) ; default t
; Ã༡ÊÑ´¹¤ò¤¹¤ë¤«
(setq auto nil) ; default nil
; Ã༡ÊÑ´¹¤ò¤¹¤ë»þ¤Ë²¿¸Ä¤ÎʸÀá¤Þ¤Ç¤ò̤³ÎÄê¤ÇÊÝ»ý¤¹¤ë¤«
(setq n-kouho-bunsetsu 16) ; default 16
; ¥í¡¼¥Þ»ú¤«¤ÊÊÑ´¹¤Ç¥¤¥ê¡¼¥¬¥ë¤Ê¥í¡¼¥Þ»ú¤ò¼Î¤Æ¤ë¤«
(setq abandon-illegal-phonogram nil) ; default nil
; °ìÍ÷¤Î»þ¤â¼¡¤ÎÆþÎϤòǧ¤á¤ë¤«
(setq allow-next-input t) ; default t
; °ìʸ»ú¥ì¥Ù¥ë¤Î¥í¡¼¥Þ»ú¤«¤ÊÊÑ´¹¤ÎÊä½õ¥Æ¡¼¥Ö¥ë
(if use-symbolic-definition
(progn
(defsymbol ?- "¡¼" "-" "¡Ý" "¡¾")
(defsymbol ?/ "/" "¡¿" "¡¦")
(defsymbol ?\\ "\\" "¡À" "¡ï")
(defsymbol
?( "(" "¡Ê" "¡Ú"
?) ")" "¡Ë" "¡Û" )
(defsymbol
?[ "¡Ö" "¡Ø" "¡Î" "¡Ì" "["
?] "¡×" "¡Ù" "¡Ï" "¡Í" "]")
(defsymbol
?. "¡£" "¡¥" "."
?, "¡¢" "¡¤" "," )
(defsymbol
?0 "0" "£°" "¡»" "Îí"
?1 "1" "£±" "°ì" "°í"
?2 "2" "£²" "Æó" "Æõ"
?3 "3" "£³" "»°" "»²"
?4 "4" "£´" "»Í" "»Í"
?5 "5" "£µ" "¸Þ" "¸à"
?6 "6" "£¶" "Ï»" "Ï»"
?7 "7" "£·" "¼·" "¼·"
?8 "8" "£¸" "Ȭ" "Ȭ"
?9 "9" "£¹" "¶å" "¶å" )
(defsymbol
?? "?" "¡©"
?! "!" "¡ª")
(defsymbol ?# "#" "¡ô")
(defsymbol ?$ "$" "¡ð")
(defsymbol ?% "%" "¡ó")
(defsymbol ?& "&" "¡õ")
(defsymbol ?+ "+" "¡Ü")
(defsymbol ?* "*" "¡ö" "¡ß")
(defsymbol ?_ "_" "¡²")
(defsymbol ?' "'" "¡Ç")
(defsymbol ?` "`" "¡Æ")
(defsymbol ?\" "\"" "¡É")
))
;; delete ¥¡¼¤â¥Ð¥Ã¥¯¥¹¥Ú¡¼¥¹¤ÈƱ¤¸½èÍý¤ò¤µ¤»¤ë
(global-set-key "\Delete" 'delete-previous) ; necessary in using Emacs
;; Help ¤¬¤Ê¤¤¿Í¤â¤¤¤ë¤Î¤Ç F1 ¤Ç¤âƱ¤¸Æ°ºî¤ò¤µ¤»¤ë¡£
(global-set-key "\F1" 'extend-mode)
;; Escape key should escape from the mode.
(global-set-key "\Escape" 'quit)
;; Ctrl-o ¤ÎÍÞÀ©
(global-unbind-key-function 'japanese-mode)
skk-dictionaries.patch:
--- NEW FILE skk-dictionaries.patch ---
diff -uNr Canna35b2/dic/ideo/words/Imakefile Canna35b2.new/dic/ideo/words/Imakefile
--- Canna35b2/dic/ideo/words/Imakefile Wed Aug 22 08:44:52 2001
+++ Canna35b2.new/dic/ideo/words/Imakefile Wed Aug 22 08:44:30 2001
@@ -82,6 +82,8 @@
InstallNamedNonExec(kanasmpl.t,kanasmpl.ctd,$(CANNADICDIR))
InstallNamedNonExec(software.t,software.ctd,$(CANNADICDIR))
InstallNamedNonExec(chimei.t,chimei.ctd,$(CANNADICDIR))
+InstallNamedNonExec(zipcode.t,zipcode.ctd,$(CANNADICDIR))
+InstallNamedNonExec(geo.t,geo.ctd,$(CANNADICDIR))
InstallNamedNonExec(hojomwd.t,hojomwd.ctd,$(CANNADICDIR))
InstallNamedNonExec(hojoswd.t,hojoswd.ctd,$(CANNADICDIR))
InstallNamedNonExec(suffix.t,suffix.ctd,$(CANNADICDIR))
@@ -90,6 +92,7 @@
InstallNamedNonExec(keishiki.t,keishiki.ctd,$(CANNADICDIR))
#else
TEXTDICS = necgaiji.t kanasmpl.t software.t chimei.t \
+ zipcode.t geo.t \
hojomwd.t hojoswd.t suffix.t number.t katakana.t keishiki.t
InstallMultipleFlags($(TEXTDICS),$(CANNADICDIR),-m 0664)
#endif
diff -uNr Canna35b2/dic/ideo/words/dics.dir Canna35b2.new/dic/ideo/words/dics.dir
--- Canna35b2/dic/ideo/words/dics.dir Sat Nov 9 11:14:13 1996
+++ Canna35b2.new/dic/ideo/words/dics.dir Wed Aug 22 08:44:30 2001
@@ -38,3 +38,5 @@
kanasmpl.ctd(.mwd) -kanasample---
necgaiji.ctd(.mwd) -necgaiji---
software.ctd(.mwd) -software---
+zipcode.ctd(.mwd) -zipcode---
+geo.ctd(.mwd) -geo---
diff -uNr Canna35b2/dic/ideo/words/geo.t Canna35b2.new/dic/ideo/words/geo.t
--- Canna35b2/dic/ideo/words/geo.t Thu Jan 1 09:00:00 1970
+++ Canna35b2.new/dic/ideo/words/geo.t Wed Aug 22 08:44:30 2001
@@ -0,0 +1,68607 @@
+#
+# This dictionary was generated from /usr/share/skk/SKK-JISYO.geo by ./Geo.rb
+# Date: Wed Aug 22 07:57:49 JST 2001
+#
+¤¢¡¼¤¯¤â¤ê¤Ó¤ë #CN ¥¢¡¼¥¯¿¹¥Ó¥ë
+¤¢¤¤ #CN °¤°æ °Â°Ò
+¤¢¤¤¤¢¤¤ #CN ²ñ¡¹
+¤¢¤¤¤¢¤² #CN Áê¾å
+¤¢¤¤¤¦¤· #CN °¦µí
+¤¢¤¤¤¦¤Á #CN ÁêÆâ
+¤¢¤¤¤ª¤¤ #CN ¹çÀ¸
+¤¢¤¤¤ª¤¤¤· #CNS ÁêÀ¸»Ô
+¤¢¤¤¤ª¤¤¤Á¤ç¤¦ #CNS °¦À¸Ä® ÁêÀ¸Ä®
+¤¢¤¤¤ª¤¤¤É¤ª¤ê #CN ÁêÀ¸ÄÌ
+¤¢¤¤¤ª¤¤¤Þ¤Á #CNS ÁêÀ¸Ä®
+¤¢¤¤¤ª¤¦ #CN Áê¹ç
+¤¢¤¤¤ª¤Õ¤¿¤¸¤Þ #CN ½©ÊæÆóÅç
+¤¢¤¤¤«¤¤ #CN ¹ç³¤
+¤¢¤¤¤«¤² #CN Áê±Æ
+¤¢¤¤¤«¤Á¤ç¤¦ #CNS ½©¼¯Ä®
+¤¢¤¤¤«¤Ã¤× #CN °¦´§
+¤¢¤¤¤«¤ß #CN Áê¿À
+¤¢¤¤¤«¤ï #CN °¾Àî Ê»Àî ÍõÀî
+¤¢¤¤¤«¤ï¤°¤ß #CN ÁêÀîÁÈ
+¤¢¤¤¤«¤ï¤Á¤ç¤¦ #CNS ÁêÀîÄ® ÍõÀîÄ®
+¤¢¤¤¤«¤ï¤Þ¤Á #CNS ¹ç²ÏÄ® ¹çÀîÄ®
+¤¢¤¤¤«¤ï¤ß¤Ê¤ß¤Þ¤Á #CNS °Â°ÒÀîÆîÄ®
+¤¢¤¤¤¬¤Á¤ç¤¦ #CNS Áê²ìÄ®
+¤¢¤¤¤¬¤Á¤ç¤¦¤¤¿¤À¤Ë #CN °Â¸ÃÄ®ËÌë
+¤¢¤¤¤¬¤Á¤ç¤¦¤Ê¤«¤¿ #CN °Â¸ÃÄ®ÃæÅÄ
+¤¢¤¤¤¬¤Á¤ç¤¦¤Õ¤ë¤ß¤ä #CN °Â¸ÃÄ®¸ÅµÜ
+¤¢¤¤¤¬¤Á¤ç¤¦¤Ø¤¤¤¢¤ó¤¦¤é #CN °Â¸ÃĮʿ°Â±º
+¤¢¤¤¤¬¤Á¤ç¤¦¤ß¤ä¤Î¤Ï¤é #CN °Â¸ÃÄ®µÜÌ
+¤¢¤¤¤¬¤Á¤ç¤¦¤ä¤Þ¤À¤Ï¤é #CN °Â¸ÃÄ®»³Åĸ¶
+¤¢¤¤¤¬¤ï¤Þ¤Á #CNS ÁêÀîÄ®
+¤¢¤¤¤®¤¬¤ª¤« #CN °¦´ô¥±µÖ
+¤¢¤¤¤®¤Á¤ç¤¦ #CNS °¦ÌÚÄ®
+¤¢¤¤¤¯¤Ü #CN Áê·¦
+¤¢¤¤¤±¤¤¤Á¤ç¤¦ #CNS °¦·ÉÄ®
+¤¢¤¤¤³¤¦¤°¤ó¤¢¤¤¤«¤ï¤Þ¤Á #CNS °¦¹Ã·´°¦ÀîÄ®
+¤¢¤¤¤³¤¦¤°¤ó¤¤è¤«¤ï¤à¤é #CNS °¦¹Ã·´À¶Àî¼
+¤¢¤¤¤³¤¦¤Á¤ç¤¦ #CNS °¦¸÷Ä®
+¤¢¤¤¤³¤¯¤Á¤ç¤¦ #CNS °¦¹ñÄ®
+¤¢¤¤¤³¤¯¤Ë¤· #CN °¦¹ñÀ¾
+¤¢¤¤¤³¤¯¤Ò¤¬¤· #CN °¦¹ñÅì
+¤¢¤¤¤³¤´¤¦ #CN Áê²Ï¶¿
+¤¢¤¤¤´¤¦ #CN °¦¶¿
+¤¢¤¤¤µ¤« #CN Áêºä
+¤¢¤¤¤µ¤ê #CN Áêµî
+¤¢¤¤¤µ¤ê¤Á¤ç¤¦ #CNS ÁêµîÄ®
+¤¢¤¤¤µ¤ï #CN ²ñÂô
+¤¢¤¤¤¶¤« #CN Áêºä
+¤¢¤¤¤¶¤È #CN ¹çΤ
+¤¢¤¤¤¶¤ì #CN Áêµî
+¤¢¤¤¤¶¤ó #CN °¦»³
+¤¢¤¤¤¶¤ó¤Á¤ç¤¦ #CNS °¦»³Ä®
+¤¢¤¤¤·¤Þ #CN ÁêÅç
+¤¢¤¤¤·¤ó¤Ç¤ó¤Á¤ç¤¦ #CNS ´Ö¿·ÅÄÄ®
+¤¢¤¤¤¸¤Þ #CN °ÂµïÅç ÁêÅè
+¤¢¤¤¤¸¤Þ¤·¤ó¤Ç¤ó #CN ÁêÅç¿·ÅÄ
+¤¢¤¤¤¹ #CN Áê¿Ü
+¤¢¤¤¤¹¤¸ #CN Áê¶Ú
+¤¢¤¤¤º¤ß¤Á¤ç¤¦ #CNS °¦½»Ä®
+¤¢¤¤¤» #CN ÁêÀ¥
+¤¢¤¤¤¼¤ó¤¸¤Á¤ç¤¦ #CNS °¦À÷»ûÄ®
+¤¢¤¤¤½¤á #CN ²ñÀ÷
+¤¢¤¤¤¾¤á¤µ¤ï¤Ê¤«¤¿¤¤ #CN ÁêÀ÷ÂôÃæÂÒ
+¤¢¤¤¤¾¤á¤Á¤ç¤¦ #CNS °¦À÷Ä®
+¤¢¤¤¤¿ #CN °¦ÅÄ ÁêÅÄ
+¤¢¤¤¤¿¤Æ #CN °¾Î©
+¤¢¤¤¤¿¤Ë¤Á¤ç¤¦ #CNS ÁêëĮ
+¤¢¤¤¤¿¤Þ #CN Áê¶Ì
+¤¢¤¤¤À #CN °¾ÅÄ ºßÅÄ ½©ÅÄ
+¤¢¤¤¤À¤ #CN ÁêÂì
+¤¢¤¤¤À¤°¤ó¤¢¤¤¤À¤Á¤ç¤¦ #CNS ±ÑÅÄ·´±ÑÅÄÄ®
+¤¢¤¤¤À¤°¤ó¤ª¤ª¤Ï¤é¤Á¤ç¤¦ #CNS ±ÑÅÄ·´Â縶Į
+¤¢¤¤¤À¤°¤ó¤µ¤¯¤È¤¦¤Á¤ç¤¦ #CNS ±ÑÅÄ·´ºîÅìÄ®
+¤¢¤¤¤À¤°¤ó¤Ë¤·¤¢¤ï¤¯¤é¤½¤ó #CNS ±ÑÅÄ·´À¾°ÀÁÒ¼
+¤¢¤¤¤À¤°¤ó¤Ò¤¬¤·¤¢¤ï¤¯¤é¤½¤ó #CNS ±ÑÅÄ·´Åì°ÀÁÒ¼
+¤¢¤¤¤À¤°¤ó¤ß¤Þ¤µ¤«¤Á¤ç¤¦ #CNS ±ÑÅÄ·´ÈþºîÄ®
+¤¢¤¤¤À¤Á¤ç¤¦ #CNS ÁêÅÄÄ®
+¤¢¤¤¤À¤Ë #CN Áêë
+¤¢¤¤¤Á #CN °¦ÃÏ
+¤¢¤¤¤Á¤°¤ó¤È¤¦¤´¤¦¤Á¤ç¤¦ #CNS °¦Ãη´Å춿Į
+¤¢¤¤¤Á¤°¤ó¤Ê¤¬¤¯¤Æ¤Á¤ç¤¦ #CNS °¦Ãη´Ä¹µ×¼êÄ®
+¤¢¤¤¤Á¤Á¤ç¤¦ #CNS °¦ÃÎÄ®
+¤¢¤¤¤Ä #CN ¹çÄÅ
+¤¢¤¤¤Å¤« #CN ²ñÄÍ
+¤¢¤¤¤Å¤ #CN Áê·î
+¤¢¤¤¤Å¤³¤¦¤²¤ó #CN ²ñÄŹ⸶
+¤¢¤¤¤Å¤Þ¤Á #CNS ²ñÄÅÄ®
+¤¢¤¤¤Å¤Þ¤Á¤ç¤¦ #CNS °©ºÊÄ®
+¤¢¤¤¤Ç¤ó¤Þ¤Á #CNS °½ÅÄÄ®
+¤¢¤¤¤É #CN Áê¸Í ÁêÅÏ
+¤¢¤¤¤É¤Þ¤ê #CN ÁêÇñ
+¤¢¤¤¤É¤ß¤Þ¤Á #CNS ²ñÉÙÄ®
+¤¢¤¤¤Ê #CN °¦Ì¾ Áê̾
+¤¢¤¤¤Ê¤¤ #CN ÁêÆâ ÍõÆâ
+¤¢¤¤¤Ê¤·¤ó¤Ç¤ó #CN °ÂÈæÆà¿·ÅÄ
+¤¢¤¤¤Ì¤Þ #CN Áê¾Â
+¤¢¤¤¤Î #CN ÁêÌî
+¤¢¤¤¤Î¤¦ #CN Áêǽ
+¤¢¤¤¤Î¤¦¤é #CN Áê¥Î±º
+¤¢¤¤¤Î¤¦¤é¤Á¤ç¤¦ #CNS Á걺Į
+¤¢¤¤¤Î¤«¤ï #CN ÁêÇ·Àî
+¤¢¤¤¤Î¤ #CN Áê¤ÎÌÚ ÁêÌÚ
+¤¢¤¤¤Î¤¤·¤ó #CN ÁêÌÚ¿·
+¤¢¤¤¤Î¤¤·¤ó¤Þ¤Á #CNS Áê¥ÎÌÚ¿·Ä®
+¤¢¤¤¤Î¤¤Þ¤Á #CNS ÁêÌÚÄ®
+¤¢¤¤¤Î¤¯¤Ü #CN Áê·¦
+¤¢¤¤¤Î¤¯¤é #CN ÁêÁÒ
+¤¢¤¤¤Î¤´¤¦¤ª¤Ä #CN ¸ã°æ¶¿²µ
+¤¢¤¤¤Î¤´¤¦¤³¤¦ #CN ¸ã°æ¶¿¹Ã
+¤¢¤¤¤Î¤µ¤È #CN °¾¤Î¶¿
+¤¢¤¤¤Î¤µ¤È1¤¸¤ç¤¦ #CN ¤¢¤¤¤ÎΤ°ì¾ò
+¤¢¤¤¤Î¤µ¤È2¤¸¤ç¤¦ #CN ¤¢¤¤¤ÎΤÆó¾ò
+¤¢¤¤¤Î¤µ¤È3¤¸¤ç¤¦ #CN ¤¢¤¤¤ÎΤ»°¾ò
+¤¢¤¤¤Î¤µ¤È4¤¸¤ç¤¦ #CN ¤¢¤¤¤ÎΤ»Í¾ò
+¤¢¤¤¤Î¤µ¤È5¤¸¤ç¤¦ #CN ¤¢¤¤¤ÎΤ¸Þ¾ò
+¤¢¤¤¤Î¤µ¤ï #CN ¹ç¤ÎÂô ÁêÌîÂô
+¤¢¤¤¤Î¤·¤Þ #CN ÁêÅç ÁêÇ·Åç ÍõÅç
+¤¢¤¤¤Î¤¿ #CN ÁêÌîÅÄ
+¤¢¤¤¤Î¤¿¤Ë #CN Áê¥Îë Áêë
+¤¢¤¤¤Î¤Á¤ç¤¦ #CNS ÁêÇ·Ä®
+¤¢¤¤¤Î¤Ê¤¤¤Á¤ç¤¦ #CNS ÁêÆâÄ®
+¤¢¤¤¤Î¤Î #CN ´ÖÌ
+¤¢¤¤¤Î¤Ï¤é #CN Áê¤Î¸¶ ÁêÌ
+¤¢¤¤¤Î¤Þ¤Á #CNS ´ÖÇ·Ä®
+¤¢¤¤¤Î¤Þ¤Á¤É¤ª¤ê2¤¸¤ç¤¦¤µ¤¬¤ë #CN ´ÖÇ·Ä®ÄÌÆó¾ò²¼¤ë
+¤¢¤¤¤Î¤Þ¤Á¤É¤ª¤ê¤ª¤·¤³¤¦¤¸¤¢¤¬¤ë #CN ´ÖÇ·Ä®Ä̲¡¾®Ï©¾å¤ë
+¤¢¤¤¤Î¤ß¤Í #CN Áê¤ÎÊö
+¤¢¤¤¤Î¤â¤ê #CN Á꿹
+¤¢¤¤¤Î¤ä #CN ²ñÌîë ´ÖÌîë ÁêÌîë
+¤¢¤¤¤Î¤ä¤Ä #CN ÁêÌîë
+¤¢¤¤¤Î¤ä¤Þ #CN °¦¤Î»³
+¤¢¤¤¤Î¤ä¤Þ¤Á #CNS ÁêÌîëĮ
+¤¢¤¤¤Ï¤¿ #CN ÍõȪ
+¤¢¤¤¤Ï¤Þ #CN ÁêÉÍ
+¤¢¤¤¤Ï¤é #CN °¾¸¶
+¤¢¤¤¤Ï¤é¤¦¤À¤Ë #CN °¾¸¶±§Ã«
+¤¢¤¤¤Ï¤é¤¦¤À¤Ë¤·¤ó¤è¤¦ #CN °¾¸¶±§Ã«¿ÀÍÛ
+¤¢¤¤¤Ï¤é¤«¤ß #CN °¾¸¶¾å
+¤¢¤¤¤Ï¤é¤«¤ä¤Î #CN °¾¸¶³üÌî
+¤¢¤¤¤Ï¤é¤³¤ä¤Þ¤À #CN °¾¸¶¾®»³ÅÄ
+¤¢¤¤¤Ï¤é¤·¤â #CN °¾¸¶²¼
+¤¢¤¤¤Ï¤é¤¿¤É¤³¤í #CN °¾¸¶ÅĽè
+¤¢¤¤¤Ï¤é¤Ä¤Å¤é¤ª #CN °¾¸¶³ëÈø
+¤¢¤¤¤Ï¤é¤È¤¦¤² #CN °¾¸¶Åã²¼
+¤¢¤¤¤Ï¤é¤Ê¤«¤à¤é #CN °¾¸¶Ãæ͸
+¤¢¤¤¤Ï¤é¤Ë¤· #CN °¾¸¶À¾
+¤¢¤¤¤Ï¤é¤Þ¤Á #CNS Á긶Į
+¤¢¤¤¤Ï¤é¤ß¤Ê¤ß¤À¤Ë #CN °¾¸¶Æîë
+¤¢¤¤¤Ï¤é¤ß¤Î¤Ï¤¿ #CN °¾¸¶»°ÌîȪ
+¤¢¤¤¤Ï¤é¤è¤·¤À #CN °¾¸¶µÈÅÄ
+¤¢¤¤¤Ð #CN ¶ÂÄí ¹çÇÈ
+¤¢¤¤¤Ð¤·¤ê #CN ÁêÁö
+¤¢¤¤¤Ð¤Á¤ç¤¦ #CNS ¹ç¾ìÄ® Íõ¾ìÄ®
+¤¢¤¤¤Ð¤é¤´¤¦ #CN Á긶¶¿
+¤¢¤¤¤Ö¤Á #CN ÁêÞ¼
+¤¢¤¤¤Þ¤¿ #CN ÁêËó ÁêËô
+¤¢¤¤¤â¤È #CN ÍõËÜ
+¤¢¤¤¤â¤È¤·¤ó #CN °¦ËÜ¿·
+¤¢¤¤¤â¤È¤Ï¤·¤Å¤á¤Ò¤¬¤·¤«¤ó¤ê¤ó¤Á¤Ê¤¤ #CN °¦Ëܶ¶ÄÞÅì´±ÎÓÃÏÆâ
+¤¢¤¤¤â¤Î¤Á¤ç¤¦ #CNS »Í½½ÊªÄ®
+¤¢¤¤¤â¤Î¤Þ¤Á #CNS »Í½½ÊªÄ®
+¤¢¤¤¤ä #CN °¾²°
[...185178 lines suppressed...]
+9997312 #CN »³·Á¸©À¾ÅÄÀî·´²¹³¤Ä®²¹³¤Àî
+9997313 #CN »³·Á¸©À¾ÅÄÀî·´²¹³¤Ä®ÌÚÌîËó
+9997314 #CN »³·Á¸©À¾ÅÄÀî·´²¹³¤Ä®±ÛÂô
+9997315 #CN »³·Á¸©À¾ÅÄÀî·´²¹³¤Ä®´ØÀî
+9997316 #CN »³·Á¸©À¾ÅÄÀî·´²¹³¤Ä®¾®¹ñ
+9997461 #CN »³·Á¸©ÄᲬ»Ô·øÂÝÂô
+9997462 #CN »³·Á¸©ÄᲬ»Ô¾®ÇÈÅÏ
+9997463 #CN »³·Á¸©ÄᲬ»Ô»°À¥
+9997464 #CN »³·Á¸©ÄᲬ»ÔͳÎÉ
+9997541 #CN »³·Á¸©ÄᲬ»ÔÀ¾ÌÜ
+9997542 #CN »³·Á¸©ÄᲬ»Ô¿åÂô
+9997543 #CN »³·Á¸©ÄᲬ»ÔÂç¹
+9997544 #CN »³·Á¸©ÄᲬ»ÔÃ滳
+9997545 #CN »³·Á¸©ÄᲬ»ÔÌð°ú
+9997546 #CN »³·Á¸©ÄᲬ»ÔÃæÂô
+9997547 #CN »³·Á¸©ÄᲬ»ÔÂç¹Ó
+9997600 #CN »³·Á¸©ÅìÅÄÀî·´Æ£ÅçÄ®
+9997601 #CN »³·Á¸©ÅìÅÄÀî·´Æ£ÅçĮƣÅç
+9997602 #CN »³·Á¸©ÅìÅÄÀî·´Æ£ÅçĮƣ¤Î²Ö
+9997604 #CN »³·Á¸©ÅìÅÄÀî·´Æ£ÅçĮƣϲ
+9997611 #CN »³·Á¸©ÅìÅÄÀî·´Æ£ÅçÄ®¾åÆ£Åç
+9997621 #CN »³·Á¸©ÅìÅÄÀî·´Æ£ÅçĮĹ¾Â
+9997622 #CN »³·Á¸©ÅìÅÄÀî·´Æ£ÅçĮ˱É
+9997631 #CN »³·Á¸©ÅìÅÄÀî·´Æ£ÅçĮȬ¿§ÌÚ
+9997632 #CN »³·Á¸©ÅìÅÄÀî·´Æ£ÅçÄ®¾®ÃæÅç
+9997633 #CN »³·Á¸©ÅìÅÄÀî·´Æ£ÅçÄ®¿ÜÁö
+9997634 #CN »³·Á¸©ÅìÅÄÀî·´Æ£ÅçÄ®»°ÏÂ
+9997635 #CN »³·Á¸©ÅìÅÄÀî·´Æ£ÅçÄ®±Û¸åµþÅÄ
+9997636 #CN »³·Á¸©ÅìÅÄÀî·´Æ£ÅçÄ®ÌîÅÄÌÜ
+9997637 #CN »³·Á¸©ÅìÅÄÀî·´Æ£ÅçÄ®²¼Ãæ¥ÎÌÜ
+9997638 #CN »³·Á¸©ÅìÅÄÀî·´Æ£ÅçĮƣ²¬
+9997641 #CN »³·Á¸©ÅìÅÄÀî·´Æ£ÅçÄ®ÜÄ
+9997642 #CN »³·Á¸©ÅìÅÄÀî·´Æ£ÅçÄ®´Øº¬
+9997643 #CN »³·Á¸©ÅìÅÄÀî·´Æ£ÅçĮ̵²»
+9997644 #CN »³·Á¸©ÅìÅÄÀî·´Æ£ÅçÄ®À
+9997645 #CN »³·Á¸©ÅìÅÄÀî·´Æ£ÅçĮʿÂ
+9997646 #CN »³·Á¸©ÅìÅÄÀî·´Æ£ÅçÄ®¹©Æ£
+9997651 #CN »³·Á¸©ÅìÅÄÀî·´Æ£ÅçÄ®ºíȪ
+9997652 #CN »³·Á¸©ÅìÅÄÀî·´Æ£ÅçĮźÀî
+9997653 #CN »³·Á¸©ÅìÅÄÀî·´Æ£ÅçÄ®ÅìËÙ±Û
+9997661 #CN »³·Á¸©ÅìÅÄÀî·´Æ£ÅçÄ®ÂçÀîÅÏ
+9997662 #CN »³·Á¸©ÅìÅÄÀî·´Æ£ÅçĮëÃ϶½²°
+9997663 #CN »³·Á¸©ÅìÅÄÀî·´Æ£ÅçÄ®Âý°æ¶½²°
+9997664 #CN »³·Á¸©ÅìÅÄÀî·´Æ£ÅçÄ®¾åÃæ¥ÎÌÜ
+9997671 #CN »³·Á¸©ÅìÅÄÀî·´Æ£ÅçÄ®¸Å·´
+9997672 #CN »³·Á¸©ÅìÅÄÀî·´Æ£ÅçÄ®Ìøµ×À¥
+9997673 #CN »³·Á¸©ÅìÅÄÀî·´Æ£ÅçÄ®¹ÓËó
+9997674 #CN »³·Á¸©ÅìÅÄÀî·´Æ£ÅçĮ̧Á¤¿·ÅÄ
+9997675 #CN »³·Á¸©ÅìÅÄÀî·´Æ£ÅçÄ®ÊõÆÁ
+9997676 #CN »³·Á¸©ÅìÅÄÀî·´Æ£ÅçÄ®ËëÌîÆâ
+9997677 #CN »³·Á¸©ÅìÅÄÀî·´Æ£ÅçÄ®ÂçȾÅÄ
+9997681 #CN »³·Á¸©ÅìÅÄÀî·´Æ£ÅçĮʿ·Á
+9997682 #CN »³·Á¸©ÅìÅÄÀî·´Æ£ÅçÄ®¿·²°Éß
+9997683 #CN »³·Á¸©ÅìÅÄÀî·´Æ£ÅçÄ®ÅÏÁ°
+9997684 #CN »³·Á¸©ÅìÅÄÀî·´Æ£ÅçÄ®ÏÂ̾Àî
+9997685 #CN »³·Á¸©ÅìÅÄÀî·´Æ£ÅçÄ®º½ÄÍ
+9997700 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®
+9997701 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®À×
+9997702 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®±ÝÌÚ
+9997703 #CN »³·Á¸©ÅìÅÄÀ;ÌÜĮʿ²¬
+9997704 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®Àé²Ï¸¶
+9997705 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®ô¢Åç
+9997706 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®Ä󶽲°
+9997707 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®ÆûÏ»ÌÚ
+9997711 #CN »³·Á¸©ÅìÅÄÀ;ÌÜĮʡ¸¶
+9997712 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®ËÙÌî
+9997713 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®¾ïËü
+9997714 #CN »³·Á¸©ÅìÅÄÀ;ÌÜĮ;ÌÜ¿·ÅÄ
+9997715 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®²ö´Û
+9997721 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®Äé¿·ÅÄ
+9997722 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®¾®½Ð¿·ÅÄ
+9997723 #CN »³·Á¸©ÅìÅÄÀ;ÌÜĮϢ»Þ
+9997724 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®ÀÖÞ¼¿·ÅÄ
+9997725 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®Âô¿·ÅÄ
+9997726 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®¸Å´Ø
+9997727 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®ÆîÌî
+9997731 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®¼çÅ¿·ÅÄ
+9997732 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®ÆîÌî¿·ÅÄ
+9997733 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®Æ²°
+9997734 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®ÃæÌî
+9997735 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®Á°ÅÄÌîÌÜ
+9997736 #CN »³·Á¸©ÅìÅÄÀ;ÌÜĮʡÅç
+9997737 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®Âç¿¿ÌÚ
+9997741 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®ÊÖµÈ
+9997742 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®µþÅç
+9997743 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®¿·ÅÄÌÜ
+9997744 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®Ëܾ®ÌîÊý
+9997745 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®¶¶½²°
+9997746 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®À¾ÂÞ
+9997747 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®ÂçÌî
+9997748 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®ÅÄë
+9997749 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®µÈÊý
+9997751 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®À¾¾®ÌîÊý
+9997752 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®¶á¹¾¿·ÅÄ
+9997753 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®µÈ²¬
+9997754 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®ÅçÅÄ
+9997755 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®À¸»°
+9997756 #CN »³·Á¸©ÅìÅÄÀ;ÌÜĮ謲ÙÀ¥
+9997757 #CN »³·Á¸©ÅìÅÄÀ;ÌÜĮʧÅÄ
+9997761 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®¹âÅÄÇþ
+9997762 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®²Èº¬¹ç
+9997763 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®Íî¹ç
+9997764 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®µÜÁ¾º¬
+9997765 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®¿ù±º
+9997766 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®µ×ÅÄ
+9997767 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®¿¼Àî
+9997768 #CN »³·Á¸©ÅìÅÄÀ;ÌÜÄ®À¾Ìî
+9997771 #CN »³·Á¸©¼òÅĻԶÉ
+9997772 #CN »³·Á¸©¼òÅÄ»ÔÌçÅÄ
+9997773 #CN »³·Á¸©¼òÅÄ»ÔÌÚÀî
+9997774 #CN »³·Á¸©¼òÅÄ»ÔÈĸÍ
+9997775 #CN »³·Á¸©¼òÅÄ»ÔÍîÌîÌÜ
+9997776 #CN »³·Á¸©¼òÅĻԿ·ËÙ
+9997777 #CN »³·Á¸©¼òÅĻԴݾÂ
+9997781 #CN »³·Á¸©ÅìÅÄÀ;ÌÜĮ;ÌÜ
+9998131 #CN »³·Á¸©¼òÅÄ»ÔÊæÀÑ »³·Á¸©¼òÅÄ»ÔÊæÀÑÌçÅÄ
+9998132 #CN »³·Á¸©¼òÅÄ»ÔËÀî
+9998133 #CN »³·Á¸©¼òÅÄ»ÔÂçËÅÄ
+9998134 #CN »³·Á¸©¼òÅÄ»ÔËܽÝ
+9998141 #CN »³·Á¸©¼òÅÄ»Ô˸¶
+9998142 #CN »³·Á¸©¼òÅĻԾëÎØ
+9998143 #CN »³·Á¸©¼òÅĻԴ¢Êæ
+9998144 #CN »³·Á¸©¼òÅÄ»ÔÄíÅÄ
+9998145 #CN »³·Á¸©¼òÅÄ»ÔÊݲ¬
+9998151 #CN »³·Á¸©¼òÅĻ԰ÂÅÄ
+9998152 #CN »³·Á¸©¼òÅĻԾå°ÂÅÄ
+9998153 #CN »³·Á¸©¼òÅĻԱßǽ»û
+9998154 #CN »³·Á¸©¼òÅĻԸÅÀÄÅÏ
+9998155 #CN »³·Á¸©¼òÅÄ»ÔÁ¾º¬ÅÄ
+9998156 #CN »³·Á¸©¼òÅĻԵ×ÊÝÅÄ
+9998157 #CN »³·Á¸©¼òÅĻԿ·ÀÄÅÏ
+9998158 #CN »³·Á¸©¼òÅÄ»ÔÉÛÌÜ
+9998161 #CN »³·Á¸©¼òÅĻԵÈÅÄ
+9998162 #CN »³·Á¸©¼òÅĻԾåÌîÁ¾º¬
+9998163 #CN »³·Á¸©¼òÅĻԾ嶽Ìî
+9998164 #CN »³·Á¸©¼òÅĻԼ¿Á¾º¬
+9998165 #CN »³·Á¸©¼òÅÄ»ÔÃæÌîÁ¾º¬
+9998166 #CN »³·Á¸©¼òÅÄ»ÔËÒÁ¾º¬
+9998167 #CN »³·Á¸©¼òÅĻԵÈÅÄ¿·ÅÄ
+9998168 #CN »³·Á¸©¼òÅÄ»ÔÄáÅÄ
+9998200 #CN »³·Á¸©Ë°³¤·´È¬È¨Ä®
+9998201 #CN »³·Á¸©Ë°³¤·´È¬È¨Ä®¾£ÅÄ
+9998202 #CN »³·Á¸©Ë°³¤·´È¬È¨Ä®Å¥Âô
+9998203 #CN »³·Á¸©Ë°³¤·´È¬È¨Ä®ÀÖÇí
+9998204 #CN »³·Á¸©Ë°³¤·´È¬È¨Ä®¿·½Ð
+9998205 #CN »³·Á¸©Ë°³¤·´È¬È¨Ä®²¼¹õÀî
+9998206 #CN »³·Á¸©Ë°³¤·´È¬È¨Ä®¾å¹õÀî
+9998207 #CN »³·Á¸©Ë°³¤·´È¬È¨Ä®ÁðÄÅ
+9998211 #CN »³·Á¸©Ë°³¤·´È¬È¨Ä®ËÌÀÄÂô
+9998212 #CN »³·Á¸©Ë°³¤·´È¬È¨Ä®¾åÀÄÂô
+9998213 #CN »³·Á¸©Ë°³¤·´È¬È¨Ä®²¼ÀÄÂô
+9998214 #CN »³·Á¸©Ë°³¤·´È¬È¨Ä®¾ïÁµ»û
+9998215 #CN »³·Á¸©Ë°³¤·´È¬È¨Ä®ÂçÏÏ
+9998221 #CN »³·Á¸©Ë°³¤·´È¬È¨Ä®»ûÅÄ
+9998222 #CN »³·Á¸©Ë°³¤·´È¬È¨Ä®ËÌÊ¿Âô
+9998223 #CN »³·Á¸©Ë°³¤·´È¬È¨Ä®ÆîÊ¿Âô
+9998224 #CN »³·Á¸©Ë°³¤·´È¬È¨Ä®Á°Àî
+9998225 #CN »³·Á¸©Ë°³¤·´È¬È¨Ä®ÂçÅçÅÄ
+9998226 #CN »³·Á¸©Ë°³¤·´È¬È¨Ä®À¯½ê
+9998227 #CN »³·Á¸©Ë°³¤·´È¬È¨Ä®²¬ÅçÅÄ
+9998231 #CN »³·Á¸©Ë°³¤·´È¬È¨Ä®Ï¼
+9998232 #CN »³·Á¸©Ë°³¤·´È¬È¨Ä®»Ô¾ò
+9998233 #CN »³·Á¸©Ë°³¤·´È¬È¨Ä®Ë¡Ï¢»û
+9998234 #CN »³·Á¸©Ë°³¤·´È¬È¨Ä®¾®Àô
+9998235 #CN »³·Á¸©Ë°³¤·´È¬È¨Ä®´Ñ²»»û
+9998241 #CN »³·Á¸©Ë°³¤·´È¬È¨Ä®Ê¡»³
+9998242 #CN »³·Á¸©Ë°³¤·´È¬È¨Ä®¶¶ËÜ
+9998243 #CN »³·Á¸©Ë°³¤·´È¬È¨Ä®ËÌ¿ÎÅÄ
+9998244 #CN »³·Á¸©Ë°³¤·´È¬È¨Ä®Âçµ×ÊÝ
+9998245 #CN »³·Á¸©Ë°³¤·´È¬È¨Ä®ÄÍÊ¥
+9998246 #CN »³·Á¸©Ë°³¤·´È¬È¨Ä®¶ÜÅÄ
+9998300 #CN »³·Á¸©Ë°³¤·´Í·º´Ä®
+9998301 #CN »³·Á¸©Ë°³¤·´Í·º´Ä®Í·º´Ä®
+9998302 #CN »³·Á¸©Ë°³¤·´Í·º´Ä®µÈ½Ð
+9998303 #CN »³·Á¸©Ë°³¤·´Í·º´Ä®ÌîÂô
+9998304 #CN »³·Á¸©Ë°³¤·´Í·º´Ä®Çò°æ¿·ÅÄ
+9998311 #CN »³·Á¸©Ë°³¤·´Í·º´Ä®¾®¸¶ÅÄ
+9998312 #CN »³·Á¸©Ë°³¤·´Í·º´Ä®¼¯ÌîÂô
+9998313 #CN »³·Á¸©Ë°³¤·´Í·º´Ä®¿ùÂô
+9998314 #CN »³·Á¸©Ë°³¤·´Í·º´Ä®¾åÏϲ¬
+9998315 #CN »³·Á¸©Ë°³¤·´Í·º´Ä®ÂçÏϲ¬
+9998316 #CN »³·Á¸©Ë°³¤·´Í·º´Ä®Ë²¬
+9998317 #CN »³·Á¸©Ë°³¤·´Í·º´Ä®¾®¾¾
+9998421 #CN »³·Á¸©¼òÅÄ»ÔÊÆÅç
+9998422 #CN »³·Á¸©¼òÅÄ»ÔÀéÂåÅÄ
+9998423 #CN »³·Á¸©¼òÅĻԵÜÆâ
+9998431 #CN »³·Á¸©Ë°³¤·´Í·º´Ä®¿ûΤ »³·Á¸©Ë°³¤·´Í·º´Ä®¿ûΤ½½Î¤ÄÍ
+9998432 #CN »³·Á¸©Ë°³¤·´Í·º´Ä®µÜÅÄ
+9998433 #CN »³·Á¸©Ë°³¤·´Í·º´Ä®¹¾ÃÏ
+9998434 #CN »³·Á¸©Ë°³¤·´Í·º´Ä®ÁýÊæ
+9998435 #CN »³·Á¸©Ë°³¤·´Í·º´Ä®¾±Àô
+9998436 #CN »³·Á¸©Ë°³¤·´Í·º´Ä®´äÀî
+9998437 #CN »³·Á¸©Ë°³¤·´Í·º´Ä®Æ£ºê
+9998438 #CN »³·Á¸©Ë°³¤·´Í·º´Ä®Èæ»Ò
+9998521 #CN »³·Á¸©Ë°³¤·´Í·º´Ä®¿á±º
+9998522 #CN »³·Á¸©Ë°³¤·´Í·º´Ä®ËÌÌÜ
+9998523 #CN »³·Á¸©Ë°³¤·´Í·º´Ä®Åö»³
+9998524 #CN »³·Á¸©Ë°³¤·´Í·º´Ä®ÉÙ²¬
+9998525 #CN »³·Á¸©Ë°³¤·´Í·º´Ä®Ä¾À¤
+9998531 #CN »³·Á¸©Ë°³¤·´Í·º´Ä®¿ûΤ
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Canna/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 26 Sep 2005 09:21:11 -0000 1.1
+++ .cvsignore 26 Sep 2005 09:29:14 -0000 1.2
@@ -0,0 +1,5 @@
+Canna37p3.tar.bz2
+cannadic-0.95c.tar.gz
+pubdic-bonobo-20021028.tar.bz2
+shion.tar.gz
+zipcode-20030204.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Canna/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 26 Sep 2005 09:21:11 -0000 1.1
+++ sources 26 Sep 2005 09:29:14 -0000 1.2
@@ -0,0 +1,5 @@
+0b8c241f63ab4cd3c0b9be569456dc33 Canna37p3.tar.bz2
+2a7fc1be5a50e0ca5dd6e5721be4371a cannadic-0.95c.tar.gz
+1c89701cc7a274068c3b265e2aa36ac2 pubdic-bonobo-20021028.tar.bz2
+9df0656abbcfdcc2001071805d23229b shion.tar.gz
+d6287eb37f8b9151fa38cc2684952177 zipcode-20030204.tar.bz2
More information about the fedora-extras-commits
mailing list