r10923 - in packages/trunk/billard-gl/debian: . patches source

Paul Wise pabs at alioth.debian.org
Tue Apr 13 14:04:38 UTC 2010


Author: pabs
Date: 2010-04-13 14:04:36 +0000 (Tue, 13 Apr 2010)
New Revision: 10923

Added:
   packages/trunk/billard-gl/debian/patches/01_debianize_data_path.patch
   packages/trunk/billard-gl/debian/patches/02_divide-by-zero_on_alpha.patch
   packages/trunk/billard-gl/debian/patches/03_config_buffer_overflows.patch
   packages/trunk/billard-gl/debian/patches/04_starting_resolution.patch
   packages/trunk/billard-gl/debian/patches/05_Makefile.patch
   packages/trunk/billard-gl/debian/patches/99_cosmetic_fixes.patch
   packages/trunk/billard-gl/debian/patches/series
   packages/trunk/billard-gl/debian/source/
   packages/trunk/billard-gl/debian/source/format
Removed:
   packages/trunk/billard-gl/debian/patches/00list
   packages/trunk/billard-gl/debian/patches/01_debianize_data_path.dpatch
   packages/trunk/billard-gl/debian/patches/02_divide-by-zero_on_alpha.dpatch
   packages/trunk/billard-gl/debian/patches/03_config_buffer_overflows.dpatch
   packages/trunk/billard-gl/debian/patches/04_starting_resolution.dpatch
   packages/trunk/billard-gl/debian/patches/05_Makefile.dpatch
   packages/trunk/billard-gl/debian/patches/99_cosmetic_fixes.dpatch
Modified:
   packages/trunk/billard-gl/debian/changelog
   packages/trunk/billard-gl/debian/control
   packages/trunk/billard-gl/debian/rules
Log:
Switch to the dpkg-source v3 quilt format and DEP-3 patch headers

Modified: packages/trunk/billard-gl/debian/changelog
===================================================================
--- packages/trunk/billard-gl/debian/changelog	2010-04-13 13:38:30 UTC (rev 10922)
+++ packages/trunk/billard-gl/debian/changelog	2010-04-13 14:04:36 UTC (rev 10923)
@@ -14,6 +14,7 @@
   * Link with GL, GLU as well as GLUT (Closes: #577314, #553938)
   * Prune Thierry Reding from Uploaders (Closes: #572544)
   * Add ${misc:Depends} to dependencies in case debhelper needs it
+  * Switch to the dpkg-source v3 quilt format and DEP-3 patch headers
 
  -- Evgeni Golov <sargentd at die-welt.net>  Thu, 21 Aug 2008 23:59:40 +0200
 

Modified: packages/trunk/billard-gl/debian/control
===================================================================
--- packages/trunk/billard-gl/debian/control	2010-04-13 13:38:30 UTC (rev 10922)
+++ packages/trunk/billard-gl/debian/control	2010-04-13 14:04:36 UTC (rev 10923)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Bartosz Fenski <fenio at debian.org>, Barry deFreese <bddebian at comcast.net>
-Build-Depends: debhelper (>= 5), dpatch, freeglut3-dev, dpkg-dev (>= 1.13.19)
+Build-Depends: debhelper (>= 5), freeglut3-dev, dpkg-dev (>= 1.13.19)
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/billard-gl/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/billard-gl/?op=log

Deleted: packages/trunk/billard-gl/debian/patches/00list
===================================================================
--- packages/trunk/billard-gl/debian/patches/00list	2010-04-13 13:38:30 UTC (rev 10922)
+++ packages/trunk/billard-gl/debian/patches/00list	2010-04-13 14:04:36 UTC (rev 10923)
@@ -1,6 +0,0 @@
-01_debianize_data_path.dpatch
-02_divide-by-zero_on_alpha.dpatch
-03_config_buffer_overflows.dpatch
-04_starting_resolution.dpatch
-05_Makefile.dpatch
-99_cosmetic_fixes.dpatch

Deleted: packages/trunk/billard-gl/debian/patches/01_debianize_data_path.dpatch
===================================================================
--- packages/trunk/billard-gl/debian/patches/01_debianize_data_path.dpatch	2010-04-13 13:38:30 UTC (rev 10922)
+++ packages/trunk/billard-gl/debian/patches/01_debianize_data_path.dpatch	2010-04-13 14:04:36 UTC (rev 10923)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_debianize_data_path.dpatch
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Changes the data path to conform with the FHS.
-
- at DPATCH@
-
-diff -ruN billard-gl-1.75.orig/src/Namen.h billard-gl-1.75/src/Namen.h
---- billard-gl-1.75.orig/src/Namen.h	2002-04-29 13:52:11.000000000 +0200
-+++ billard-gl-1.75/src/Namen.h	2005-01-22 12:14:04.000000000 +0100
-@@ -23,7 +23,7 @@
- #define TUTORIAL 105
- 
- #ifndef _WIN32
--#define PFAD "/usr/share/BillardGL/"
-+#define PFAD "/usr/share/games/billard-gl/"
- #endif
- 
- #ifndef PFAD

Copied: packages/trunk/billard-gl/debian/patches/01_debianize_data_path.patch (from rev 10921, packages/trunk/billard-gl/debian/patches/01_debianize_data_path.dpatch)
===================================================================
--- packages/trunk/billard-gl/debian/patches/01_debianize_data_path.patch	                        (rev 0)
+++ packages/trunk/billard-gl/debian/patches/01_debianize_data_path.patch	2010-04-13 14:04:36 UTC (rev 10923)
@@ -0,0 +1,13 @@
+Description: Changes the data path to conform with the FHS.
+Origin: other
+--- a/src/Namen.h
++++ b/src/Namen.h
+@@ -23,7 +23,7 @@
+ #define TUTORIAL 105
+ 
+ #ifndef _WIN32
+-#define PFAD "/usr/share/BillardGL/"
++#define PFAD "/usr/share/games/billard-gl/"
+ #endif
+ 
+ #ifndef PFAD

Deleted: packages/trunk/billard-gl/debian/patches/02_divide-by-zero_on_alpha.dpatch
===================================================================
--- packages/trunk/billard-gl/debian/patches/02_divide-by-zero_on_alpha.dpatch	2010-04-13 13:38:30 UTC (rev 10922)
+++ packages/trunk/billard-gl/debian/patches/02_divide-by-zero_on_alpha.dpatch	2010-04-13 14:04:36 UTC (rev 10923)
@@ -1,33 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_divide-by-zero_on_alpha.dpatch by Thierry Reding <thierry at doppeltgemoppelt.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes divide-by-zero on alphas. (by Julien Lemoine)
-## DP: Closes: #166378
-
- at DPATCH@
-
-diff -ruN billard-gl-1.75.orig/src/kugeltabellen.cpp billard-gl-1.75/src/kugeltabellen.cpp
---- billard-gl-1.75.orig/src/kugeltabellen.cpp	2002-04-23 17:57:09.000000000 +0200
-+++ billard-gl-1.75/src/kugeltabellen.cpp	2005-01-22 12:14:04.000000000 +0100
-@@ -7,6 +7,7 @@
- #ifndef M_PI
- #define M_PI 3.14159265358979323846
- #endif
-+#define EPSILON 0.00001
- 
- GLint calc_ind2(GLint b, GLint c, GLint Aufloesung) {
-   return ((c*(2*Aufloesung+3-c))/2)+b;
-@@ -28,9 +29,9 @@
-       GLfloat temp_y=ay+((b+0.0)/(Aufloesung+0.0))*(by-ay)+((c+0.0)/(Aufloesung+0.0))*(cy-ay);
-       GLfloat temp_z=az+((b+0.0)/(Aufloesung+0.0))*(bz-az)+((c+0.0)/(Aufloesung+0.0))*(cz-az);
-       GLfloat Abstand=sqrt(temp_x*temp_x+temp_y*temp_y+temp_z*temp_z);
--      temp_x=temp_x/Abstand;
--      temp_y=temp_y/Abstand;
--      temp_z=temp_z/Abstand;
-+      temp_x= (temp_x/Abstand == 0) ? EPSILON : temp_x/Abstand;
-+      temp_y= (temp_y/Abstand == 0) ? EPSILON : temp_y/Abstand;
-+      temp_z= (temp_z/Abstand == 0) ? EPSILON : temp_z/Abstand;
-       vertices[iv++]=temp_x; 
-       vertices[iv++]=temp_y; 
-       vertices[iv++]=temp_z; 

Copied: packages/trunk/billard-gl/debian/patches/02_divide-by-zero_on_alpha.patch (from rev 10921, packages/trunk/billard-gl/debian/patches/02_divide-by-zero_on_alpha.dpatch)
===================================================================
--- packages/trunk/billard-gl/debian/patches/02_divide-by-zero_on_alpha.patch	                        (rev 0)
+++ packages/trunk/billard-gl/debian/patches/02_divide-by-zero_on_alpha.patch	2010-04-13 14:04:36 UTC (rev 10923)
@@ -0,0 +1,26 @@
+Author: Julien LEMOINE <speedblue at debian.org>
+Bug-Debian: http://bugs.debian.org/166378
+Description: Fixes divide-by-zero on alphas.
+--- a/src/kugeltabellen.cpp
++++ b/src/kugeltabellen.cpp
+@@ -7,6 +7,7 @@
+ #ifndef M_PI
+ #define M_PI 3.14159265358979323846
+ #endif
++#define EPSILON 0.00001
+ 
+ GLint calc_ind2(GLint b, GLint c, GLint Aufloesung) {
+   return ((c*(2*Aufloesung+3-c))/2)+b;
+@@ -28,9 +29,9 @@
+       GLfloat temp_y=ay+((b+0.0)/(Aufloesung+0.0))*(by-ay)+((c+0.0)/(Aufloesung+0.0))*(cy-ay);
+       GLfloat temp_z=az+((b+0.0)/(Aufloesung+0.0))*(bz-az)+((c+0.0)/(Aufloesung+0.0))*(cz-az);
+       GLfloat Abstand=sqrt(temp_x*temp_x+temp_y*temp_y+temp_z*temp_z);
+-      temp_x=temp_x/Abstand;
+-      temp_y=temp_y/Abstand;
+-      temp_z=temp_z/Abstand;
++      temp_x= (temp_x/Abstand == 0) ? EPSILON : temp_x/Abstand;
++      temp_y= (temp_y/Abstand == 0) ? EPSILON : temp_y/Abstand;
++      temp_z= (temp_z/Abstand == 0) ? EPSILON : temp_z/Abstand;
+       vertices[iv++]=temp_x; 
+       vertices[iv++]=temp_y; 
+       vertices[iv++]=temp_z; 

Deleted: packages/trunk/billard-gl/debian/patches/03_config_buffer_overflows.dpatch
===================================================================
--- packages/trunk/billard-gl/debian/patches/03_config_buffer_overflows.dpatch	2010-04-13 13:38:30 UTC (rev 10922)
+++ packages/trunk/billard-gl/debian/patches/03_config_buffer_overflows.dpatch	2010-04-13 14:04:36 UTC (rev 10923)
@@ -1,47 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_config_buffer_overflows.dpatch by  <thierry at doppeltgemoppelt.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes buffer overflows while loading the config file.
-## DP: Closes: #290822
-
- at DPATCH@
-
-diff -ruN billard-gl-1.75.orig/src/KommandoZeilenParameter.cpp billard-gl-1.75/src/KommandoZeilenParameter.cpp
---- billard-gl-1.75.orig/src/KommandoZeilenParameter.cpp	2002-04-23 18:04:13.000000000 +0200
-+++ billard-gl-1.75/src/KommandoZeilenParameter.cpp	2005-01-22 12:33:22.000000000 +0100
-@@ -8,8 +8,8 @@
- void SchreibeKonfiguration(){
-   FILE *f;
- #ifndef _WIN32
--  char dateiname[40];
--  sprintf(dateiname,"%s/.BillardGL.conf.v7",getenv("HOME"));
-+  char dateiname[512];
-+  snprintf(dateiname,sizeof(dateiname),"%s/.BillardGL.conf.v7",getenv("HOME"));
-   f=fopen(dateiname,"w+");
- #endif
- #ifdef _WIN32
-@@ -65,8 +65,8 @@
- void LeseKonfiguration(){
-   FILE *f;
- #ifndef _WIN32
--  char dateiname[40];
--  sprintf(dateiname,"%s/.BillardGL.conf.v7",getenv("HOME"));
-+  char dateiname[512];
-+  snprintf(dateiname,sizeof(dateiname),"%s/.BillardGL.conf.v7",getenv("HOME"));
-   f=fopen(dateiname,"r");
- #endif
- #ifdef _WIN32
-@@ -95,9 +95,9 @@
-     fscanf(f,"%i",&GrueneLampe);
-     fscanf(f,"%f",&EffektLautstaerke);
-     fscanf(f,"%f",&MusikLautstaerke);
--    fscanf(f,"%s",Spieler1temp);
--    fscanf(f,"%s",Spieler2temp);
--    fscanf(f,"%s",NetzwerkSpielertemp);
-+    fscanf(f,"%9s",Spieler1temp);
-+    fscanf(f,"%9s",Spieler2temp);
-+    fscanf(f,"%9s",NetzwerkSpielertemp);
-     for (int i=0;i<10;i++) {
-       if (Spieler1temp[i]=='%') {
- 	Spieler1[i]=' ';

Copied: packages/trunk/billard-gl/debian/patches/03_config_buffer_overflows.patch (from rev 10921, packages/trunk/billard-gl/debian/patches/03_config_buffer_overflows.dpatch)
===================================================================
--- packages/trunk/billard-gl/debian/patches/03_config_buffer_overflows.patch	                        (rev 0)
+++ packages/trunk/billard-gl/debian/patches/03_config_buffer_overflows.patch	2010-04-13 14:04:36 UTC (rev 10923)
@@ -0,0 +1,40 @@
+Author: Ulf Härnhammar <Ulf.Harnhammar.9485 at student.uu.se>
+Description: Fixes buffer overflows while loading the config file.
+Bug-Debian: http://bugs.debian.org/290822
+--- a/src/KommandoZeilenParameter.cpp
++++ b/src/KommandoZeilenParameter.cpp
+@@ -8,8 +8,8 @@
+ void SchreibeKonfiguration(){
+   FILE *f;
+ #ifndef _WIN32
+-  char dateiname[40];
+-  sprintf(dateiname,"%s/.BillardGL.conf.v7",getenv("HOME"));
++  char dateiname[512];
++  snprintf(dateiname,sizeof(dateiname),"%s/.BillardGL.conf.v7",getenv("HOME"));
+   f=fopen(dateiname,"w+");
+ #endif
+ #ifdef _WIN32
+@@ -65,8 +65,8 @@
+ void LeseKonfiguration(){
+   FILE *f;
+ #ifndef _WIN32
+-  char dateiname[40];
+-  sprintf(dateiname,"%s/.BillardGL.conf.v7",getenv("HOME"));
++  char dateiname[512];
++  snprintf(dateiname,sizeof(dateiname),"%s/.BillardGL.conf.v7",getenv("HOME"));
+   f=fopen(dateiname,"r");
+ #endif
+ #ifdef _WIN32
+@@ -95,9 +95,9 @@
+     fscanf(f,"%i",&GrueneLampe);
+     fscanf(f,"%f",&EffektLautstaerke);
+     fscanf(f,"%f",&MusikLautstaerke);
+-    fscanf(f,"%s",Spieler1temp);
+-    fscanf(f,"%s",Spieler2temp);
+-    fscanf(f,"%s",NetzwerkSpielertemp);
++    fscanf(f,"%9s",Spieler1temp);
++    fscanf(f,"%9s",Spieler2temp);
++    fscanf(f,"%9s",NetzwerkSpielertemp);
+     for (int i=0;i<10;i++) {
+       if (Spieler1temp[i]=='%') {
+ 	Spieler1[i]=' ';

Deleted: packages/trunk/billard-gl/debian/patches/04_starting_resolution.dpatch
===================================================================
--- packages/trunk/billard-gl/debian/patches/04_starting_resolution.dpatch	2010-04-13 13:38:30 UTC (rev 10922)
+++ packages/trunk/billard-gl/debian/patches/04_starting_resolution.dpatch	2010-04-13 14:04:36 UTC (rev 10923)
@@ -1,31 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_starting_resolution.dpatch by  <thierry at doppeltgemoppelt.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: By default, start in windowed mode at a resolution of 640x480.
-## DP: Closes: #173197
-## DP: Closes: #284855
-
- at DPATCH@
-
-diff -ruN billard-gl-1.75.orig/src/KommandoZeilenParameter.cpp billard-gl-1.75/src/KommandoZeilenParameter.cpp
---- billard-gl-1.75.orig/src/KommandoZeilenParameter.cpp	2002-04-23 18:04:13.000000000 +0200
-+++ billard-gl-1.75/src/KommandoZeilenParameter.cpp	2005-01-22 12:42:31.000000000 +0100
-@@ -144,7 +144,7 @@
-   BandenFaktor         = 0.4;
-   KollisionsFaktor     = 0.95;
-   ZBufferLoeschen      = 1;
--  BildschirmAufloesung = 800;
-+  BildschirmAufloesung = 640;
-   Farbtiefe            = 16;
-   Reflektionen         = 0;
-   Sprache              = 0;
-@@ -154,7 +154,7 @@
-   TischLampen          = 2;
-   GrueneLampe          = 0;
- 
--  FullScreen           = 1;
-+  FullScreen           = 0;
- 
-   EffektLautstaerke    = .5;
-   MusikLautstaerke     = .5;

Copied: packages/trunk/billard-gl/debian/patches/04_starting_resolution.patch (from rev 10921, packages/trunk/billard-gl/debian/patches/04_starting_resolution.dpatch)
===================================================================
--- packages/trunk/billard-gl/debian/patches/04_starting_resolution.patch	                        (rev 0)
+++ packages/trunk/billard-gl/debian/patches/04_starting_resolution.patch	2010-04-13 14:04:36 UTC (rev 10923)
@@ -0,0 +1,24 @@
+Author: Thierry Reding <thierry at doppeltgemoppelt.de>
+Description: By default, start in windowed mode at a resolution of 640x480.
+Bug-Debian: http://bugs.debian.org/173197
+Bug-Debian: http://bugs.debian.org/284855
+--- a/src/KommandoZeilenParameter.cpp
++++ b/src/KommandoZeilenParameter.cpp
+@@ -144,7 +144,7 @@
+   BandenFaktor         = 0.4;
+   KollisionsFaktor     = 0.95;
+   ZBufferLoeschen      = 1;
+-  BildschirmAufloesung = 800;
++  BildschirmAufloesung = 640;
+   Farbtiefe            = 16;
+   Reflektionen         = 0;
+   Sprache              = 0;
+@@ -154,7 +154,7 @@
+   TischLampen          = 2;
+   GrueneLampe          = 0;
+ 
+-  FullScreen           = 1;
++  FullScreen           = 0;
+ 
+   EffektLautstaerke    = .5;
+   MusikLautstaerke     = .5;

Deleted: packages/trunk/billard-gl/debian/patches/05_Makefile.dpatch
===================================================================
--- packages/trunk/billard-gl/debian/patches/05_Makefile.dpatch	2010-04-13 13:38:30 UTC (rev 10922)
+++ packages/trunk/billard-gl/debian/patches/05_Makefile.dpatch	2010-04-13 14:04:36 UTC (rev 10923)
@@ -1,44 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_Makefile.dpatch by Thierry Reding <thierry at doppeltgemoppelt.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix makefile to generate lowercase name for executable.
-## DP: Enable debian/rules to pass additional CFLAGS.
-
- at DPATCH@
-
-diff -ruN billard-gl-1.75.orig/src/Makefile billard-gl-1.75/src/Makefile
---- billard-gl-1.75.orig/src/Makefile	2002-04-29 13:26:46.000000000 +0200
-+++ billard-gl-1.75/src/Makefile	2005-01-31 03:46:57.000000000 +0100
-@@ -7,8 +7,8 @@
- 
- CC	=	gcc
- CXX	=	g++
--CFLAGS	=	-pipe -Wall -W -DNO_DEBUG -g
--CXXFLAGS=	-pipe -Wall -W -DNO_DEBUG -g 
-+CFLAGS	=	-pipe -Wall -W -DNO_DEBUG $(MORE_CFLAGS)
-+CXXFLAGS=	-pipe -Wall -W -DNO_DEBUG $(MORE_CFLAGS)
- INCPATH	=	-I/usr/X11R6/include 
- LINK	=	g++
- LFLAGS	=	
-@@ -109,7 +109,7 @@
- SRCMOC	=	
- OBJMOC	=	
- DIST	=	
--TARGET	=	BillardGL
-+TARGET	=	billard-gl
- INTERFACE_DECL_PATH = .
- 
- ####### Implicit rules
-
---- billard-gl-1.75.orig/src/Makefile   (revision 4)
-+++ billard-gl-1.75/src/Makefile        (working copy)
-@@ -12,7 +12,7 @@
- INCPATH	=	-I/usr/X11R6/include 
- LINK	=	g++
- LFLAGS	=	
--LIBS	=	-L/usr/X11R6/lib -lGL -lGLU -lglut -lXmu -lXext -lX11 -lm -lXi
-+LIBS	=	-lGL -lGLU -lglut
- 
- ## -lqgl -lGLU
- 

Copied: packages/trunk/billard-gl/debian/patches/05_Makefile.patch (from rev 10921, packages/trunk/billard-gl/debian/patches/05_Makefile.dpatch)
===================================================================
--- packages/trunk/billard-gl/debian/patches/05_Makefile.patch	                        (rev 0)
+++ packages/trunk/billard-gl/debian/patches/05_Makefile.patch	2010-04-13 14:04:36 UTC (rev 10923)
@@ -0,0 +1,30 @@
+Author: Thierry Reding <thierry at doppeltgemoppelt.de>
+Description: Fix makefile to generate lowercase name for executable.
+ Enable debian/rules to pass additional CFLAGS.
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -7,12 +7,12 @@
+ 
+ CC	=	gcc
+ CXX	=	g++
+-CFLAGS	=	-pipe -Wall -W -DNO_DEBUG -g
+-CXXFLAGS=	-pipe -Wall -W -DNO_DEBUG -g 
++CFLAGS	=	-pipe -Wall -W -DNO_DEBUG $(MORE_CFLAGS)
++CXXFLAGS=	-pipe -Wall -W -DNO_DEBUG $(MORE_CFLAGS)
+ INCPATH	=	-I/usr/X11R6/include 
+ LINK	=	g++
+ LFLAGS	=	
+-LIBS	=	-L/usr/X11R6/lib -lGL -lGLU -lglut -lXmu -lXext -lX11 -lm -lXi
++LIBS	=	-lGL -lGLU -lglut
+ 
+ ## -lqgl -lGLU
+ 
+@@ -109,7 +109,7 @@
+ SRCMOC	=	
+ OBJMOC	=	
+ DIST	=	
+-TARGET	=	BillardGL
++TARGET	=	billard-gl
+ INTERFACE_DECL_PATH = .
+ 
+ ####### Implicit rules

Deleted: packages/trunk/billard-gl/debian/patches/99_cosmetic_fixes.dpatch
===================================================================
--- packages/trunk/billard-gl/debian/patches/99_cosmetic_fixes.dpatch	2010-04-13 13:38:30 UTC (rev 10922)
+++ packages/trunk/billard-gl/debian/patches/99_cosmetic_fixes.dpatch	2010-04-13 14:04:36 UTC (rev 10923)
@@ -1,54 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 99_cosmetic_fixes.dpatch by Thierry Reding <thierry at doppeltgemoppelt.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes a couple of compiler warnings.
-
- at DPATCH@
-
-diff -ruN billard-gl-1.75.orig/src/BillardGL.cpp billard-gl-1.75/src/BillardGL.cpp
---- billard-gl-1.75.orig/src/BillardGL.cpp	2002-04-23 18:17:42.000000000 +0200
-+++ billard-gl-1.75/src/BillardGL.cpp	2005-01-23 03:50:58.000000000 +0100
-@@ -35,8 +35,6 @@
- 
- #include "BillardGL.h"
- 
--#pragma comment(linker, "/subsystem:\"windows\" /entry:\"mainCRTStartup\"")
--
- //Tabellen
- GLfloat Bewegungstabelle[2000][16][3];
- GLint   Soundtabelle[1000];
-diff -ruN billard-gl-1.75.orig/src/bmp.cpp billard-gl-1.75/src/bmp.cpp
---- billard-gl-1.75.orig/src/bmp.cpp	2002-04-22 12:31:24.000000000 +0200
-+++ billard-gl-1.75/src/bmp.cpp	2005-01-23 03:50:43.000000000 +0100
-@@ -4,14 +4,16 @@
- // Modified by Volker Blanz, 25.4.2001
- //
- 
--#include <iostream.h>
--#include <fstream.h>
-+#include <iostream>
-+#include <fstream>
- #include <stdio.h>
- #include <string.h>
- #include "LA.h"
- #include "Namen.h"
- #include "bmp.h"
- 
-+using namespace std;
-+
- // from ioutil:
- 
- WORDX readWord(FILE *f) {
-diff -ruN billard-gl-1.75.orig/src/Kugel.cpp billard-gl-1.75/src/Kugel.cpp
---- billard-gl-1.75.orig/src/Kugel.cpp	2002-04-22 12:58:08.000000000 +0200
-+++ billard-gl-1.75/src/Kugel.cpp	2005-01-31 04:03:54.000000000 +0100
-@@ -123,7 +123,7 @@
-         glBindTexture(GL_TEXTURE_2D,Texturen[TG]);
- 	sprintf(Name,"Texturen/%i/%i.bmp",TG,Nr); 
- 	loadBMP(tex_r,tex_g,tex_b,Name);
--	GLfloat *texcoord;
-+	GLfloat *texcoord = NULL;
- 	if (tex_r.nrh!=tex_r.nch) {
- 	  GLfloat Aspekt=(tex_r.nch+1.0)/(tex_r.nrh+1.0);
- 	  texcoord = (GLfloat*) malloc (20*(Aufloesung+1)*(Aufloesung+2)*sizeof(GLfloat));

Copied: packages/trunk/billard-gl/debian/patches/99_cosmetic_fixes.patch (from rev 10921, packages/trunk/billard-gl/debian/patches/99_cosmetic_fixes.dpatch)
===================================================================
--- packages/trunk/billard-gl/debian/patches/99_cosmetic_fixes.patch	                        (rev 0)
+++ packages/trunk/billard-gl/debian/patches/99_cosmetic_fixes.patch	2010-04-13 14:04:36 UTC (rev 10923)
@@ -0,0 +1,45 @@
+Author: Thierry Reding <thierry at doppeltgemoppelt.de>
+Description: Fixes a couple of compiler warnings.
+--- a/src/BillardGL.cpp
++++ b/src/BillardGL.cpp
+@@ -35,8 +35,6 @@
+ 
+ #include "BillardGL.h"
+ 
+-#pragma comment(linker, "/subsystem:\"windows\" /entry:\"mainCRTStartup\"")
+-
+ //Tabellen
+ GLfloat Bewegungstabelle[2000][16][3];
+ GLint   Soundtabelle[1000];
+--- a/src/bmp.cpp
++++ b/src/bmp.cpp
+@@ -4,14 +4,16 @@
+ // Modified by Volker Blanz, 25.4.2001
+ //
+ 
+-#include <iostream.h>
+-#include <fstream.h>
++#include <iostream>
++#include <fstream>
+ #include <stdio.h>
+ #include <string.h>
+ #include "LA.h"
+ #include "Namen.h"
+ #include "bmp.h"
+ 
++using namespace std;
++
+ // from ioutil:
+ 
+ WORDX readWord(FILE *f) {
+--- a/src/Kugel.cpp
++++ b/src/Kugel.cpp
+@@ -123,7 +123,7 @@
+         glBindTexture(GL_TEXTURE_2D,Texturen[TG]);
+ 	sprintf(Name,"Texturen/%i/%i.bmp",TG,Nr); 
+ 	loadBMP(tex_r,tex_g,tex_b,Name);
+-	GLfloat *texcoord;
++	GLfloat *texcoord = NULL;
+ 	if (tex_r.nrh!=tex_r.nch) {
+ 	  GLfloat Aspekt=(tex_r.nch+1.0)/(tex_r.nrh+1.0);
+ 	  texcoord = (GLfloat*) malloc (20*(Aufloesung+1)*(Aufloesung+2)*sizeof(GLfloat));

Copied: packages/trunk/billard-gl/debian/patches/series (from rev 10921, packages/trunk/billard-gl/debian/patches/00list)
===================================================================
--- packages/trunk/billard-gl/debian/patches/series	                        (rev 0)
+++ packages/trunk/billard-gl/debian/patches/series	2010-04-13 14:04:36 UTC (rev 10923)
@@ -0,0 +1,6 @@
+01_debianize_data_path.patch
+02_divide-by-zero_on_alpha.patch
+03_config_buffer_overflows.patch
+04_starting_resolution.patch
+05_Makefile.patch
+99_cosmetic_fixes.patch

Modified: packages/trunk/billard-gl/debian/rules
===================================================================
--- packages/trunk/billard-gl/debian/rules	2010-04-13 13:38:30 UTC (rev 10922)
+++ packages/trunk/billard-gl/debian/rules	2010-04-13 14:04:36 UTC (rev 10923)
@@ -3,8 +3,6 @@
 # GNU copyright 1997 to 1999 by Joey Hess.
 # Modified for billardgl by Martin Butterweck
 
-include /usr/share/dpatch/dpatch.make
-
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 export MORE_CFLAGS=-g
 else
@@ -17,14 +15,12 @@
 
 build: build-stamp
 
-build-stamp: patch
+build-stamp:
 	dh_testdir
 	$(MAKE) -C src
 	touch build-stamp
 
-clean: clean-patched unpatch
-
-clean-patched:
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp

Added: packages/trunk/billard-gl/debian/source/format
===================================================================
--- packages/trunk/billard-gl/debian/source/format	                        (rev 0)
+++ packages/trunk/billard-gl/debian/source/format	2010-04-13 14:04:36 UTC (rev 10923)
@@ -0,0 +1 @@
+3.0 (quilt)




More information about the Pkg-games-commits mailing list