Import Debian changes 5d9-4.1debian/5d9-4.1

scm (5d9-4.1) unstable; urgency=high

  * Non-maintainer upload.
  * High-urgency upload for sarge-targetted RC bugfix.
  * Revert upstream "CAUTIOUS" define, which causes the scm build to
    fail its test suite on alpha (and, it appears, powerpc as well).
    Closes: #245810.

scm (5d9-4) unstable; urgency=low

  * Apply patch from 144062 to fix hppa build (Closes: #144062)
  * Change scm.1 section from Jan 4 200 to 1. (lintian)

scm (5d9-3) unstable; urgency=low

  * Properly clean up info files.
  * Make and install Xlibscm.info.

scm (5d9-2) unstable; urgency=low

  * Fix path problem in slibcat.  Hack at mklibcat.scm.  (Closes: #241510)

scm (5d9-1) unstable; urgency=low

  * New upstream release
  * Merge NMU sparc changes (Closes: #191171, #191356)
  * SHORT_INT is defined for ia64 upstream (Closes: #141928)
  * Scheme imps now grouped in info file (has been for a while)
  (Closes: #115452)

1 files changed, 53 insertions, 52 deletions

diff --git a/x11.scm b/x11.scm
index 7b49bf1..0ea4210 100644
--- a/x11.scm
+++ b/x11.scm
@@ -425,22 +425,23 @@
 (define XC:xterm 152)
 ;;inc2scm extracted #define values from /usr/include/X11/Xlib.h
 (define x:Xlib-Specification-Release 6)
+(define X:HAVE-UTF8-STRING 1)
 (define x:True 1)
 (define x:False 0)
 (define x:Queued-Already 0)
 (define x:Queued-After-Reading 1)
 (define x:Queued-After-Flush 2)
 (define x:All-Planes -1)
-(define x:XN-Required-Char-Set 134529975)
-(define x:XN-Query-Orientation 134530014)
-(define x:XN-Base-Font-Name 134530054)
-(define x:XNOM-Automatic 134530087)
-(define x:XN-Missing-Char-Set 134530116)
-(define x:XN-Default-String 134530153)
-(define x:XN-Orientation 134530187)
-(define x:XN-Directional-Dependent-Drawing 134530216)
-(define x:XN-Contextual-Drawing 134530307)
-(define x:XN-Font-Info 134530349)
+(define x:XN-Required-Char-Set 134531850)
+(define x:XN-Query-Orientation 134531889)
+(define x:XN-Base-Font-Name 134531929)
+(define x:XNOM-Automatic 134531962)
+(define x:XN-Missing-Char-Set 134531991)
+(define x:XN-Default-String 134532028)
+(define x:XN-Orientation 134532062)
+(define x:XN-Directional-Dependent-Drawing 134532091)
+(define x:XN-Contextual-Drawing 134532163)
+(define x:XN-Font-Info 134532205)
 (define x:XIM-Preedit-Area 1)
 (define x:XIM-Preedit-Callbacks 2)
 (define x:XIM-Preedit-Position 4)
@@ -450,48 +451,48 @@
 (define x:XIM-Status-Callbacks 512)
 (define x:XIM-Status-Nothing 1024)
 (define x:XIM-Status-None 2048)
-(define x:XN-Va-Nested-List 134530560)
-(define x:XN-Query-Input-Style 134530595)
-(define x:XN-Client-Window 134530634)
-(define x:XN-Input-Style 134530666)
-(define x:XN-Focus-Window 134530694)
-(define x:XN-Resource-Name 134530724)
-(define x:XN-Resource-Class 134530756)
-(define x:XN-Geometry-Callback 134530790)
-(define x:XN-Destroy-Callback 134530830)
-(define x:XN-Filter-Events 134530868)
-(define x:XN-Preedit-Start-Callback 134530900)
-(define x:XN-Preedit-Done-Callback 134530949)
-(define x:XN-Preedit-Draw-Callback 134530996)
-(define x:XN-Preedit-Caret-Callback 134531043)
-(define x:XN-Preedit-State-Notify-Callback 134531092)
-(define x:XN-Preedit-Attributes 134531171)
-(define x:XN-Status-Start-Callback 134531213)
-(define x:XN-Status-Done-Callback 134531260)
-(define x:XN-Status-Draw-Callback 134531305)
-(define x:XN-Status-Attributes 134531350)
-(define x:XN-Area 134531390)
-(define x:XN-Area-Needed 134531405)
-(define x:XN-Spot-Location 134531433)
-(define x:XN-Colormap 134531465)
-(define x:XN-Std-Colormap 134531488)
-(define x:XN-Foreground 134531518)
-(define x:XN-Background 134531545)
-(define x:XN-Background-Pixmap 134531572)
-(define x:XN-Font-Set 134531612)
-(define x:XN-Line-Space 134531634)
-(define x:XN-Cursor 134531660)
-(define x:XN-Query-IM-Values-List 134531679)
-(define x:XN-Query-IC-Values-List 134531723)
-(define x:XN-Visible-Position 134531767)
-(define x:XNR6-Preedit-Callback 134531805)
-(define x:XN-String-Conversion-Callback 134531847)
-(define x:XN-String-Conversion 134531904)
-(define x:XN-Reset-State 134531944)
-(define x:XN-Hot-Key 134531972)
-(define x:XN-Hot-Key-State 134531992)
-(define x:XN-Preedit-State 134532023)
-(define x:XN-Separatorof-Nested-List 134532055)
+(define x:XN-Va-Nested-List 134532416)
+(define x:XN-Query-Input-Style 134532451)
+(define x:XN-Client-Window 134532490)
+(define x:XN-Input-Style 134532522)
+(define x:XN-Focus-Window 134532550)
+(define x:XN-Resource-Name 134532580)
+(define x:XN-Resource-Class 134532612)
+(define x:XN-Geometry-Callback 134532646)
+(define x:XN-Destroy-Callback 134532686)
+(define x:XN-Filter-Events 134532724)
+(define x:XN-Preedit-Start-Callback 134532756)
+(define x:XN-Preedit-Done-Callback 134532805)
+(define x:XN-Preedit-Draw-Callback 134532852)
+(define x:XN-Preedit-Caret-Callback 134532899)
+(define x:XN-Preedit-State-Notify-Callback 134532948)
+(define x:XN-Preedit-Attributes 134533027)
+(define x:XN-Status-Start-Callback 134533069)
+(define x:XN-Status-Done-Callback 134533116)
+(define x:XN-Status-Draw-Callback 134533161)
+(define x:XN-Status-Attributes 134533206)
+(define x:XN-Area 134533246)
+(define x:XN-Area-Needed 134533261)
+(define x:XN-Spot-Location 134533289)
+(define x:XN-Colormap 134533321)
+(define x:XN-Std-Colormap 134533344)
+(define x:XN-Foreground 134533374)
+(define x:XN-Background 134533401)
+(define x:XN-Background-Pixmap 134533428)
+(define x:XN-Font-Set 134533468)
+(define x:XN-Line-Space 134533490)
+(define x:XN-Cursor 134533516)
+(define x:XN-Query-IM-Values-List 134533535)
+(define x:XN-Query-IC-Values-List 134533579)
+(define x:XN-Visible-Position 134533623)
+(define x:XNR6-Preedit-Callback 134533661)
+(define x:XN-String-Conversion-Callback 134533703)
+(define x:XN-String-Conversion 134533760)
+(define x:XN-Reset-State 134533800)
+(define x:XN-Hot-Key 134533828)
+(define x:XN-Hot-Key-State 134533848)
+(define x:XN-Preedit-State 134533879)
+(define x:XN-Separatorof-Nested-List 134533911)
 (define x:X-Buffer-Overflow -1)
 (define x:X-Lookup-None 1)
 (define x:X-Lookup-Chars 2)