r2262 - in glibc-package/branches/glibc-2.6/debian: . patches patches/all
Author: madcoder
Date: 2007-05-20 15:46:20 +0000 (Sun, 20 May 2007)
New Revision: 2262
Removed:
glibc-package/branches/glibc-2.6/debian/patches/all/submitted-new-brf-encoding.diff
Modified:
glibc-package/branches/glibc-2.6/debian/changelog
glibc-package/branches/glibc-2.6/debian/patches/series
Log:
submitted-new-brf-encoding is merged upstream.
Modified: glibc-package/branches/glibc-2.6/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.6/debian/changelog 2007-05-20 15:29:58 UTC (rev 2261)
+++ glibc-package/branches/glibc-2.6/debian/changelog 2007-05-20 15:46:20 UTC (rev 2262)
@@ -20,7 +20,7 @@
- Remove mips/cvs-ldsodefs_h.diff (merged upstream).
- Remove mips/submitted-msq.diff (merged upstream).
- Remove all/cvs-iconv-E13B.diff (obsolete).
- - Disable all/submitted-new-brf-encoding.diff (broken).
+ - Remove all/submitted-new-brf-encoding.diff (merged upstream).
- Remove any/cvs-2.5-branch-update.diff (obsolete).
- Remove any/cvs-pow.diff (obsolete).
- Disable any/cvs-printf_fp-c.diff (broken).
@@ -56,7 +56,7 @@
(<< 2.17cvs20070426-1) for libc-dev. Closes: #422625.
* debian/local/etc_init.d/glibc.sh: fix a typo. Closes: #423870.
- -- Pierre Habouzit <madcoder@debian.org> Sun, 20 May 2007 15:45:53 +0200
+ -- Pierre Habouzit <madcoder@debian.org> Sun, 20 May 2007 17:45:36 +0200
glibc (2.5-7) unstable; urgency=low
Deleted: glibc-package/branches/glibc-2.6/debian/patches/all/submitted-new-brf-encoding.diff
===================================================================
--- glibc-package/branches/glibc-2.6/debian/patches/all/submitted-new-brf-encoding.diff 2007-05-20 15:29:58 UTC (rev 2261)
+++ glibc-package/branches/glibc-2.6/debian/patches/all/submitted-new-brf-encoding.diff 2007-05-20 15:46:20 UTC (rev 2262)
@@ -1,218 +0,0 @@
-This patch has been submitted upstream BZ2681 by Samuel Thibault,
-who works on accessibility issues. It adds a new BRF encoding,
-aka ASCII Braille.
-
-Index: iconvdata/Makefile
-===================================================================
---- iconvdata/Makefile.orig
-+++ iconvdata/Makefile
-@@ -58,7 +58,7 @@
- IBM1142 IBM1143 IBM1144 IBM1145 IBM1146 IBM1147 IBM1148 \
- IBM1149 IBM1166 IBM1167 IBM4517 IBM4899 IBM4909 IBM4971 \
- IBM5347 IBM9030 IBM9066 IBM9448 IBM12712 IBM16804 \
-- IBM1364 IBM1371 IBM1388 IBM1390 IBM1399 ISO_11548-1 MIK
-+ IBM1364 IBM1371 IBM1388 IBM1390 IBM1399 ISO_11548-1 MIK BRF
-
- modules.so := $(addsuffix .so, $(modules))
-
-@@ -196,7 +196,7 @@
- ibm9030.c ibm9030.h ibm9066.c ibm9066.h ibm9448.c ibm9448.h \
- ibm12712.c ibm12712.h ibm16804.c ibm16804.h \
- ibm1364.c ibm1364.h ibm1371.c ibm1371.h ibm1388.c ibm1388.h \
-- ibm1390.c ibm1390.h ibm1399.c ibm1399.h iso_11548-1.c mik.c
-+ ibm1390.c ibm1390.h ibm1399.c ibm1399.h iso_11548-1.c mik.c brf.c
-
- # We build the transformation modules only when we build shared libs.
- ifeq (yes,$(build-shared))
-@@ -237,7 +237,7 @@
- iso8859-13 iso8859-14 iso8859-15 mac-uk sami-ws2 \
- iso-ir-197 tis-620 koi8-u ibm874 cp10007 koi8-t \
- georgian-ps georgian-academy iso-ir-209 mac-sami \
-- iso8859-11 ibm866nav pt154 rk1048 mik
-+ iso8859-11 ibm866nav pt154 rk1048 mik brf
-
- gen-special-modules := iso8859-7jp
-
-Index: iconvdata/brf.c
-===================================================================
---- /dev/null
-+++ iconvdata/brf.c
-@@ -0,0 +1,29 @@
-+/* Conversion from and to BRF.
-+ Copyright (C) 2006 Free Software Foundation, Inc.
-+ This file is part of the GNU C Library.
-+ Contributed by Samuel Thibault <samuel.thibault@ens-lyon.org>, 2006.
-+
-+ The GNU C Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ The GNU C 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
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with the GNU C Library; if not, write to the Free
-+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+ 02111-1307 USA. */
-+
-+#include <stdint.h>
-+
-+/* Get the conversion table. */
-+#define TABLES <brf.h>
-+
-+#define CHARSET_NAME "BRF//"
-+#define HAS_HOLES 1 /* Not all 256 character are defined. */
-+
-+#include <8bit-gap.c>
-Index: iconvdata/gconv-modules
-===================================================================
---- iconvdata/gconv-modules.orig
-+++ iconvdata/gconv-modules
-@@ -1907,3 +1907,7 @@
- # from to module cost
- module MIK// INTERNAL MIK 1
- module INTERNAL MIK// MIK 1
-+
-+# from to module cost
-+module BRF// INTERNAL BRF 1
-+module INTERNAL BRF// BRF 1
-Index: iconvdata/testdata/BRF
-===================================================================
---- /dev/null
-+++ iconvdata/testdata/BRF
-@@ -0,0 +1,7 @@
-+A B C D E F G H I J
-+K L M N O P Q R S T
-+U V X Y Z & = ( ! )
-+* < % ? : $ ] \ [ W
-+1 2 3 4 5 6 7 8 9 0
-+/ + # > ' -
-+@ ^ _ " . ; ,
-Index: iconvdata/testdata/BRF..UTF-8
-===================================================================
---- /dev/null
-+++ iconvdata/testdata/BRF..UTF-8
-@@ -0,0 +1,7 @@
-+⠁⠀⠃⠀⠉⠀⠙⠀⠑⠀⠋⠀⠛⠀⠓⠀⠊⠀⠚
-+⠅⠀⠇⠀⠍⠀⠝⠀⠕⠀⠏⠀⠟⠀⠗⠀⠎⠀⠞
-+⠥⠀⠧⠀⠭⠀⠽⠀⠵⠀⠯⠀⠿⠀⠷⠀⠮⠀⠾
-+⠡⠀⠣⠀⠩⠀⠹⠀⠱⠀⠫⠀⠻⠀⠳⠀⠪⠀⠺
-+⠂⠀⠆⠀⠒⠀⠲⠀⠢⠀⠖⠀⠶⠀⠦⠀⠔⠀⠴
-+⠌⠀⠬⠀⠼⠀⠜⠀⠄⠀⠤
-+⠈⠀⠘⠀⠸⠀⠐⠀⠨⠀⠰⠀⠠
-Index: localedata/charmaps/BRF
-===================================================================
---- /dev/null
-+++ localedata/charmaps/BRF
-@@ -0,0 +1,108 @@
-+<code_set_name> BRF
-+<comment_char> %
-+<escape_char> /
-+% version: 1.0
-+% source: Samuel Thibault <samuel.thibault@ens-lyon.org>
-+
-+CHARMAP
-+<U0000> /x00 NULL (NUL)
-+<U0001> /x01 START OF HEADING (SOH)
-+<U0002> /x02 START OF TEXT (STX)
-+<U0003> /x03 END OF TEXT (ETX)
-+<U0004> /x04 END OF TRANSMISSION (EOT)
-+<U0005> /x05 ENQUIRY (ENQ)
-+<U0006> /x06 ACKNOWLEDGE (ACK)
-+<U0007> /x07 BELL (BEL)
-+<U0008> /x08 BACKSPACE (BS)
-+<U0009> /x09 CHARACTER TABULATION (HT)
-+<U000A> /x0a LINE FEED (LF)
-+<U000B> /x0b LINE TABULATION (VT)
-+<U000C> /x0c FORM FEED (FF)
-+<U000D> /x0d CARRIAGE RETURN (CR)
-+<U000E> /x0e SHIFT OUT (SO)
-+<U000F> /x0f SHIFT IN (SI)
-+<U0010> /x10 DATALINK ESCAPE (DLE)
-+<U0011> /x11 DEVICE CONTROL ONE (DC1)
-+<U0012> /x12 DEVICE CONTROL TWO (DC2)
-+<U0013> /x13 DEVICE CONTROL THREE (DC3)
-+<U0014> /x14 DEVICE CONTROL FOUR (DC4)
-+<U0015> /x15 NEGATIVE ACKNOWLEDGE (NAK)
-+<U0016> /x16 SYNCHRONOUS IDLE (SYN)
-+<U0017> /x17 END OF TRANSMISSION BLOCK (ETB)
-+<U0018> /x18 CANCEL (CAN)
-+<U0019> /x19 END OF MEDIUM (EM)
-+<U001A> /x1a SUBSTITUTE (SUB)
-+<U001B> /x1b ESCAPE (ESC)
-+<U001C> /x1c FILE SEPARATOR (IS4)
-+<U001D> /x1d GROUP SEPARATOR (IS3)
-+<U001E> /x1e RECORD SEPARATOR (IS2)
-+<U001F> /x1f UNIT SEPARATOR (IS1)
-+<U2800> /x20 BRAILLE PATTERN BLANK
-+<U282E> /x21 BRAILLE PATTERN DOTS-2346
-+<U2810> /x22 BRAILLE PATTERN DOTS-5
-+<U283C> /x23 BRAILLE PATTERN DOTS-3456
-+<U282B> /x24 BRAILLE PATTERN DOTS-1246
-+<U2829> /x25 BRAILLE PATTERN DOTS-146
-+<U282F> /x26 BRAILLE PATTERN DOTS-12346
-+<U2804> /x27 BRAILLE PATTERN DOTS-3
-+<U2837> /x28 BRAILLE PATTERN DOTS-12356
-+<U283E> /x29 BRAILLE PATTERN DOTS-23456
-+<U2821> /x2a BRAILLE PATTERN DOTS-16
-+<U282C> /x2b BRAILLE PATTERN DOTS-346
-+<U2820> /x2c BRAILLE PATTERN DOTS-6
-+<U2824> /x2d BRAILLE PATTERN DOTS-36
-+<U2828> /x2e BRAILLE PATTERN DOTS-46
-+<U280C> /x2f BRAILLE PATTERN DOTS-34
-+<U2834> /x30 BRAILLE PATTERN DOTS-356
-+<U2802> /x31 BRAILLE PATTERN DOTS-2
-+<U2806> /x32 BRAILLE PATTERN DOTS-23
-+<U2812> /x33 BRAILLE PATTERN DOTS-25
-+<U2832> /x34 BRAILLE PATTERN DOTS-256
-+<U2822> /x35 BRAILLE PATTERN DOTS-26
-+<U2816> /x36 BRAILLE PATTERN DOTS-235
-+<U2836> /x37 BRAILLE PATTERN DOTS-2356
-+<U2826> /x38 BRAILLE PATTERN DOTS-236
-+<U2814> /x39 BRAILLE PATTERN DOTS-35
-+<U2831> /x3a BRAILLE PATTERN DOTS-156
-+<U2830> /x3b BRAILLE PATTERN DOTS-56
-+<U2823> /x3c BRAILLE PATTERN DOTS-126
-+<U283F> /x3d BRAILLE PATTERN DOTS-123456
-+<U281C> /x3e BRAILLE PATTERN DOTS-345
-+<U2839> /x3f BRAILLE PATTERN DOTS-1456
-+<U2808> /x40 BRAILLE PATTERN DOTS-4
-+<U2801> /x41 BRAILLE PATTERN DOTS-1
-+<U2803> /x42 BRAILLE PATTERN DOTS-12
-+<U2809> /x43 BRAILLE PATTERN DOTS-14
-+<U2819> /x44 BRAILLE PATTERN DOTS-145
-+<U2811> /x45 BRAILLE PATTERN DOTS-15
-+<U280B> /x46 BRAILLE PATTERN DOTS-124
-+<U281B> /x47 BRAILLE PATTERN DOTS-1245
-+<U2813> /x48 BRAILLE PATTERN DOTS-125
-+<U280A> /x49 BRAILLE PATTERN DOTS-24
-+<U281A> /x4a BRAILLE PATTERN DOTS-245
-+<U2805> /x4b BRAILLE PATTERN DOTS-13
-+<U2807> /x4c BRAILLE PATTERN DOTS-123
-+<U280D> /x4d BRAILLE PATTERN DOTS-134
-+<U281D> /x4e BRAILLE PATTERN DOTS-1345
-+<U2815> /x4f BRAILLE PATTERN DOTS-135
-+<U280F> /x50 BRAILLE PATTERN DOTS-1234
-+<U281F> /x51 BRAILLE PATTERN DOTS-12345
-+<U2817> /x52 BRAILLE PATTERN DOTS-1235
-+<U280E> /x53 BRAILLE PATTERN DOTS-234
-+<U281E> /x54 BRAILLE PATTERN DOTS-2345
-+<U2825> /x55 BRAILLE PATTERN DOTS-136
-+<U2827> /x56 BRAILLE PATTERN DOTS-1236
-+<U283A> /x57 BRAILLE PATTERN DOTS-2456
-+<U282D> /x58 BRAILLE PATTERN DOTS-1346
-+<U283D> /x59 BRAILLE PATTERN DOTS-13456
-+<U2835> /x5a BRAILLE PATTERN DOTS-1356
-+<U282A> /x5b BRAILLE PATTERN DOTS-246
-+<U2833> /x5c BRAILLE PATTERN DOTS-1256
-+<U283B> /x5d BRAILLE PATTERN DOTS-12456
-+<U2818> /x5e BRAILLE PATTERN DOTS-45
-+<U2838> /x5f BRAILLE PATTERN DOTS-456
-+END CHARMAP
-+
-+WIDTH
-+<U2800>...<U283F> 1
-+END WIDTH
Modified: glibc-package/branches/glibc-2.6/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.6/debian/patches/series 2007-05-20 15:29:58 UTC (rev 2261)
+++ glibc-package/branches/glibc-2.6/debian/patches/series 2007-05-20 15:46:20 UTC (rev 2262)
@@ -86,7 +86,6 @@
all/local-remove-manual.diff
all/local-ru_RU.diff
all/local-pt_BR.diff
-# all/submitted-new-brf-encoding.diff -p0
# any/cvs-printf_fp-c.diff -p1
any/local-notls.diff -p0
Reply to: