[Pkg-sdl-commits] [SCM] Debian packaging of SDL2 branch, master, updated. debian/1.3.0_20111204-1-45-g9989127

[Manuel A. Fernandez Montecelo]

The following commit has been merged in the master branch:
commit 99891273f36912154ba0cc9dbe67cf3a28d861c2
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date:   Sun Jan 20 00:37:48 2013 +0000

    Update Build-Deps and options, there are many differences with previous versions

diff --git a/debian/control b/debian/control
index addf1cc..3133f80 100644
--- a/debian/control
+++ b/debian/control
@@ -10,20 +10,26 @@ Standards-Version: 3.9.3
 Build-Depends: debhelper (>= 9),
                dpkg-dev (>= 1.16.1~),
                nasm [any-i386],
+               libasound2-dev [linux-any],
+               libaudiofile-dev,
+               libdirectfb-dev (>= 1.0) [!hurd-any],
+               libgl1-mesa-dev,
+               libglu1-mesa-dev,
+               libpulse-dev,
+               libts-dev [linux-any],
+               libudev-dev [linux-any],
+               libusb2-dev [kfreebsd-any],
+               libusbhid-dev [kfreebsd-any],
                libx11-dev,
+               libxcursor-dev,
                libxext-dev,
+               libxi-dev,
+               libxinerama-dev,
+               libxrandr-dev,
+               libxss-dev,
                libxt-dev,
                libxv-dev,
-               x11proto-core-dev,
-               libts-dev [linux-any],
-               libaudiofile-dev,
-               libpulse-dev,
-               libgl1-mesa-dev,
-               libasound2-dev [linux-any],
-               libcaca-dev,
-               libdirectfb-dev (>= 1.0) [!hurd-i386],
-               libusbhid-dev [kfreebsd-any],
-               libglu1-mesa-dev
+               libxxf86vm-dev
 Vcs-Git: git://anonscm.debian.org/pkg-sdl/packages/libsdl2.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-sdl/packages/libsdl2.git
 Homepage: http://www.libsdl.org/
@@ -58,17 +64,27 @@ Package: libsdl2-dev
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends},
-         libsdl2-2.0-0 (= ${binary:Version}),
-         libx11-dev,
-         libts-dev [linux-any],
-         libglu1-mesa-dev,
          libasound2-dev [linux-any],
+         libaudiofile-dev,
+         libdirectfb-dev (>= 1.0) [!hurd-any],
+         libgl1-mesa-dev,
+         libglu1-mesa-dev,
          libpulse-dev,
-         libdirectfb-dev (>= 0.9.22),
-         libcaca-dev,
+         libsdl2-2.0-0 (= ${binary:Version}),
+         libts-dev [linux-any],
+         libudev-dev [linux-any],
+         libusb2-dev [kfreebsd-any],
          libusbhid-dev [kfreebsd-any],
+         libx11-dev,
+         libxcursor-dev,
+         libxext-dev,
+         libxi-dev,
+         libxinerama-dev,
+         libxrandr-dev,
+         libxss-dev,
          libxt-dev,
-         libxext-dev
+         libxv-dev,
+         libxxf86vm-dev
 Conflicts: libsdl-1.3-dev
 Replaces: libsdl-1.3-dev
 Description: Simple DirectMedia Layer development files
diff --git a/debian/rules b/debian/rules
index 81eb4ad..15f890e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,18 +6,13 @@ DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 confflags = --disable-rpath --enable-sdl-dlopen --disable-loadso \
-            --disable-video-ggi --disable-video-svga --disable-video-aalib \
             --disable-nas --disable-esd --disable-arts \
             --disable-alsa-shared --disable-pulseaudio-shared \
             --disable-x11-shared \
             --enable-video-directfb
-all_confflags = --enable-video-caca
 udeb_confflags = --enable-video-directfb \
                  --disable-video-x11 \
-                 --disable-dga --disable-video-photon \
-                 --disable-video-fbcon --disable-video-ps2gs \
-                 --disable-video-opengl --disable-video-xbios \
-                 --disable-video-gem --disable-video-caca \
+                 --disable-video-opengl \
                  --disable-audio \
                  --disable-oss --disable-alsa --disable-pulseaudio
 
@@ -36,7 +31,7 @@ endif
 	dh $@ --parallel
 
 override_dh_auto_configure:
-	dh_auto_configure -Bbuilddir/all -- $(confflags) $(all_confflags)
+	dh_auto_configure -Bbuilddir/all -- $(confflags)
 	dh_auto_configure -Bbuilddir/udeb -- $(confflags) $(udeb_confflags)
 
 override_dh_auto_build:

-- 
Debian packaging of SDL2