[SCM] A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids branch, master, updated. upstream/1.21.1-84-g2cf70b5

[Robin Cornelius]

The following commit has been merged in the master branch:
commit 6dbf70a80c14501bd4f3bf505022b002dca9bc06
Author: Robin Cornelius <robin.cornelius at gmail.com>
Date:   Wed Sep 10 19:25:37 2008 +0100

    Fix some final build mistakes in a pbuilder

diff --git a/debian/control b/debian/control
index f95c635..fb62d07 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: games
 Priority: extra
 Maintainer: Secondlife Debian Team <secondlife-debian-maintainers at slupdate.byteme.org.uk>
 Uploaders: Robin Cornelius <robin.cornelius at gmail.com>
-Build-Depends: debhelper (>= 5), quilt (>= 0.40), cmake, libcairo2-dev, libglib2.0-dev, libgtk2.0-dev, libsdl1.2-dev, libvorbis-dev, libopenjpeg-dev, libjpeg62-dev, libpng12-dev, flex, bison, libssl-dev, libexpat1-dev, libaprutil1-dev, libapr1-dev, zlib1g-dev, libxmlrpc-epi-dev, libgl1-mesa-dev ( >= 7 ) | libgl-dev, libboost-dev, libboost-regex-dev,libboost-signals-dev ,libboost-program-options-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, libc-ares-dev , libllmozlib2-dev  (>= 0.0.1), libopenal-dev, libalut-dev, libapr1-dev, python
+Build-Depends: debhelper (>= 5), quilt (>= 0.40), cmake, libcairo2-dev, libglib2.0-dev, libgtk2.0-dev, libsdl1.2-dev, libvorbis-dev, libopenjpeg-dev, libjpeg62-dev, libpng12-dev, flex, bison, libssl-dev, libexpat1-dev, libaprutil1-dev, libapr1-dev, zlib1g-dev, libxmlrpc-epi-dev, libgl1-mesa-dev ( >= 7 ) | libgl-dev, libboost-dev, libboost-regex-dev,libboost-signals-dev ,libboost-program-options-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, libc-ares-dev , libllmozlib2-dev  (>= 0.0.1), libopenal-dev, libalut-dev, libapr1-dev, python, libcurl4-gnutls-dev
 Standards-Version: 3.7.3
 XS-Vcs-Git: http://git.debian.org/git/pkg-games/slviewer.git
 
diff --git a/debian/patches/series b/debian/patches/series
index 8c4f535..980358f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -29,3 +29,4 @@ dont_depend_on_artwork_to_build.patch
 VWR-8751-Build-with-a-shared-llmozlib2.patch
 lltemplatemessagereader_memcpy.patch
 no_old_school_typedefs.patch
+gcc_warning_on_llwindowsdl_var_not_set.patch

-- 
A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids