[SCM] Packaging for Red Eclipse branch, master, updated. debian/1.2-2-4-g46fc97d

[Martin Erik Werner]

The following commit has been merged in the master branch:
commit 46fc97d9149b6085c40aa5d6cb36997882321d38
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Mon Feb 27 13:53:08 2012 +0100

    Re-version build-deps for autobuilders

diff --git a/debian/changelog b/debian/changelog
index db2628d..740a503 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
 redeclipse (1.2-3) UNRELEASED; urgency=low
 
-  * Unversion lib dependencies
-    - libgl1-mesa-dev     -> libgl-dev
-    - libsdl1.2-dev       -> libsdl-dev
-    - lib1g-dev           -> libz-dev
+  * Add unversion lib dependency alternatives
+    - libgl1-mesa-dev | libgl-dev
+    - libsdl1.2-dev | libsdl-dev
+    - lib1g-dev | libz-dev
 
- -- Martin Erik Werner <martinerikwerner at gmail.com>  Mon, 27 Feb 2012 00:46:25 +0100
+ -- Martin Erik Werner <martinerikwerner at gmail.com>  Mon, 27 Feb 2012 13:53:19 +0100
 
 redeclipse (1.2-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index f172e9c..bbd3ba0 100644
--- a/debian/control
+++ b/debian/control
@@ -6,12 +6,12 @@ Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 8),
                imagemagick,
                libenet-dev,
-               libgl-dev,
-               libsdl-dev,
+               liblg1-mesa-dev | libgl-dev,
                libsdl-image1.2-dev,
                libsdl-mixer1.2-dev,
+               libsdl1.2-dev | libsdl-dev,
                libx11-dev,
-               libz-dev
+               zlib1g-dev | libz-dev
 Standards-Version: 3.9.3
 Homepage: http://www.redeclipse.net
 Vcs-Git: git://git.debian.org/pkg-games/redeclipse.git

-- 
Packaging for Red Eclipse