[Pkg-sdl-commits] [SCM] Debian packaging of SDL 1.3 branch, master, updated. debian/1.3.0_20111204-1-3-g57e7896
Sam Hocevar
sam at hocevar.net
Thu May 17 19:48:50 UTC 2012
The following commit has been merged in the master branch:
commit 57e78967a4ba45a09e0d3fa66454cae8fba1bff0
Author: Sam Hocevar <sam at hocevar.net>
Date: Thu May 17 21:00:15 2012 +0200
* Upstream version was renamed to 2.0 (Closes: #669367).
* New upstream snapshot (Closes: #671506).
* This package no longer conflicts with libsdl-1.2.
diff --git a/debian/changelog b/debian/changelog
index 0620536..ee5bd3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libsdl-2.0 (2.0.0~20120220b-1) UNRELEASED; urgency=low
+
+ * Upstream version was renamed to 2.0 (Closes: #669367).
+ * New upstream snapshot (Closes: #671506).
+ * This package no longer conflicts with libsdl-1.2.
+
+ -- Sam Hocevar <sho at debian.org> Thu, 17 May 2012 19:03:59 +0200
+
libsdl-1.3 (1.3.0~20111204-1) experimental; urgency=low
* Initial upload from upstream snapshot.
diff --git a/debian/control b/debian/control
index 338b658..2ea9576 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: libsdl-1.3
+Source: libsdl-2.0
Priority: optional
Section: libs
Maintainer: Debian SDL packages maintainers <pkg-sdl-maintainers at lists.alioth.debian.org>
@@ -19,13 +19,15 @@ Build-Depends: dpkg (>= 1.13.2),
libdirectfb-dev (>= 1.0) [!hurd-i386],
libusbhid-dev [kfreebsd-any],
libglu1-mesa-dev
-Vcs-Svn: svn://svn.debian.org/pkg-sdl/unstable/libsdl-1.3
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-sdl/unstable/libsdl-1.3/
+Vcs-Git: git://anonscm.debian.org/pkg-sdl/packages/libsdl-2.0.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-sdl/packages/libsdl-2.0.git
Homepage: http://www.libsdl.org/
-Package: libsdl-1.3-0
+Package: libsdl-2.0-0
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
+Conflicts: libsdl-1.3-0
+Replaces: libsdl-1.3-0
Description: Simple DirectMedia Layer
SDL is a library that allows programs portable low level access to
a video framebuffer, audio output, mouse, and keyboard.
@@ -33,7 +35,7 @@ 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: libsdl-1.3-0-udeb
+Package: libsdl-2.0-0-udeb
XC-Package-Type: udeb
Architecture: any
Section: debian-installer
@@ -45,11 +47,11 @@ Description: Simple DirectMedia Layer (with directfb graphics and no sound)
.
This version of SDL is compiled with directfb graphics and no sound.
-Package: libsdl-1.3-dev
+Package: libsdl-2.0-dev
Architecture: any
Section: libdevel
Depends: ${misc:Depends},
- libsdl-1.3-0 (= ${binary:Version}),
+ libsdl-2.0-0 (= ${binary:Version}),
libx11-dev,
libglu1-mesa-dev,
libasound2-dev [linux-any],
@@ -59,8 +61,8 @@ Depends: ${misc:Depends},
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, libsdl1.2-dev
+Conflicts: libsdl-1.3-dev
+Replaces: libsdl-1.3-dev
Provides: libsdl-dev
Description: Simple DirectMedia Layer development files
SDL is a library that allows programs portable low level access to a video
diff --git a/debian/libsdl-1.3-0.install b/debian/libsdl-2.0-0.install
similarity index 100%
rename from debian/libsdl-1.3-0.install
rename to debian/libsdl-2.0-0.install
diff --git a/debian/libsdl-1.3-dev.install b/debian/libsdl-2.0-dev.install
similarity index 67%
rename from debian/libsdl-1.3-dev.install
rename to debian/libsdl-2.0-dev.install
index 0965f5d..5d9b6fb 100644
--- a/debian/libsdl-1.3-dev.install
+++ b/debian/libsdl-2.0-dev.install
@@ -1,7 +1,7 @@
-usr/include/SDL
+usr/include/SDL2
usr/lib/*.a
usr/lib/*.so
usr/lib/*.la
usr/lib/pkgconfig
-usr/bin/sdl-config
+usr/bin/sdl2-config
usr/share/aclocal/*
diff --git a/debian/patches/300_dont_propagate_lpthread.diff b/debian/patches/300_dont_propagate_lpthread.diff
index 052e953..bd9c5e1 100644
--- a/debian/patches/300_dont_propagate_lpthread.diff
+++ b/debian/patches/300_dont_propagate_lpthread.diff
@@ -1,12 +1,12 @@
---
- sdl-config.in | 2 +-
- sdl.pc.in | 2 +-
+ sdl2-config.in | 2 +-
+ sdl2.pc.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
-Index: SDL-1.2.14/sdl.pc.in
+Index: SDL-1.2.14/sdl2.pc.in
===================================================================
---- SDL-1.2.14.orig/sdl.pc.in 2009-10-12 19:07:20.000000000 -0400
-+++ SDL-1.2.14/sdl.pc.in 2009-11-28 09:21:57.000000000 -0500
+--- SDL-1.2.14.orig/sdl2.pc.in 2009-10-12 19:07:20.000000000 -0400
++++ SDL-1.2.14/sdl2.pc.in 2009-11-28 09:21:57.000000000 -0500
@@ -10,6 +10,6 @@
Version: @SDL_VERSION@
Requires:
@@ -15,10 +15,10 @@ Index: SDL-1.2.14/sdl.pc.in
+Libs: -L${libdir} @SDL_RLD_FLAGS@ -lSDL
Libs.private: @SDL_STATIC_LIBS@
Cflags: -I${includedir}/SDL @SDL_CFLAGS@
-Index: SDL-1.2.14/sdl-config.in
+Index: SDL-1.2.14/sdl2-config.in
===================================================================
---- SDL-1.2.14.orig/sdl-config.in 2009-10-12 19:07:20.000000000 -0400
-+++ SDL-1.2.14/sdl-config.in 2009-11-28 09:21:04.000000000 -0500
+--- SDL-1.2.14.orig/sdl2-config.in 2009-10-12 19:07:20.000000000 -0400
++++ SDL-1.2.14/sdl2-config.in 2009-11-28 09:21:04.000000000 -0500
@@ -45,7 +45,7 @@
echo -I at includedir@/SDL @SDL_CFLAGS@
;;
diff --git a/debian/rules b/debian/rules
index ae73e8d..1d50777 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ else
NJOBS := 1
endif
-export SHLIBVER=1.3.0~20111204-1
+export SHLIBVER=2.0~20120220-1
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
@@ -117,24 +117,24 @@ binary-arch: build install
dh_testdir
dh_testroot
dh_installdocs -A BUGS CREDITS README README-SDL.txt
- dh_installexamples -plibsdl-1.3-dev test
- rm debian/libsdl-1.3-dev/usr/share/doc/libsdl-1.3-dev/examples/test/COPYING
- cd debian/libsdl-1.3-dev/usr/share/doc/libsdl-1.3-dev/examples; \
+ dh_installexamples -plibsdl-2.0-dev test
+ rm debian/libsdl-2.0-dev/usr/share/doc/libsdl-2.0-dev/examples/test/COPYING
+ cd debian/libsdl-2.0-dev/usr/share/doc/libsdl-2.0-dev/examples; \
tar cf examples.tar test; \
rm -rf test
- #mkdir -p debian/libsdl-1.3-dev/usr/share/man/man3
- #cd debian/libsdl-1.3-dev/usr/share/doc/libsdl-1.3-dev/docs; \
+ #mkdir -p debian/libsdl-2.0-dev/usr/share/man/man3
+ #cd debian/libsdl-2.0-dev/usr/share/doc/libsdl-2.0-dev/docs; \
# mv man3/* ../../../man/man3/; rmdir man3
- dh_installman -plibsdl-1.3-dev debian/sdl-config.1
+ dh_installman -plibsdl-2.0-dev debian/sdl2-config.1
dh_installchangelogs
dh_install --sourcedir=debian/tmp
- sed -i -e "s/^dependency_libs=.*/dependency_libs=''/" debian/libsdl-1.3-dev/usr/lib/libSDL.la
- dh_install --sourcedir=builddir/udeb/ -plibsdl-1.3-0-udeb build/.libs/*.so.* usr/lib/;
- rm -rf debian/libsdl-1.3-0/usr/include
+ sed -i -e "s/^dependency_libs=.*/dependency_libs=''/" debian/libsdl-2.0-dev/usr/lib/libSDL2.la
+ dh_install --sourcedir=builddir/udeb/ -plibsdl-2.0-0-udeb build/.libs/*.so.* usr/lib/;
+ rm -rf debian/libsdl-2.0-0/usr/include
dh_strip
dh_compress
dh_fixperms
- dh_makeshlibs -V"libsdl-1.3-0 (>= $(SHLIBVER))" --add-udeb=libsdl-1.3-0-udeb
+ dh_makeshlibs -V"libsdl-2.0-0 (>= $(SHLIBVER))" --add-udeb=libsdl-2.0-0-udeb
dh_installdeb
dh_shlibdeps
dh_gencontrol
diff --git a/debian/sdl-config.1 b/debian/sdl2-config.1
similarity index 87%
rename from debian/sdl-config.1
rename to debian/sdl2-config.1
index ce6589d..0872a26 100644
--- a/debian/sdl-config.1
+++ b/debian/sdl2-config.1
@@ -1,15 +1,15 @@
-.TH sdl-config 1 "2011-12-04" "SDL 1.3"
+.TH sdl2-config 1 "2012-02-20" "SDL 2.0"
.SH NAME
-sdl-config \- script to get information about the installed version of SDL
+sdl2-config \- script to get information about the installed version of SDL
.SH SYNOPSIS
-.B sdl-config
+.B sdl2-config
[ --prefix=
.IR DIR ]
[ --exec-prefix=
.IR DIR ]
[ --version ] [ --libs | --library-libs | --plugin-libs ] [ --cflags ]
.SH DESCRIPTION
-.B sdl-config
+.B sdl2-config
is a tool that is used to configure and determine the compiler and linker
flags that should be used to compile and link progams, libraries, and
plugins that use SDL. It is also used internally by the m4 macros that are
@@ -60,24 +60,24 @@ specified before any of the --cflags, --libs, --library-libs, and
Prints the currently installed version of SDL on standard output.
.SH EXAMPLES
.TP
-gcc -o main.o $(sdl-config --cflags) main.c
+gcc -o main.o $(sdl2-config --cflags) main.c
is how you might use
-.B sdl-config
+.B sdl2-config
to compile a C source file for an executable program.
.TP
-gcc -o my_app $(sdl-config --libs) main.o util.o
+gcc -o my_app $(sdl2-config --libs) main.o util.o
is how you might use
-.B sdl-config
+.B sdl2-config
to link compiled objects into an executable program.
.TP
-gcc -o libSDL_nifty-1.3.so.0.0.1 $(sdl --library-libs) read.o write.o munge.o
+gcc -o libSDL_nifty-2.0.so.0.0.1 $(sdl --library-libs) read.o write.o munge.o
is how you might use
-.B sdl-config
+.B sdl2-config
to link compiled objects into a shared library.
.TP
gcc -o libnifty_xmms.so $(sdl --plugin-libs) stream.o blit.o deinterlace.o
is how you might use
-.B sdl-config
+.B sdl2-config
to link compiled objects into a plugin for use by another program.
.SH AUTHOR
The Simple DirectMedia Layer (SDL) library was written by Sam Lantinga.
--
Debian packaging of SDL 1.3
More information about the pkg-sdl-commits
mailing list