[Pkg-sdl-commits] r276 - unstable/libsdl1.2/debian
Samuel Hocevar
sho at alioth.debian.org
Sun Dec 4 01:28:01 UTC 2011
Author: sho
Date: 2011-12-04 13:28:01 +0000 (Sun, 04 Dec 2011)
New Revision: 276
Added:
unstable/libsdl1.2/debian/libsdl1.2debian.install
Removed:
unstable/libsdl1.2/debian/libsdl1.2debian-all.install
unstable/libsdl1.2/debian/sys-build.mk
Modified:
unstable/libsdl1.2/debian/changelog
unstable/libsdl1.2/debian/control
unstable/libsdl1.2/debian/rules
Log:
libsdl1.2 (1.2.14-6.4) unstable; urgency=low
* Non-maintainer upload.
* Build improvements from Guillem Jover that should really have gone
with the previous upload. Closes: #614332.
+ Line-wrap build-depends.
+ Use -any syntax for architecture-specific stuff.
+ Fix cross-compilation by using DEB_HOST_* variables.
+ Update or remove non-existing configure flags.
+ Forbid dlopening for X11.
* Use --enable-debug with the debug keyword, not the noopt one.
* Refactor configure options.
* Disable NAS. We have PulseAudio now.
* Pass --disable-loadso, just to be sure.
-- Josselin Mouette <joss at debian.org> Tue, 24 May 2011 22:51:57 +0200
libsdl1.2 (1.2.14-6.3) unstable; urgency=low
* Non-maintainer upload with maintainer’s approval.
* Merge all builds into a single one, there is no more a reason to
keep all these packages.
* Remove support for libaa (there’s libcaca), libsvga (directfb
supports more architectures) and libesd (pulseaudio does much more).
* Remove obsolete sys-build.mk from source directory.
-- Josselin Mouette <joss at debian.org> Sat, 16 Apr 2011 18:25:59 +0200
libsdl1.2 (1.2.14-6.2) unstable; urgency=low
* Non-maintainer upload.
* Remove arts as build dependency as is being removed from the archive
(Closes: #620982, #581231).
- Remove libsdl1.2debian-arts.
- Remove references to arts in other packages that this source provides.
- Pass --disable-arts to the configure script.
[ Ana Beatriz Guerrero Lopez ]
* Update uploaders, remove aurel32, joss and sho.
-- Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com> Fri, 08 Apr 2011 23:35:29 +0200
libsdl1.2 (1.2.14-6.1) unstable; urgency=medium
* Non-maintainer upload.
* Disable altivec on powerpc. Debian's powerpc port supports systems
without it, and libsdl's build system only pretends to do runtime
detection (closes: #572420).
-- Julien Cristau <jcristau at debian.org> Sun, 10 Oct 2010 17:12:11 +0200
Modified: unstable/libsdl1.2/debian/changelog
===================================================================
--- unstable/libsdl1.2/debian/changelog 2011-11-26 23:38:04 UTC (rev 275)
+++ unstable/libsdl1.2/debian/changelog 2011-12-04 13:28:01 UTC (rev 276)
@@ -1,3 +1,55 @@
+libsdl1.2 (1.2.14-6.4) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Build improvements from Guillem Jover that should really have gone
+ with the previous upload. Closes: #614332.
+ + Line-wrap build-depends.
+ + Use -any syntax for architecture-specific stuff.
+ + Fix cross-compilation by using DEB_HOST_* variables.
+ + Update or remove non-existing configure flags.
+ + Forbid dlopening for X11.
+ * Use --enable-debug with the debug keyword, not the noopt one.
+ * Refactor configure options.
+ * Disable NAS. We have PulseAudio now.
+ * Pass --disable-loadso, just to be sure.
+
+ -- Josselin Mouette <joss at debian.org> Tue, 24 May 2011 22:51:57 +0200
+
+libsdl1.2 (1.2.14-6.3) unstable; urgency=low
+
+ * Non-maintainer upload with maintainer’s approval.
+ * Merge all builds into a single one, there is no more a reason to
+ keep all these packages.
+ * Remove support for libaa (there’s libcaca), libsvga (directfb
+ supports more architectures) and libesd (pulseaudio does much more).
+ * Remove obsolete sys-build.mk from source directory.
+
+ -- Josselin Mouette <joss at debian.org> Sat, 16 Apr 2011 18:25:59 +0200
+
+libsdl1.2 (1.2.14-6.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove arts as build dependency as is being removed from the archive
+ (Closes: #620982, #581231).
+ - Remove libsdl1.2debian-arts.
+ - Remove references to arts in other packages that this source provides.
+ - Pass --disable-arts to the configure script.
+
+ [ Ana Beatriz Guerrero Lopez ]
+
+ * Update uploaders, remove aurel32, joss and sho.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com> Fri, 08 Apr 2011 23:35:29 +0200
+
+libsdl1.2 (1.2.14-6.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Disable altivec on powerpc. Debian's powerpc port supports systems
+ without it, and libsdl's build system only pretends to do runtime
+ detection (closes: #572420).
+
+ -- Julien Cristau <jcristau at debian.org> Sun, 10 Oct 2010 17:12:11 +0200
+
libsdl1.2 (1.2.14-6) unstable; urgency=low
* Add 320_disappearingcursor.diff to fix problems with the mouse cursor
Modified: unstable/libsdl1.2/debian/control
===================================================================
--- unstable/libsdl1.2/debian/control 2011-11-26 23:38:04 UTC (rev 275)
+++ unstable/libsdl1.2/debian/control 2011-12-04 13:28:01 UTC (rev 276)
@@ -2,115 +2,56 @@
Priority: optional
Section: libs
Maintainer: Debian SDL packages maintainers <pkg-sdl-maintainers at lists.alioth.debian.org>
-Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>, Aurelien Jarno <aurel32 at debian.org>, Josselin Mouette <joss at debian.org>, Barry deFreese <bdefreese at debian.org>
+Uploaders: Barry deFreese <bdefreese at debian.org>
Standards-Version: 3.8.4
-Build-Depends: dpkg (>= 1.13.2), debhelper (>= 5.0), quilt, nasm [i386 kfreebsd-i386], libaa1-dev, libx11-dev, libxext-dev, libxt-dev, libxv-dev, x11proto-core-dev, libaudiofile-dev, libesd0-dev, libpulse-dev, libgl1-mesa-dev, libsvga1-dev [amd64 i386], 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], libglu1-mesa-dev
+Build-Depends: dpkg (>= 1.13.2),
+ debhelper (>= 5.0),
+ quilt,
+ nasm [any-i386],
+ libx11-dev,
+ libxext-dev,
+ libxt-dev,
+ libxv-dev,
+ x11proto-core-dev,
+ 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
Vcs-Svn: svn://svn.debian.org/pkg-sdl/unstable/libsdl.2
Vcs-Browser: http://svn.debian.org/wsvn/pkg-sdl/unstable/libsdl1.2/
Homepage: http://www.libsdl.org/
Package: libsdl1.2debian
Architecture: any
-Depends: ${misc: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: ${misc:Depends}, ${shlibs:Depends}
+Replaces: libsdl1.2debian-all,
+ libsdl1.2debian-alsa,
+ libsdl1.2debian-esd,
+ libsdl1.2debian-oss,
+ libsdl1.2debian-nas,
+ libsdl1.2debian-pulseaudio
+Conflicts: libsdl1.2debian-all,
+ libsdl1.2debian-alsa,
+ libsdl1.2debian-esd,
+ libsdl1.2debian-oss,
+ libsdl1.2debian-nas,
+ libsdl1.2debian-pulseaudio,
+ libsdl1.2-all,
+ libsdl1.2-esd,
+ libsdl1.2-oss,
+ libsdl1.2-nas,
+ libsdl1.2
Description: Simple DirectMedia Layer
SDL is a library that allows programs portable low level access to
a video framebuffer, audio output, mouse, and keyboard.
.
- This is just a dummy package. You also need one of the seven versions of
- the library that this package depends on.
- .
- (Note: Updates from SDL CVS after the version release date are occasionally
- factored into these packages).
+ This version of SDL is compiled with X11, caca and DirectFB graphics
+ drivers and OSS, ALSA, NAS and PulseAudio sound drivers.
-Package: libsdl1.2debian-all
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc: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
-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
- framebuffer, audio output, mouse, and keyboard.
- .
- This version of SDL is compiled with X11, aalib, svga and ggi graphics
- drivers and oss, esound, alsa, arts, nas and pulseaudio sound drivers.
-
-Package: libsdl1.2debian-alsa
-Architecture: linux-any
-Priority: extra
-Depends: ${shlibs:Depends}, ${misc: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
-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.
- .
- This version of SDL is compiled with X11 graphics and ALSA sound.
-
-Package: libsdl1.2debian-oss
-Architecture: any
-Priority: extra
-Depends: ${shlibs:Depends}, ${misc: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
-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
- framebuffer, audio output, mouse, and keyboard.
- .
- This version of SDL is compiled with X11 graphics and oss sound.
-
-Package: libsdl1.2debian-esd
-Architecture: any
-Priority: extra
-Depends: ${shlibs:Depends}, ${misc: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
-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
- framebuffer, audio output, mouse, and keyboard.
- .
- This version of SDL is compiled with X11 graphics and esd (esound) sound.
-
-Package: libsdl1.2debian-arts
-Architecture: any
-Priority: extra
-Depends: ${shlibs:Depends}, ${misc: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
-Priority: extra
-Depends: ${shlibs:Depends}, ${misc: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
-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
- framebuffer, audio output, mouse, and keyboard.
- .
- This version of SDL is compiled with X11 graphics and NAS sound.
-
-Package: libsdl1.2debian-pulseaudio
-Architecture: any
-Priority: extra
-Depends: ${shlibs:Depends}, ${misc: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
-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.
- .
- This version of SDL is compiled with X11 graphics and PulseAudio sound.
-
Package: libsdl1.2debian-udeb
XC-Package-Type: udeb
Architecture: any
@@ -126,7 +67,17 @@
Package: libsdl1.2-dev
Architecture: any
Section: libdevel
-Depends: ${misc:Depends}, libsdl1.2debian (= ${binary:Version}), libx11-dev, libglu1-mesa-dev, libasound2-dev [linux-any], libartsc0-dev, libesd0-dev,libpulse-dev, libdirectfb-dev (>= 0.9.22), libsvga1-dev [amd64 i386], libaa1-dev, libcaca-dev, libusbhid-dev [kfreebsd-any], libxt-dev, libxext-dev, libaudio-dev
+Depends: ${misc:Depends},
+ libsdl1.2debian (= ${binary:Version}),
+ libx11-dev,
+ libglu1-mesa-dev,
+ libasound2-dev [linux-any],
+ libpulse-dev,
+ libdirectfb-dev (>= 0.9.22),
+ libcaca-dev,
+ libusbhid-dev [kfreebsd-any],
+ libxt-dev,
+ libxext-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
Deleted: unstable/libsdl1.2/debian/libsdl1.2debian-all.install
===================================================================
--- unstable/libsdl1.2/debian/libsdl1.2debian-all.install 2011-11-26 23:38:04 UTC (rev 275)
+++ unstable/libsdl1.2/debian/libsdl1.2debian-all.install 2011-12-04 13:28:01 UTC (rev 276)
@@ -1 +0,0 @@
-usr/lib/*.so.*
Copied: unstable/libsdl1.2/debian/libsdl1.2debian.install (from rev 275, unstable/libsdl1.2/debian/libsdl1.2debian-all.install)
===================================================================
--- unstable/libsdl1.2/debian/libsdl1.2debian.install (rev 0)
+++ unstable/libsdl1.2/debian/libsdl1.2debian.install 2011-12-04 13:28:01 UTC (rev 276)
@@ -0,0 +1 @@
+usr/lib/*.so.*
Modified: unstable/libsdl1.2/debian/rules
===================================================================
--- unstable/libsdl1.2/debian/rules 2011-11-26 23:38:04 UTC (rev 275)
+++ unstable/libsdl1.2/debian/rules 2011-12-04 13:28:01 UTC (rev 276)
@@ -12,37 +12,34 @@
NJOBS := 1
endif
-export SHLIBVER=(>= 1.2.10-1)
+export SHLIBVER=1.2.10-1
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
-DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
export DEB_HOST_GNU_TYPE
export DEB_BUILD_GNU_TYPE
confflags = --prefix=/usr
-confflags += --disable-rpath --enable-dlopen \
- --enable-dependency-tracking \
- --enable-arts-shared=no --enable-alsa-shared=no \
- --enable-esd-shared=no --enable-pulseaudio-shared=no
-all_confflags = --disable-video-ggi \
- --enable-video-aalib --enable-video-directfb \
- --enable-video-caca
-udeb_confflags = --enable-video-directfb --disable-video-ggi \
- --disable-video-svga --disable-video-x11 \
- --disable-video-aalib --disable-dga --disable-video-photon \
+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-audio --disable-audio-arts --disable-audio-esd \
- --disable-audio-oss --disable-audio-nas --disable-audio-alsa \
- --disable-pulseaudio
+ --disable-audio \
+ --disable-oss --disable-alsa --disable-pulseaudio
-FLAVOURS = arts esd oss nas pulseaudio
-
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
confflags += --build $(DEB_HOST_GNU_TYPE)
else
@@ -50,55 +47,35 @@
endif
# Support for DEB_BUILD_OPTIONS
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
confflags += --enable-debug
else
confflags += --disable-debug
endif
-# Only build SVGA support on linux-x86 and linux-amd64
-ifneq (,$(findstring $(DEB_BUILD_ARCH),amd64 i386))
- all_confflags += --enable-video-svga
-else
- all_confflags += --disable-video-svga
-endif
# Only use NASM routines on x86 CPUs
-ifeq ($(DEB_BUILD_ARCH_CPU),i386)
+ifeq ($(DEB_HOST_ARCH_CPU),i386)
confflags += --enable-nasm
endif
# Don't use PlayStation 3 Cell driver on powerpc
-ifeq ($(DEB_BUILD_ARCH_CPU),powerpc)
- confflags += --enable-video-ps3=no
+ifeq ($(DEB_HOST_ARCH_CPU),powerpc)
+ confflags += --enable-video-ps3=no \
+ --disable-altivec
endif
-# Only build ALSA support on Linux targets
-ifeq ($(DEB_BUILD_ARCH_OS),linux)
- FLAVOURS += alsa
- no_libasound =
-else
- no_libasound = -Nlibsdl1.2debian-alsa
-endif
-
configure: configure-stamp
configure-stamp:
dh_testdir
QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
touch configure # Fix timestamp
- for dir in all $(FLAVOURS) udeb; do \
+ for dir in all udeb; do \
if ( [ "$$dir" = "all" ] ); then \
SWITCHES="$(all_confflags)"; \
elif ( [ "$$dir" = "udeb" ] ); then \
SWITCHES="$(udeb_confflags)"; \
else \
SWITCHES=""; \
- for switch in $(FLAVOURS); do \
- if ( [ "$$dir" = "$$switch" ] ); then \
- SWITCHES="$$SWITCHES --enable-$$switch"; \
- else \
- SWITCHES="$$SWITCHES --disable-$$switch"; \
- fi; \
- done; \
fi; \
mkdir -p builddir/$$dir; \
(cd builddir/$$dir; ../../configure $(confflags) $$SWITCHES); \
@@ -108,7 +85,7 @@
build: build-stamp
build-stamp: configure-stamp
dh_testdir
- for dir in all $(FLAVOURS) udeb; do \
+ for dir in all udeb; do \
$(MAKE) -j $(NJOBS) -C builddir/$$dir || exit 1; \
done
touch build-stamp
@@ -150,23 +127,17 @@
dh_installchangelogs
dh_install --sourcedir=debian/tmp
sed -i -e "s/^dependency_libs=.*/dependency_libs=''/" debian/libsdl1.2-dev/usr/lib/libSDL.la
- for dir in $(FLAVOURS) udeb; do \
- dh_install --sourcedir=builddir/$$dir/ -plibsdl1.2debian-$$dir build/.libs/*.so.* usr/lib/; \
- done
+ dh_install --sourcedir=builddir/udeb/ -plibsdl1.2debian-udeb build/.libs/*.so.* usr/lib/;
rm -rf debian/libsdl1.2debian/usr/include
dh_strip
dh_compress
dh_fixperms
- dh_makeshlibs
- for dir in all $(FLAVOURS) ; do \
- echo "libSDL-1.2 0 libsdl1.2debian $$SHLIBVER" > debian/libsdl1.2debian-$$dir/DEBIAN/shlibs; \
- echo "udeb: libSDL-1.2 0 libsdl1.2debian-udeb $$SHLIBVER" >> debian/libsdl1.2debian-$$dir/DEBIAN/shlibs; \
- done
+ dh_makeshlibs -V"libsdl1.2debian (>= $(SHLIBVER))" --add-udeb=libsdl1.2debian-udeb
dh_installdeb
dh_shlibdeps
- dh_gencontrol $(no_libasound)
+ dh_gencontrol
dh_md5sums
- dh_builddeb $(no_libasound)
+ dh_builddeb
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary
Deleted: unstable/libsdl1.2/debian/sys-build.mk
===================================================================
--- unstable/libsdl1.2/debian/sys-build.mk 2011-11-26 23:38:04 UTC (rev 275)
+++ unstable/libsdl1.2/debian/sys-build.mk 2011-12-04 13:28:01 UTC (rev 276)
@@ -1,167 +0,0 @@
-#!/usr/bin/make -f
-# Separate tarball/patch build system by Adam Heath <doogie at debian.org>
-
-# The magic targets that you need to concern yourself with are:
-#
-# source.build: Unpacks upstream tarballs, optionally applies patches
-# to fix the upstream patches, then applies upstream
-# patches.
-# source.make: Applies debian patches.
-# source.clean: Cleans the build directory, then unfixes the upstream
-# patches.
-# source.compile: Will compile the source for you. Please check
-# debian/scripts/vars.
-# source.cmd: When calling this target, if you define a variable
-# SOURCE_CMD, it will run that command in the build
-# tree.
-# make-diff: Generates debian.diff in the current directory which
-# contains all edits that are currently in the build
-# tree.
-#
-# Nothing in this file should require any editting. Please look at
-# debian/scripts/vars for things to change for the local environment.
-#
-# debian/rules target command
-# ----------------------------------------------------------------
-# clean: $(MAKE) -f debian/sys-build.mk source.clean
-# build: $(MAKE) -f debian/sys-build.mk source.compile
-# for simple systems.
-# build: $(MAKE) -f debian/sys-build.mk source.make
-# and, in the rules file, you can
-# build the targets you want.
-SHELL=/bin/bash
-ifndef NOISY
-.SILENT:
-endif
-
-include debian/scripts/vars
-# remove quotes
-DIFF_EXCLUDE:=$(patsubst %,-x %,$(shell echo $(DIFF_EXCLUDE)))
-
-ifdef TAR_DIR
-BUILD_TREE=$(SOURCE_DIR)/$(TAR_DIR)
-else
-BUILD_TREE=$(SOURCE_DIR)
-endif
-
-SOURCE_CMD=:
-
-ifdef CLEAN_IGNORE
- CLEAN_CMD=-
- CLEAN_SH=
-else
- CLEAN_CMD=
- CLEAN_SH=
-endif
-ifndef CLEAN_TARGET
- CLEAN_TARGET=clean
-endif
-
-foo:
- echo $(DIFF_EXCLUDE)
-
-make-diff:
- mv $(BUILD_TREE) bak
- $(MAKE) -f debian/sys-build.mk source.clean
- $(MAKE) -f debian/sys-build.mk source.make
- mv $(BUILD_TREE) $(BUILD_TREE).orig
- mv bak $(BUILD_TREE)
-
-ifdef TAR_DIR
-ifdef CLEAN_TARGET_EXTERNAL
- $(CLEAN_CMD)$(MAKE) -f debian/rules $(CLEAN_TARGET_EXTERNAL)
-else
- $(CLEAN_CMD)$(MAKE) -C $(BUILD_TREE) $(CLEAN_TARGET)
-endif
- -(cd $(SOURCE_DIR);diff -ruN $(TAR_DIR).orig $(TAR_DIR) $(DIFF_EXCLUDE)) > debian.diff
-else
-ifdef CLEAN_TARGET_EXTERNAL
- $(CLEAN_CMD)$(MAKE) -f debian/rules $(CLEAN_TARGET_EXTERNAL)
-else
- $(CLEAN_CMD)for a in $(BUILD_TREE)/*;do $(MAKE) -C $$a $(CLEAN_TARGET);done
-endif
- -(diff -ruN $(BUILD_TREE).orig $(BUILD_TREE) $(DIFF_EXCLUDE)) > debian.diff
- if [ ! -s debian.diff ];then\
- rm debian.diff;\
- fi
-endif
- rm -rf $(BUILD_TREE).orig
-
-patchapply: $(STAMP_DIR)/patchapply
-$(STAMP_DIR)/patchapply: $(STAMP_DIR)/source.build $(STAMP_DIR)
- $(SHELL) debian/scripts/lib patch.apply
- touch $@
- rm -f $(STAMP_DIR)/patchunapply
-
-patchunapply: $(STAMP_DIR)/patchunapply
-$(STAMP_DIR)/patchunapply: $(STAMP_DIR)/source.build $(STAMP_DIR)
- $(SHELL) debian/scripts/lib patch.unapply
- touch $@
- rm -f $(STAMP_DIR)/patchapply
-
-.export: SOURCE_TREE
-
-#
-# The rules that really do the work all start with $(STAMPDIR)
-# This little trick allows us to use stamp files to keep us from
-# having to rerun long targets over and over. It also puts
-# all stamp files in one place, for easy cleaning.
-#
-# If a stampdir rule depends on something else, be sure it is
-# another stampdir rule. Depending on base rule won't work.
-#
-
-source.build: $(STAMP_DIR)/source.build
-STAMP_DIR_TARGETS+= $(STAMP_DIR)/source.build
-$(STAMP_DIR)/source.build: $(STAMP_DIR)/source.unpack $(STAMP_DIR)/source.patch $(STAMP_DIR)
- touch $@
-
-source.make: $(STAMP_DIR)/source.make
-STAMP_DIR_TARGETS+= $(STAMP_DIR)/source.make
-$(STAMP_DIR)/source.make: $(STAMP_DIR)/source.build $(STAMP_DIR)/patchapply $(STAMP_DIR)
- touch $@
-
-source.unpack: $(STAMP_DIR)/source.unpack
-STAMP_DIR_TARGETS+= $(STAMP_DIR)/source.unpack
-$(STAMP_DIR)/source.unpack: $(STAMP_DIR)
- $(SHELL) debian/scripts/source.unpack
- touch $@
-
-source.patch: $(STAMP_DIR)/source.patch
-STAMP_DIR_TARGETS+= $(STAMP_DIR)/source.patch
-$(STAMP_DIR)/source.patch: $(STAMP_DIR)/source.unpack $(STAMP_DIR)/fix.source.patch $(STAMP_DIR)
- $(SHELL) debian/scripts/lib source.patch
- touch $@
-
-fix.source.patch: $(STAMP_DIR)/fix.source.patch
-STAMP_DIR_TARGETS+= $(STAMP_DIR)/fix.source.patch
-$(STAMP_DIR)/fix.source.patch: $(STAMP_DIR)
- $(SHELL) debian/scripts/lib fix.source.patch
- touch $@
-
-unfix.source.patch: $(STAMP_DIR)/unfix.source.patch
-STAMP_DIR_TARGETS+= $(STAMP_DIR)/unfix.source.patch
-$(STAMP_DIR)/unfix.source.patch: $(STAMP_DIR)
- $(SHELL) debian/scripts/lib unfix.source.patch
- touch $@
-
-source.compile: $(STAMP_DIR)/source.compile
-STAMP_DIR_TARGETS+= $(STAMP_DIR)/source.compile
-$(STAMP_DIR)/source.compile: $(STAMP_DIR)/source.make $(STAMP_DIR)
- $(MAKE) -C $(BUILD_TREE) $(BUILD_TARGET)
- touch $@
-
-source.command:
- (cd $(BUILD_TREE); $(SOURCE_CMD))
-
-DIR_TARGETS+=$(STAMP_DIR)
-$(STAMP_DIR_TARGETS): $(STAMP_DIR)
-
-$(DIR_TARGETS)/:
- mkdir -p $@
-
-source.clean: unfix.source.patch
- $(SHELL) debian/scripts/lib source.clean
- rm -f $(STAMP_DIR_TARGETS)
- rm -rf $(STAMP_DIR)
- $(MAKE) -C debian/scripts clean
More information about the pkg-sdl-commits
mailing list