[pipenightdreams] 03/07: Patch cut into three patches
Dariusz Dwornikowski
tdi-guest at moszumanska.debian.org
Wed Nov 25 06:45:30 UTC 2015
This is an automated email from the git hooks/post-receive script.
tdi-guest pushed a commit to branch patch-queue/master
in repository pipenightdreams.
commit af0facf69890df8e32eda21b2ecb26866cbb5b2b
Author: Dariusz Dwornikowski <dariusz.dwornikowski at cs.put.poznan.pl>
Date: Tue Nov 24 17:58:19 2015 +0100
Patch cut into three patches
---
debian/patches/manpage.patch | 33 ++++
debian/patches/migrate.patch | 374 -------------------------------------------
debian/patches/series | 2 +
debian/patches/source.patch | 341 +++++++++++++++++++++++++++++++++++++++
debian/rules | 1 -
5 files changed, 376 insertions(+), 375 deletions(-)
diff --git a/debian/patches/manpage.patch b/debian/patches/manpage.patch
new file mode 100644
index 0000000..b398a41
--- /dev/null
+++ b/debian/patches/manpage.patch
@@ -0,0 +1,33 @@
+--- pipenightdreams-0.10.0.orig/man/pipenightdreams.6
++++ pipenightdreams-0.10.0/man/pipenightdreams.6
+@@ -1,15 +1,12 @@
+ .TH PIPENIGHTDREAMS 6 "23rd May 2002"
+
+ .SH NAME
+-
+ pipenightdreams \- Just another pipe trip (PipeDream clon).
+
+ .SH SYNOPSIS
+-
+ \fB pipenightdreams\fP [\--datadir <DATADIR>] [\--fullscreen]
+
+ .SH DESCRIPTION
+-
+ \fB pipenightdreams\fP is a PipeDream style game. The objetive of the game is to carry
+ liquid from some point to the exit using different kinds of pipes. On each level
+ there is a minimum number of required pipes that should be at least reached for it
+@@ -46,7 +43,6 @@
+ .IP HYPER\ BONUS
+ The green one.
+
+-
+ .SH OPTIONS
+ \fB --datadir <CUSTOM DATA DIR> \fP is used when
+ the data directory is not the default one (\fB /usr/share/games/pipenightdreams\fP
+@@ -64,6 +60,4 @@
+ http://www.libsdl.org/projects/pipenightdreams
+
+ .SH AUTHORS
+-
+ Waldemar A. Baraldi <baraldi at lacasilla.com.ar>
+-
diff --git a/debian/patches/migrate.patch b/debian/patches/migrate.patch
index 6b7ddc0..11bf17c 100644
--- a/debian/patches/migrate.patch
+++ b/debian/patches/migrate.patch
@@ -1,36 +1,3 @@
---- pipenightdreams-0.10.0.orig/man/pipenightdreams.6
-+++ pipenightdreams-0.10.0/man/pipenightdreams.6
-@@ -1,15 +1,12 @@
- .TH PIPENIGHTDREAMS 6 "23rd May 2002"
-
- .SH NAME
--
- pipenightdreams \- Just another pipe trip (PipeDream clon).
-
- .SH SYNOPSIS
--
- \fB pipenightdreams\fP [\--datadir <DATADIR>] [\--fullscreen]
-
- .SH DESCRIPTION
--
- \fB pipenightdreams\fP is a PipeDream style game. The objetive of the game is to carry
- liquid from some point to the exit using different kinds of pipes. On each level
- there is a minimum number of required pipes that should be at least reached for it
-@@ -46,7 +43,6 @@
- .IP HYPER\ BONUS
- The green one.
-
--
- .SH OPTIONS
- \fB --datadir <CUSTOM DATA DIR> \fP is used when
- the data directory is not the default one (\fB /usr/share/games/pipenightdreams\fP
-@@ -64,6 +60,4 @@
- http://www.libsdl.org/projects/pipenightdreams
-
- .SH AUTHORS
--
- Waldemar A. Baraldi <baraldi at lacasilla.com.ar>
--
--- pipenightdreams-0.10.0.orig/man/Makefile.in
+++ pipenightdreams-0.10.0/man/Makefile.in
@@ -1,4 +1,4 @@
@@ -61,168 +28,6 @@
cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
---- pipenightdreams-0.10.0.orig/src/pointer.cpp
-+++ pipenightdreams-0.10.0/src/pointer.cpp
-@@ -17,7 +17,7 @@
-
- #include "pointer.h"
-
--Pointer::Pointer(int row=0, int column=0){
-+Pointer::Pointer(int row, int column){
- this->row=row;
- this->column=column;
- this->moved_flag=true;
-@@ -25,27 +25,6 @@
-
- Pointer::~Pointer(){ delete image_name;}
-
--void Pointer::setRow(int row){
-- this->row=row;
--}
--
--void Pointer::setColumn(int column){
-- this->column=column;
--}
--
--void Pointer::setRowColumn(int row, int column){
-- this->row=row;
-- this->column=column;
--}
--
--void Pointer::setMoved(bool flag){
-- moved_flag=flag;
--}
--
--bool Pointer::moved(){
-- return moved_flag;
--}
--
- int Pointer::getRow(){
- return row;
- }
---- pipenightdreams-0.10.0.orig/src/score.cpp
-+++ pipenightdreams-0.10.0/src/score.cpp
-@@ -18,7 +18,7 @@
- #include "score.h"
- #include <math.h>
-
--Score::Score(int value=0){
-+Score::Score(int value){
- this->value=value;
- delta=0;
- changed=true;
---- pipenightdreams-0.10.0.orig/src/main.cpp
-+++ pipenightdreams-0.10.0/src/main.cpp
-@@ -36,10 +36,12 @@
- if (data_dir) delete data_dir;
- data_dir=new Str(argv[++i]);
- }else
-- if (!strcmp("--fullscreen", argv[i]))
-+ if (!strcmp("--level", argv[i])) {
-+ level = atoi(argv[++i]);
-+ } else if (!strcmp("--fullscreen", argv[i]))
- fullscreen=true;
- else{
-- printf("Invalid Data Dir\nUse pipenightdreams [--datadir <DATA DIR>] [--fullscreen]\n");
-+ printf("Invalid Data Dir\nUse pipenightdreams [--datadir <DATA DIR>] [--fullscreen] [--level <level>]\n");
- printf("Using default: %s\n", GAME_DATADIR);
- }
- i++;
---- pipenightdreams-0.10.0.orig/src/level.ll
-+++ pipenightdreams-0.10.0/src/level.ll
-@@ -93,6 +93,20 @@
- #define INVALID 100
-
- int nline;
-+
-+int Level::load(Str * filename){
-+ YY_FLUSH_BUFFER;
-+ nline=1;
-+ if (!(yyin=fopen(filename->get(), "r"))){
-+ delete filename;
-+ return 1;
-+ }
-+ delete filename;
-+ level();
-+ fclose(yyin);
-+ if (error) return -1;
-+ return 0;
-+}
- %}
-
- %option noyywrap
-@@ -599,17 +613,3 @@
- }else printError(new Str("'pipenightdreams' not found"));
- }
-
--int Level::load(Str * filename){
-- YY_FLUSH_BUFFER;
-- nline=1;
-- if (!(yyin=fopen(filename->get(), "r"))){
-- delete filename;
-- return 1;
-- }
-- delete filename;
-- level();
-- fclose(yyin);
-- if (error) return -1;
-- return 0;
--}
--
---- pipenightdreams-0.10.0.orig/src/graphic.cpp
-+++ pipenightdreams-0.10.0/src/graphic.cpp
-@@ -44,11 +44,11 @@
- if (pixels) free(pixels);
- }
-
--void Graphic::setAlpha(char value=OPAQUE){
-+void Graphic::setAlpha(char value){
- SDL_SetAlpha(surface, SDL_SRCALPHA, value);
- }
-
--void Graphic::enableClipping(bool flag=true){
-+void Graphic::enableClipping(bool flag){
-
- if (flag){
- SDL_Rect rect;
-@@ -68,7 +68,7 @@
- clip_height=height;
- }
-
--void Graphic::flip(Axis a=HAxis){
-+void Graphic::flip(Axis a){
- if (surface){
- if (SDL_MUSTLOCK(surface))
- if (SDL_LockSurface(surface)<0) return;
---- pipenightdreams-0.10.0.orig/src/str.cpp
-+++ pipenightdreams-0.10.0/src/str.cpp
-@@ -11,7 +11,7 @@
-
- const char Str::nul = '\0';
-
--Str::Str(const char * string=NULL){
-+Str::Str(const char * string){
- s=NULL;
- set(string);
- }
-@@ -25,7 +25,7 @@
- if (s) delete[] s;
- }
-
--void Str::set(const char * string=NULL){
-+void Str::set(const char * string){
- if (s) delete[] s;
- if (string){
- s=new char[strlen(string)+1];
-@@ -71,7 +71,7 @@
- return (strlen(s));
- }
-
--bool Str::isEqual(Str * str, bool case_sensitive = true){
-+bool Str::isEqual(Str * str, bool case_sensitive){
- if (case_sensitive){
- return (!strcmp(s, str->s));
- }
--- pipenightdreams-0.10.0.orig/src/Makefile.in
+++ pipenightdreams-0.10.0/src/Makefile.in
@@ -1,4 +1,4 @@
@@ -284,185 +89,6 @@
mostlyclean-am: mostlyclean-hdr mostlyclean-binPROGRAMS \
mostlyclean-compile mostlyclean-tags mostlyclean-depend \
mostlyclean-generic
---- pipenightdreams-0.10.0.orig/src/pipe.cpp
-+++ pipenightdreams-0.10.0/src/pipe.cpp
-@@ -43,11 +43,11 @@
- return !(full_level>0) && !fixed;
- }
-
--void Pipe::setFixed(bool flag=true){
-+void Pipe::setFixed(bool flag){
- fixed=flag;
- }
-
--void Pipe::setBonus(Bonus bonus=NormalBonus){
-+void Pipe::setBonus(Bonus bonus){
- this->bonus=bonus;
- }
-
---- pipenightdreams-0.10.0.orig/src/image.cpp
-+++ pipenightdreams-0.10.0/src/image.cpp
-@@ -19,7 +19,7 @@
- #include "SDL_image.h"
- #include <stdio.h>
-
--Image::Image(Str * filename=NULL):Graphic(){
-+Image::Image(Str * filename):Graphic(){
- if (filename) load(filename);
- }
-
---- pipenightdreams-0.10.0.orig/src/config.h.in
-+++ pipenightdreams-0.10.0/src/config.h.in
-@@ -1,4 +1,4 @@
--/* src/config.h.in. Generated automatically from configure.in by autoheader. */
-+/* src/config.h.in. Generated automatically from configure.in by autoheader 2.13. */
-
- /* Define if lex declares yytext as a char * by default, not a char[]. */
- #undef YYTEXT_POINTER
---- pipenightdreams-0.10.0.orig/src/list.cpp
-+++ pipenightdreams-0.10.0/src/list.cpp
-@@ -125,7 +125,7 @@
- return (insert(indexOf(i), obj));
- }
-
--List::Result List::remove(Index * index, bool del=false){
-+List::Result List::remove(Index * index, bool del){
- if (isEmpty()) return EmptyList;
- if (!index) return NullIndex;
-
-@@ -155,7 +155,7 @@
- return Removed;
- }
-
--void List::empty(bool del=true){
-+void List::empty(bool del){
- while (!isEmpty())
- remove(getFirst(), del);
- }
---- pipenightdreams-0.10.0.orig/src/pipenightdreams.cpp
-+++ pipenightdreams-0.10.0/src/pipenightdreams.cpp
-@@ -99,6 +99,7 @@
- switch (error){
- case 1:{
- showFinal();
-+ game_over=true;
- break;
- }
- case -1:{
---- pipenightdreams-0.10.0.orig/src/player.cpp
-+++ pipenightdreams-0.10.0/src/player.cpp
-@@ -163,14 +163,6 @@
- queue->paint(vm);
- }
-
--void Player::setRestrictionCoef(unsigned int coef){
-- queue->setRestrictionCoef(coef);
--}
--
--void Player::setFixedCoef(unsigned int coef){
-- queue->setFixedCoef(coef);
--}
--
- void Player::tick(){
- score->tick();
-
---- pipenightdreams-0.10.0.orig/src/pointer.h
-+++ pipenightdreams-0.10.0/src/pointer.h
-@@ -43,11 +43,27 @@
-
- friend class Board;
-
-- inline void setRow(int row);
-- inline void setColumn(int column);
-- inline void setRowColumn(int row, int column);
-- inline void setMoved(bool flag);
-- inline bool moved();
-+ inline void setRow(int row){
-+ this->row=row;
-+ }
-+
-+ inline void setColumn(int column){
-+ this->column=column;
-+ }
-+
-+ inline void setRowColumn(int row, int column){
-+ this->row=row;
-+ this->column=column;
-+ }
-+
-+ inline void setMoved(bool flag){
-+ moved_flag=flag;
-+ }
-+
-+ inline bool moved(){
-+ return moved_flag;
-+ }
-+
-
- Str * image_name;
- Image * ima;
---- pipenightdreams-0.10.0.orig/src/player.h
-+++ pipenightdreams-0.10.0/src/player.h
-@@ -47,8 +47,13 @@
- void setStartRowColumn(int row, int column);
- void setBoard(Board * bd);
-
-- inline void setRestrictionCoef(unsigned int coef);
-- inline void setFixedCoef(unsigned int coef);
-+ inline void setRestrictionCoef(unsigned int coef){
-+ queue->setRestrictionCoef(coef);
-+ }
-+
-+ inline void setFixedCoef(unsigned int coef){
-+ queue->setFixedCoef(coef);
-+ }
-
- void incLives();
- void decLives();
---- pipenightdreams-0.10.0.orig/src/hash.cpp
-+++ pipenightdreams-0.10.0/src/hash.cpp
-@@ -55,10 +55,10 @@
- return(sum % nbuckets);
- }
-
--Hash::Hash(int bs=256){
-+Hash::Hash(int bs){
- int i;
- nbuckets=bs;
-- lbuckets=new (List *)[nbuckets];
-+ lbuckets=new List *[nbuckets];
-
- for (i=0;i<nbuckets;i++)
- lbuckets[i]=new List();
-@@ -99,7 +99,7 @@
- return NotAdded;
- }
-
--Hash::Result Hash::remove(Str * str, bool del=false){
-+Hash::Result Hash::remove(Str * str, bool del){
- if (str){
- Index * i;
- List * list=lbuckets[function(str)];
-@@ -135,7 +135,7 @@
- return NULL;
- }
-
--void Hash::empty(bool del=true){
-+void Hash::empty(bool del){
- int i;
- List * list;
- for (i=0;i<nbuckets;i++){
---- pipenightdreams-0.10.0.orig/src/eventmanager.cpp
-+++ pipenightdreams-0.10.0/src/eventmanager.cpp
-@@ -40,7 +40,7 @@
- lista_streams->remove(lista_streams->indexOf(s));
- }
-
--void EventManager::pumpEvents(bool wait=false){
-+void EventManager::pumpEvents(bool wait){
- SDL_Event event;
- Index * stream;
- bool got=false;
--- pipenightdreams-0.10.0.orig/Makefile.in
+++ pipenightdreams-0.10.0/Makefile.in
@@ -1,4 +1,4 @@
diff --git a/debian/patches/series b/debian/patches/series
index 8802488..e0722ce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
+manpage.patch
+source.patch
migrate.patch
diff --git a/debian/patches/source.patch b/debian/patches/source.patch
new file mode 100644
index 0000000..6cfb8f1
--- /dev/null
+++ b/debian/patches/source.patch
@@ -0,0 +1,341 @@
+--- pipenightdreams-0.10.0.orig/src/pipe.cpp
++++ pipenightdreams-0.10.0/src/pipe.cpp
+@@ -43,11 +43,11 @@
+ return !(full_level>0) && !fixed;
+ }
+
+-void Pipe::setFixed(bool flag=true){
++void Pipe::setFixed(bool flag){
+ fixed=flag;
+ }
+
+-void Pipe::setBonus(Bonus bonus=NormalBonus){
++void Pipe::setBonus(Bonus bonus){
+ this->bonus=bonus;
+ }
+
+--- pipenightdreams-0.10.0.orig/src/image.cpp
++++ pipenightdreams-0.10.0/src/image.cpp
+@@ -19,7 +19,7 @@
+ #include "SDL_image.h"
+ #include <stdio.h>
+
+-Image::Image(Str * filename=NULL):Graphic(){
++Image::Image(Str * filename):Graphic(){
+ if (filename) load(filename);
+ }
+
+--- pipenightdreams-0.10.0.orig/src/config.h.in
++++ pipenightdreams-0.10.0/src/config.h.in
+@@ -1,4 +1,4 @@
+-/* src/config.h.in. Generated automatically from configure.in by autoheader. */
++/* src/config.h.in. Generated automatically from configure.in by autoheader 2.13. */
+
+ /* Define if lex declares yytext as a char * by default, not a char[]. */
+ #undef YYTEXT_POINTER
+--- pipenightdreams-0.10.0.orig/src/list.cpp
++++ pipenightdreams-0.10.0/src/list.cpp
+@@ -125,7 +125,7 @@
+ return (insert(indexOf(i), obj));
+ }
+
+-List::Result List::remove(Index * index, bool del=false){
++List::Result List::remove(Index * index, bool del){
+ if (isEmpty()) return EmptyList;
+ if (!index) return NullIndex;
+
+@@ -155,7 +155,7 @@
+ return Removed;
+ }
+
+-void List::empty(bool del=true){
++void List::empty(bool del){
+ while (!isEmpty())
+ remove(getFirst(), del);
+ }
+--- pipenightdreams-0.10.0.orig/src/pipenightdreams.cpp
++++ pipenightdreams-0.10.0/src/pipenightdreams.cpp
+@@ -99,6 +99,7 @@
+ switch (error){
+ case 1:{
+ showFinal();
++ game_over=true;
+ break;
+ }
+ case -1:{
+--- pipenightdreams-0.10.0.orig/src/player.cpp
++++ pipenightdreams-0.10.0/src/player.cpp
+@@ -163,14 +163,6 @@
+ queue->paint(vm);
+ }
+
+-void Player::setRestrictionCoef(unsigned int coef){
+- queue->setRestrictionCoef(coef);
+-}
+-
+-void Player::setFixedCoef(unsigned int coef){
+- queue->setFixedCoef(coef);
+-}
+-
+ void Player::tick(){
+ score->tick();
+
+--- pipenightdreams-0.10.0.orig/src/pointer.h
++++ pipenightdreams-0.10.0/src/pointer.h
+@@ -43,11 +43,27 @@
+
+ friend class Board;
+
+- inline void setRow(int row);
+- inline void setColumn(int column);
+- inline void setRowColumn(int row, int column);
+- inline void setMoved(bool flag);
+- inline bool moved();
++ inline void setRow(int row){
++ this->row=row;
++ }
++
++ inline void setColumn(int column){
++ this->column=column;
++ }
++
++ inline void setRowColumn(int row, int column){
++ this->row=row;
++ this->column=column;
++ }
++
++ inline void setMoved(bool flag){
++ moved_flag=flag;
++ }
++
++ inline bool moved(){
++ return moved_flag;
++ }
++
+
+ Str * image_name;
+ Image * ima;
+--- pipenightdreams-0.10.0.orig/src/player.h
++++ pipenightdreams-0.10.0/src/player.h
+@@ -47,8 +47,13 @@
+ void setStartRowColumn(int row, int column);
+ void setBoard(Board * bd);
+
+- inline void setRestrictionCoef(unsigned int coef);
+- inline void setFixedCoef(unsigned int coef);
++ inline void setRestrictionCoef(unsigned int coef){
++ queue->setRestrictionCoef(coef);
++ }
++
++ inline void setFixedCoef(unsigned int coef){
++ queue->setFixedCoef(coef);
++ }
+
+ void incLives();
+ void decLives();
+--- pipenightdreams-0.10.0.orig/src/hash.cpp
++++ pipenightdreams-0.10.0/src/hash.cpp
+@@ -55,10 +55,10 @@
+ return(sum % nbuckets);
+ }
+
+-Hash::Hash(int bs=256){
++Hash::Hash(int bs){
+ int i;
+ nbuckets=bs;
+- lbuckets=new (List *)[nbuckets];
++ lbuckets=new List *[nbuckets];
+
+ for (i=0;i<nbuckets;i++)
+ lbuckets[i]=new List();
+@@ -99,7 +99,7 @@
+ return NotAdded;
+ }
+
+-Hash::Result Hash::remove(Str * str, bool del=false){
++Hash::Result Hash::remove(Str * str, bool del){
+ if (str){
+ Index * i;
+ List * list=lbuckets[function(str)];
+@@ -135,7 +135,7 @@
+ return NULL;
+ }
+
+-void Hash::empty(bool del=true){
++void Hash::empty(bool del){
+ int i;
+ List * list;
+ for (i=0;i<nbuckets;i++){
+--- pipenightdreams-0.10.0.orig/src/eventmanager.cpp
++++ pipenightdreams-0.10.0/src/eventmanager.cpp
+@@ -40,7 +40,7 @@
+ lista_streams->remove(lista_streams->indexOf(s));
+ }
+
+-void EventManager::pumpEvents(bool wait=false){
++void EventManager::pumpEvents(bool wait){
+ SDL_Event event;
+ Index * stream;
+ bool got=false;
+--- pipenightdreams-0.10.0.orig/src/pointer.cpp
++++ pipenightdreams-0.10.0/src/pointer.cpp
+@@ -17,7 +17,7 @@
+
+ #include "pointer.h"
+
+-Pointer::Pointer(int row=0, int column=0){
++Pointer::Pointer(int row, int column){
+ this->row=row;
+ this->column=column;
+ this->moved_flag=true;
+@@ -25,27 +25,6 @@
+
+ Pointer::~Pointer(){ delete image_name;}
+
+-void Pointer::setRow(int row){
+- this->row=row;
+-}
+-
+-void Pointer::setColumn(int column){
+- this->column=column;
+-}
+-
+-void Pointer::setRowColumn(int row, int column){
+- this->row=row;
+- this->column=column;
+-}
+-
+-void Pointer::setMoved(bool flag){
+- moved_flag=flag;
+-}
+-
+-bool Pointer::moved(){
+- return moved_flag;
+-}
+-
+ int Pointer::getRow(){
+ return row;
+ }
+--- pipenightdreams-0.10.0.orig/src/score.cpp
++++ pipenightdreams-0.10.0/src/score.cpp
+@@ -18,7 +18,7 @@
+ #include "score.h"
+ #include <math.h>
+
+-Score::Score(int value=0){
++Score::Score(int value){
+ this->value=value;
+ delta=0;
+ changed=true;
+--- pipenightdreams-0.10.0.orig/src/main.cpp
++++ pipenightdreams-0.10.0/src/main.cpp
+@@ -36,10 +36,12 @@
+ if (data_dir) delete data_dir;
+ data_dir=new Str(argv[++i]);
+ }else
+- if (!strcmp("--fullscreen", argv[i]))
++ if (!strcmp("--level", argv[i])) {
++ level = atoi(argv[++i]);
++ } else if (!strcmp("--fullscreen", argv[i]))
+ fullscreen=true;
+ else{
+- printf("Invalid Data Dir\nUse pipenightdreams [--datadir <DATA DIR>] [--fullscreen]\n");
++ printf("Invalid Data Dir\nUse pipenightdreams [--datadir <DATA DIR>] [--fullscreen] [--level <level>]\n");
+ printf("Using default: %s\n", GAME_DATADIR);
+ }
+ i++;
+--- pipenightdreams-0.10.0.orig/src/level.ll
++++ pipenightdreams-0.10.0/src/level.ll
+@@ -93,6 +93,20 @@
+ #define INVALID 100
+
+ int nline;
++
++int Level::load(Str * filename){
++ YY_FLUSH_BUFFER;
++ nline=1;
++ if (!(yyin=fopen(filename->get(), "r"))){
++ delete filename;
++ return 1;
++ }
++ delete filename;
++ level();
++ fclose(yyin);
++ if (error) return -1;
++ return 0;
++}
+ %}
+
+ %option noyywrap
+@@ -599,17 +613,3 @@
+ }else printError(new Str("'pipenightdreams' not found"));
+ }
+
+-int Level::load(Str * filename){
+- YY_FLUSH_BUFFER;
+- nline=1;
+- if (!(yyin=fopen(filename->get(), "r"))){
+- delete filename;
+- return 1;
+- }
+- delete filename;
+- level();
+- fclose(yyin);
+- if (error) return -1;
+- return 0;
+-}
+-
+--- pipenightdreams-0.10.0.orig/src/graphic.cpp
++++ pipenightdreams-0.10.0/src/graphic.cpp
+@@ -44,11 +44,11 @@
+ if (pixels) free(pixels);
+ }
+
+-void Graphic::setAlpha(char value=OPAQUE){
++void Graphic::setAlpha(char value){
+ SDL_SetAlpha(surface, SDL_SRCALPHA, value);
+ }
+
+-void Graphic::enableClipping(bool flag=true){
++void Graphic::enableClipping(bool flag){
+
+ if (flag){
+ SDL_Rect rect;
+@@ -68,7 +68,7 @@
+ clip_height=height;
+ }
+
+-void Graphic::flip(Axis a=HAxis){
++void Graphic::flip(Axis a){
+ if (surface){
+ if (SDL_MUSTLOCK(surface))
+ if (SDL_LockSurface(surface)<0) return;
+--- pipenightdreams-0.10.0.orig/src/str.cpp
++++ pipenightdreams-0.10.0/src/str.cpp
+@@ -11,7 +11,7 @@
+
+ const char Str::nul = '\0';
+
+-Str::Str(const char * string=NULL){
++Str::Str(const char * string){
+ s=NULL;
+ set(string);
+ }
+@@ -25,7 +25,7 @@
+ if (s) delete[] s;
+ }
+
+-void Str::set(const char * string=NULL){
++void Str::set(const char * string){
+ if (s) delete[] s;
+ if (string){
+ s=new char[strlen(string)+1];
+@@ -71,7 +71,7 @@
+ return (strlen(s));
+ }
+
+-bool Str::isEqual(Str * str, bool case_sensitive = true){
++bool Str::isEqual(Str * str, bool case_sensitive){
+ if (case_sensitive){
+ return (!strcmp(s, str->s));
+ }
diff --git a/debian/rules b/debian/rules
index 5050f1c..46cf086 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,5 @@
dh $@ --parallel --with autoreconf
override_dh_auto_configure:
- autoreconf -i --force
dh_auto_configure -- --prefix=/usr --bindir=/usr/games --mandir=/usr/share/man
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/pipenightdreams.git
More information about the Pkg-games-commits
mailing list