diff -u libsdl1.2-1.2.13/debian/control libsdl1.2-1.2.13/debian/control --- libsdl1.2-1.2.13/debian/control +++ libsdl1.2-1.2.13/debian/control @@ -5,14 +5,14 @@ XSBC-Original-Maintainer: Debian SDL packages maintainers Uploaders: Sam Hocevar (Debian packages) , Aurelien Jarno , Josselin Mouette Standards-Version: 3.8.0 -Build-Depends: dpkg (>= 1.13.2), debhelper (>= 4.0), quilt, nasm [i386 lpia kfreebsd-i386], libaa1-dev, libx11-dev, libxext-dev, libxt-dev, libxv-dev, x11proto-core-dev, libaudiofile-dev, libesd0-dev, libpulse-dev, libgl1-mesa-dev, libarts1-dev, libartsc0-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libaudio-dev, libcaca-dev, libdirectfb-dev (>= 1.0) [!hurd-i386], libusbhid-dev [kfreebsd-i386 kfreebsd-amd64] +Build-Depends: dpkg (>= 1.13.2), debhelper (>= 4.0), quilt, nasm [i386 lpia kfreebsd-i386], libaa1-dev, libx11-dev, libxext-dev, libxt-dev, libxv-dev, x11proto-core-dev, libaudiofile-dev, libesd0-dev, libpulse-dev, libgl1-mesa-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libaudio-dev, libcaca-dev, libdirectfb-dev (>= 1.0) [!hurd-i386], libusbhid-dev [kfreebsd-i386 kfreebsd-amd64] Vcs-Svn: svn://svn.debian.org/pkg-sdl/unstable/libsdl.2 Vcs-Browser: http://svn.debian.org/wsvn/pkg-sdl/unstable/libsdl.2/ Package: libsdl1.2debian Architecture: any Section: libs -Depends: libsdl1.2debian-alsa (= ${binary:Version}) | libsdl1.2debian-all (= ${binary:Version}) | libsdl1.2debian-esd (= ${binary:Version}) | libsdl1.2debian-arts (= ${binary:Version}) | libsdl1.2debian-oss (= ${binary:Version}) | libsdl1.2debian-nas (= ${binary:Version}) | libsdl1.2debian-pulseaudio (= ${binary:Version}) +Depends: libsdl1.2debian-alsa (= ${binary:Version}) | libsdl1.2debian-all (= ${binary:Version}) | libsdl1.2debian-esd (= ${binary:Version}) | libsdl1.2debian-oss (= ${binary:Version}) | libsdl1.2debian-nas (= ${binary:Version}) | libsdl1.2debian-pulseaudio (= ${binary:Version}) Description: Simple DirectMedia Layer SDL is a library that allows programs portable low level access to a video framebuffer, audio output, mouse, and keyboard. @@ -27,8 +27,8 @@ Architecture: any Section: libs Depends: ${shlibs:Depends} -Replaces: libsdl1.2-all, libsdl1.2-esd, libsdl1.2-oss, libsdl1.2-arts, libsdl1.2 (<< 1.2.1-1), libsdl1.2debian-alsa, libsdl1.2debian-esd, libsdl1.2debian-oss, libsdl1.2debian-arts, libsdl1.2debian-nas, libsdl1.2-nas -Conflicts: libsdl1.2-all, libsdl1.2-esd, libsdl1.2-oss, libsdl1.2-arts, libsdl1.2 (<< 1.2.1-1), libsdl1.2debian-alsa, libsdl1.2debian-esd, libsdl1.2debian-oss, libsdl1.2debian-arts, libsdl1.2debian-nas, libsdl1.2-nas +Replaces: libsdl1.2-all, libsdl1.2-esd, libsdl1.2-oss, libsdl1.2-arts, libsdl1.2 (<< 1.2.1-1), libsdl1.2debian-alsa, libsdl1.2debian-esd, libsdl1.2debian-oss, libsdl1.2debian-nas, libsdl1.2-nas +Conflicts: libsdl1.2-all, libsdl1.2-esd, libsdl1.2-oss, libsdl1.2-arts, libsdl1.2 (<< 1.2.1-1), libsdl1.2debian-alsa, libsdl1.2debian-esd, libsdl1.2debian-oss, libsdl1.2debian-nas, libsdl1.2-nas Provides: libsdl1.2-all Description: Simple DirectMedia Layer (with all available options) SDL is a library that allows programs portable low level access to a video @@ -42,8 +42,8 @@ Section: libs Priority: extra Depends: ${shlibs:Depends} -Replaces: libsdl1.2-all, libsdl1.2-esd, libsdl1.2-oss, libsdl1.2-arts, libsdl1.2 (<< 1.2.1-1), libsdl1.2debian-all, libsdl1.2debian-arts, libsdl1.2debian-esd, libsdl1.2debian-oss, libsdl1.2debian-nas, libsdl1.2-nas, libsdl1.2debian-pulseaudio -Conflicts: libsdl1.2-all, libsdl1.2-esd, libsdl1.2-oss, libsdl1.2-arts, libsdl1.2 (<< 1.2.1-1), libsdl1.2debian-all, libsdl1.2debian-arts, libsdl1.2debian-esd, libsdl1.2debian-oss, libsdl1.2debian-nas, libsdl1.2-nas, libsdl1.2debian-pulseaudio +Replaces: libsdl1.2-all, libsdl1.2-esd, libsdl1.2-oss, libsdl1.2 (<< 1.2.1-1), libsdl1.2debian-all, libsdl1.2debian-arts, libsdl1.2debian-esd, libsdl1.2debian-oss, libsdl1.2debian-nas, libsdl1.2-nas, libsdl1.2debian-pulseaudio +Conflicts: libsdl1.2-all, libsdl1.2-esd, libsdl1.2-oss, libsdl1.2 (<< 1.2.1-1), libsdl1.2debian-all, libsdl1.2debian-arts, libsdl1.2debian-esd, libsdl1.2debian-oss, libsdl1.2debian-nas, libsdl1.2-nas, libsdl1.2debian-pulseaudio Description: Simple DirectMedia Layer (with X11 and ALSA options) SDL is a library that allows programs portable low level access to a video framebuffer, audio output, mouse, and keyboard. @@ -55,8 +55,8 @@ Section: libs Priority: extra Depends: ${shlibs:Depends} -Replaces: libsdl1.2-all, libsdl1.2-esd, libsdl1.2-oss, libsdl1.2-arts, libsdl1.2 (<< 1.2.1-1), libsdl1.2debian-all, libsdl1.2debian-alsa, libsdl1.2debian-esd, libsdl1.2debian-arts, libsdl1.2debian-nas, libsdl1.2-nas, libsdl1.2debian-pulseaudio -Conflicts: libsdl1.2-all, libsdl1.2-esd, libsdl1.2-oss, libsdl1.2-arts, libsdl1.2 (<< 1.2.1-1), libsdl1.2debian-all, libsdl1.2debian-alsa, libsdl1.2debian-esd, libsdl1.2debian-arts, libsdl1.2debian-nas, libsdl1.2-nas, libsdl1.2debian-pulseaudio +Replaces: libsdl1.2-all, libsdl1.2-esd, libsdl1.2-oss, libsdl1.2-arts, libsdl1.2 (<< 1.2.1-1), libsdl1.2debian-all, libsdl1.2debian-alsa, libsdl1.2debian-esd, libsdl1.2debian-nas, libsdl1.2-nas, libsdl1.2debian-pulseaudio +Conflicts: libsdl1.2-all, libsdl1.2-esd, libsdl1.2-oss, libsdl1.2-arts, libsdl1.2 (<< 1.2.1-1), libsdl1.2debian-all, libsdl1.2debian-alsa, libsdl1.2debian-esd, libsdl1.2debian-nas, libsdl1.2-nas, libsdl1.2debian-pulseaudio Provides: libsdl1.2-oss Description: Simple DirectMedia Layer (with X11 and OSS options) SDL is a library that allows programs portable low level access to a video @@ -69,8 +69,8 @@ Section: libs Priority: extra Depends: ${shlibs:Depends} -Replaces: libsdl1.2-all, libsdl1.2-esd, libsdl1.2-oss, libsdl1.2-arts, libsdl1.2 (<< 1.2.1-1), libsdl1.2debian-all, libsdl1.2debian-alsa, libsdl1.2debian-oss, libsdl1.2debian-arts, libsdl1.2debian-nas, libsdl1.2-nas, libsdl1.2debian-pulseaudio -Conflicts: libsdl1.2-all, libsdl1.2-esd, libsdl1.2-oss, libsdl1.2-arts, libsdl1.2 (<< 1.2.1-1), libsdl1.2debian-all, libsdl1.2debian-alsa, libsdl1.2debian-oss, libsdl1.2debian-arts, libsdl1.2debian-nas, libsdl1.2-nas, libsdl1.2debian-pulseaudio +Replaces: libsdl1.2-all, libsdl1.2-esd, libsdl1.2-oss, libsdl1.2-arts, libsdl1.2 (<< 1.2.1-1), libsdl1.2debian-all, libsdl1.2debian-alsa, libsdl1.2debian-oss, libsdl1.2debian-nas, libsdl1.2-nas, libsdl1.2debian-pulseaudio +Conflicts: libsdl1.2-all, libsdl1.2-esd, libsdl1.2-oss, libsdl1.2-arts, libsdl1.2 (<< 1.2.1-1), libsdl1.2debian-all, libsdl1.2debian-alsa, libsdl1.2debian-oss, libsdl1.2debian-nas, libsdl1.2-nas, libsdl1.2debian-pulseaudio Provides: libsdl1.2-esd Description: Simple DirectMedia Layer (with X11 and esound options) SDL is a library that allows programs portable low level access to a video @@ -78,27 +78,14 @@ . This version of SDL is compiled with X11 graphics and esd (esound) sound. -Package: libsdl1.2debian-arts -Architecture: any -Section: libs -Priority: extra -Depends: ${shlibs:Depends} -Replaces: libsdl1.2-all, libsdl1.2-esd, libsdl1.2-oss, libsdl1.2-arts, libsdl1.2 (<< 1.2.1-1), libsdl1.2debian-all, libsdl1.2debian-alsa, libsdl1.2debian-esd, libsdl1.2debian-oss, libsdl1.2debian-nas, libsdl1.2-nas, libsdl1.2debian-pulseaudio -Conflicts: libsdl1.2-all, libsdl1.2-esd, libsdl1.2-oss, libsdl1.2-arts, libsdl1.2 (<< 1.2.1-1), libsdl1.2debian-all, libsdl1.2debian-alsa, libsdl1.2debian-esd, libsdl1.2debian-oss, libsdl1.2debian-nas, libsdl1.2-nas, libsdl1.2debian-pulseaudio -Provides: libsdl1.2-arts -Description: Simple DirectMedia Layer (with X11 and aRts options) - 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 X11 graphics and aRts sound. Package: libsdl1.2debian-nas Architecture: any Section: libs Priority: extra Depends: ${shlibs:Depends} -Replaces: libsdl1.2-all, libsdl1.2-esd, libsdl1.2-oss, libsdl1.2-arts, libsdl1.2 (<< 1.2.1-1), libsdl1.2debian-all, libsdl1.2debian-alsa, libsdl1.2debian-esd, libsdl1.2debian-oss, libsdl1.2debian-arts, libsdl1.2debian-pulseaudio -Conflicts: libsdl1.2-all, libsdl1.2-esd, libsdl1.2-oss, libsdl1.2-arts, libsdl1.2 (<< 1.2.1-1), libsdl1.2debian-all, libsdl1.2debian-alsa, libsdl1.2debian-esd, libsdl1.2debian-oss, libsdl1.2debian-arts, libsdl1.2debian-pulseaudio +Replaces: libsdl1.2-all, libsdl1.2-esd, libsdl1.2-oss, libsdl1.2-arts, libsdl1.2 (<< 1.2.1-1), libsdl1.2debian-all, libsdl1.2debian-alsa, libsdl1.2debian-esd, libsdl1.2debian-oss, libsdl1.2debian-pulseaudio +Conflicts: libsdl1.2-all, libsdl1.2-esd, libsdl1.2-oss, libsdl1.2-arts, libsdl1.2 (<< 1.2.1-1), libsdl1.2debian-all, libsdl1.2debian-alsa, libsdl1.2debian-esd, libsdl1.2debian-oss, libsdl1.2debian-pulseaudio Provides: libsdl1.2-nas Description: Simple DirectMedia Layer (with X11 and NAS options) SDL is a library that allows programs portable low level access to a video @@ -111,8 +98,8 @@ Section: libs Priority: extra Depends: ${shlibs:Depends} -Replaces: libsdl1.2-all, libsdl1.2-esd, libsdl1.2-oss, libsdl1.2-arts, libsdl1.2 (<< 1.2.1-1), libsdl1.2debian-all, libsdl1.2debian-alsa, libsdl1.2debian-esd, libsdl1.2debian-oss, libsdl1.2debian-arts -Conflicts: libsdl1.2-all, libsdl1.2-esd, libsdl1.2-oss, libsdl1.2-arts, libsdl1.2 (<< 1.2.1-1), libsdl1.2debian-all, libsdl1.2debian-alsa, libsdl1.2debian-esd, libsdl1.2debian-oss, libsdl1.2debian-arts +Replaces: libsdl1.2-all, libsdl1.2-esd, libsdl1.2-oss, libsdl1.2 (<< 1.2.1-1), libsdl1.2debian-all, libsdl1.2debian-arts, libsdl1.2debian-alsa, libsdl1.2debian-esd, libsdl1.2debian-oss +Conflicts: libsdl1.2-all, libsdl1.2-esd, libsdl1.2-oss, libsdl1.2 (<< 1.2.1-1), libsdl1.2debian-all, libsdl1.2debian-arts, libsdl1.2debian-alsa, libsdl1.2debian-esd, libsdl1.2debian-oss Description: Simple DirectMedia Layer (with X11 and PulseAudio options) SDL is a library that allows programs portable low level access to a video framebuffer, audio output, mouse, and keyboard. @@ -135,7 +122,7 @@ Architecture: any Section: libdevel Depends: libsdl1.2debian (= ${binary:Version}), libx11-dev, libglu1-mesa-dev -Recommends: libxt-dev, libxext-dev, libasound2-dev [linux-any], libaa1-dev, libaudio-dev, libartsc0-dev, libesd0-dev, libdirectfb-dev (>= 0.9.22), libusbhid-dev [kfreebsd-any], libcaca-dev +Recommends: libxt-dev, libxext-dev, libasound2-dev [linux-any], libaa1-dev, libaudio-dev, libesd0-dev, libdirectfb-dev (>= 0.9.22), libusbhid-dev [kfreebsd-any], libcaca-dev Replaces: libsdl-dev, libsdl0.11-dev, libsdl1.0-dev, libsdl1.1-dev Conflicts: xlibs-pic (<< 4.1.0-10), libsdl-dev, libsdl0.11-dev, libsdl0.11, libsdl1.0-dev, libsdl1.1-dev Provides: libsdl-dev diff -u libsdl1.2-1.2.13/debian/changelog libsdl1.2-1.2.13/debian/changelog --- libsdl1.2-1.2.13/debian/changelog +++ libsdl1.2-1.2.13/debian/changelog @@ -1,3 +1,20 @@ +libsdl1.2 (1.2.13-4ubuntu2) jaunty; urgency=low + + * Rebuild without aRts support. (LP: #320915) + * Multiple changes in debian/control + - dropped build-depends on libarts1-dev, libartsc0-dev. These + packages will disappear as part of the arts removal. + - Removed Package: libsdl1.2debian-arts section entirely + - dropped depends on libsdl1.2debian-arts (= ${binary:Version}) for + libsdl1.2-debian + - dropped depends on libartsc0-dev for libsdl1.2-dev + * Multiple changes in debian/rules + - set --enable-arts-shared=no and --enable-arts=no in confflags + - removed --disable-audio-arts from udeb_confflags + - dropped arts from FLAVOURS= + + -- Richard Birnie Sun, 25 Jan 2009 13:41:45 +0000 + libsdl1.2 (1.2.13-4ubuntu1) jaunty; urgency=low * Merge from debian unstable, remaining changes: diff -u libsdl1.2-1.2.13/debian/rules libsdl1.2-1.2.13/debian/rules --- libsdl1.2-1.2.13/debian/rules +++ libsdl1.2-1.2.13/debian/rules @@ -27,7 +27,7 @@ confflags = --prefix=/usr confflags += --disable-rpath --enable-dlopen \ --enable-dependency-tracking \ - --enable-arts-shared=no --enable-alsa-shared=no \ + --enable-arts-shared=no --enable-arts=no --enable-alsa-shared=no \ --enable-esd-shared=no --enable-pulseaudio-shared=no all_confflags = --disable-video-ggi \ --enable-video-aalib --enable-video-directfb \ @@ -42,7 +42,7 @@ --disable-audio-oss --disable-audio-nas --disable-audio-alsa \ --disable-pulseaudio -FLAVOURS = arts esd oss nas pulseaudio +FLAVOURS = esd oss nas pulseaudio ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) confflags += --build $(DEB_HOST_GNU_TYPE)