[Pkg-sdl-commits] [SCM] Debian packaging of SDL2 branch, master, updated. debian/2.0.0_20130103-1-11-gdefdbe2

[Felix Geyer]

The following commit has been merged in the master branch:
commit fecb23b2067cbe878f7dc43bf3d5ecc46fac4706
Author: Felix Geyer <fgeyer at debian.org>
Date:   Sun Jun 2 16:03:09 2013 +0200

    Disable directfb backend for now as it's broken and upstream disables it by default.
    
    Drop the udeb package.

diff --git a/debian/changelog b/debian/changelog
index eb1db2d..5a0496a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ libsdl2 (2.0.0~rc1-1) UNRELEASED; urgency=low
   * Bump SHLIBVER to 2.0.0~rc1.
   * Update debian/docs.
   * Bump Standards-Version to 3.9.4, no changes needed.
+  * Disable directfb backend for now as it's broken and upstream
+    disables it by default.
+    - Drop the udeb package.
 
  -- Felix Geyer <fgeyer at debian.org>  Sat, 01 Jun 2013 10:17:56 +0200
 
diff --git a/debian/control b/debian/control
index 1c40ce3..7328603 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,6 @@ Build-Depends: debhelper (>= 9),
                nasm [any-i386],
                libasound2-dev [linux-any],
                libaudiofile-dev,
-               libdirectfb-dev (>= 1.0) [!hurd-any],
                libgl1-mesa-dev,
                libglu1-mesa-dev,
                libpulse-dev,
@@ -48,25 +47,12 @@ Description: Simple DirectMedia Layer
  This version of SDL is compiled with X11, caca and DirectFB graphics
  drivers and OSS, ALSA, NAS and PulseAudio sound drivers.
 
-Package: libsdl2-2.0-0-udeb
-Package-Type: udeb
-Architecture: any
-Section: debian-installer
-Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Simple DirectMedia Layer (with directfb graphics and no sound)
- SDL is a library that allows programs portable low level access to a video
- framebuffer, audio output, mouse, and keyboard.
- .
- This version of SDL is compiled with directfb graphics and no sound.
-
 Package: libsdl2-dev
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends},
          libasound2-dev [linux-any],
          libaudiofile-dev,
-         libdirectfb-dev (>= 1.0) [!hurd-any],
          libgl1-mesa-dev,
          libglu1-mesa-dev,
          libpulse-dev,
diff --git a/debian/rules b/debian/rules
index 6e0dff1..0556bae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,12 +9,7 @@ confflags = --disable-rpath --enable-sdl-dlopen --disable-loadso \
             --disable-nas --disable-esd --disable-arts \
             --disable-alsa-shared --disable-pulseaudio-shared \
             --disable-x11-shared \
-            --enable-video-directfb
-udeb_confflags = --enable-video-directfb \
-                 --disable-video-x11 \
-                 --disable-video-opengl \
-                 --disable-audio \
-                 --disable-oss --disable-alsa --disable-pulseaudio
+            --disable-video-directfb
 
 # Only use NASM routines on x86 CPUs
 ifeq ($(DEB_HOST_ARCH_CPU),i386)
@@ -31,26 +26,18 @@ endif
 	dh $@ --parallel
 
 override_dh_auto_configure:
-	dh_auto_configure -Bbuilddir/all -- $(confflags)
-	dh_auto_configure -Bbuilddir/udeb -- $(confflags) $(udeb_confflags)
+	dh_auto_configure -- $(confflags)
 
 override_dh_auto_build:
-	dh_auto_build -Bbuilddir/all
-	dh_auto_build -Bbuilddir/udeb
+	dh_auto_build
 	tar czf debian/examples.tar.gz test
 
-override_dh_auto_install:
-	dh_auto_install -Bbuilddir/all
-	dh_auto_install -Bbuilddir/udeb --destdir=debian/tmp-udeb
-
 override_dh_auto_clean:
-	dh_auto_clean -Bbuilddir/all
-	dh_auto_clean -Bbuilddir/udeb
+	dh_auto_clean
 	rm -f debian/examples.tar.gz
 
 override_dh_install:
-	dh_install -plibsdl2-2.0-0-udeb --sourcedir=debian/tmp-udeb
-	dh_install --remaining-packages --fail-missing -XlibSDL2.la
+	dh_install --fail-missing -XlibSDL2.la
 
 override_dh_installexamples:
 	dh_installexamples -plibsdl2-dev debian/examples.tar.gz
@@ -65,4 +52,4 @@ override_dh_strip:
 	dh_strip --dbg-package=libsdl2-dbg
 
 override_dh_makeshlibs:
-	dh_makeshlibs -V"libsdl2-2.0-0 (>= $(SHLIBVER))" --add-udeb=libsdl2-2.0-0-udeb
+	dh_makeshlibs -V"libsdl2-2.0-0 (>= $(SHLIBVER))"

-- 
Debian packaging of SDL2