Prepare changelog for upload.

Change the >= ${source:Version} dependency to >= ${source:Upstream-Version}.
This way libgl1-mesa-dev stays installable after a minor revision bump on
architectures where mesa isn't built yet.

configs/debian-indirect-default

@@ -0,0 +1,7 @@
+# Configuration defaults for building GLX-enabled libGL.
+
+include $(TOP)/configs/debian-dri-default
+
+CONFIG_NAME = debian-indirect-default
+
+DRI_DIRS = 

configs/debian-indirect-hurd-i386

@@ -0,0 +1,9 @@
+# Configuration for building the DRI drivers on the build architecture.
+
+include $(TOP)/configs/linux-indirect
+include $(TOP)/configs/debian-indirect-default
+
+CONFIG_NAME = debian-indirect-hurd-i386
+
+# vim: ft=make
+

debian/changelog

@@ -1,11 +1,38 @@
-mesa (6.5.2-5) UNRELEASED; urgency=low
+mesa (6.5.2-7) unstable; urgency=low
 
+  [ Brice Goglin ]
+  * libgl1-mesa-dev does not need to depend on libgl1-mesa-dri,
+    libgl1-mesa-glx is enough (since their split in 6.4.1-0.1);
+    closes: #432081.  Thanks, Samuel Thibault!
+
+  [ Julien Cristau ]
+  * libgl1-mesa-dev Depends on libgl1-mesa-glx (>= ${source:Upstream-Version})
+    instead of >= ${Source-Version}.  This way it's still installable on
+    architectures where mesa isn't built yet when a minor revision is
+    uploaded.
+
+ -- Julien Cristau <jcristau@debian.org>  Wed, 11 Jul 2007 05:50:45 +0200
+
+mesa (6.5.2-6) unstable; urgency=low
+
+  * libgl1-mesa-swx11 needs to depend on libosmesa6 (>= 6.5.2-1) because
+    it used to contain libOSMesa.so.6.  This means that programs linked
+    against this lib got a dependency on -swx11 which was broken since
+    6.5.2-1.
+  * Fix build on hurd-i386 (build libgl1-mesa-glx without dri support and
+    don't build the dri drivers); closes: #420403.  Thanks, Samuel Thibault!
+
+ -- Julien Cristau <jcristau@debian.org>  Thu, 05 Jul 2007 00:56:35 +0200
+
+mesa (6.5.2-5) unstable; urgency=low
+
+  [ Brice Goglin ]
   * Add 07_call_radeonSetCliprects_from_radeonMakeCurrent.patch
     (closes: #420164). Thanks to Christian Ohm.
   * Add 08_r300_update_window_state_when_bound_but_stamp_changed.patch
   * Add 09_i915_always_enable_pixel_fog.patch
 
- -- Brice Goglin <Brice.Goglin@ens-lyon.org>  Fri, 20 Apr 2007 18:36:51 +0200
+ -- Julien Cristau <jcristau@debian.org>  Fri, 18 May 2007 13:36:25 +0200
 
 mesa (6.5.2-4) unstable; urgency=low
 

debian/control

@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5), quilt (>= 0.40), pkg-config, libdrm-dev (>= 2.2
 Package: libgl1-mesa-swx11
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, libosmesa6 (>= 6.5.2-1)
 Conflicts: mesag3-glide, mesag3-glide2, mesag3+ggi, libgl1, nvidia-glx, mesag3, libgl1-mesa-swrast
 Provides: libgl1, mesag3, libgl1-mesa-swrast
 Replaces: libgl1, mesag3, libgl1-mesa-swrast
@@ -158,7 +158,7 @@ Description: A free implementation of the OpenGL API -- GLX runtime -- debugging
 Package: libgl1-mesa-dri
 Section: libs
 Priority: optional
-Architecture: any
+Architecture: alpha amd64 arm armeb armel hppa i386 ia64 kfreebsd-i386 kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc
 Depends: ${shlibs:Depends}, libgl1-mesa-glx (= ${binary:Version})
 Suggests: libglide3
 Conflicts: xlibmesa-dri (<< 1:7.0.0)
@@ -179,7 +179,7 @@ Description: A free implementation of the OpenGL API -- DRI modules
 Package: libgl1-mesa-dri-dbg
 Section: libdevel
 Priority: extra
-Architecture: any
+Architecture: alpha amd64 arm armeb armel hppa i386 ia64 kfreebsd-i386 kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc
 Depends: libgl1-mesa-dri (= ${binary:Version})
 Description: A free implementation of the OpenGL API -- DRI modules -- debugging symbols
  This version of Mesa provides GLX and DRI capabilities: it is capable of
@@ -218,7 +218,7 @@ Description: A free implementation of the OpenGL API -- DRI modules -- debugging
 Package: libgl1-mesa-dev
 Section: libdevel
 Architecture: all
-Depends: libc6-dev, mesa-common-dev (= ${source:Version}), libgl1-mesa-glx (>= ${Source-Version}), libgl1-mesa-dri (>= ${Source-Version})
+Depends: libc6-dev, mesa-common-dev (= ${source:Version}), libgl1-mesa-glx (>= ${source:Upstream-Version})
 Conflicts: libgl-dev, libgl1-mesa-dri-dev
 Replaces: libgl-dev, libgl1-mesa-dri-dev
 Provides: libgl-dev, libgl1-mesa-dri-dev

debian/scripts/choose-configs

@@ -22,10 +22,14 @@ else
 endif
 
 # and for the GLX/DRI-enabled libGL
-ifneq ($(wildcard configs/debian-dri-$(DEB_BUILD_ARCH)),)
-	DRI_CONFIGS := debian-dri-$(DEB_BUILD_ARCH)
+ifneq ($(wildcard configs/debian-indirect-$(DEB_BUILD_ARCH)),)
+	DRI_CONFIGS := debian-indirect-$(DEB_BUILD_ARCH)
 else
+  ifneq ($(wildcard configs/debian-dri-$(DEB_BUILD_ARCH)),)
+	DRI_CONFIGS := debian-dri-$(DEB_BUILD_ARCH)
+  else
 	DRI_CONFIGS := debian-dri-any
+  endif
 endif
 
 ##############################################################################