[Pkg-sdl-commits] r102 - tarballs unstable/libsdl-sge/debian
unstable/libsdl-sge/debian/patches
Samuel Hocevar
sho at costa.debian.org
Tue Oct 24 07:06:20 UTC 2006
Author: sho
Date: 2006-10-24 07:06:20 +0000 (Tue, 24 Oct 2006)
New Revision: 102
Added:
tarballs/libsdl-sge_030809dfsg.orig.tar.gz
unstable/libsdl-sge/debian/patches/006_freetype2_fixes.diff
unstable/libsdl-sge/debian/patches/100_font.diff
Modified:
unstable/libsdl-sge/debian/changelog
unstable/libsdl-sge/debian/control
unstable/libsdl-sge/debian/patches/series
Log:
libsdl-sge (030809dfsg-1) unstable; urgency=high
* Remove non-free font from the original tarball (Closes: #393747).
* debian/control:
+ Suggest ttf-bitstream-vera as a replacement for the font.
* debian/patches/100_font.diff:
+ New patch to use ttf-bitstream-vera instead of the old non-free font.
-- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Mon, 23 Oct 2006 16:33:23 +0200
libsdl-sge (030809-3) unstable; urgency=low
* 006_freetype2_fixes.diff:
+ Fix from freetype2 upstream that removes usage of internal structures
(Closes: #370685).
-- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Tue, 13 Jun 2006 22:51:55 +0200
Added: tarballs/libsdl-sge_030809dfsg.orig.tar.gz
===================================================================
(Binary files differ)
Property changes on: tarballs/libsdl-sge_030809dfsg.orig.tar.gz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: unstable/libsdl-sge/debian/changelog
===================================================================
--- unstable/libsdl-sge/debian/changelog 2006-10-08 17:08:46 UTC (rev 101)
+++ unstable/libsdl-sge/debian/changelog 2006-10-24 07:06:20 UTC (rev 102)
@@ -1,3 +1,22 @@
+libsdl-sge (030809dfsg-1) unstable; urgency=high
+
+ * Remove non-free font from the original tarball (Closes: #393747).
+
+ * debian/control:
+ + Suggest ttf-bitstream-vera as a replacement for the font.
+ * debian/patches/100_font.diff:
+ + New patch to use ttf-bitstream-vera instead of the old non-free font.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Mon, 23 Oct 2006 16:33:23 +0200
+
+libsdl-sge (030809-3) unstable; urgency=low
+
+ * 006_freetype2_fixes.diff:
+ + Fix from freetype2 upstream that removes usage of internal structures
+ (Closes: #370685).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Tue, 13 Jun 2006 22:51:55 +0200
+
libsdl-sge (030809-2) unstable; urgency=low
[ Aurelien Jarno ]
Modified: unstable/libsdl-sge/debian/control
===================================================================
--- unstable/libsdl-sge/debian/control 2006-10-08 17:08:46 UTC (rev 101)
+++ unstable/libsdl-sge/debian/control 2006-10-24 07:06:20 UTC (rev 102)
@@ -22,6 +22,7 @@
Section: libdevel
Architecture: any
Depends: libsdl-sge (>= 030809-1), libsdl1.2-dev, libsdl-image1.2-dev, libfreetype6-dev
+Suggests: ttf-bitstream-vera
Conflicts: libsdl-sge (<< 020904-1.1)
Replaces: libsdl-sge (<< 020904-1.1)
Description: development files for libsdl-sge
Added: unstable/libsdl-sge/debian/patches/006_freetype2_fixes.diff
===================================================================
--- unstable/libsdl-sge/debian/patches/006_freetype2_fixes.diff (rev 0)
+++ unstable/libsdl-sge/debian/patches/006_freetype2_fixes.diff 2006-10-24 07:06:20 UTC (rev 102)
@@ -0,0 +1,21 @@
+Index: libsdl-sge-030809/sge_tt_text.cpp
+===================================================================
+--- libsdl-sge-030809.orig/sge_tt_text.cpp 2006-06-13 22:50:18.000000000 +0200
++++ libsdl-sge-030809/sge_tt_text.cpp 2006-06-13 22:51:08.000000000 +0200
+@@ -40,7 +40,6 @@
+ #include FT_FREETYPE_H
+ #include FT_OUTLINE_H
+ #include FT_TRUETYPE_IDS_H
+-#include FT_INTERNAL_OBJECTS_H
+
+ /* The structure used to hold glyph information (cached) */
+ struct glyph {
+@@ -295,7 +294,7 @@
+ }
+ memset(stream, 0, sizeof(*stream));
+
+- stream->memory = _sge_library->memory;
++ stream->memory = NULL;
+ stream->read = RWread;
+ stream->descriptor.pointer = src;
+ stream->pos = (unsigned long)position;
Added: unstable/libsdl-sge/debian/patches/100_font.diff
===================================================================
--- unstable/libsdl-sge/debian/patches/100_font.diff (rev 0)
+++ unstable/libsdl-sge/debian/patches/100_font.diff 2006-10-24 07:06:20 UTC (rev 102)
@@ -0,0 +1,78 @@
+Index: libsdl-sge-030809dfsg/examples/alpha.cpp
+===================================================================
+--- libsdl-sge-030809dfsg.orig/examples/alpha.cpp 2006-10-23 16:34:39.000000000 +0200
++++ libsdl-sge-030809dfsg/examples/alpha.cpp 2006-10-23 16:35:52.000000000 +0200
+@@ -32,7 +32,7 @@
+ /* Open TT font file */
+ if(sge_TTF_Init()!=0){fprintf(stderr,"TT error: %s\n",SDL_GetError());exit(1);}
+ sge_TTFont *font;
+- font=sge_TTF_OpenFont("font.ttf", 55);
++ font=sge_TTF_OpenFont("/usr/share/fonts/truetype/ttf-bitstream-vera/Vera.ttf", 55);
+ if(font==NULL){fprintf(stderr,"TT error: %s\n",SDL_GetError());exit(1);}
+
+ /* Ugly font rendering */
+Index: libsdl-sge-030809dfsg/examples/basics.cpp
+===================================================================
+--- libsdl-sge-030809dfsg.orig/examples/basics.cpp 2006-10-23 16:34:39.000000000 +0200
++++ libsdl-sge-030809dfsg/examples/basics.cpp 2006-10-23 16:35:56.000000000 +0200
+@@ -40,7 +40,7 @@
+ /* Open TT font file */
+ if(sge_TTF_Init()!=0){fprintf(stderr,"TT error: %s\n",SDL_GetError());exit(1);}
+ sge_TTFont *font;
+- font=sge_TTF_OpenFont("font.ttf", 50);
++ font=sge_TTF_OpenFont("/usr/share/fonts/truetype/ttf-bitstream-vera/Vera.ttf", 50);
+ if(font==NULL){fprintf(stderr,"TT error: %s\n",SDL_GetError());exit(1);}
+
+ /* Draws TT text on screen */
+Index: libsdl-sge-030809dfsg/examples/basics_c.c
+===================================================================
+--- libsdl-sge-030809dfsg.orig/examples/basics_c.c 2006-10-23 16:34:34.000000000 +0200
++++ libsdl-sge-030809dfsg/examples/basics_c.c 2006-10-23 16:35:54.000000000 +0200
+@@ -42,7 +42,7 @@
+
+ /* Draws TT text on screen */
+ if(sge_TTF_Init()!=0){fprintf(stderr,"TT error: %s\n",SDL_GetError());exit(1);}
+- font=sge_TTF_OpenFont("font.ttf", 50);
++ font=sge_TTF_OpenFont("/usr/share/fonts/truetype/ttf-bitstream-vera/Vera.ttf", 50);
+ if(font==NULL){fprintf(stderr,"TT error: %s\n",SDL_GetError());exit(1);}
+
+ /* Draws TT text on screen */
+Index: libsdl-sge-030809dfsg/examples/blitting.cpp
+===================================================================
+--- libsdl-sge-030809dfsg.orig/examples/blitting.cpp 2006-10-23 16:34:39.000000000 +0200
++++ libsdl-sge-030809dfsg/examples/blitting.cpp 2006-10-23 16:35:59.000000000 +0200
+@@ -28,7 +28,7 @@
+ /* Open TT font file */
+ if(sge_TTF_Init()!=0){fprintf(stderr,"TT error: %s\n", SDL_GetError());exit(1);}
+ sge_TTFont *font;
+- font=sge_TTF_OpenFont("font.ttf", 50);
++ font=sge_TTF_OpenFont("/usr/share/fonts/truetype/ttf-bitstream-vera/Vera.ttf", 50);
+ if(font==NULL){fprintf(stderr,"TT error: %s\n", SDL_GetError());exit(1);}
+
+ /* Make a nice background */
+Index: libsdl-sge-030809dfsg/examples/input.cpp
+===================================================================
+--- libsdl-sge-030809dfsg.orig/examples/input.cpp 2006-10-23 16:34:40.000000000 +0200
++++ libsdl-sge-030809dfsg/examples/input.cpp 2006-10-23 16:36:00.000000000 +0200
+@@ -29,7 +29,7 @@
+ /* Init TTF */
+ if(sge_TTF_Init()!=0){fprintf(stderr,"TT error: %s\n", SDL_GetError());exit(1);}
+ sge_TTFont *font;
+- font=sge_TTF_OpenFont("font.ttf", 25);
++ font=sge_TTF_OpenFont("/usr/share/fonts/truetype/ttf-bitstream-vera/Vera.ttf", 25);
+ if(font==NULL){fprintf(stderr,"TT error: %s\n", SDL_GetError());exit(1);}
+
+ //sge_TTF_SetFontStyle(font, SGE_TTF_ITALIC);
+Index: libsdl-sge-030809dfsg/examples/inputdeluxe.cpp
+===================================================================
+--- libsdl-sge-030809dfsg.orig/examples/inputdeluxe.cpp 2006-10-23 16:34:40.000000000 +0200
++++ libsdl-sge-030809dfsg/examples/inputdeluxe.cpp 2006-10-23 16:36:04.000000000 +0200
+@@ -42,7 +42,7 @@
+ //Open a TT font
+ if(sge_TTF_Init()!=0){fprintf(stderr,"TT error: %s\n",SDL_GetError());exit(1);}
+ sge_TTFont *font;
+- font=sge_TTF_OpenFont("font.ttf", 25);
++ font=sge_TTF_OpenFont("/usr/share/fonts/truetype/ttf-bitstream-vera/Vera.ttf", 25);
+ if(font==NULL){fprintf(stderr,"TT error: %s\n",SDL_GetError());exit(1);}
+
+ text.set_ttFont(font,0,255,0); //Use our font
Modified: unstable/libsdl-sge/debian/patches/series
===================================================================
--- unstable/libsdl-sge/debian/patches/series 2006-10-08 17:08:46 UTC (rev 101)
+++ unstable/libsdl-sge/debian/patches/series 2006-10-24 07:06:20 UTC (rev 102)
@@ -1,5 +1,7 @@
001_makefile_fixes.diff -p1
+004_legacy_functions.diff -p1
005_freetype_support.diff -p1
-004_legacy_functions.diff -p1
+006_freetype2_fixes.diff
010_examples.diff -p1
015_overflow.diff -p1
+100_font.diff
More information about the Pkg-sdl-commits
mailing list