[Pkg-sdl-commits] r142 - in unstable/libsdl1.2/debian: . patches

[sho at alioth.debian.org]

Author: sho
Date: 2007-10-08 19:02:42 +0000 (Mon, 08 Oct 2007)
New Revision: 142

Added:
   unstable/libsdl1.2/debian/patches/218_joystick_memmove.diff
Modified:
   unstable/libsdl1.2/debian/changelog
   unstable/libsdl1.2/debian/control
   unstable/libsdl1.2/debian/patches/series
Log:
libsdl1.2 (1.2.12-2) unstable; urgency=low

  * debian/control:
    + Build-depend on x11proto-core-dev instead of x-dev.
    + Cleaned up uploaders field.
    + Fixed X-Vcs fields.

  * debian/patches/218_joystick_memmove.diff:
    + Use memmove() instead of memcpy() in overlapping places.

 -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Mon, 08 Oct 2007 18:49:04 +0000


Modified: unstable/libsdl1.2/debian/changelog
===================================================================
--- unstable/libsdl1.2/debian/changelog	2007-09-24 14:18:33 UTC (rev 141)
+++ unstable/libsdl1.2/debian/changelog	2007-10-08 19:02:42 UTC (rev 142)
@@ -1,3 +1,15 @@
+libsdl1.2 (1.2.12-2) unstable; urgency=low
+
+  * debian/control:
+    + Build-depend on x11proto-core-dev instead of x-dev.
+    + Cleaned up uploaders field.
+    + Fixed X-Vcs fields.
+
+  * debian/patches/218_joystick_memmove.diff:
+    + Use memmove() instead of memcpy() in overlapping places.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Mon, 08 Oct 2007 18:49:04 +0000
+
 libsdl1.2 (1.2.12-1) unstable; urgency=low
 
   * New upstream release (Closes: #438463).

Modified: unstable/libsdl1.2/debian/control
===================================================================
--- unstable/libsdl1.2/debian/control	2007-09-24 14:18:33 UTC (rev 141)
+++ unstable/libsdl1.2/debian/control	2007-10-08 19:02:42 UTC (rev 142)
@@ -2,10 +2,11 @@
 Priority: optional
 Section: libs
 Maintainer: Debian SDL packages maintainers <pkg-sdl-maintainers at lists.alioth.debian.org>
-Uploaders: Matthew Danish <mrd at debian.org>, Zephaniah E. Hull <warp at debian.org>, Sam Hocevar (Debian packages) <sam+deb at zoy.org>, Aurelien Jarno <aurel32 at debian.org>, Josselin Mouette <joss at debian.org>
+Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>, Aurelien Jarno <aurel32 at debian.org>, Josselin Mouette <joss at debian.org>
 Standards-Version: 3.7.2
-Build-Depends: dpkg (>= 1.13.2), debhelper (>= 4.0), quilt, nasm [i386 kfreebsd-i386], libaa1-dev, libx11-dev, libxext-dev, libxt-dev, libxv-dev, x-dev, libaudiofile-dev, libesd0-dev, libpulse-dev, xlibmesa-gl-dev | libgl-dev, libsvga1-dev [amd64 i386], libarts1-dev, libartsc0-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libaudio-dev, libdirectfb-dev (>= 0.9.25.1) [!hurd-i386], libusbhid-dev [kfreebsd-i386 kfreebsd-amd64]
-XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-sdl/unstable/libsdl1.2/
+Build-Depends: dpkg (>= 1.13.2), debhelper (>= 4.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, xlibmesa-gl-dev | libgl-dev, libsvga1-dev [amd64 i386], libarts1-dev, libartsc0-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libaudio-dev, libdirectfb-dev (>= 0.9.25.1) [!hurd-i386], libusbhid-dev [kfreebsd-i386 kfreebsd-amd64]
+XS-Vcs-Svn: svn://svn.debian.org/pkg-sdl/unstable/libsdl.2
+XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-sdl/unstable/libsdl.2/
 
 Package: libsdl1.2debian
 Architecture: any

Added: unstable/libsdl1.2/debian/patches/218_joystick_memmove.diff
===================================================================
--- unstable/libsdl1.2/debian/patches/218_joystick_memmove.diff	                        (rev 0)
+++ unstable/libsdl1.2/debian/patches/218_joystick_memmove.diff	2007-10-08 19:02:42 UTC (rev 142)
@@ -0,0 +1,13 @@
+Index: libsdl1.2-1.2.12/src/joystick/SDL_joystick.c
+===================================================================
+--- libsdl1.2-1.2.12.orig/src/joystick/SDL_joystick.c	2007-10-08 19:01:12.000000000 +0000
++++ libsdl1.2-1.2.12/src/joystick/SDL_joystick.c	2007-10-08 19:01:20.000000000 +0000
+@@ -373,7 +373,7 @@
+ 	/* Remove joystick from list */
+ 	for ( i=0; SDL_joysticks[i]; ++i ) {
+ 		if ( joystick == SDL_joysticks[i] ) {
+-			SDL_memcpy(&SDL_joysticks[i], &SDL_joysticks[i+1],
++			SDL_memmove(&SDL_joysticks[i], &SDL_joysticks[i+1],
+ 			       (SDL_numjoysticks-i)*sizeof(joystick));
+ 			break;
+ 		}

Modified: unstable/libsdl1.2/debian/patches/series
===================================================================
--- unstable/libsdl1.2/debian/patches/series	2007-09-24 14:18:33 UTC (rev 141)
+++ unstable/libsdl1.2/debian/patches/series	2007-10-08 19:02:42 UTC (rev 142)
@@ -15,4 +15,5 @@
 215_kfreebsd_gnu.diff
 216_page_size.diff
 217_x11_keytounicode.diff
+218_joystick_memmove.diff
 300_dont_propagate_lpthread.diff