[Pkg-sdl-commits] r194 - in experimental/sdlperl/debian: . patches

[aurel32 at alioth.debian.org]

Author: aurel32
Date: 2008-12-31 18:31:17 +0000 (Wed, 31 Dec 2008)
New Revision: 194

Added:
   experimental/sdlperl/debian/README.source
   experimental/sdlperl/debian/patches/040_sprintf.diff
Modified:
   experimental/sdlperl/debian/changelog
   experimental/sdlperl/debian/control
   experimental/sdlperl/debian/patches/series
Log:
sdlperl (2.1.2-2) experimental; urgency=low

  * debian/patches/040_sprintf.diff:
    + fix problematic use of sprintf when -D_FORTIFY_SOURCE=2 is used.
  * debian/README.source:
    + New file.
  * debian/control:
    + Bumped Standards-Version to 3.8.0.

 -- Aurelien Jarno <aurel32 at debian.org>  Wed, 31 Dec 2008 19:25:22 +0100




Added: experimental/sdlperl/debian/README.source
===================================================================
--- experimental/sdlperl/debian/README.source	                        (rev 0)
+++ experimental/sdlperl/debian/README.source	2008-12-31 18:31:17 UTC (rev 194)
@@ -0,0 +1,57 @@
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To configure quilt to use debian/patches instead of patches, you want
+either to export QUILT_PATCHES=debian/patches in your environment
+or use this snippet in your ~/.quiltrc:
+
+    for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+        if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+                export QUILT_PATCHES=debian/patches
+        fi
+    done
+
+To get the fully patched source after unpacking the source package, cd to
+the root level of the source package and run:
+
+    quilt push -a
+
+The last patch listed in debian/patches/series will become the current
+patch.
+
+To add a new set of changes, first run quilt push -a, and then run:
+
+    quilt new <patch>
+
+where <patch> is a descriptive name for the patch, used as the filename in
+debian/patches.  Then, for every file that will be modified by this patch,
+run:
+
+    quilt add <file>
+
+before editing those files.  You must tell quilt with quilt add what files
+will be part of the patch before making changes or quilt will not work
+properly.  After editing the files, run:
+
+    quilt refresh
+
+to save the results as a patch.
+
+Alternately, if you already have an external patch and you just want to
+add it to the build system, run quilt push -a and then:
+
+    quilt import -P <patch> /path/to/patch
+    quilt push -a
+
+(add -p 0 to quilt import if needed). <patch> as above is the filename to
+use in debian/patches.  The last quilt push -a will apply the patch to
+make sure it works properly.
+
+To remove an existing patch from the list of patches that will be applied,
+run:
+
+    quilt delete <patch>
+
+You may need to run quilt pop -a to unapply patches first before running
+this command.

Modified: experimental/sdlperl/debian/changelog
===================================================================
--- experimental/sdlperl/debian/changelog	2008-12-31 12:25:44 UTC (rev 193)
+++ experimental/sdlperl/debian/changelog	2008-12-31 18:31:17 UTC (rev 194)
@@ -1,3 +1,14 @@
+sdlperl (2.1.2-2) experimental; urgency=low
+
+  * debian/patches/040_sprintf.diff:
+    + fix problematic use of sprintf when -D_FORTIFY_SOURCE=2 is used.
+  * debian/README.source:
+    + New file.
+  * debian/control:
+    + Bumped Standards-Version to 3.8.0.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Wed, 31 Dec 2008 19:25:22 +0100
+
 sdlperl (2.1.2-1) experimental; urgency=low
 
   * New upstream version targetted to experimental (Closes: #362974).

Modified: experimental/sdlperl/debian/control
===================================================================
--- experimental/sdlperl/debian/control	2008-12-31 12:25:44 UTC (rev 193)
+++ experimental/sdlperl/debian/control	2008-12-31 18:31:17 UTC (rev 194)
@@ -4,8 +4,7 @@
 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>
 Build-Depends: debhelper (>= 4.0), quilt, perl (>= 5.8), libmodule-build-perl, libtest-simple-perl, libsdl1.2-dev (>= 1.2.5-3), libsdl-image1.2-dev, libsdl-mixer1.2-dev (>= 1.2.5-2), libsdl-ttf2.0-dev, libsdl-gfx1.2-dev, libsdl-net1.2-dev
-Conflicts: frozen-bubble
-Standards-Version: 3.7.2
+Standards-Version: 3.8.0
 
 Package: libsdl-perl
 Architecture: any

Added: experimental/sdlperl/debian/patches/040_sprintf.diff
===================================================================
--- experimental/sdlperl/debian/patches/040_sprintf.diff	                        (rev 0)
+++ experimental/sdlperl/debian/patches/040_sprintf.diff	2008-12-31 18:31:17 UTC (rev 194)
@@ -0,0 +1,11 @@
+--- sdlperl-2.1.2.orig/src/SFont.xs	2008-12-30 01:11:00.000000000 +0100
++++ sdlperl-2.1.2/src/SFont.xs	2008-12-30 01:11:18.000000000 +0100
+@@ -204,7 +204,7 @@
+ 		if ((ch=='\b')&&(strlen(text)>0))
+ 		    text[strlen(text)-1]='\0';
+ 		else if (ch!='\b')
+-		    sprintf(text,"%s%c",text,ch);
++		    sprintf(text+strlen(text),"%c",ch);
+ 	        if (SFont_TextWidth2(Font,text)>PixelWidth) text[strlen(text)-1]='\0';
+ 		SDL_BlitSurface( Back, NULL, Dest, &rect);
+ 		SFont_PutString2(Dest, Font, x, y, text);

Modified: experimental/sdlperl/debian/patches/series
===================================================================
--- experimental/sdlperl/debian/patches/series	2008-12-31 12:25:44 UTC (rev 193)
+++ experimental/sdlperl/debian/patches/series	2008-12-31 18:31:17 UTC (rev 194)
@@ -6,3 +6,4 @@
 
 030_glu_nurbs.diff -p1
 030_opengl_fixes.diff -p1
+040_sprintf.diff -p1