10 files changed, 73 insertions, 7 deletions
diff --git a/configs/debian b/configs/debian
index 5b3b349a416..0a50109402f 100644
--- a/configs/debian
+++ b/configs/debian
@@ -3,3 +3,6 @@ include $(TOP)/configs/linux
 
 CONFIG_NAME = debian
 
+override SRC_DIRS = mesa glu
+override PROGRAM_DIRS =
+
diff --git a/configs/debian-dri-common b/configs/debian-dri-common
index 4069e2c4070..ef2cebd748d 100644
--- a/configs/debian-dri-common
+++ b/configs/debian-dri-common
@@ -2,7 +2,10 @@ include $(TOP)/configs/debian-common
 
 CONFIG_NAME = debian-dri-common
 
-DRI_DRIVER_INSTALL_DIR = $(INSTALL_DIR)/lib/dri
-DRI_DRIVER_SEARCH_DIR = /usr/lib/dri
+override SRC_DIRS = glx/x11 mesa
+override PROGRAM_DIRS =
+
+override DRI_DRIVER_INSTALL_DIR = $(INSTALL_DIR)/lib/dri
+override DRI_DRIVER_SEARCH_DIR = /usr/lib/dri
 
 
diff --git a/configs/debian-osmesa16 b/configs/debian-osmesa16
new file mode 100644
index 00000000000..93b4cdfc78d
--- /dev/null
+++ b/configs/debian-osmesa16
@@ -0,0 +1,15 @@
+include $(TOP)/configs/debian-common
+
+CONFIG_NAME = debian-osmesa16
+
+DEFINES += -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
+
+override OSMESA_LIB = OSMesa16
+override OSMESA_LIB_NAME = lib$(OSMESA_LIB).so
+
+override SRC_DIRS = mesa glu
+override DRIVER_DIRS = osmesa
+override PROGRAM_DIRS =
+
+override APP_LIB_DEPS = -lOSMesa16
+
diff --git a/configs/debian-osmesa16-static b/configs/debian-osmesa16-static
new file mode 100644
index 00000000000..3057db7c2fa
--- /dev/null
+++ b/configs/debian-osmesa16-static
@@ -0,0 +1,7 @@
+include $(TOP)/configs/debian-static
+include $(TOP)/configs/debian-osmesa16
+
+CONFIG_NAME = debian-osmesa16-static
+
+override OSMESA_LIB_NAME = lib$(OSMESA_LIB).a
+
diff --git a/configs/debian-osmesa32 b/configs/debian-osmesa32
new file mode 100644
index 00000000000..5653c3b3313
--- /dev/null
+++ b/configs/debian-osmesa32
@@ -0,0 +1,15 @@
+include $(TOP)/configs/debian-common
+
+CONFIG_NAME = debian-osmesa32
+
+DEFINES += -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
+
+override OSMESA_LIB = OSMesa32
+override OSMESA_LIB_NAME = lib$(OSMESA_LIB).so
+
+override SRC_DIRS = mesa glu
+override DRIVER_DIRS = osmesa
+override PROGRAM_DIRS =
+
+override APP_LIB_DEPS = -lOSMesa32
+
diff --git a/configs/debian-osmesa32-static b/configs/debian-osmesa32-static
new file mode 100644
index 00000000000..f970db81b6a
--- /dev/null
+++ b/configs/debian-osmesa32-static
@@ -0,0 +1,7 @@
+include $(TOP)/configs/debian-static
+include $(TOP)/configs/debian-osmesa32
+
+CONFIG_NAME = debian-osmesa32-static
+
+override OSMESA_LIB_NAME = lib$(OSMESA_LIB).a
+
diff --git a/configs/debian-static b/configs/debian-static
new file mode 100644
index 00000000000..202b8b0788c
--- /dev/null
+++ b/configs/debian-static
@@ -0,0 +1,6 @@
+include $(TOP)/configs/debian-common
+
+CONFIG_NAME = debian-static
+
+override MKLIB_OPTIONS = -static
+
diff --git a/debian/libglu1-mesa-dev.install b/debian/libglu1-mesa-dev.install
index f8973bf1d69..abada7c1aec 100644
--- a/debian/libglu1-mesa-dev.install
+++ b/debian/libglu1-mesa-dev.install
@@ -1,2 +1,3 @@
 usr/include/GL/glu.h
 usr/include/GL/glu_mangle.h
+usr/lib/libGLU.so
diff --git a/debian/mesa-common-dev.install b/debian/mesa-common-dev.install
index e69de29bb2d..7c104927712 100644
--- a/debian/mesa-common-dev.install
+++ b/debian/mesa-common-dev.install
@@ -0,0 +1,4 @@
+usr/include/GL/gl.h
+usr/include/GL/glext.h
+usr/include/GL/osmesa.h
+usr/include/GL/gl_mangle.h
diff --git a/debian/rules b/debian/rules
index 90e176e0b83..093efc14a90 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,10 +26,15 @@ DEB_BUILD_DIR      ?= $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE)
 
 STAMPDIR = debian/stamp
 
+# build the following configurations
 CONFIGS = debian \
-          debian-dri
+          debian-dri \
+          debian-osmesa16 \
+          debian-osmesa16-static \
+          debian-osmesa32 \
+          debian-osmesa32-static
 
-STAMP = $(STAMPDIR)/$(DEB_BUILD_GNU_TYPE)-
+STAMP = $(STAMPDIR)/$(DEB_BUILD_GNU_TYPE)
 BUILD_STAMPS = $(addprefix $(STAMP)-build-, $(CONFIGS))
 INSTALL_STAMPS = $(addprefix $(STAMP)-install-, $(CONFIGS))
 
@@ -42,14 +47,14 @@ $(STAMP)-build-%:
 	dh_testdir
 	mkdir -p $(DEB_BUILD_DIR)/$*
 	find $(CURDIR)/* -maxdepth 0 -not -path '$(DEB_BUILD_DIR)*' | xargs cp -rl -t $(DEB_BUILD_DIR)/$*
-	ln -s $* $(DEB_BUILD_DIR)/$*/configs/current
+	ln -sf $* $(DEB_BUILD_DIR)/$*/configs/current
 	cd $(DEB_BUILD_DIR)/$* && $(MAKE)
 	touch $@
 
 pre-install:
 	dh_testdir
 	dh_testroot
-	dh_clean -k --exclude ./Makefile.orig
+	dh_clean -k --exclude ./Makefile.orig --exclude configs/CVS/Root.bak
 	dh_installdirs
 
 install: build pre-install $(INSTALL_STAMPS)
@@ -62,7 +67,7 @@ clean:
 	dh_testdir
 	dh_testroot
 	rm -rf $(DEB_BUILD_DIR) debian/stamp
-	dh_clean --exclude ./Makefile.orig
+	dh_clean --exclude ./Makefile.orig --exclude configs/CVS/Root.bak
 
 # Build architecture-independent files here.
 binary-indep: build install