Merge lp:~logan/ubuntu/raring/scheme2c/debian-merge into lp:ubuntu/raring/scheme2c

[Logan Rosen]

[Daniel Holbach (dholbach)]

Good work.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-10-28 10:16:01 +0000
+++ debian/changelog	2012-11-28 20:03:23 +0000
@@ -1,3 +1,24 @@
+scheme2c (2011.07.26-5ubuntu1) raring; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Build with -U_FORTIFY_SOURCE to fix FTBFS (on ARM too).
+
+ -- Logan Rosen <[e-mail]>  Wed, 28 Nov 2012 14:58:22 -0500
+
+scheme2c (2011.07.26-5) unstable; urgency=low
+
+  * include missing xlib .sch files used by, e.g., QobiScheme
+
+ -- Barak A. Pearlmutter <[e-mail]>  Thu, 15 Mar 2012 15:29:55 +0000
+
+scheme2c (2011.07.26-4) unstable; urgency=low
+
+  * dh 9
+  * bump debian policy (no changes required)
+  * minor non-functional upstream tweaks
+
+ -- Barak A. Pearlmutter <[e-mail]>  Thu, 01 Mar 2012 20:53:25 +0000
+
 scheme2c (2011.07.26-3ubuntu1) precise; urgency=low
 
   * Merge from Debian testing.  Remaining changes:

=== modified file 'debian/compat'
--- debian/compat	2011-07-19 19:41:56 +0000
+++ debian/compat	2012-11-28 20:03:23 +0000
@@ -1,1 +1,1 @@
-8
+9

=== modified file 'debian/control'
--- debian/control	2011-07-26 20:30:04 +0000
+++ debian/control	2012-11-28 20:03:23 +0000
@@ -1,12 +1,13 @@
 Source: scheme2c
 Section: lisp
 Priority: extra
-Maintainer: Barak A. Pearlmutter <[e-mail]>
-Build-Depends: debhelper (>= 8),
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Barak A. Pearlmutter <[e-mail]>
+Build-Depends: debhelper (>= 9),
     libsigsegv-dev, libx11-dev,
     texlive-latex-base, texlive-latex-extra, latex209-bin,
     texlive-fonts-recommended, ghostscript
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://scheme2c.alioth.debian.org/
 Vcs-Git: git://git.debian.org/git/collab-maint/scheme2c.git
 Vcs-Browser: http://git.debian.org/?p=collab-maint/scheme2c.git

=== modified file 'debian/patches/debian-changes'
--- debian/patches/debian-changes	2011-10-09 21:43:11 +0000
+++ debian/patches/debian-changes	2012-11-28 20:03:23 +0000
@@ -5,12 +5,10 @@
  information below has been extracted from the changelog. Adjust it or drop
  it.
  .
- scheme2c (2011.07.26-3) unstable; urgency=low
+ scheme2c (2011.07.26-5) unstable; urgency=low
  .
-   * single debian patch source option (closes: #643271)
-   * tiny upstream documentation tweaks
+   * include missing xlib .sch files used by, e.g., QobiScheme
 Author: Barak A. Pearlmutter <[e-mail]>
-Bug-Debian: http://bugs.debian.org/643271
 
 ---
 The information above should follow the Patch Tagging Guidelines, please
@@ -25,6 +23,17 @@
 Reviewed-By: <name and email of someone who approved the patch>
 Last-Update: <YYYY-MM-DD>
 
+--- scheme2c-2011.07.26.orig/README
++++ scheme2c-2011.07.26/README
+@@ -170,7 +170,7 @@ running ULTRIX.
+     such as ~/bin:
+ 
+ 	8 >cd ..
+-	9 >make "DESTDIR = /udir/`whoami`/bin" install-private
++	9 >make prefix=$HOME/s2c BINDIR=. LIBDIR=. LIBSUBDIR=. install
+ 	10 >rehash
+ 
+     Given that this directory in the current search path, the compiler can
 --- scheme2c-2011.07.26.orig/CHANGES
 +++ scheme2c-2011.07.26/CHANGES
 @@ -64,7 +64,7 @@ Compiler changes since the 01nov91jfb re
@@ -36,66 +45,103 @@
  
  7.  Lambda expressions containing arguments that are not symbols now result
      in an error message rather than a compiler error.
---- scheme2c-2011.07.26.orig/README
-+++ scheme2c-2011.07.26/README
-@@ -170,7 +170,7 @@ running ULTRIX.
-     such as ~/bin:
- 
- 	8 >cd ..
--	9 >make "DESTDIR = /udir/`whoami`/bin" install-private
-+	9 >make prefix=$HOME/s2c BINDIR=. LIBDIR=. LIBSUBDIR=. install
- 	10 >rehash
- 
-     Given that this directory in the current search path, the compiler can
---- scheme2c-2011.07.26.orig/scrt/makefile
-+++ scheme2c-2011.07.26/scrt/makefile
-@@ -41,7 +41,7 @@ INSTALL_SCRIPT = ${INSTALL}
- .SUFFIXES:
- .SUFFIXES:	.o .c .sc .s
+--- /dev/null
++++ scheme2c-2011.07.26/INSTALL
+@@ -0,0 +1,45 @@
++#!/bin/sh
++
++# QUICK BUILD/INSTALLATION GUIDE
++
++# Quick instructions for building s2c on Debian amd64, including the
++# X11-enabled libraries etc.  All lines including "-C doc" can be
++# omitted to skip the manuals.  Switch AMD64 to LINUX (for i386) or ARM
++# (for arm).  Change prefix to /usr or /home/username, and other
++# locations, as appropriate.
++
++# required development libraries: libsigsegv-dev, libx11-dev
++
++# required to build documentation:
++# 	texlive-latex-base, texlive-latex-extra, latex209-bin,
++# 	texlive-fonts-recommended, ghostscript
++
++# In the root of the unpacked sources run:
++
++set -e
++set -x
++
++A=AMD64
++P="prefix=/usr/local MANDIR=\$(prefix)/share/man DOCDIR=\$(prefix)/share/doc/scheme2c"
++D=~/tmp/s2c
++I="$P DESTDIR=$D"
++T=~/tmp/scheme2c-binary.tar.gz
++MAKE=make
++
++${MAKE} $P for$A
++${MAKE} $P -C $A
++${MAKE} $P -C $A/cdecl all
++${MAKE} $P -C $A/xlib sizeof.cdecl libs2cxl.a s2cixl
++${MAKE} $P -C doc
++
++${MAKE} $I -C $A/scrt  install
++${MAKE} $I -C $A/scsc  install
++${MAKE} $I -C $A/cdecl install
++${MAKE} $I -C $A/xlib  install
++${MAKE} $I -C doc      install
++
++tar -zcf $T -C $D .
++
++# The result is a tarball which can be installed with, e.g.,
++
++# sudo tar -C / -zxf $T
+--- scheme2c-2011.07.26.orig/cdecl/makefile
++++ scheme2c-2011.07.26/cdecl/makefile
+@@ -19,7 +19,7 @@ MISC = sizeof.c sch.sc README document l
+ 
+ SRCDIR = ../../cdecl
  
 -SCC = ../scsc/s2cc
 +SCC = ../scsc/Xs2cc
- SCCFLAGS = 
- 
- SRCDIR = ../../scrt
-@@ -111,24 +111,20 @@ Xmv:		Xs2ci Xlibs2c.a
- 	mv Xlibs2c.a libs2c.a
- 
- port:
--	$(MAKE) "CC = ${CC}" "CFLAGS = ${CFLAGS}" "SCC = echo" \
-+	$(MAKE) "CC=${CC}" "CFLAGS=${CFLAGS}" "SCC=echo" \
- 	     Xlibs2c.a Xs2ci Xmv ${Plib}
- 
- libs2c_p.a:	libs2c.a
- 	mkdir -p saveobj
- 	mv ${Sruntime} ${Cruntime} ${Aruntime} saveobj/
- 	rm -f libs2c_p.a
--	$(MAKE) "CC = ${CC}" "CFLAGS = ${CFLAGS} -pg" ${Sruntime} ${Cruntime} \
-+	$(MAKE) "CC=${CC}" "CFLAGS=${CFLAGS} -pg" ${Sruntime} ${Cruntime} \
- 	     ${Aruntime}
- 	ar q libs2c_p.a ${Cruntime} ${Sruntime} ${Aruntime}
- 	${RANLIB} libs2c_p.a
- 	mv saveobj/* ./
- 	rmdir saveobj
- 
--install-private:
--	$(MAKE) "DESTDIR=${DESTDIR}" "LIBDIR=/." "BINDIR=/. LIBSUBDIR=." \
--	     "OWNER = -o `whoami`" install
--
- install:
- 	${INSTALL} -d ${DESTDIR}${LIBDIR}/${LIBSUBDIR}
- 	${INSTALL_DATA} libs2c.a ${DESTDIR}${LIBDIR}/${LIBSUBDIR}/
-@@ -160,8 +156,8 @@ bindist:
- 	      libs2c.a ${Plib} s2ci ${destdir}
- 
- all:
--	$(MAKE) "CC = ${CC}" "CFLAGS = ${CFLAGS}" "SCC = ${SCC}" \
--	     "SCCFLAGS = ${SCCFLAGS}" Xlibs2c.a Xs2ci Xmv ${Plib}
-+	$(MAKE) "CC=${CC}" "CFLAGS=${CFLAGS}" "SCC=${SCC}" \
-+	     "SCCFLAGS=${SCCFLAGS}" Xlibs2c.a Xs2ci Xmv ${Plib}
- 
- srclinks:
- 	for x in ${Cruntimec} ${Chfiles} ${Sruntimec} ${Sruntimesc} ${Smisc}; \
+ 
+ .sc.c:
+ 	${SCC} -C $*.sc
+--- scheme2c-2011.07.26.orig/doc/embedded.tex
++++ scheme2c-2011.07.26/doc/embedded.tex
+@@ -150,11 +150,11 @@ application. The current time slice valu
+ \subsection*{Sample embedded application}
+ 
+ A sample embedded Scheme application, \texttt{embedded}, is found in
+-the directory \texttt{server}.  A typescript of its execution shows
++the directory \texttt{scrt}.  A typescript of its execution shows
+ how an application should interact with an embedded Scheme system.
+ \begin{quote}
+ \begin{verbatim}
+-csh 990 >embedded
++$ embedded
+ Embedded Scheme->C Test Bed
+ 0- (+ 1 2)
+ 3
+--- scheme2c-2011.07.26.orig/doc/smithnotes.tex
++++ scheme2c-2011.07.26/doc/smithnotes.tex
+@@ -62,7 +62,7 @@ is executed, the window looks like this:
+ 
+ \begin{quote}
+ \begin{verbatim}
+-csh >s2ci
++$ s2ci
+ Scheme->C -- 01sep91jfb -- Copyright 1989 Digital Equipment Corporation
+ >
+ \end{verbatim}
+--- scheme2c-2011.07.26.orig/doc/s2cc.l
++++ scheme2c-2011.07.26/doc/s2cc.l
+@@ -149,7 +149,7 @@ error file.
+ .br
+ /.../libs2c_p.a	profiled library (optional)
+ .br
+-/.../s2cc	c-shell script
++/.../s2cc	shell script
+ .br
+ /.../s2ccomp	compiler
+ .br
 --- scheme2c-2011.07.26.orig/xlib/makefile
 +++ scheme2c-2011.07.26/xlib/makefile
 @@ -17,7 +17,7 @@ CDECL = ../cdecl/s2cdecl
@@ -107,17 +153,25 @@
  SCXLIB = libs2cxl.a
  
  XD = X.cdecl Xatom.cdecl Xlib.cdecl Xresource.cdecl Xutil.cdecl \
---- scheme2c-2011.07.26.orig/doc/s2cc.l
-+++ scheme2c-2011.07.26/doc/s2cc.l
-@@ -149,7 +149,7 @@ error file.
- .br
- /.../libs2c_p.a	profiled library (optional)
- .br
--/.../s2cc	c-shell script
-+/.../s2cc	shell script
- .br
- /.../s2ccomp	compiler
- .br
+@@ -39,6 +39,9 @@ xdsc =	depth.sc screen.sc visual.sc xarc
+ 	xvisualinfo.sc xwindowattributes.sc xwindowchanges.sc xwmhints.sc \
+ 	xpixmapformatvalues.sc xtextproperty.sc
+ 
++xdschextra = xws2.sch xws3.sch xws4.sch xws5.sch xws6.sch xws7.sch	\
++	xws8.sch xws9.sch xws10.sch xwsr4.sch
++
+ xdsch =	depth.sch screen.sch visual.sch xarc.sch xchar2b.sch xcharstruct.sch \
+ 	xclasshint.sch xcomposestatus.sch xcolor.sch xlibCONSTANTS.sch \
+ 	xevent.sch xfontprop.sch xfontstruct.sch xgcvalues.sch \
+@@ -49,7 +52,7 @@ xdsch =	depth.sch screen.sch visual.sch
+ 	xlibSTUBS.sch xtextitem.sch xtextitem16.sch xtimecoord.sch \
+ 	xlibTYPES.sch xvisualinfo.sch xwindowattributes.sch \
+ 	xwindowchanges.sch xwmhints.sch	xpixmapformatvalues.sch \
+-	xtextproperty.sch
++	xtextproperty.sch $(xdschextra)
+ 
+ 
+ xdc =	depth.c screen.c visual.c xarc.c xchar2b.c xcharstruct.c \
 --- scheme2c-2011.07.26.orig/scsc/makefile
 +++ scheme2c-2011.07.26/scsc/makefile
 @@ -81,24 +81,29 @@ sc-to-c:	${scc}
@@ -161,7 +215,7 @@
  	ln -sf s2cc ${DESTDIR}${BINDIR}/scc
  	${INSTALL} -d ${DESTDIR}${LIBDIR}/${LIBSUBDIR}
  	${INSTALL_PROGRAM} s2ccomp ${DESTDIR}${LIBDIR}/${LIBSUBDIR}/
-@@ -112,19 +117,7 @@ clean-sc-to-c:
+@@ -112,19 +117,9 @@ clean-sc-to-c:
  noprogs:
  	rm -f s2ccomp Xs2ccomp
  
@@ -182,17 +236,8 @@
 -	echo `pwd`'/Xs2ccomp -scl ${SCL} -scmh ${SCMH} \
 -	     -cc ${CC} -LIBDIR ' `pwd`'/${RTDIR} $$*' >> Xs2cc
 -	chmod +x Xs2cc
---- scheme2c-2011.07.26.orig/cdecl/makefile
-+++ scheme2c-2011.07.26/cdecl/makefile
-@@ -19,7 +19,7 @@ MISC = sizeof.c sch.sc README document l
- 
- SRCDIR = ../../cdecl
- 
--SCC = ../scsc/s2cc
-+SCC = ../scsc/Xs2cc
- 
- .sc.c:
- 	${SCC} -C $*.sc
++
++.PHONY: all clean port install sc-to-c srclinks noprogs clean-sc-to-c
 --- scheme2c-2011.07.26.orig/test/makefile
 +++ scheme2c-2011.07.26/test/makefile
 @@ -2,7 +2,7 @@
@@ -232,3 +277,52 @@
 +	./test54
 +
 +.PHONY: autotest-test autotest-test50 autotest-test54
+--- scheme2c-2011.07.26.orig/scrt/makefile
++++ scheme2c-2011.07.26/scrt/makefile
+@@ -41,7 +41,7 @@ INSTALL_SCRIPT = ${INSTALL}
+ .SUFFIXES:
+ .SUFFIXES:	.o .c .sc .s
+ 
+-SCC = ../scsc/s2cc
++SCC = ../scsc/Xs2cc
+ SCCFLAGS = 
+ 
+ SRCDIR = ../../scrt
+@@ -111,24 +111,20 @@ Xmv:		Xs2ci Xlibs2c.a
+ 	mv Xlibs2c.a libs2c.a
+ 
+ port:
+-	$(MAKE) "CC = ${CC}" "CFLAGS = ${CFLAGS}" "SCC = echo" \
++	$(MAKE) "CC=${CC}" "CFLAGS=${CFLAGS}" "SCC=echo" \
+ 	     Xlibs2c.a Xs2ci Xmv ${Plib}
+ 
+ libs2c_p.a:	libs2c.a
+ 	mkdir -p saveobj
+ 	mv ${Sruntime} ${Cruntime} ${Aruntime} saveobj/
+ 	rm -f libs2c_p.a
+-	$(MAKE) "CC = ${CC}" "CFLAGS = ${CFLAGS} -pg" ${Sruntime} ${Cruntime} \
++	$(MAKE) "CC=${CC}" "CFLAGS=${CFLAGS} -pg" ${Sruntime} ${Cruntime} \
+ 	     ${Aruntime}
+ 	ar q libs2c_p.a ${Cruntime} ${Sruntime} ${Aruntime}
+ 	${RANLIB} libs2c_p.a
+ 	mv saveobj/* ./
+ 	rmdir saveobj
+ 
+-install-private:
+-	$(MAKE) "DESTDIR=${DESTDIR}" "LIBDIR=/." "BINDIR=/. LIBSUBDIR=." \
+-	     "OWNER = -o `whoami`" install
+-
+ install:
+ 	${INSTALL} -d ${DESTDIR}${LIBDIR}/${LIBSUBDIR}
+ 	${INSTALL_DATA} libs2c.a ${DESTDIR}${LIBDIR}/${LIBSUBDIR}/
+@@ -160,8 +156,8 @@ bindist:
+ 	      libs2c.a ${Plib} s2ci ${destdir}
+ 
+ all:
+-	$(MAKE) "CC = ${CC}" "CFLAGS = ${CFLAGS}" "SCC = ${SCC}" \
+-	     "SCCFLAGS = ${SCCFLAGS}" Xlibs2c.a Xs2ci Xmv ${Plib}
++	$(MAKE) "CC=${CC}" "CFLAGS=${CFLAGS}" "SCC=${SCC}" \
++	     "SCCFLAGS=${SCCFLAGS}" Xlibs2c.a Xs2ci Xmv ${Plib}
+ 
+ srclinks:
+ 	for x in ${Cruntimec} ${Chfiles} ${Sruntimec} ${Sruntimesc} ${Smisc}; \

=== modified file 'doc/embedded.tex'
--- doc/embedded.tex	2008-08-10 22:48:11 +0000
+++ doc/embedded.tex	2012-11-28 20:03:23 +0000
@@ -150,11 +150,11 @@
 \subsection*{Sample embedded application}
 
 A sample embedded Scheme application, \texttt{embedded}, is found in
-the directory \texttt{server}.  A typescript of its execution shows
+the directory \texttt{scrt}.  A typescript of its execution shows
 how an application should interact with an embedded Scheme system.
 \begin{quote}
 \begin{verbatim}
-csh 990 >embedded
+$ embedded
 Embedded Scheme->C Test Bed
 0- (+ 1 2)
 3

=== modified file 'doc/smithnotes.tex'
--- doc/smithnotes.tex	2011-07-19 19:41:56 +0000
+++ doc/smithnotes.tex	2012-11-28 20:03:23 +0000
@@ -62,7 +62,7 @@
 
 \begin{quote}
 \begin{verbatim}
-csh >s2ci
+$ s2ci
 Scheme->C -- 01sep91jfb -- Copyright 1989 Digital Equipment Corporation
 >
 \end{verbatim}

=== modified file 'scsc/makefile'
--- scsc/makefile	2011-08-19 13:44:46 +0000
+++ scsc/makefile	2012-11-28 20:03:23 +0000
@@ -121,3 +121,5 @@
 	for x in ${scsc} ${scc} ${scsch}; \
 	    do ln -s ${SRCDIR}/$$x $$x;\
 	done
+
+.PHONY: all clean port install sc-to-c srclinks noprogs clean-sc-to-c

=== modified file 'xlib/makefile'
--- xlib/makefile	2011-08-19 13:44:46 +0000
+++ xlib/makefile	2012-11-28 20:03:23 +0000
@@ -39,6 +39,9 @@
 	xvisualinfo.sc xwindowattributes.sc xwindowchanges.sc xwmhints.sc \
 	xpixmapformatvalues.sc xtextproperty.sc
 
+xdschextra = xws2.sch xws3.sch xws4.sch xws5.sch xws6.sch xws7.sch	\
+	xws8.sch xws9.sch xws10.sch xwsr4.sch
+
 xdsch =	depth.sch screen.sch visual.sch xarc.sch xchar2b.sch xcharstruct.sch \
 	xclasshint.sch xcomposestatus.sch xcolor.sch xlibCONSTANTS.sch \
 	xevent.sch xfontprop.sch xfontstruct.sch xgcvalues.sch \
@@ -49,7 +52,7 @@
 	xlibSTUBS.sch xtextitem.sch xtextitem16.sch xtimecoord.sch \
 	xlibTYPES.sch xvisualinfo.sch xwindowattributes.sch \
 	xwindowchanges.sch xwmhints.sch	xpixmapformatvalues.sch \
-	xtextproperty.sch
+	xtextproperty.sch $(xdschextra)
 
 
 xdc =	depth.c screen.c visual.c xarc.c xchar2b.c xcharstruct.c \