[SCM] X/Open curses library with an X11 and SDL interface branch, master, updated. upstream/3.4-9-g924e769

[Peter Pentchev]

The following commit has been merged in the master branch:
commit 924e76991ba568f0dbe729642f8fa133a52b0b7b
Author: Peter Pentchev <roam at ringlet.net>
Date:   Sun Sep 12 01:24:18 2010 +0300

    Actually build and install the SDL interface.

diff --git a/debian/libxcurses-dev.install b/debian/libxcurses-dev.install
index 153e2a0..d5a9616 100644
--- a/debian/libxcurses-dev.install
+++ b/debian/libxcurses-dev.install
@@ -1,3 +1,4 @@
 usr/bin/*
 usr/include/*
 usr/lib/lib*.a
+sdl1/libpdcurses.a usr/lib
diff --git a/debian/patches/02-install-sdl.patch b/debian/patches/02-install-sdl.patch
new file mode 100644
index 0000000..a5513a4
--- /dev/null
+++ b/debian/patches/02-install-sdl.patch
@@ -0,0 +1,37 @@
+Description: Install the header files needed for SDL compatibility.
+Forwarded: no
+Author: Peter Pentchev <roam at ringlet.net>
+Last-Update: 2010-09-12
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -30,6 +30,7 @@
+ distclean \
+ mostlyclean \
+ realclean ::
++	cd sdl1; $(MAKE) $(MFLAGS) $@
+ 	cd x11; $(MAKE) $(MFLAGS) $@
+ 	cd doc; $(MAKE) $(MFLAGS) $@
+ 
+@@ -39,7 +40,9 @@
+ 	$(INSTALL) -d -m 755 $(includedir)
+ 	$(INSTALL) -d -m 755 $(includedir)/xcurses
+ 	$(INSTALL) -c -m 644 $(srcdir)/curses.h $(includedir)/xcurses.h
+-	$(INSTALL) -c -m 644 $(srcdir)/curses.h $(includedir)/xcurses/curses.h
++	for i in $(srcdir)/curses.h $(srcdir)/curspriv.h $(srcdir)/sdl1/*.h; do \
++		$(INSTALL) -c -m 644 $$i $(includedir)/xcurses/; \
++	done
+ 	sed -e 's/#include <curses.h>/#include <xcurses.h>/' \
+ 		< $(srcdir)/panel.h > ./xpanel.h
+ 	$(INSTALL) -m 644 ./xpanel.h $(includedir)/xpanel.h
+--- a/sdl1/Makefile
++++ b/sdl1/Makefile
+@@ -44,7 +44,7 @@
+ 
+ libs:	$(LIBCURSES)
+ 
+-clean:
++clean distclean:
+ 	-rm -rf *.o trace $(LIBCURSES) $(DEMOS)
+ 
+ demos:	$(DEMOS)
diff --git a/debian/patches/series b/debian/patches/series
index a949066..32ebd35 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-shlib.patch
+02-install-sdl.patch

-- 
X/Open curses library with an X11 and SDL interface