X Strike Force XFree86 SVN commit: r2167 - in trunk/debian: . patches
Author: branden
Date: 2005-01-31 16:16:12 -0500 (Mon, 31 Jan 2005)
New Revision: 2167
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
trunk/debian/patches/096_Xlib_l10n_pt_BR.UTF-8.diff
Log:
Replace post-processed comments with pre-processed ones in patch #096;
this quiets build-time warnings. Also document why this patch is not yet
suitable for submission to upstream.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2005-01-27 07:54:19 UTC (rev 2166)
+++ trunk/debian/CHANGESETS 2005-01-31 21:16:12 UTC (rev 2167)
@@ -245,4 +245,9 @@
bug, and to Steve Langasek for hounding me incessantly about it.
2166
+Replace post-processed comments with pre-processed ones in patch #096;
+this quiets build-time warnings. Also document why this patch is not yet
+suitable for submission to upstream.
+ 2167
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-01-27 07:54:19 UTC (rev 2166)
+++ trunk/debian/changelog 2005-01-31 21:16:12 UTC (rev 2167)
@@ -187,8 +187,12 @@
thinking about. Thanks to Clint Adams for pointing out this unfiled RC
bug, and to Steve Langasek for hounding me incessantly about it.
- -- Branden Robinson <branden@debian.org> Thu, 27 Jan 2005 02:48:16 -0500
+ * Replace post-processed comments with pre-processed ones in patch #096;
+ this quiets build-time warnings. Also document why this patch is not yet
+ suitable for submission to upstream.
+ -- Branden Robinson <branden@debian.org> Mon, 31 Jan 2005 16:14:26 -0500
+
xfree86 (4.3.0.dfsg.1-10) unstable; urgency=medium
* Upload urgency set to medium due to fix for stable-release-critical bugs
Modified: trunk/debian/patches/096_Xlib_l10n_pt_BR.UTF-8.diff
===================================================================
--- trunk/debian/patches/096_Xlib_l10n_pt_BR.UTF-8.diff 2005-01-27 07:54:19 UTC (rev 2166)
+++ trunk/debian/patches/096_Xlib_l10n_pt_BR.UTF-8.diff 2005-01-31 21:16:12 UTC (rev 2167)
@@ -6,8 +6,17 @@
Compose file differences by Gustavo Noronha Silva; the rest by Branden
Robinson.
-Not submitted upstream yet.
+Not submitted upstream yet. In Branden's opinion this isn't really
+suitable for upstream submission yet; we should either be able to specify
+only the differences between en_US.UTF-8 and pt_BR.UTF-8, and generate full
+Compose maps at build time, or support an #include-style syntax within the
+Compose files themselves, which is evaluated at runtime.
+Either one requires upstream hacking.
+
+Last but not least, pt_BR.UTF-8 needs to be periodically resynced with
+changes to en_US.UTF-8, and this hasn't been happening.
+
diff -urN xc/nls~/Compose/Imakefile xc/nls/Compose/Imakefile
--- xc/nls~/Compose/Imakefile 2004-08-12 02:38:22.000000000 -0500
+++ xc/nls/Compose/Imakefile 2004-08-12 02:38:54.000000000 -0500
@@ -23,14 +32,14 @@
--- xc/nls~/Compose/pt_BR.UTF-8 1969-12-31 19:00:00.000000000 -0500
+++ xc/nls/Compose/pt_BR.UTF-8 2004-08-12 02:38:54.000000000 -0500
@@ -0,0 +1,5541 @@
-+# UTF-8 (Unicode) compose sequence
-+# David.Monniaux@ens.fr
-+#
-+# Modified for Brazilian Portuguese by Gustavo Noronha Silva <kov@debian.org>
++XCOMM UTF-8 (Unicode) compose sequence
++XCOMM David.Monniaux@ens.fr
++XCOMM
++XCOMM Modified for Brazilian Portuguese by Gustavo Noronha Silva <kov@debian.org>
+
-+# Part 1 - Manual definitions
++XCOMM Part 1 - Manual definitions
+
-+# Spacing versions of dead accents
++XCOMM Spacing versions of dead accents
+<dead_tilde> <space> : "~" asciitilde
+<dead_tilde> <dead_tilde> : "~" asciitilde
+<dead_acute> <space> : "'" apostrophe
@@ -60,8 +69,8 @@
+<dead_iota> <dead_space> : "ͺ" U37a
+<dead_iota> <dead_iota> : "ͺ" U37a
+
-+# ASCII characters that may be difficult to access
-+# on some keyboards.
++XCOMM ASCII characters that may be difficult to access
++XCOMM on some keyboards.
+<Multi_key> <plus> <plus> : "#" numbersign
+<Multi_key> <apostrophe> <space> : "'" apostrophe
+<Multi_key> <space> <apostrophe> : "'" apostrophe
@@ -98,7 +107,7 @@
+<Multi_key> <minus> <space> : "~" asciitilde
+<Multi_key> <space> <minus> : "~" asciitilde
+
-+# Spaces
++XCOMM Spaces
+<Multi_key> <space> <space> : " " nobreakspace # NO-BREAK SPACE
+<Multi_key> <space> <period>: " " U2008 # PUNCTUATION SPACE
+
@@ -133,7 +142,7 @@
+
+<Multi_key> <o> <o> : "°" degree # ^0 already taken
+
-+# Quotation marks
++XCOMM Quotation marks
+<Multi_key> <quotedbl> <backslash> : "〝" U301d # REVERSED DOUBLE PRIME QUOTATION MARK
+<Multi_key> <quotedbl> <slash> : "〞" U301e # DOUBLE PRIME QUOTATION MARK
+<Multi_key> <less> <less> : "«" guillemotleft # LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
@@ -151,10 +160,10 @@
+<Multi_key> <comma> <quotedbl> : "„" U201e # DOUBLE LOW-9 QUOTATION MARK
+<Multi_key> <quotedbl> <comma> : "„" U201e # DOUBLE LOW-9 QUOTATION MARK
+
-+# Per xxx
++XCOMM Per xxx
+<Multi_key> <percent> <o> : "‰" U2030 # PER MILLE SIGN
+
-+# Currencies
++XCOMM Currencies
+<Multi_key> <C> <E> : "₠" U20a0 # EURO-CURRENCY SIGN
+<Multi_key> <C> <slash> : "₡" U20a1 # COLON SIGN
+<Multi_key> <slash> <C> : "₡" U20a1 # COLON SIGN
@@ -170,7 +179,7 @@
+<Multi_key> <R> <s> : "₨" U20a8 # RUPEE SIGN
+<Multi_key> <W> <equal> : "₩" U20a9 # WON SIGN
+<Multi_key> <equal> <W> : "₩" U20a9 # WON SIGN
-+# "₪" U20aa NEW SHEQEL SIGN
++XCOMM "₪" U20aa NEW SHEQEL SIGN
+<Multi_key> <d> <minus> : "₫" U20ab # DONG SIGN
+<Multi_key> <C> <equal> : "€" EuroSign # EURO SIGN
+<Multi_key> <equal> <C> : "€" EuroSign # EURO SIGN
@@ -182,20 +191,20 @@
+<Multi_key> <Y> <equal> : "¥" yen
+<Multi_key> <equal><Y> : "¥" yen
+
-+# Long S
++XCOMM Long S
+<Multi_key> <f> <s> : "ſ" U017f # LONG S
+<Multi_key> <f> <S> : "ſ" U017f # LONG S
+
-+# Dashes
++XCOMM Dashes
+<Multi_key> <minus> <minus> <period> : "–" U2013 # EN DASH
+<Multi_key> <minus> <minus> <minus> : "—" U2014 # EM DASH
+
-+# Musical alterations
++XCOMM Musical alterations
+<Multi_key> <numbersign> <b> : "♭" U266d # MUSIC FLAT SIGN
+<Multi_key> <numbersign> <f> : "♮" U266e # MUSIC NATURAL SIGN
+<Multi_key> <numbersign> <numbersign> : "♯" U266f # MUSIC SHARP SIGN
+
-+# Other symbols
++XCOMM Other symbols
+<Multi_key> <s> <o> : "§" section # SECTION SIGN
+<Multi_key> <o> <s> : "§" section # SECTION SIGN
+
@@ -204,15 +213,15 @@
+
+<Multi_key> <P> <P> : "¶" paragraph # PILCROW SIGN (PARAGRAPH SIGN)
+
-+# Part 2
++XCOMM Part 2
+
-+# Compose map for Korean Hangul(Choseongul) Conjoining Jamos automatically
-+# generated from UnicodeData-2.0.14.txt at
-+# ftp://ftp.unicode.org/Public/2.0-Update/UnicodeData-2.0.14.txt
-+# by Jungshik Shin <jshin@jshin.net> 2002-10-17
-+# There are some conflicts among sequences, but I left them alone.
-+#
-+# group 1: cluster jamos made of three basic jamos
++XCOMM Compose map for Korean Hangul(Choseongul) Conjoining Jamos automatically
++XCOMM generated from UnicodeData-2.0.14.txt at
++XCOMM ftp://ftp.unicode.org/Public/2.0-Update/UnicodeData-2.0.14.txt
++XCOMM by Jungshik Shin <jshin@jshin.net> 2002-10-17
++XCOMM There are some conflicts among sequences, but I left them alone.
++XCOMM
++XCOMM group 1: cluster jamos made of three basic jamos
+
+ <Multi_key> <U1107> <U1109> <U1100> : "ᄢ" U1122 : ᄇᅠ ᄉᅠ ᄀᅠ = ᄢᅠ
+ <Multi_key> <U1107> <U1109> <U1103> : "ᄣ" U1123 : ᄇᅠ ᄉᅠ ᄃᅠ = ᄣᅠ
@@ -5601,21 +5610,21 @@
--- xc/nls~/XLC_LOCALE/pt_BR.UTF-8 1969-12-31 19:00:00.000000000 -0500
+++ xc/nls/XLC_LOCALE/pt_BR.UTF-8 2004-08-12 02:38:54.000000000 -0500
@@ -0,0 +1,143 @@
-+# XLocale Database Sample for pt_BR.UTF-8
-+#
-+# Based on XLocale Database Sample for en_US.UTF-8
-+#
++XCOMM XLocale Database Sample for pt_BR.UTF-8
++XCOMM
++XCOMM Based on XLocale Database Sample for en_US.UTF-8
++XCOMM
+
-+#
-+# XLC_FONTSET category
-+#
++XCOMM
++XCOMM XLC_FONTSET category
++XCOMM
+XLC_FONTSET
+
+on_demand_loading True
+
+object_name generic
+
-+# fs0 class
++XCOMM fs0 class
+fs0 {
+ charset {
+ name ISO10646-1
@@ -5624,9 +5633,9 @@
+ primary ISO10646-1
+ }
+}
-+# We leave the legacy encodings in for the moment, because we don't
-+# have that many ISO10646 fonts yet.
-+# fs1 class (7 bit ASCII)
++XCOMM We leave the legacy encodings in for the moment, because we don't
++XCOMM have that many ISO10646 fonts yet.
++XCOMM fs1 class (7 bit ASCII)
+fs1 {
+ charset {
+ name ISO8859-1:GL
@@ -5636,7 +5645,7 @@
+ vertical_rotate all
+ }
+}
-+# fs2 class (ISO8859 families)
++XCOMM fs2 class (ISO8859 families)
+fs2 {
+ charset {
+ name ISO8859-1:GR
@@ -5645,7 +5654,7 @@
+ primary ISO8859-1:GR
+ }
+}
-+# fs3 class (Kanji)
++XCOMM fs3 class (Kanji)
+fs3 {
+ charset {
+ name JISX0208.1983-0:GL
@@ -5654,7 +5663,7 @@
+ primary JISX0208.1983-0:GL
+ }
+}
-+# fs4 class (Korean Character)
++XCOMM fs4 class (Korean Character)
+fs4 {
+ charset {
+ name KSC5601.1987-0:GL
@@ -5663,7 +5672,7 @@
+ primary KSC5601.1987-0:GL
+ }
+}
-+# fs5 class (Chinese Han Character)
++XCOMM fs5 class (Chinese Han Character)
+fs5 {
+ charset {
+ name GB2312.1980-0:GL
@@ -5672,7 +5681,7 @@
+ primary GB2312.1980-0:GL
+ }
+}
-+# fs6 class (Half Kana)
++XCOMM fs6 class (Half Kana)
+fs6 {
+ charset {
+ name JISX0201.1976-0:GR
@@ -5684,30 +5693,30 @@
+}
+END XLC_FONTSET
+
-+#
-+# XLC_XLOCALE category
-+#
++XCOMM
++XCOMM XLC_XLOCALE category
++XCOMM
+XLC_XLOCALE
+
+encoding_name UTF-8
+mb_cur_max 6
+state_depend_encoding False
+
-+# cs0 class
++XCOMM cs0 class
+cs0 {
+ side GL:Default
+ length 1
+ ct_encoding ISO8859-1:GL
+}
+
-+# cs1 class
++XCOMM cs1 class
+cs1 {
+ side GR:Default
+ length 1
+ ct_encoding ISO8859-1:GR
+}
+
-+# cs2 class
++XCOMM cs2 class
+cs2 {
+ side GR
+ length 2
@@ -5715,7 +5724,7 @@
+
+}
+
-+# cs3 class
++XCOMM cs3 class
+cs3 {
+ side GL
+ length 2
@@ -5723,21 +5732,21 @@
+
+}
+
-+# cs4 class
++XCOMM cs4 class
+cs4 {
+ side GR
+ length 2
+ ct_encoding GB2312.1980-0:GL; GB2312.1980-0:GR
+}
+
-+# cs5 class
++XCOMM cs5 class
+cs5 {
+ side GR
+ length 1
+ ct_encoding JISX0201.1976-0:GR
+}
+
-+# cs6 class
++XCOMM cs6 class
+cs6 {
+ side none
+ ct_encoding ISO10646-1
Reply to: