Codebase list pipenightdreams / d177598
Patch imported form 1.0 cut into three patches Dariusz Dwornikowski 8 years ago
5 changed file(s) with 1266 addition(s) and 1121 deletion(s). Raw diff Collapse all Expand all
+43
-0
debian/patches/manpage.patch less more
0 From: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
1 Date: Tue, 24 Nov 2015 17:59:23 +0100
2 Subject: manpage
3
4 ---
5 man/pipenightdreams.6 | 6 ------
6 1 file changed, 6 deletions(-)
7
8 diff --git a/man/pipenightdreams.6 b/man/pipenightdreams.6
9 index 92d79a1..10d8d01 100644
10 --- a/man/pipenightdreams.6
11 +++ b/man/pipenightdreams.6
12 @@ -1,15 +1,12 @@
13 .TH PIPENIGHTDREAMS 6 "23rd May 2002"
14
15 .SH NAME
16 -
17 pipenightdreams \- Just another pipe trip (PipeDream clon).
18
19 .SH SYNOPSIS
20 -
21 \fB pipenightdreams\fP [\--datadir <DATADIR>] [\--fullscreen]
22
23 .SH DESCRIPTION
24 -
25 \fB pipenightdreams\fP is a PipeDream style game. The objetive of the game is to carry
26 liquid from some point to the exit using different kinds of pipes. On each level
27 there is a minimum number of required pipes that should be at least reached for it
28 @@ -46,7 +43,6 @@ The blue one.
29 .IP HYPER\ BONUS
30 The green one.
31
32 -
33 .SH OPTIONS
34 \fB --datadir <CUSTOM DATA DIR> \fP is used when
35 the data directory is not the default one (\fB /usr/share/games/pipenightdreams\fP
36 @@ -64,6 +60,4 @@ Pipenightdreams home page at
37 http://www.libsdl.org/projects/pipenightdreams
38
39 .SH AUTHORS
40 -
41 Waldemar A. Baraldi <baraldi@lacasilla.com.ar>
42 -
+825
-1120
debian/patches/migrate.patch less more
0 --- pipenightdreams-0.10.0.orig/man/pipenightdreams.6
1 +++ pipenightdreams-0.10.0/man/pipenightdreams.6
2 @@ -1,15 +1,12 @@
3 .TH PIPENIGHTDREAMS 6 "23rd May 2002"
4
5 .SH NAME
6 -
7 pipenightdreams \- Just another pipe trip (PipeDream clon).
8
9 .SH SYNOPSIS
10 -
11 \fB pipenightdreams\fP [\--datadir <DATADIR>] [\--fullscreen]
12
13 .SH DESCRIPTION
14 -
15 \fB pipenightdreams\fP is a PipeDream style game. The objetive of the game is to carry
16 liquid from some point to the exit using different kinds of pipes. On each level
17 there is a minimum number of required pipes that should be at least reached for it
18 @@ -46,7 +43,6 @@
19 .IP HYPER\ BONUS
20 The green one.
21
22 -
23 .SH OPTIONS
24 \fB --datadir <CUSTOM DATA DIR> \fP is used when
25 the data directory is not the default one (\fB /usr/share/games/pipenightdreams\fP
26 @@ -64,6 +60,4 @@
27 http://www.libsdl.org/projects/pipenightdreams
28
29 .SH AUTHORS
30 -
31 Waldemar A. Baraldi <baraldi@lacasilla.com.ar>
32 -
33 --- pipenightdreams-0.10.0.orig/man/Makefile.in
34 +++ pipenightdreams-0.10.0/man/Makefile.in
35 @@ -1,4 +1,4 @@
36 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
37 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
38
39 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
40 # This Makefile.in is free software; the Free Software Foundation
41 @@ -67,6 +67,7 @@
42 LEX = @LEX@
43 LIBTOOL = @LIBTOOL@
44 LN_S = @LN_S@
45 +MAINT = @MAINT@
46 MAKEINFO = @MAKEINFO@
47 NM = @NM@
48 OBJDUMP = @OBJDUMP@
49 @@ -92,11 +93,11 @@
50
51 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
52
53 -TAR = gtar
54 +TAR = tar
55 GZIP_ENV = --best
56 all: all-redirect
57 .SUFFIXES:
58 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
59 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
60 cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile
61
62 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
63 --- pipenightdreams-0.10.0.orig/src/pointer.cpp
64 +++ pipenightdreams-0.10.0/src/pointer.cpp
65 @@ -17,7 +17,7 @@
66
67 #include "pointer.h"
68
69 -Pointer::Pointer(int row=0, int column=0){
70 +Pointer::Pointer(int row, int column){
71 this->row=row;
72 this->column=column;
73 this->moved_flag=true;
74 @@ -25,27 +25,6 @@
75
76 Pointer::~Pointer(){ delete image_name;}
77
78 -void Pointer::setRow(int row){
79 - this->row=row;
80 -}
81 -
82 -void Pointer::setColumn(int column){
83 - this->column=column;
84 -}
85 -
86 -void Pointer::setRowColumn(int row, int column){
87 - this->row=row;
88 - this->column=column;
89 -}
90 -
91 -void Pointer::setMoved(bool flag){
92 - moved_flag=flag;
93 -}
94 -
95 -bool Pointer::moved(){
96 - return moved_flag;
97 -}
98 -
99 int Pointer::getRow(){
100 return row;
101 }
102 --- pipenightdreams-0.10.0.orig/src/score.cpp
103 +++ pipenightdreams-0.10.0/src/score.cpp
104 @@ -18,7 +18,7 @@
105 #include "score.h"
106 #include <math.h>
107
108 -Score::Score(int value=0){
109 +Score::Score(int value){
110 this->value=value;
111 delta=0;
112 changed=true;
113 --- pipenightdreams-0.10.0.orig/src/main.cpp
114 +++ pipenightdreams-0.10.0/src/main.cpp
115 @@ -36,10 +36,12 @@
116 if (data_dir) delete data_dir;
117 data_dir=new Str(argv[++i]);
118 }else
119 - if (!strcmp("--fullscreen", argv[i]))
120 + if (!strcmp("--level", argv[i])) {
121 + level = atoi(argv[++i]);
122 + } else if (!strcmp("--fullscreen", argv[i]))
123 fullscreen=true;
124 else{
125 - printf("Invalid Data Dir\nUse pipenightdreams [--datadir <DATA DIR>] [--fullscreen]\n");
126 + printf("Invalid Data Dir\nUse pipenightdreams [--datadir <DATA DIR>] [--fullscreen] [--level <level>]\n");
127 printf("Using default: %s\n", GAME_DATADIR);
128 }
129 i++;
130 --- pipenightdreams-0.10.0.orig/src/level.ll
131 +++ pipenightdreams-0.10.0/src/level.ll
132 @@ -93,6 +93,20 @@
133 #define INVALID 100
134
135 int nline;
136 +
137 +int Level::load(Str * filename){
138 + YY_FLUSH_BUFFER;
139 + nline=1;
140 + if (!(yyin=fopen(filename->get(), "r"))){
141 + delete filename;
142 + return 1;
143 + }
144 + delete filename;
145 + level();
146 + fclose(yyin);
147 + if (error) return -1;
148 + return 0;
149 +}
150 %}
151
152 %option noyywrap
153 @@ -599,17 +613,3 @@
154 }else printError(new Str("'pipenightdreams' not found"));
155 }
156
157 -int Level::load(Str * filename){
158 - YY_FLUSH_BUFFER;
159 - nline=1;
160 - if (!(yyin=fopen(filename->get(), "r"))){
161 - delete filename;
162 - return 1;
163 - }
164 - delete filename;
165 - level();
166 - fclose(yyin);
167 - if (error) return -1;
168 - return 0;
169 -}
170 -
171 --- pipenightdreams-0.10.0.orig/src/graphic.cpp
172 +++ pipenightdreams-0.10.0/src/graphic.cpp
173 @@ -44,11 +44,11 @@
174 if (pixels) free(pixels);
175 }
176
177 -void Graphic::setAlpha(char value=OPAQUE){
178 +void Graphic::setAlpha(char value){
179 SDL_SetAlpha(surface, SDL_SRCALPHA, value);
180 }
181
182 -void Graphic::enableClipping(bool flag=true){
183 +void Graphic::enableClipping(bool flag){
184
185 if (flag){
186 SDL_Rect rect;
187 @@ -68,7 +68,7 @@
188 clip_height=height;
189 }
190
191 -void Graphic::flip(Axis a=HAxis){
192 +void Graphic::flip(Axis a){
193 if (surface){
194 if (SDL_MUSTLOCK(surface))
195 if (SDL_LockSurface(surface)<0) return;
196 --- pipenightdreams-0.10.0.orig/src/str.cpp
197 +++ pipenightdreams-0.10.0/src/str.cpp
198 @@ -11,7 +11,7 @@
199
200 const char Str::nul = '\0';
201
202 -Str::Str(const char * string=NULL){
203 +Str::Str(const char * string){
204 s=NULL;
205 set(string);
206 }
207 @@ -25,7 +25,7 @@
208 if (s) delete[] s;
209 }
210
211 -void Str::set(const char * string=NULL){
212 +void Str::set(const char * string){
213 if (s) delete[] s;
214 if (string){
215 s=new char[strlen(string)+1];
216 @@ -71,7 +71,7 @@
217 return (strlen(s));
218 }
219
220 -bool Str::isEqual(Str * str, bool case_sensitive = true){
221 +bool Str::isEqual(Str * str, bool case_sensitive){
222 if (case_sensitive){
223 return (!strcmp(s, str->s));
224 }
225 --- pipenightdreams-0.10.0.orig/src/Makefile.in
226 +++ pipenightdreams-0.10.0/src/Makefile.in
227 @@ -1,4 +1,4 @@
228 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
229 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
230
231 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
232 # This Makefile.in is free software; the Free Software Foundation
233 @@ -67,6 +67,7 @@
234 LEX = @LEX@
235 LIBTOOL = @LIBTOOL@
236 LN_S = @LN_S@
237 +MAINT = @MAINT@
238 MAKEINFO = @MAKEINFO@
239 NM = @NM@
240 OBJDUMP = @OBJDUMP@
241 @@ -118,7 +119,7 @@
242
243 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
244
245 -TAR = gtar
246 +TAR = tar
247 GZIP_ENV = --best
248 DEP_FILES = .deps/board.P .deps/canvas.P .deps/cross.P \
249 .deps/elbowdownleft.P .deps/elbowdownright.P .deps/elbowupleft.P \
250 @@ -137,7 +138,7 @@
251 all: all-redirect
252 .SUFFIXES:
253 .SUFFIXES: .S .c .cc .cpp .ll .o .s
254 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
255 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
256 cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile
257
258 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
259 @@ -155,7 +156,7 @@
260 && CONFIG_FILES= CONFIG_HEADERS=src/config.h \
261 $(SHELL) ./config.status
262 @echo timestamp > stamp-h 2> /dev/null
263 -$(srcdir)/config.h.in: $(srcdir)/stamp-h.in
264 +$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-h.in
265 @if test ! -f $@; then \
266 rm -f $(srcdir)/stamp-h.in; \
267 $(MAKE) $(srcdir)/stamp-h.in; \
268 @@ -242,7 +243,7 @@
269 awk ' { files[$$0] = 1; } \
270 END { for (i in files) print i; }'`; \
271 test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
272 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
273 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP))
274
275 mostlyclean-tags:
276
277 @@ -382,7 +383,7 @@
278 -rm -f config.cache config.log stamp-h stamp-h[0-9]*
279
280 maintainer-clean-generic:
281 - -test -z "levelll" || rm -f levelll
282 + -test -z "levelcc" || rm -f levelcc
283 mostlyclean-am: mostlyclean-hdr mostlyclean-binPROGRAMS \
284 mostlyclean-compile mostlyclean-tags mostlyclean-depend \
285 mostlyclean-generic
286 --- pipenightdreams-0.10.0.orig/src/pipe.cpp
287 +++ pipenightdreams-0.10.0/src/pipe.cpp
288 @@ -43,11 +43,11 @@
289 return !(full_level>0) && !fixed;
290 }
291
292 -void Pipe::setFixed(bool flag=true){
293 +void Pipe::setFixed(bool flag){
294 fixed=flag;
295 }
296
297 -void Pipe::setBonus(Bonus bonus=NormalBonus){
298 +void Pipe::setBonus(Bonus bonus){
299 this->bonus=bonus;
300 }
301
302 --- pipenightdreams-0.10.0.orig/src/image.cpp
303 +++ pipenightdreams-0.10.0/src/image.cpp
304 @@ -19,7 +19,7 @@
305 #include "SDL_image.h"
306 #include <stdio.h>
307
308 -Image::Image(Str * filename=NULL):Graphic(){
309 +Image::Image(Str * filename):Graphic(){
310 if (filename) load(filename);
311 }
312
313 --- pipenightdreams-0.10.0.orig/src/config.h.in
314 +++ pipenightdreams-0.10.0/src/config.h.in
315 @@ -1,4 +1,4 @@
316 -/* src/config.h.in. Generated automatically from configure.in by autoheader. */
317 +/* src/config.h.in. Generated automatically from configure.in by autoheader 2.13. */
318
319 /* Define if lex declares yytext as a char * by default, not a char[]. */
320 #undef YYTEXT_POINTER
321 --- pipenightdreams-0.10.0.orig/src/list.cpp
322 +++ pipenightdreams-0.10.0/src/list.cpp
323 @@ -125,7 +125,7 @@
324 return (insert(indexOf(i), obj));
325 }
326
327 -List::Result List::remove(Index * index, bool del=false){
328 +List::Result List::remove(Index * index, bool del){
329 if (isEmpty()) return EmptyList;
330 if (!index) return NullIndex;
331
332 @@ -155,7 +155,7 @@
333 return Removed;
334 }
335
336 -void List::empty(bool del=true){
337 +void List::empty(bool del){
338 while (!isEmpty())
339 remove(getFirst(), del);
340 }
341 --- pipenightdreams-0.10.0.orig/src/pipenightdreams.cpp
342 +++ pipenightdreams-0.10.0/src/pipenightdreams.cpp
343 @@ -99,6 +99,7 @@
344 switch (error){
345 case 1:{
346 showFinal();
347 + game_over=true;
348 break;
349 }
350 case -1:{
351 --- pipenightdreams-0.10.0.orig/src/player.cpp
352 +++ pipenightdreams-0.10.0/src/player.cpp
353 @@ -163,14 +163,6 @@
354 queue->paint(vm);
355 }
356
357 -void Player::setRestrictionCoef(unsigned int coef){
358 - queue->setRestrictionCoef(coef);
359 -}
360 -
361 -void Player::setFixedCoef(unsigned int coef){
362 - queue->setFixedCoef(coef);
363 -}
364 -
365 void Player::tick(){
366 score->tick();
367
368 --- pipenightdreams-0.10.0.orig/src/pointer.h
369 +++ pipenightdreams-0.10.0/src/pointer.h
370 @@ -43,11 +43,27 @@
371
372 friend class Board;
373
374 - inline void setRow(int row);
375 - inline void setColumn(int column);
376 - inline void setRowColumn(int row, int column);
377 - inline void setMoved(bool flag);
378 - inline bool moved();
379 + inline void setRow(int row){
380 + this->row=row;
381 + }
382 +
383 + inline void setColumn(int column){
384 + this->column=column;
385 + }
386 +
387 + inline void setRowColumn(int row, int column){
388 + this->row=row;
389 + this->column=column;
390 + }
391 +
392 + inline void setMoved(bool flag){
393 + moved_flag=flag;
394 + }
395 +
396 + inline bool moved(){
397 + return moved_flag;
398 + }
399 +
400
401 Str * image_name;
402 Image * ima;
403 --- pipenightdreams-0.10.0.orig/src/player.h
404 +++ pipenightdreams-0.10.0/src/player.h
405 @@ -47,8 +47,13 @@
406 void setStartRowColumn(int row, int column);
407 void setBoard(Board * bd);
408
409 - inline void setRestrictionCoef(unsigned int coef);
410 - inline void setFixedCoef(unsigned int coef);
411 + inline void setRestrictionCoef(unsigned int coef){
412 + queue->setRestrictionCoef(coef);
413 + }
414 +
415 + inline void setFixedCoef(unsigned int coef){
416 + queue->setFixedCoef(coef);
417 + }
418
419 void incLives();
420 void decLives();
421 --- pipenightdreams-0.10.0.orig/src/hash.cpp
422 +++ pipenightdreams-0.10.0/src/hash.cpp
423 @@ -55,10 +55,10 @@
424 return(sum % nbuckets);
425 }
426
427 -Hash::Hash(int bs=256){
428 +Hash::Hash(int bs){
429 int i;
430 nbuckets=bs;
431 - lbuckets=new (List *)[nbuckets];
432 + lbuckets=new List *[nbuckets];
433
434 for (i=0;i<nbuckets;i++)
435 lbuckets[i]=new List();
436 @@ -99,7 +99,7 @@
437 return NotAdded;
438 }
439
440 -Hash::Result Hash::remove(Str * str, bool del=false){
441 +Hash::Result Hash::remove(Str * str, bool del){
442 if (str){
443 Index * i;
444 List * list=lbuckets[function(str)];
445 @@ -135,7 +135,7 @@
446 return NULL;
447 }
448
449 -void Hash::empty(bool del=true){
450 +void Hash::empty(bool del){
451 int i;
452 List * list;
453 for (i=0;i<nbuckets;i++){
454 --- pipenightdreams-0.10.0.orig/src/eventmanager.cpp
455 +++ pipenightdreams-0.10.0/src/eventmanager.cpp
456 @@ -40,7 +40,7 @@
457 lista_streams->remove(lista_streams->indexOf(s));
458 }
459
460 -void EventManager::pumpEvents(bool wait=false){
461 +void EventManager::pumpEvents(bool wait){
462 SDL_Event event;
463 Index * stream;
464 bool got=false;
465 --- pipenightdreams-0.10.0.orig/Makefile.in
466 +++ pipenightdreams-0.10.0/Makefile.in
467 @@ -1,4 +1,4 @@
468 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
469 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
470
471 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
472 # This Makefile.in is free software; the Free Software Foundation
473 @@ -67,6 +67,7 @@
474 LEX = @LEX@
475 LIBTOOL = @LIBTOOL@
476 LN_S = @LN_S@
477 +MAINT = @MAINT@
478 MAKEINFO = @MAKEINFO@
479 NM = @NM@
480 OBJDUMP = @OBJDUMP@
481 @@ -85,32 +86,60 @@
0 From: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
1 Date: Tue, 24 Nov 2015 17:59:23 +0100
2 Subject: migrate
3
4 ---
5 Makefile.in | 67 ++++++++++++-----
6 aclocal.m4 | 71 +++++++++++++++++-
7 configure | 135 +++++++++++++++++++++-------------
8 configure.in | 2 +-
9 images/Makefile.in | 9 ++-
10 images/arrows_grey/Makefile.in | 7 +-
11 images/arrows_yellow/Makefile.in | 7 +-
12 images/default/Makefile.in | 7 +-
13 images/flow_blue/Makefile.in | 7 +-
14 images/flow_green/Makefile.in | 7 +-
15 images/flow_light/Makefile.in | 7 +-
16 images/pipes_cables/Makefile.in | 7 +-
17 images/pipes_metal/Makefile.in | 7 +-
18 images/pipes_space/Makefile.in | 9 ++-
19 images/pipes_space/back01/Makefile.in | 7 +-
20 images/pipes_space/back02/Makefile.in | 7 +-
21 images/pipes_space/back03/Makefile.in | 7 +-
22 images/pipes_space/back04/Makefile.in | 7 +-
23 images/pipes_space/back05/Makefile.in | 7 +-
24 images/pipes_toys/Makefile.in | 7 +-
25 images/pipes_wire/Makefile.in | 7 +-
26 levels/Makefile.in | 7 +-
27 man/Makefile.in | 7 +-
28 src/Makefile.in | 13 ++--
29 24 files changed, 283 insertions(+), 142 deletions(-)
30
31 diff --git a/Makefile.in b/Makefile.in
32 index ad2016c..3dc9eaa 100644
33 --- a/Makefile.in
34 +++ b/Makefile.in
35 @@ -1,4 +1,4 @@
36 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
37 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
38
39 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
40 # This Makefile.in is free software; the Free Software Foundation
41 @@ -67,6 +67,7 @@ LD = @LD@
42 LEX = @LEX@
43 LIBTOOL = @LIBTOOL@
44 LN_S = @LN_S@
45 +MAINT = @MAINT@
46 MAKEINFO = @MAKEINFO@
47 NM = @NM@
48 OBJDUMP = @OBJDUMP@
49 @@ -85,32 +86,60 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
48250 CONFIG_HEADER = ./src/config.h
48351 CONFIG_CLEAN_FILES =
48452 DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
546114 # This directory's subdirectories are mostly independent; you can cd
547115 # into them and run `make' without going through this Makefile.
548116 # To change the values of `make' variables: instead of editing Makefiles,
549 @@ -189,7 +218,7 @@
117 @@ -189,7 +218,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
550118 awk ' { files[$$0] = 1; } \
551119 END { for (i in files) print i; }'`; \
552120 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
555123
556124 mostlyclean-tags:
557125
558 @@ -299,32 +328,32 @@
126 @@ -299,32 +328,32 @@ distclean-generic:
559127 -rm -f config.cache config.log stamp-h stamp-h[0-9]*
560128
561129 maintainer-clean-generic:
598166 maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
599167 distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
600168 dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
601 --- pipenightdreams-0.10.0.orig/configure
602 +++ pipenightdreams-0.10.0/configure
169 diff --git a/aclocal.m4 b/aclocal.m4
170 index 9641c3c..b5cc7e3 100644
171 --- a/aclocal.m4
172 +++ b/aclocal.m4
173 @@ -1,4 +1,4 @@
174 -dnl aclocal.m4 generated automatically by aclocal 1.4-p5
175 +dnl aclocal.m4 generated automatically by aclocal 1.4-p6
176
177 dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
178 dnl This file is free software; the Free Software Foundation
179 @@ -646,7 +646,8 @@ dnl Usage:
180 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
181
182 AC_DEFUN([AM_INIT_AUTOMAKE],
183 -[AC_REQUIRE([AC_PROG_INSTALL])
184 +[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
185 +AC_REQUIRE([AC_PROG_INSTALL])
186 PACKAGE=[$1]
187 AC_SUBST(PACKAGE)
188 VERSION=[$2]
189 @@ -662,13 +663,42 @@ AC_REQUIRE([AM_SANITY_CHECK])
190 AC_REQUIRE([AC_ARG_PROGRAM])
191 dnl FIXME This is truly gross.
192 missing_dir=`cd $ac_aux_dir && pwd`
193 -AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
194 +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
195 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
196 -AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
197 +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
198 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
199 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
200 AC_REQUIRE([AC_PROG_MAKE_SET])])
201
202 +# Copyright 2002 Free Software Foundation, Inc.
203 +
204 +# This program is free software; you can redistribute it and/or modify
205 +# it under the terms of the GNU General Public License as published by
206 +# the Free Software Foundation; either version 2, or (at your option)
207 +# any later version.
208 +
209 +# This program is distributed in the hope that it will be useful,
210 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
211 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
212 +# GNU General Public License for more details.
213 +
214 +# You should have received a copy of the GNU General Public License
215 +# along with this program; if not, write to the Free Software
216 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
217 +
218 +# AM_AUTOMAKE_VERSION(VERSION)
219 +# ----------------------------
220 +# Automake X.Y traces this macro to ensure aclocal.m4 has been
221 +# generated from the m4 files accompanying Automake X.Y.
222 +AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
223 +
224 +# AM_SET_CURRENT_AUTOMAKE_VERSION
225 +# -------------------------------
226 +# Call AM_AUTOMAKE_VERSION so it can be traced.
227 +# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
228 +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
229 + [AM_AUTOMAKE_VERSION([1.4-p6])])
230 +
231 #
232 # Check to make sure that the build environment is sane.
233 #
234 @@ -728,6 +758,39 @@ else
235 fi
236 AC_SUBST($1)])
237
238 +# Add --enable-maintainer-mode option to configure.
239 +# From Jim Meyering
240 +
241 +# serial 1
242 +
243 +AC_DEFUN([AM_MAINTAINER_MODE],
244 +[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
245 + dnl maintainer-mode is disabled by default
246 + AC_ARG_ENABLE(maintainer-mode,
247 +[ --enable-maintainer-mode enable make rules and dependencies not useful
248 + (and sometimes confusing) to the casual installer],
249 + USE_MAINTAINER_MODE=$enableval,
250 + USE_MAINTAINER_MODE=no)
251 + AC_MSG_RESULT($USE_MAINTAINER_MODE)
252 + AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
253 + MAINT=$MAINTAINER_MODE_TRUE
254 + AC_SUBST(MAINT)dnl
255 +]
256 +)
257 +
258 +# Define a conditional.
259 +
260 +AC_DEFUN([AM_CONDITIONAL],
261 +[AC_SUBST($1_TRUE)
262 +AC_SUBST($1_FALSE)
263 +if $2; then
264 + $1_TRUE=
265 + $1_FALSE='#'
266 +else
267 + $1_TRUE='#'
268 + $1_FALSE=
269 +fi])
270 +
271 # Like AC_CONFIG_HEADER, but automatically create stamp file.
272
273 AC_DEFUN([AM_CONFIG_HEADER],
274 diff --git a/configure b/configure
275 index 45d594a..5a392b6 100755
276 --- a/configure
277 +++ b/configure
603278 @@ -11,6 +11,9 @@
604279 ac_help=
605280 ac_default_prefix=/usr/local
610285 ac_default_prefix=/usr/local
611286 ac_help="$ac_help
612287 --with-sdl-prefix=PFX Prefix where SDL is installed (optional)"
613 @@ -529,7 +532,7 @@
288 @@ -529,7 +532,7 @@ fi
614289
615290
616291 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
619294 # On Suns, sometimes $CPP names a directory.
620295 if test -n "$CPP" && test -d "$CPP"; then
621296 CPP=
622 @@ -544,13 +547,13 @@
297 @@ -544,13 +547,13 @@ else
623298 # On the NeXT, cc -E runs the code through the compiler's parser,
624299 # not just through cpp.
625300 cat > conftest.$ac_ext <<EOF
635310 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
636311 if test -z "$ac_err"; then
637312 :
638 @@ -561,13 +564,13 @@
313 @@ -561,13 +564,13 @@ else
639314 rm -rf conftest*
640315 CPP="${CC-cc} -E -traditional-cpp"
641316 cat > conftest.$ac_ext <<EOF
651326 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
652327 if test -z "$ac_err"; then
653328 :
654 @@ -578,13 +581,13 @@
329 @@ -578,13 +581,13 @@ else
655330 rm -rf conftest*
656331 CPP="${CC-cc} -nologo -E"
657332 cat > conftest.$ac_ext <<EOF
667342 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
668343 if test -z "$ac_err"; then
669344 :
670 @@ -614,7 +617,7 @@
345 @@ -614,7 +617,7 @@ do
671346 # Extract the first word of "$ac_prog", so it can be a program name with args.
672347 set dummy $ac_prog; ac_word=$2
673348 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
676351 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
677352 echo $ac_n "(cached) $ac_c" 1>&6
678353 else
679 @@ -647,7 +650,7 @@
354 @@ -647,7 +650,7 @@ test -n "$LEX" || LEX=""$missing_dir/missing flex""
680355 # Extract the first word of "flex", so it can be a program name with args.
681356 set dummy flex; ac_word=$2
682357 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
685360 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
686361 echo $ac_n "(cached) $ac_c" 1>&6
687362 else
688 @@ -681,7 +684,7 @@
363 @@ -681,7 +684,7 @@ then
689364 *) ac_lib=l ;;
690365 esac
691366 echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
694369 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
695370 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
696371 echo $ac_n "(cached) $ac_c" 1>&6
697 @@ -689,7 +692,7 @@
372 @@ -689,7 +692,7 @@ else
698373 ac_save_LIBS="$LIBS"
699374 LIBS="-l$ac_lib $LIBS"
700375 cat > conftest.$ac_ext <<EOF
703378 #include "confdefs.h"
704379 /* Override any gcc2 internal prototype to avoid an error. */
705380 /* We use char because int might match the return type of a gcc2
706 @@ -700,7 +703,7 @@
381 @@ -700,7 +703,7 @@ int main() {
707382 yywrap()
708383 ; return 0; }
709384 EOF
712387 rm -rf conftest*
713388 eval "ac_cv_lib_$ac_lib_var=yes"
714389 else
715 @@ -723,7 +726,7 @@
390 @@ -723,7 +726,7 @@ fi
716391 fi
717392
718393 echo $ac_n "checking lex output file root""... $ac_c" 1>&6
721396 if eval "test \"`echo '$''{'ac_cv_prog_lex_root'+set}'`\" = set"; then
722397 echo $ac_n "(cached) $ac_c" 1>&6
723398 else
724 @@ -744,7 +747,7 @@
399 @@ -744,7 +747,7 @@ echo "$ac_t""$ac_cv_prog_lex_root" 1>&6
725400 LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
726401
727402 echo $ac_n "checking whether yytext is a pointer""... $ac_c" 1>&6
730405 if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then
731406 echo $ac_n "(cached) $ac_c" 1>&6
732407 else
733 @@ -756,14 +759,14 @@
408 @@ -756,14 +759,14 @@ echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
734409 ac_save_LIBS="$LIBS"
735410 LIBS="$LIBS $LEXLIB"
736411 cat > conftest.$ac_ext <<EOF
747422 rm -rf conftest*
748423 ac_cv_prog_lex_yytext_pointer=yes
749424 else
750 @@ -808,6 +811,7 @@
425 @@ -808,6 +811,7 @@ ac_config_guess=$ac_aux_dir/config.guess
751426 ac_config_sub=$ac_aux_dir/config.sub
752427 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
753428
755430 # Find a good install program. We prefer a C program (faster),
756431 # so one script is as good as another. But avoid the broken or
757432 # incompatible versions:
758 @@ -820,7 +824,7 @@
433 @@ -820,7 +824,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
759434 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
760435 # ./install, which can be erroneously created by make from ./install.sh.
761436 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
764439 if test -z "$INSTALL"; then
765440 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
766441 echo $ac_n "(cached) $ac_c" 1>&6
767 @@ -873,7 +877,7 @@
442 @@ -873,7 +877,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
768443 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
769444
770445 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
773448 # Just in case
774449 sleep 1
775450 echo timestamp > conftestfile
776 @@ -930,7 +934,7 @@
451 @@ -930,7 +934,7 @@ test "$program_suffix" != NONE &&
777452 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
778453
779454 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
782457 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
783458 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
784459 echo $ac_n "(cached) $ac_c" 1>&6
785 @@ -975,21 +979,21 @@
460 @@ -975,21 +979,21 @@ EOF
786461
787462
788463 missing_dir=`cd $ac_aux_dir && pwd`
810485 # Run test in a subshell; some versions of sh will print an error if
811486 # an executable is not found, even if stderr is redirected.
812487 # Redirect stdin to placate older versions of autoconf. Sigh.
813 @@ -1001,21 +1005,21 @@
488 @@ -1001,21 +1005,21 @@ else
814489 echo "$ac_t""missing" 1>&6
815490 fi
816491
838513 # Run test in a subshell; some versions of sh will print an error if
839514 # an executable is not found, even if stderr is redirected.
840515 # Redirect stdin to placate older versions of autoconf. Sigh.
841 @@ -1028,7 +1032,7 @@
516 @@ -1028,7 +1032,7 @@ else
842517 fi
843518
844519 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
847522 # Run test in a subshell; some versions of sh will print an error if
848523 # an executable is not found, even if stderr is redirected.
849524 # Redirect stdin to placate older versions of autoconf. Sigh.
850 @@ -1041,18 +1045,40 @@
525 @@ -1041,18 +1045,40 @@ else
851526 fi
852527
853528
890565 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
891566 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
892567 echo $ac_n "(cached) $ac_c" 1>&6
893 @@ -1083,7 +1109,7 @@
568 @@ -1083,7 +1109,7 @@ do
894569 # Extract the first word of "$ac_prog", so it can be a program name with args.
895570 set dummy $ac_prog; ac_word=$2
896571 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
899574 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
900575 echo $ac_n "(cached) $ac_c" 1>&6
901576 else
902 @@ -1115,7 +1141,7 @@
577 @@ -1115,7 +1141,7 @@ test -n "$CXX" || CXX="gcc"
903578
904579
905580 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
908583
909584 ac_ext=C
910585 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
911 @@ -1126,12 +1152,12 @@
586 @@ -1126,12 +1152,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
912587
913588 cat > conftest.$ac_ext << EOF
914589
923598 ac_cv_prog_cxx_works=yes
924599 # If we can't run a trivial program, we are probably using a cross compiler.
925600 if (./conftest; exit) 2>/dev/null; then
926 @@ -1157,12 +1183,12 @@
601 @@ -1157,12 +1183,12 @@ if test $ac_cv_prog_cxx_works = no; then
927602 { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
928603 fi
929604 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
938613 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
939614 echo $ac_n "(cached) $ac_c" 1>&6
940615 else
941 @@ -1171,7 +1197,7 @@
616 @@ -1171,7 +1197,7 @@ else
942617 yes;
943618 #endif
944619 EOF
947622 ac_cv_prog_gxx=yes
948623 else
949624 ac_cv_prog_gxx=no
950 @@ -1190,7 +1216,7 @@
625 @@ -1190,7 +1216,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}"
951626 ac_save_CXXFLAGS="$CXXFLAGS"
952627 CXXFLAGS=
953628 echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
956631 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
957632 echo $ac_n "(cached) $ac_c" 1>&6
958633 else
959 @@ -1233,7 +1259,7 @@
634 @@ -1233,7 +1259,7 @@ fi
960635 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
961636 # ./install, which can be erroneously created by make from ./install.sh.
962637 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
965640 if test -z "$INSTALL"; then
966641 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
967642 echo $ac_n "(cached) $ac_c" 1>&6
968 @@ -1293,7 +1319,7 @@
643 @@ -1293,7 +1319,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
969644
970645 #AC_CANONICAL_HOST
971646 echo $ac_n "checking target system type""... $ac_c" 1>&6
974649
975650 target_alias=$target
976651 case "$target_alias" in
977 @@ -1361,7 +1387,7 @@
652 @@ -1361,7 +1387,7 @@ fi
978653 # Extract the first word of "sdl-config", so it can be a program name with args.
979654 set dummy sdl-config; ac_word=$2
980655 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
983658 if eval "test \"`echo '$''{'ac_cv_path_SDL_CONFIG'+set}'`\" = set"; then
984659 echo $ac_n "(cached) $ac_c" 1>&6
985660 else
986 @@ -1396,7 +1422,7 @@
661 @@ -1396,7 +1422,7 @@ fi
987662
988663 min_sdl_version=$SDL_VERSION
989664 echo $ac_n "checking for SDL - version >= $min_sdl_version""... $ac_c" 1>&6
992667 no_sdl=""
993668 if test "$SDL_CONFIG" = "no" ; then
994669 no_sdl=yes
995 @@ -1420,7 +1446,7 @@
670 @@ -1420,7 +1446,7 @@ echo "configure:1400: checking for SDL - version >= $min_sdl_version" >&5
996671 echo $ac_n "cross compiling; assumed OK... $ac_c"
997672 else
998673 cat > conftest.$ac_ext <<EOF
1001676 #include "confdefs.h"
1002677
1003678 #include <stdio.h>
1004 @@ -1478,7 +1504,7 @@
679 @@ -1478,7 +1504,7 @@ int main ()
1005680
1006681
1007682 EOF
1010685 then
1011686 :
1012687 else
1013 @@ -1512,7 +1538,7 @@
688 @@ -1512,7 +1538,7 @@ fi
1014689 CFLAGS="$CFLAGS $SDL_CFLAGS"
1015690 LIBS="$LIBS $SDL_LIBS"
1016691 cat > conftest.$ac_ext <<EOF
1019694 #include "confdefs.h"
1020695
1021696 #include <stdio.h>
1022 @@ -1522,7 +1548,7 @@
697 @@ -1522,7 +1548,7 @@ int main() {
1023698 return 0;
1024699 ; return 0; }
1025700 EOF
1028703 rm -rf conftest*
1029704 echo "*** The test program compiled, but did not run. This usually means"
1030705 echo "*** that the run-time linker is not finding SDL or finding the wrong"
1031 @@ -1561,7 +1587,7 @@
706 @@ -1561,7 +1587,7 @@ CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
1032707 LIBS="$LIBS $SDL_LIBS"
1033708
1034709 echo $ac_n "checking for IMG_Load in -lSDL_image""... $ac_c" 1>&6
1037712 ac_lib_var=`echo SDL_image'_'IMG_Load | sed 'y%./+-%__p_%'`
1038713 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1039714 echo $ac_n "(cached) $ac_c" 1>&6
1040 @@ -1569,7 +1595,7 @@
715 @@ -1569,7 +1595,7 @@ else
1041716 ac_save_LIBS="$LIBS"
1042717 LIBS="-lSDL_image $LIBS"
1043718 cat > conftest.$ac_ext <<EOF
1046721 #include "confdefs.h"
1047722 /* Override any gcc2 internal prototype to avoid an error. */
1048723 /* We use char because int might match the return type of a gcc2
1049 @@ -1580,7 +1606,7 @@
724 @@ -1580,7 +1606,7 @@ int main() {
1050725 IMG_Load()
1051726 ; return 0; }
1052727 EOF
1055730 rm -rf conftest*
1056731 eval "ac_cv_lib_$ac_lib_var=yes"
1057732 else
1058 @@ -1799,6 +1825,9 @@
733 @@ -1799,6 +1825,9 @@ s%@AUTOMAKE@%$AUTOMAKE%g
1059734 s%@AUTOHEADER@%$AUTOHEADER%g
1060735 s%@MAKEINFO@%$MAKEINFO%g
1061736 s%@SET_MAKE@%$SET_MAKE%g
1065740 s%@CXX@%$CXX%g
1066741 s%@target@%$target%g
1067742 s%@target_alias@%$target_alias%g
1068 --- pipenightdreams-0.10.0.orig/configure.in
1069 +++ pipenightdreams-0.10.0/configure.in
1070 @@ -9,9 +9,9 @@
743 diff --git a/configure.in b/configure.in
744 index c148040..44b0ec9 100644
745 --- a/configure.in
746 +++ b/configure.in
747 @@ -9,9 +9,9 @@ AM_PROG_LEX
1071748 # archive.
1072749
1073750 AM_INIT_AUTOMAKE(pipenightdreams, 0.10.0)
1078755
1079756 # We now have a list of macros which tell autoconf what tools we need to
1080757 # build our software, in this case "make", a C++ compiler, and "install".
1081 --- pipenightdreams-0.10.0.orig/aclocal.m4
1082 +++ pipenightdreams-0.10.0/aclocal.m4
1083 @@ -1,4 +1,4 @@
1084 -dnl aclocal.m4 generated automatically by aclocal 1.4-p5
1085 +dnl aclocal.m4 generated automatically by aclocal 1.4-p6
1086
1087 dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
1088 dnl This file is free software; the Free Software Foundation
1089 @@ -646,7 +646,8 @@
1090 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
1091
1092 AC_DEFUN([AM_INIT_AUTOMAKE],
1093 -[AC_REQUIRE([AC_PROG_INSTALL])
1094 +[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
1095 +AC_REQUIRE([AC_PROG_INSTALL])
1096 PACKAGE=[$1]
1097 AC_SUBST(PACKAGE)
1098 VERSION=[$2]
1099 @@ -662,13 +663,42 @@
1100 AC_REQUIRE([AC_ARG_PROGRAM])
1101 dnl FIXME This is truly gross.
1102 missing_dir=`cd $ac_aux_dir && pwd`
1103 -AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
1104 +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
1105 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
1106 -AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
1107 +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
1108 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
1109 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
1110 AC_REQUIRE([AC_PROG_MAKE_SET])])
1111
1112 +# Copyright 2002 Free Software Foundation, Inc.
1113 +
1114 +# This program is free software; you can redistribute it and/or modify
1115 +# it under the terms of the GNU General Public License as published by
1116 +# the Free Software Foundation; either version 2, or (at your option)
1117 +# any later version.
1118 +
1119 +# This program is distributed in the hope that it will be useful,
1120 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
1121 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1122 +# GNU General Public License for more details.
1123 +
1124 +# You should have received a copy of the GNU General Public License
1125 +# along with this program; if not, write to the Free Software
1126 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
1127 +
1128 +# AM_AUTOMAKE_VERSION(VERSION)
1129 +# ----------------------------
1130 +# Automake X.Y traces this macro to ensure aclocal.m4 has been
1131 +# generated from the m4 files accompanying Automake X.Y.
1132 +AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
1133 +
1134 +# AM_SET_CURRENT_AUTOMAKE_VERSION
1135 +# -------------------------------
1136 +# Call AM_AUTOMAKE_VERSION so it can be traced.
1137 +# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
1138 +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
1139 + [AM_AUTOMAKE_VERSION([1.4-p6])])
1140 +
1141 #
1142 # Check to make sure that the build environment is sane.
1143 #
1144 @@ -728,6 +758,39 @@
1145 fi
1146 AC_SUBST($1)])
1147
1148 +# Add --enable-maintainer-mode option to configure.
1149 +# From Jim Meyering
1150 +
1151 +# serial 1
1152 +
1153 +AC_DEFUN([AM_MAINTAINER_MODE],
1154 +[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
1155 + dnl maintainer-mode is disabled by default
1156 + AC_ARG_ENABLE(maintainer-mode,
1157 +[ --enable-maintainer-mode enable make rules and dependencies not useful
1158 + (and sometimes confusing) to the casual installer],
1159 + USE_MAINTAINER_MODE=$enableval,
1160 + USE_MAINTAINER_MODE=no)
1161 + AC_MSG_RESULT($USE_MAINTAINER_MODE)
1162 + AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
1163 + MAINT=$MAINTAINER_MODE_TRUE
1164 + AC_SUBST(MAINT)dnl
1165 +]
1166 +)
1167 +
1168 +# Define a conditional.
1169 +
1170 +AC_DEFUN([AM_CONDITIONAL],
1171 +[AC_SUBST($1_TRUE)
1172 +AC_SUBST($1_FALSE)
1173 +if $2; then
1174 + $1_TRUE=
1175 + $1_FALSE='#'
1176 +else
1177 + $1_TRUE='#'
1178 + $1_FALSE=
1179 +fi])
1180 +
1181 # Like AC_CONFIG_HEADER, but automatically create stamp file.
1182
1183 AC_DEFUN([AM_CONFIG_HEADER],
1184 --- pipenightdreams-0.10.0.orig/levels/Makefile.in
1185 +++ pipenightdreams-0.10.0/levels/Makefile.in
1186 @@ -1,4 +1,4 @@
1187 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
1188 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
1189
1190 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
1191 # This Makefile.in is free software; the Free Software Foundation
1192 @@ -65,6 +65,7 @@
1193 LEX = @LEX@
1194 LIBTOOL = @LIBTOOL@
1195 LN_S = @LN_S@
1196 +MAINT = @MAINT@
1197 MAKEINFO = @MAKEINFO@
1198 NM = @NM@
1199 OBJDUMP = @OBJDUMP@
1200 @@ -88,11 +89,11 @@
1201
1202 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
1203
1204 -TAR = gtar
1205 +TAR = tar
1206 GZIP_ENV = --best
1207 all: all-redirect
1208 .SUFFIXES:
1209 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1210 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1211 cd $(top_srcdir) && $(AUTOMAKE) --gnu levels/Makefile
1212
1213 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
1214 --- pipenightdreams-0.10.0.orig/images/flow_green/Makefile.in
1215 +++ pipenightdreams-0.10.0/images/flow_green/Makefile.in
1216 @@ -1,4 +1,4 @@
1217 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
1218 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
1219
1220 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
1221 # This Makefile.in is free software; the Free Software Foundation
1222 @@ -65,6 +65,7 @@
1223 LEX = @LEX@
1224 LIBTOOL = @LIBTOOL@
1225 LN_S = @LN_S@
1226 +MAINT = @MAINT@
1227 MAKEINFO = @MAKEINFO@
1228 NM = @NM@
1229 OBJDUMP = @OBJDUMP@
1230 @@ -88,11 +89,11 @@
1231
1232 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
1233
1234 -TAR = gtar
1235 +TAR = tar
1236 GZIP_ENV = --best
1237 all: all-redirect
1238 .SUFFIXES:
1239 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1240 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1241 cd $(top_srcdir) && $(AUTOMAKE) --gnu images/flow_green/Makefile
1242
1243 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
1244 --- pipenightdreams-0.10.0.orig/images/pipes_metal/Makefile.in
1245 +++ pipenightdreams-0.10.0/images/pipes_metal/Makefile.in
1246 @@ -1,4 +1,4 @@
1247 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
1248 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
1249
1250 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
1251 # This Makefile.in is free software; the Free Software Foundation
1252 @@ -65,6 +65,7 @@
1253 LEX = @LEX@
1254 LIBTOOL = @LIBTOOL@
1255 LN_S = @LN_S@
1256 +MAINT = @MAINT@
1257 MAKEINFO = @MAKEINFO@
1258 NM = @NM@
1259 OBJDUMP = @OBJDUMP@
1260 @@ -88,11 +89,11 @@
1261
1262 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
1263
1264 -TAR = gtar
1265 +TAR = tar
1266 GZIP_ENV = --best
1267 all: all-redirect
1268 .SUFFIXES:
1269 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1270 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1271 cd $(top_srcdir) && $(AUTOMAKE) --gnu images/pipes_metal/Makefile
1272
1273 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
1274 --- pipenightdreams-0.10.0.orig/images/flow_light/Makefile.in
1275 +++ pipenightdreams-0.10.0/images/flow_light/Makefile.in
1276 @@ -1,4 +1,4 @@
1277 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
1278 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
1279
1280 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
1281 # This Makefile.in is free software; the Free Software Foundation
1282 @@ -65,6 +65,7 @@
1283 LEX = @LEX@
1284 LIBTOOL = @LIBTOOL@
1285 LN_S = @LN_S@
1286 +MAINT = @MAINT@
1287 MAKEINFO = @MAKEINFO@
1288 NM = @NM@
1289 OBJDUMP = @OBJDUMP@
1290 @@ -88,11 +89,11 @@
1291
1292 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
1293
1294 -TAR = gtar
1295 +TAR = tar
1296 GZIP_ENV = --best
1297 all: all-redirect
1298 .SUFFIXES:
1299 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1300 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1301 cd $(top_srcdir) && $(AUTOMAKE) --gnu images/flow_light/Makefile
1302
1303 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
1304 --- pipenightdreams-0.10.0.orig/images/arrows_yellow/Makefile.in
1305 +++ pipenightdreams-0.10.0/images/arrows_yellow/Makefile.in
1306 @@ -1,4 +1,4 @@
1307 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
1308 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
1309
1310 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
1311 # This Makefile.in is free software; the Free Software Foundation
1312 @@ -65,6 +65,7 @@
1313 LEX = @LEX@
1314 LIBTOOL = @LIBTOOL@
1315 LN_S = @LN_S@
1316 +MAINT = @MAINT@
1317 MAKEINFO = @MAKEINFO@
1318 NM = @NM@
1319 OBJDUMP = @OBJDUMP@
1320 @@ -88,11 +89,11 @@
1321
1322 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
1323
1324 -TAR = gtar
1325 +TAR = tar
1326 GZIP_ENV = --best
1327 all: all-redirect
1328 .SUFFIXES:
1329 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1330 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1331 cd $(top_srcdir) && $(AUTOMAKE) --gnu images/arrows_yellow/Makefile
1332
1333 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
1334 --- pipenightdreams-0.10.0.orig/images/pipes_space/back01/Makefile.in
1335 +++ pipenightdreams-0.10.0/images/pipes_space/back01/Makefile.in
1336 @@ -1,4 +1,4 @@
1337 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
1338 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
1339
1340 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
1341 # This Makefile.in is free software; the Free Software Foundation
1342 @@ -65,6 +65,7 @@
1343 LEX = @LEX@
1344 LIBTOOL = @LIBTOOL@
1345 LN_S = @LN_S@
1346 +MAINT = @MAINT@
1347 MAKEINFO = @MAKEINFO@
1348 NM = @NM@
1349 OBJDUMP = @OBJDUMP@
1350 @@ -88,11 +89,11 @@
1351
1352 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
1353
1354 -TAR = gtar
1355 +TAR = tar
1356 GZIP_ENV = --best
1357 all: all-redirect
1358 .SUFFIXES:
1359 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1360 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1361 cd $(top_srcdir) && $(AUTOMAKE) --gnu images/pipes_space/back01/Makefile
1362
1363 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
1364 --- pipenightdreams-0.10.0.orig/images/pipes_space/back02/Makefile.in
1365 +++ pipenightdreams-0.10.0/images/pipes_space/back02/Makefile.in
1366 @@ -1,4 +1,4 @@
1367 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
1368 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
1369
1370 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
1371 # This Makefile.in is free software; the Free Software Foundation
1372 @@ -65,6 +65,7 @@
1373 LEX = @LEX@
1374 LIBTOOL = @LIBTOOL@
1375 LN_S = @LN_S@
1376 +MAINT = @MAINT@
1377 MAKEINFO = @MAKEINFO@
1378 NM = @NM@
1379 OBJDUMP = @OBJDUMP@
1380 @@ -88,11 +89,11 @@
1381
1382 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
1383
1384 -TAR = gtar
1385 +TAR = tar
1386 GZIP_ENV = --best
1387 all: all-redirect
1388 .SUFFIXES:
1389 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1390 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1391 cd $(top_srcdir) && $(AUTOMAKE) --gnu images/pipes_space/back02/Makefile
1392
1393 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
1394 --- pipenightdreams-0.10.0.orig/images/pipes_space/back04/Makefile.in
1395 +++ pipenightdreams-0.10.0/images/pipes_space/back04/Makefile.in
1396 @@ -1,4 +1,4 @@
1397 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
1398 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
1399
1400 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
1401 # This Makefile.in is free software; the Free Software Foundation
1402 @@ -65,6 +65,7 @@
1403 LEX = @LEX@
1404 LIBTOOL = @LIBTOOL@
1405 LN_S = @LN_S@
1406 +MAINT = @MAINT@
1407 MAKEINFO = @MAKEINFO@
1408 NM = @NM@
1409 OBJDUMP = @OBJDUMP@
1410 @@ -88,11 +89,11 @@
1411
1412 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
1413
1414 -TAR = gtar
1415 +TAR = tar
1416 GZIP_ENV = --best
1417 all: all-redirect
1418 .SUFFIXES:
1419 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1420 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1421 cd $(top_srcdir) && $(AUTOMAKE) --gnu images/pipes_space/back04/Makefile
1422
1423 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
1424 --- pipenightdreams-0.10.0.orig/images/pipes_space/back05/Makefile.in
1425 +++ pipenightdreams-0.10.0/images/pipes_space/back05/Makefile.in
1426 @@ -1,4 +1,4 @@
1427 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
1428 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
1429
1430 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
1431 # This Makefile.in is free software; the Free Software Foundation
1432 @@ -65,6 +65,7 @@
1433 LEX = @LEX@
1434 LIBTOOL = @LIBTOOL@
1435 LN_S = @LN_S@
1436 +MAINT = @MAINT@
1437 MAKEINFO = @MAKEINFO@
1438 NM = @NM@
1439 OBJDUMP = @OBJDUMP@
1440 @@ -88,11 +89,11 @@
1441
1442 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
1443
1444 -TAR = gtar
1445 +TAR = tar
1446 GZIP_ENV = --best
1447 all: all-redirect
1448 .SUFFIXES:
1449 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1450 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1451 cd $(top_srcdir) && $(AUTOMAKE) --gnu images/pipes_space/back05/Makefile
1452
1453 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
1454 --- pipenightdreams-0.10.0.orig/images/pipes_space/back03/Makefile.in
1455 +++ pipenightdreams-0.10.0/images/pipes_space/back03/Makefile.in
1456 @@ -1,4 +1,4 @@
1457 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
1458 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
1459
1460 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
1461 # This Makefile.in is free software; the Free Software Foundation
1462 @@ -65,6 +65,7 @@
1463 LEX = @LEX@
1464 LIBTOOL = @LIBTOOL@
1465 LN_S = @LN_S@
1466 +MAINT = @MAINT@
1467 MAKEINFO = @MAKEINFO@
1468 NM = @NM@
1469 OBJDUMP = @OBJDUMP@
1470 @@ -88,11 +89,11 @@
1471
1472 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
1473
1474 -TAR = gtar
1475 +TAR = tar
1476 GZIP_ENV = --best
1477 all: all-redirect
1478 .SUFFIXES:
1479 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1480 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1481 cd $(top_srcdir) && $(AUTOMAKE) --gnu images/pipes_space/back03/Makefile
1482
1483 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
1484 --- pipenightdreams-0.10.0.orig/images/pipes_space/Makefile.in
1485 +++ pipenightdreams-0.10.0/images/pipes_space/Makefile.in
1486 @@ -1,4 +1,4 @@
1487 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
1488 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
1489
1490 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
1491 # This Makefile.in is free software; the Free Software Foundation
1492 @@ -65,6 +65,7 @@
1493 LEX = @LEX@
1494 LIBTOOL = @LIBTOOL@
1495 LN_S = @LN_S@
1496 +MAINT = @MAINT@
1497 MAKEINFO = @MAKEINFO@
1498 NM = @NM@
1499 OBJDUMP = @OBJDUMP@
1500 @@ -90,11 +91,11 @@
1501
1502 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
1503
1504 -TAR = gtar
1505 +TAR = tar
1506 GZIP_ENV = --best
1507 all: all-redirect
1508 .SUFFIXES:
1509 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1510 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1511 cd $(top_srcdir) && $(AUTOMAKE) --gnu images/pipes_space/Makefile
1512
1513 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
1514 @@ -199,7 +200,7 @@
758 diff --git a/images/Makefile.in b/images/Makefile.in
759 index 8a2e593..6eb3656 100644
760 --- a/images/Makefile.in
761 +++ b/images/Makefile.in
762 @@ -1,4 +1,4 @@
763 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
764 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
765
766 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
767 # This Makefile.in is free software; the Free Software Foundation
768 @@ -65,6 +65,7 @@ LD = @LD@
769 LEX = @LEX@
770 LIBTOOL = @LIBTOOL@
771 LN_S = @LN_S@
772 +MAINT = @MAINT@
773 MAKEINFO = @MAKEINFO@
774 NM = @NM@
775 OBJDUMP = @OBJDUMP@
776 @@ -90,11 +91,11 @@ DIST_COMMON = Makefile.am Makefile.in
777
778 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
779
780 -TAR = gtar
781 +TAR = tar
782 GZIP_ENV = --best
783 all: all-redirect
784 .SUFFIXES:
785 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
786 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
787 cd $(top_srcdir) && $(AUTOMAKE) --gnu images/Makefile
788
789 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
790 @@ -199,7 +200,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
1515791 awk ' { files[$$0] = 1; } \
1516792 END { for (i in files) print i; }'`; \
1517793 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
1520796
1521797 mostlyclean-tags:
1522798
1523 --- pipenightdreams-0.10.0.orig/images/default/Makefile.in
1524 +++ pipenightdreams-0.10.0/images/default/Makefile.in
1525 @@ -1,4 +1,4 @@
1526 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
1527 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
1528
1529 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
1530 # This Makefile.in is free software; the Free Software Foundation
1531 @@ -65,6 +65,7 @@
1532 LEX = @LEX@
1533 LIBTOOL = @LIBTOOL@
1534 LN_S = @LN_S@
1535 +MAINT = @MAINT@
1536 MAKEINFO = @MAKEINFO@
1537 NM = @NM@
1538 OBJDUMP = @OBJDUMP@
1539 @@ -88,11 +89,11 @@
799 diff --git a/images/arrows_grey/Makefile.in b/images/arrows_grey/Makefile.in
800 index 50ecde1..666f3c1 100644
801 --- a/images/arrows_grey/Makefile.in
802 +++ b/images/arrows_grey/Makefile.in
803 @@ -1,4 +1,4 @@
804 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
805 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
806
807 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
808 # This Makefile.in is free software; the Free Software Foundation
809 @@ -65,6 +65,7 @@ LD = @LD@
810 LEX = @LEX@
811 LIBTOOL = @LIBTOOL@
812 LN_S = @LN_S@
813 +MAINT = @MAINT@
814 MAKEINFO = @MAKEINFO@
815 NM = @NM@
816 OBJDUMP = @OBJDUMP@
817 @@ -88,11 +89,11 @@ DIST_COMMON = Makefile.am Makefile.in
818
819 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
820
821 -TAR = gtar
822 +TAR = tar
823 GZIP_ENV = --best
824 all: all-redirect
825 .SUFFIXES:
826 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
827 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
828 cd $(top_srcdir) && $(AUTOMAKE) --gnu images/arrows_grey/Makefile
829
830 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
831 diff --git a/images/arrows_yellow/Makefile.in b/images/arrows_yellow/Makefile.in
832 index c5e974c..a3c0686 100644
833 --- a/images/arrows_yellow/Makefile.in
834 +++ b/images/arrows_yellow/Makefile.in
835 @@ -1,4 +1,4 @@
836 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
837 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
838
839 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
840 # This Makefile.in is free software; the Free Software Foundation
841 @@ -65,6 +65,7 @@ LD = @LD@
842 LEX = @LEX@
843 LIBTOOL = @LIBTOOL@
844 LN_S = @LN_S@
845 +MAINT = @MAINT@
846 MAKEINFO = @MAKEINFO@
847 NM = @NM@
848 OBJDUMP = @OBJDUMP@
849 @@ -88,11 +89,11 @@ DIST_COMMON = Makefile.am Makefile.in
850
851 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
852
853 -TAR = gtar
854 +TAR = tar
855 GZIP_ENV = --best
856 all: all-redirect
857 .SUFFIXES:
858 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
859 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
860 cd $(top_srcdir) && $(AUTOMAKE) --gnu images/arrows_yellow/Makefile
861
862 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
863 diff --git a/images/default/Makefile.in b/images/default/Makefile.in
864 index 2e16f7f..447cb47 100644
865 --- a/images/default/Makefile.in
866 +++ b/images/default/Makefile.in
867 @@ -1,4 +1,4 @@
868 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
869 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
870
871 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
872 # This Makefile.in is free software; the Free Software Foundation
873 @@ -65,6 +65,7 @@ LD = @LD@
874 LEX = @LEX@
875 LIBTOOL = @LIBTOOL@
876 LN_S = @LN_S@
877 +MAINT = @MAINT@
878 MAKEINFO = @MAKEINFO@
879 NM = @NM@
880 OBJDUMP = @OBJDUMP@
881 @@ -88,11 +89,11 @@ DIST_COMMON = Makefile.am Makefile.in
1540882
1541883 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
1542884
1550892 cd $(top_srcdir) && $(AUTOMAKE) --gnu images/default/Makefile
1551893
1552894 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
1553 --- pipenightdreams-0.10.0.orig/images/flow_blue/Makefile.in
1554 +++ pipenightdreams-0.10.0/images/flow_blue/Makefile.in
1555 @@ -1,4 +1,4 @@
1556 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
1557 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
1558
1559 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
1560 # This Makefile.in is free software; the Free Software Foundation
1561 @@ -65,6 +65,7 @@
1562 LEX = @LEX@
1563 LIBTOOL = @LIBTOOL@
1564 LN_S = @LN_S@
1565 +MAINT = @MAINT@
1566 MAKEINFO = @MAKEINFO@
1567 NM = @NM@
1568 OBJDUMP = @OBJDUMP@
1569 @@ -88,11 +89,11 @@
895 diff --git a/images/flow_blue/Makefile.in b/images/flow_blue/Makefile.in
896 index 8baa822..fec41c8 100644
897 --- a/images/flow_blue/Makefile.in
898 +++ b/images/flow_blue/Makefile.in
899 @@ -1,4 +1,4 @@
900 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
901 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
902
903 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
904 # This Makefile.in is free software; the Free Software Foundation
905 @@ -65,6 +65,7 @@ LD = @LD@
906 LEX = @LEX@
907 LIBTOOL = @LIBTOOL@
908 LN_S = @LN_S@
909 +MAINT = @MAINT@
910 MAKEINFO = @MAKEINFO@
911 NM = @NM@
912 OBJDUMP = @OBJDUMP@
913 @@ -88,11 +89,11 @@ DIST_COMMON = Makefile.am Makefile.in
1570914
1571915 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
1572916
1580924 cd $(top_srcdir) && $(AUTOMAKE) --gnu images/flow_blue/Makefile
1581925
1582926 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
1583 --- pipenightdreams-0.10.0.orig/images/Makefile.in
1584 +++ pipenightdreams-0.10.0/images/Makefile.in
1585 @@ -1,4 +1,4 @@
1586 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
1587 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
1588
1589 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
1590 # This Makefile.in is free software; the Free Software Foundation
1591 @@ -65,6 +65,7 @@
1592 LEX = @LEX@
1593 LIBTOOL = @LIBTOOL@
1594 LN_S = @LN_S@
1595 +MAINT = @MAINT@
1596 MAKEINFO = @MAKEINFO@
1597 NM = @NM@
1598 OBJDUMP = @OBJDUMP@
1599 @@ -90,11 +91,11 @@
1600
1601 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
1602
1603 -TAR = gtar
1604 +TAR = tar
1605 GZIP_ENV = --best
1606 all: all-redirect
1607 .SUFFIXES:
1608 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1609 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1610 cd $(top_srcdir) && $(AUTOMAKE) --gnu images/Makefile
1611
1612 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
1613 @@ -199,7 +200,7 @@
927 diff --git a/images/flow_green/Makefile.in b/images/flow_green/Makefile.in
928 index b1dcb06..9a31d12 100644
929 --- a/images/flow_green/Makefile.in
930 +++ b/images/flow_green/Makefile.in
931 @@ -1,4 +1,4 @@
932 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
933 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
934
935 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
936 # This Makefile.in is free software; the Free Software Foundation
937 @@ -65,6 +65,7 @@ LD = @LD@
938 LEX = @LEX@
939 LIBTOOL = @LIBTOOL@
940 LN_S = @LN_S@
941 +MAINT = @MAINT@
942 MAKEINFO = @MAKEINFO@
943 NM = @NM@
944 OBJDUMP = @OBJDUMP@
945 @@ -88,11 +89,11 @@ DIST_COMMON = Makefile.am Makefile.in
946
947 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
948
949 -TAR = gtar
950 +TAR = tar
951 GZIP_ENV = --best
952 all: all-redirect
953 .SUFFIXES:
954 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
955 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
956 cd $(top_srcdir) && $(AUTOMAKE) --gnu images/flow_green/Makefile
957
958 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
959 diff --git a/images/flow_light/Makefile.in b/images/flow_light/Makefile.in
960 index 746eea0..790890f 100644
961 --- a/images/flow_light/Makefile.in
962 +++ b/images/flow_light/Makefile.in
963 @@ -1,4 +1,4 @@
964 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
965 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
966
967 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
968 # This Makefile.in is free software; the Free Software Foundation
969 @@ -65,6 +65,7 @@ LD = @LD@
970 LEX = @LEX@
971 LIBTOOL = @LIBTOOL@
972 LN_S = @LN_S@
973 +MAINT = @MAINT@
974 MAKEINFO = @MAKEINFO@
975 NM = @NM@
976 OBJDUMP = @OBJDUMP@
977 @@ -88,11 +89,11 @@ DIST_COMMON = Makefile.am Makefile.in
978
979 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
980
981 -TAR = gtar
982 +TAR = tar
983 GZIP_ENV = --best
984 all: all-redirect
985 .SUFFIXES:
986 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
987 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
988 cd $(top_srcdir) && $(AUTOMAKE) --gnu images/flow_light/Makefile
989
990 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
991 diff --git a/images/pipes_cables/Makefile.in b/images/pipes_cables/Makefile.in
992 index 03c2e4c..dabea67 100644
993 --- a/images/pipes_cables/Makefile.in
994 +++ b/images/pipes_cables/Makefile.in
995 @@ -1,4 +1,4 @@
996 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
997 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
998
999 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
1000 # This Makefile.in is free software; the Free Software Foundation
1001 @@ -65,6 +65,7 @@ LD = @LD@
1002 LEX = @LEX@
1003 LIBTOOL = @LIBTOOL@
1004 LN_S = @LN_S@
1005 +MAINT = @MAINT@
1006 MAKEINFO = @MAKEINFO@
1007 NM = @NM@
1008 OBJDUMP = @OBJDUMP@
1009 @@ -88,11 +89,11 @@ DIST_COMMON = Makefile.am Makefile.in
1010
1011 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
1012
1013 -TAR = gtar
1014 +TAR = tar
1015 GZIP_ENV = --best
1016 all: all-redirect
1017 .SUFFIXES:
1018 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1019 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1020 cd $(top_srcdir) && $(AUTOMAKE) --gnu images/pipes_cables/Makefile
1021
1022 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
1023 diff --git a/images/pipes_metal/Makefile.in b/images/pipes_metal/Makefile.in
1024 index 2b6bfb6..6764f95 100644
1025 --- a/images/pipes_metal/Makefile.in
1026 +++ b/images/pipes_metal/Makefile.in
1027 @@ -1,4 +1,4 @@
1028 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
1029 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
1030
1031 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
1032 # This Makefile.in is free software; the Free Software Foundation
1033 @@ -65,6 +65,7 @@ LD = @LD@
1034 LEX = @LEX@
1035 LIBTOOL = @LIBTOOL@
1036 LN_S = @LN_S@
1037 +MAINT = @MAINT@
1038 MAKEINFO = @MAKEINFO@
1039 NM = @NM@
1040 OBJDUMP = @OBJDUMP@
1041 @@ -88,11 +89,11 @@ DIST_COMMON = Makefile.am Makefile.in
1042
1043 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
1044
1045 -TAR = gtar
1046 +TAR = tar
1047 GZIP_ENV = --best
1048 all: all-redirect
1049 .SUFFIXES:
1050 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1051 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1052 cd $(top_srcdir) && $(AUTOMAKE) --gnu images/pipes_metal/Makefile
1053
1054 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
1055 diff --git a/images/pipes_space/Makefile.in b/images/pipes_space/Makefile.in
1056 index b7b163b..7cb4433 100644
1057 --- a/images/pipes_space/Makefile.in
1058 +++ b/images/pipes_space/Makefile.in
1059 @@ -1,4 +1,4 @@
1060 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
1061 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
1062
1063 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
1064 # This Makefile.in is free software; the Free Software Foundation
1065 @@ -65,6 +65,7 @@ LD = @LD@
1066 LEX = @LEX@
1067 LIBTOOL = @LIBTOOL@
1068 LN_S = @LN_S@
1069 +MAINT = @MAINT@
1070 MAKEINFO = @MAKEINFO@
1071 NM = @NM@
1072 OBJDUMP = @OBJDUMP@
1073 @@ -90,11 +91,11 @@ DIST_COMMON = Makefile.am Makefile.in
1074
1075 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
1076
1077 -TAR = gtar
1078 +TAR = tar
1079 GZIP_ENV = --best
1080 all: all-redirect
1081 .SUFFIXES:
1082 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1083 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1084 cd $(top_srcdir) && $(AUTOMAKE) --gnu images/pipes_space/Makefile
1085
1086 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
1087 @@ -199,7 +200,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
16141088 awk ' { files[$$0] = 1; } \
16151089 END { for (i in files) print i; }'`; \
16161090 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
16191093
16201094 mostlyclean-tags:
16211095
1622 --- pipenightdreams-0.10.0.orig/images/arrows_grey/Makefile.in
1623 +++ pipenightdreams-0.10.0/images/arrows_grey/Makefile.in
1624 @@ -1,4 +1,4 @@
1625 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
1626 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
1627
1628 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
1629 # This Makefile.in is free software; the Free Software Foundation
1630 @@ -65,6 +65,7 @@
1631 LEX = @LEX@
1632 LIBTOOL = @LIBTOOL@
1633 LN_S = @LN_S@
1634 +MAINT = @MAINT@
1635 MAKEINFO = @MAKEINFO@
1636 NM = @NM@
1637 OBJDUMP = @OBJDUMP@
1638 @@ -88,11 +89,11 @@
1639
1640 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
1641
1642 -TAR = gtar
1643 +TAR = tar
1644 GZIP_ENV = --best
1645 all: all-redirect
1646 .SUFFIXES:
1647 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1648 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1649 cd $(top_srcdir) && $(AUTOMAKE) --gnu images/arrows_grey/Makefile
1650
1651 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
1652 --- pipenightdreams-0.10.0.orig/images/pipes_toys/Makefile.in
1653 +++ pipenightdreams-0.10.0/images/pipes_toys/Makefile.in
1654 @@ -1,4 +1,4 @@
1655 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
1656 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
1657
1658 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
1659 # This Makefile.in is free software; the Free Software Foundation
1660 @@ -65,6 +65,7 @@
1661 LEX = @LEX@
1662 LIBTOOL = @LIBTOOL@
1663 LN_S = @LN_S@
1664 +MAINT = @MAINT@
1665 MAKEINFO = @MAKEINFO@
1666 NM = @NM@
1667 OBJDUMP = @OBJDUMP@
1668 @@ -88,11 +89,11 @@
1096 diff --git a/images/pipes_space/back01/Makefile.in b/images/pipes_space/back01/Makefile.in
1097 index df70e8a..d3840c4 100644
1098 --- a/images/pipes_space/back01/Makefile.in
1099 +++ b/images/pipes_space/back01/Makefile.in
1100 @@ -1,4 +1,4 @@
1101 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
1102 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
1103
1104 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
1105 # This Makefile.in is free software; the Free Software Foundation
1106 @@ -65,6 +65,7 @@ LD = @LD@
1107 LEX = @LEX@
1108 LIBTOOL = @LIBTOOL@
1109 LN_S = @LN_S@
1110 +MAINT = @MAINT@
1111 MAKEINFO = @MAKEINFO@
1112 NM = @NM@
1113 OBJDUMP = @OBJDUMP@
1114 @@ -88,11 +89,11 @@ DIST_COMMON = Makefile.am Makefile.in
1115
1116 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
1117
1118 -TAR = gtar
1119 +TAR = tar
1120 GZIP_ENV = --best
1121 all: all-redirect
1122 .SUFFIXES:
1123 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1124 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1125 cd $(top_srcdir) && $(AUTOMAKE) --gnu images/pipes_space/back01/Makefile
1126
1127 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
1128 diff --git a/images/pipes_space/back02/Makefile.in b/images/pipes_space/back02/Makefile.in
1129 index 00bb98a..74045b8 100644
1130 --- a/images/pipes_space/back02/Makefile.in
1131 +++ b/images/pipes_space/back02/Makefile.in
1132 @@ -1,4 +1,4 @@
1133 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
1134 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
1135
1136 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
1137 # This Makefile.in is free software; the Free Software Foundation
1138 @@ -65,6 +65,7 @@ LD = @LD@
1139 LEX = @LEX@
1140 LIBTOOL = @LIBTOOL@
1141 LN_S = @LN_S@
1142 +MAINT = @MAINT@
1143 MAKEINFO = @MAKEINFO@
1144 NM = @NM@
1145 OBJDUMP = @OBJDUMP@
1146 @@ -88,11 +89,11 @@ DIST_COMMON = Makefile.am Makefile.in
1147
1148 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
1149
1150 -TAR = gtar
1151 +TAR = tar
1152 GZIP_ENV = --best
1153 all: all-redirect
1154 .SUFFIXES:
1155 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1156 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1157 cd $(top_srcdir) && $(AUTOMAKE) --gnu images/pipes_space/back02/Makefile
1158
1159 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
1160 diff --git a/images/pipes_space/back03/Makefile.in b/images/pipes_space/back03/Makefile.in
1161 index 14dc741..7392be8 100644
1162 --- a/images/pipes_space/back03/Makefile.in
1163 +++ b/images/pipes_space/back03/Makefile.in
1164 @@ -1,4 +1,4 @@
1165 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
1166 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
1167
1168 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
1169 # This Makefile.in is free software; the Free Software Foundation
1170 @@ -65,6 +65,7 @@ LD = @LD@
1171 LEX = @LEX@
1172 LIBTOOL = @LIBTOOL@
1173 LN_S = @LN_S@
1174 +MAINT = @MAINT@
1175 MAKEINFO = @MAKEINFO@
1176 NM = @NM@
1177 OBJDUMP = @OBJDUMP@
1178 @@ -88,11 +89,11 @@ DIST_COMMON = Makefile.am Makefile.in
1179
1180 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
1181
1182 -TAR = gtar
1183 +TAR = tar
1184 GZIP_ENV = --best
1185 all: all-redirect
1186 .SUFFIXES:
1187 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1188 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1189 cd $(top_srcdir) && $(AUTOMAKE) --gnu images/pipes_space/back03/Makefile
1190
1191 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
1192 diff --git a/images/pipes_space/back04/Makefile.in b/images/pipes_space/back04/Makefile.in
1193 index 7bc3660..c4de7d0 100644
1194 --- a/images/pipes_space/back04/Makefile.in
1195 +++ b/images/pipes_space/back04/Makefile.in
1196 @@ -1,4 +1,4 @@
1197 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
1198 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
1199
1200 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
1201 # This Makefile.in is free software; the Free Software Foundation
1202 @@ -65,6 +65,7 @@ LD = @LD@
1203 LEX = @LEX@
1204 LIBTOOL = @LIBTOOL@
1205 LN_S = @LN_S@
1206 +MAINT = @MAINT@
1207 MAKEINFO = @MAKEINFO@
1208 NM = @NM@
1209 OBJDUMP = @OBJDUMP@
1210 @@ -88,11 +89,11 @@ DIST_COMMON = Makefile.am Makefile.in
1211
1212 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
1213
1214 -TAR = gtar
1215 +TAR = tar
1216 GZIP_ENV = --best
1217 all: all-redirect
1218 .SUFFIXES:
1219 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1220 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1221 cd $(top_srcdir) && $(AUTOMAKE) --gnu images/pipes_space/back04/Makefile
1222
1223 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
1224 diff --git a/images/pipes_space/back05/Makefile.in b/images/pipes_space/back05/Makefile.in
1225 index 7a8bf18..3b59404 100644
1226 --- a/images/pipes_space/back05/Makefile.in
1227 +++ b/images/pipes_space/back05/Makefile.in
1228 @@ -1,4 +1,4 @@
1229 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
1230 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
1231
1232 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
1233 # This Makefile.in is free software; the Free Software Foundation
1234 @@ -65,6 +65,7 @@ LD = @LD@
1235 LEX = @LEX@
1236 LIBTOOL = @LIBTOOL@
1237 LN_S = @LN_S@
1238 +MAINT = @MAINT@
1239 MAKEINFO = @MAKEINFO@
1240 NM = @NM@
1241 OBJDUMP = @OBJDUMP@
1242 @@ -88,11 +89,11 @@ DIST_COMMON = Makefile.am Makefile.in
1243
1244 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
1245
1246 -TAR = gtar
1247 +TAR = tar
1248 GZIP_ENV = --best
1249 all: all-redirect
1250 .SUFFIXES:
1251 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1252 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1253 cd $(top_srcdir) && $(AUTOMAKE) --gnu images/pipes_space/back05/Makefile
1254
1255 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
1256 diff --git a/images/pipes_toys/Makefile.in b/images/pipes_toys/Makefile.in
1257 index b7a9ee2..812a6ec 100644
1258 --- a/images/pipes_toys/Makefile.in
1259 +++ b/images/pipes_toys/Makefile.in
1260 @@ -1,4 +1,4 @@
1261 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
1262 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
1263
1264 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
1265 # This Makefile.in is free software; the Free Software Foundation
1266 @@ -65,6 +65,7 @@ LD = @LD@
1267 LEX = @LEX@
1268 LIBTOOL = @LIBTOOL@
1269 LN_S = @LN_S@
1270 +MAINT = @MAINT@
1271 MAKEINFO = @MAKEINFO@
1272 NM = @NM@
1273 OBJDUMP = @OBJDUMP@
1274 @@ -88,11 +89,11 @@ DIST_COMMON = Makefile.am Makefile.in
16691275
16701276 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
16711277
16791285 cd $(top_srcdir) && $(AUTOMAKE) --gnu images/pipes_toys/Makefile
16801286
16811287 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
1682 --- pipenightdreams-0.10.0.orig/images/pipes_cables/Makefile.in
1683 +++ pipenightdreams-0.10.0/images/pipes_cables/Makefile.in
1684 @@ -1,4 +1,4 @@
1685 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
1686 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
1687
1688 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
1689 # This Makefile.in is free software; the Free Software Foundation
1690 @@ -65,6 +65,7 @@
1691 LEX = @LEX@
1692 LIBTOOL = @LIBTOOL@
1693 LN_S = @LN_S@
1694 +MAINT = @MAINT@
1695 MAKEINFO = @MAKEINFO@
1696 NM = @NM@
1697 OBJDUMP = @OBJDUMP@
1698 @@ -88,11 +89,11 @@
1699
1700 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
1701
1702 -TAR = gtar
1703 +TAR = tar
1704 GZIP_ENV = --best
1705 all: all-redirect
1706 .SUFFIXES:
1707 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1708 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1709 cd $(top_srcdir) && $(AUTOMAKE) --gnu images/pipes_cables/Makefile
1710
1711 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
1712 --- pipenightdreams-0.10.0.orig/images/pipes_wire/Makefile.in
1713 +++ pipenightdreams-0.10.0/images/pipes_wire/Makefile.in
1714 @@ -1,4 +1,4 @@
1715 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
1716 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
1717
1718 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
1719 # This Makefile.in is free software; the Free Software Foundation
1720 @@ -65,6 +65,7 @@
1721 LEX = @LEX@
1722 LIBTOOL = @LIBTOOL@
1723 LN_S = @LN_S@
1724 +MAINT = @MAINT@
1725 MAKEINFO = @MAKEINFO@
1726 NM = @NM@
1727 OBJDUMP = @OBJDUMP@
1728 @@ -88,11 +89,11 @@
1288 diff --git a/images/pipes_wire/Makefile.in b/images/pipes_wire/Makefile.in
1289 index e3d12a7..c6a320a 100644
1290 --- a/images/pipes_wire/Makefile.in
1291 +++ b/images/pipes_wire/Makefile.in
1292 @@ -1,4 +1,4 @@
1293 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
1294 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
1295
1296 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
1297 # This Makefile.in is free software; the Free Software Foundation
1298 @@ -65,6 +65,7 @@ LD = @LD@
1299 LEX = @LEX@
1300 LIBTOOL = @LIBTOOL@
1301 LN_S = @LN_S@
1302 +MAINT = @MAINT@
1303 MAKEINFO = @MAKEINFO@
1304 NM = @NM@
1305 OBJDUMP = @OBJDUMP@
1306 @@ -88,11 +89,11 @@ DIST_COMMON = Makefile.am Makefile.in
17291307
17301308 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
17311309
17391317 cd $(top_srcdir) && $(AUTOMAKE) --gnu images/pipes_wire/Makefile
17401318
17411319 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
1320 diff --git a/levels/Makefile.in b/levels/Makefile.in
1321 index 9b4cf48..d344cf9 100644
1322 --- a/levels/Makefile.in
1323 +++ b/levels/Makefile.in
1324 @@ -1,4 +1,4 @@
1325 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
1326 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
1327
1328 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
1329 # This Makefile.in is free software; the Free Software Foundation
1330 @@ -65,6 +65,7 @@ LD = @LD@
1331 LEX = @LEX@
1332 LIBTOOL = @LIBTOOL@
1333 LN_S = @LN_S@
1334 +MAINT = @MAINT@
1335 MAKEINFO = @MAKEINFO@
1336 NM = @NM@
1337 OBJDUMP = @OBJDUMP@
1338 @@ -88,11 +89,11 @@ DIST_COMMON = Makefile.am Makefile.in
1339
1340 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
1341
1342 -TAR = gtar
1343 +TAR = tar
1344 GZIP_ENV = --best
1345 all: all-redirect
1346 .SUFFIXES:
1347 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1348 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1349 cd $(top_srcdir) && $(AUTOMAKE) --gnu levels/Makefile
1350
1351 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
1352 diff --git a/man/Makefile.in b/man/Makefile.in
1353 index 9e40d62..4779d02 100644
1354 --- a/man/Makefile.in
1355 +++ b/man/Makefile.in
1356 @@ -1,4 +1,4 @@
1357 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
1358 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
1359
1360 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
1361 # This Makefile.in is free software; the Free Software Foundation
1362 @@ -67,6 +67,7 @@ LD = @LD@
1363 LEX = @LEX@
1364 LIBTOOL = @LIBTOOL@
1365 LN_S = @LN_S@
1366 +MAINT = @MAINT@
1367 MAKEINFO = @MAKEINFO@
1368 NM = @NM@
1369 OBJDUMP = @OBJDUMP@
1370 @@ -92,11 +93,11 @@ DIST_COMMON = Makefile.am Makefile.in
1371
1372 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
1373
1374 -TAR = gtar
1375 +TAR = tar
1376 GZIP_ENV = --best
1377 all: all-redirect
1378 .SUFFIXES:
1379 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1380 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1381 cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile
1382
1383 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
1384 diff --git a/src/Makefile.in b/src/Makefile.in
1385 index fbddd31..e267bc5 100644
1386 --- a/src/Makefile.in
1387 +++ b/src/Makefile.in
1388 @@ -1,4 +1,4 @@
1389 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
1390 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
1391
1392 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
1393 # This Makefile.in is free software; the Free Software Foundation
1394 @@ -67,6 +67,7 @@ LD = @LD@
1395 LEX = @LEX@
1396 LIBTOOL = @LIBTOOL@
1397 LN_S = @LN_S@
1398 +MAINT = @MAINT@
1399 MAKEINFO = @MAKEINFO@
1400 NM = @NM@
1401 OBJDUMP = @OBJDUMP@
1402 @@ -118,7 +119,7 @@ DIST_COMMON = ./stamp-h.in Makefile.am Makefile.in config.h.in level.cc
1403
1404 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
1405
1406 -TAR = gtar
1407 +TAR = tar
1408 GZIP_ENV = --best
1409 DEP_FILES = .deps/board.P .deps/canvas.P .deps/cross.P \
1410 .deps/elbowdownleft.P .deps/elbowdownright.P .deps/elbowupleft.P \
1411 @@ -137,7 +138,7 @@ OBJECTS = $(pipenightdreams_OBJECTS)
1412 all: all-redirect
1413 .SUFFIXES:
1414 .SUFFIXES: .S .c .cc .cpp .ll .o .s
1415 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1416 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1417 cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile
1418
1419 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
1420 @@ -155,7 +156,7 @@ stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
1421 && CONFIG_FILES= CONFIG_HEADERS=src/config.h \
1422 $(SHELL) ./config.status
1423 @echo timestamp > stamp-h 2> /dev/null
1424 -$(srcdir)/config.h.in: $(srcdir)/stamp-h.in
1425 +$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-h.in
1426 @if test ! -f $@; then \
1427 rm -f $(srcdir)/stamp-h.in; \
1428 $(MAKE) $(srcdir)/stamp-h.in; \
1429 @@ -242,7 +243,7 @@ TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
1430 awk ' { files[$$0] = 1; } \
1431 END { for (i in files) print i; }'`; \
1432 test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
1433 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
1434 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP))
1435
1436 mostlyclean-tags:
1437
1438 @@ -382,7 +383,7 @@ distclean-generic:
1439 -rm -f config.cache config.log stamp-h stamp-h[0-9]*
1440
1441 maintainer-clean-generic:
1442 - -test -z "levelll" || rm -f levelll
1443 + -test -z "levelcc" || rm -f levelcc
1444 mostlyclean-am: mostlyclean-hdr mostlyclean-binPROGRAMS \
1445 mostlyclean-compile mostlyclean-tags mostlyclean-depend \
1446 mostlyclean-generic
+2
-0
debian/patches/series less more
0 manpage.patch
1 source.patch
02 migrate.patch
+396
-0
debian/patches/source.patch less more
0 From: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
1 Date: Tue, 24 Nov 2015 17:59:23 +0100
2 Subject: source
3
4 ---
5 src/config.h.in | 2 +-
6 src/eventmanager.cpp | 2 +-
7 src/graphic.cpp | 6 +++---
8 src/hash.cpp | 8 ++++----
9 src/image.cpp | 2 +-
10 src/level.ll | 28 ++++++++++++++--------------
11 src/list.cpp | 4 ++--
12 src/main.cpp | 6 ++++--
13 src/pipe.cpp | 4 ++--
14 src/pipenightdreams.cpp | 1 +
15 src/player.cpp | 8 --------
16 src/player.h | 9 +++++++--
17 src/pointer.cpp | 23 +----------------------
18 src/pointer.h | 26 +++++++++++++++++++++-----
19 src/score.cpp | 2 +-
20 src/str.cpp | 6 +++---
21 16 files changed, 66 insertions(+), 71 deletions(-)
22
23 diff --git a/src/config.h.in b/src/config.h.in
24 index 31064ca..60e0680 100644
25 --- a/src/config.h.in
26 +++ b/src/config.h.in
27 @@ -1,4 +1,4 @@
28 -/* src/config.h.in. Generated automatically from configure.in by autoheader. */
29 +/* src/config.h.in. Generated automatically from configure.in by autoheader 2.13. */
30
31 /* Define if lex declares yytext as a char * by default, not a char[]. */
32 #undef YYTEXT_POINTER
33 diff --git a/src/eventmanager.cpp b/src/eventmanager.cpp
34 index e31941a..e2e7cd4 100644
35 --- a/src/eventmanager.cpp
36 +++ b/src/eventmanager.cpp
37 @@ -40,7 +40,7 @@ void EventManager::removeStream(EventStream * s){
38 lista_streams->remove(lista_streams->indexOf(s));
39 }
40
41 -void EventManager::pumpEvents(bool wait=false){
42 +void EventManager::pumpEvents(bool wait){
43 SDL_Event event;
44 Index * stream;
45 bool got=false;
46 diff --git a/src/graphic.cpp b/src/graphic.cpp
47 index 9e0867e..4360c22 100644
48 --- a/src/graphic.cpp
49 +++ b/src/graphic.cpp
50 @@ -44,11 +44,11 @@ Graphic::~Graphic(){
51 if (pixels) free(pixels);
52 }
53
54 -void Graphic::setAlpha(char value=OPAQUE){
55 +void Graphic::setAlpha(char value){
56 SDL_SetAlpha(surface, SDL_SRCALPHA, value);
57 }
58
59 -void Graphic::enableClipping(bool flag=true){
60 +void Graphic::enableClipping(bool flag){
61
62 if (flag){
63 SDL_Rect rect;
64 @@ -68,7 +68,7 @@ void Graphic::setClipping(int x, int y, int width, int height){
65 clip_height=height;
66 }
67
68 -void Graphic::flip(Axis a=HAxis){
69 +void Graphic::flip(Axis a){
70 if (surface){
71 if (SDL_MUSTLOCK(surface))
72 if (SDL_LockSurface(surface)<0) return;
73 diff --git a/src/hash.cpp b/src/hash.cpp
74 index a8be35d..3560842 100644
75 --- a/src/hash.cpp
76 +++ b/src/hash.cpp
77 @@ -55,10 +55,10 @@ int Hash::function(Str * str){
78 return(sum % nbuckets);
79 }
80
81 -Hash::Hash(int bs=256){
82 +Hash::Hash(int bs){
83 int i;
84 nbuckets=bs;
85 - lbuckets=new (List *)[nbuckets];
86 + lbuckets=new List *[nbuckets];
87
88 for (i=0;i<nbuckets;i++)
89 lbuckets[i]=new List();
90 @@ -99,7 +99,7 @@ Hash::Result Hash::add(Str * str, Object * obj){
91 return NotAdded;
92 }
93
94 -Hash::Result Hash::remove(Str * str, bool del=false){
95 +Hash::Result Hash::remove(Str * str, bool del){
96 if (str){
97 Index * i;
98 List * list=lbuckets[function(str)];
99 @@ -135,7 +135,7 @@ Object * Hash::find(Str * str){
100 return NULL;
101 }
102
103 -void Hash::empty(bool del=true){
104 +void Hash::empty(bool del){
105 int i;
106 List * list;
107 for (i=0;i<nbuckets;i++){
108 diff --git a/src/image.cpp b/src/image.cpp
109 index b4e6be5..aa4344c 100644
110 --- a/src/image.cpp
111 +++ b/src/image.cpp
112 @@ -19,7 +19,7 @@
113 #include "SDL_image.h"
114 #include <stdio.h>
115
116 -Image::Image(Str * filename=NULL):Graphic(){
117 +Image::Image(Str * filename):Graphic(){
118 if (filename) load(filename);
119 }
120
121 diff --git a/src/level.ll b/src/level.ll
122 index 26e7608..9877572 100644
123 --- a/src/level.ll
124 +++ b/src/level.ll
125 @@ -93,6 +93,20 @@
126 #define INVALID 100
127
128 int nline;
129 +
130 +int Level::load(Str * filename){
131 + YY_FLUSH_BUFFER;
132 + nline=1;
133 + if (!(yyin=fopen(filename->get(), "r"))){
134 + delete filename;
135 + return 1;
136 + }
137 + delete filename;
138 + level();
139 + fclose(yyin);
140 + if (error) return -1;
141 + return 0;
142 +}
143 %}
144
145 %option noyywrap
146 @@ -599,17 +613,3 @@ void Level::level(){
147 }else printError(new Str("'pipenightdreams' not found"));
148 }
149
150 -int Level::load(Str * filename){
151 - YY_FLUSH_BUFFER;
152 - nline=1;
153 - if (!(yyin=fopen(filename->get(), "r"))){
154 - delete filename;
155 - return 1;
156 - }
157 - delete filename;
158 - level();
159 - fclose(yyin);
160 - if (error) return -1;
161 - return 0;
162 -}
163 -
164 diff --git a/src/list.cpp b/src/list.cpp
165 index 836527e..7d4f5ed 100644
166 --- a/src/list.cpp
167 +++ b/src/list.cpp
168 @@ -125,7 +125,7 @@ List::Result List::insert(int i, Object * obj){
169 return (insert(indexOf(i), obj));
170 }
171
172 -List::Result List::remove(Index * index, bool del=false){
173 +List::Result List::remove(Index * index, bool del){
174 if (isEmpty()) return EmptyList;
175 if (!index) return NullIndex;
176
177 @@ -155,7 +155,7 @@ List::Result List::remove(Index * index, bool del=false){
178 return Removed;
179 }
180
181 -void List::empty(bool del=true){
182 +void List::empty(bool del){
183 while (!isEmpty())
184 remove(getFirst(), del);
185 }
186 diff --git a/src/main.cpp b/src/main.cpp
187 index 36adf7a..fca6e76 100644
188 --- a/src/main.cpp
189 +++ b/src/main.cpp
190 @@ -36,10 +36,12 @@ int main(int argc, char *argv[])
191 if (data_dir) delete data_dir;
192 data_dir=new Str(argv[++i]);
193 }else
194 - if (!strcmp("--fullscreen", argv[i]))
195 + if (!strcmp("--level", argv[i])) {
196 + level = atoi(argv[++i]);
197 + } else if (!strcmp("--fullscreen", argv[i]))
198 fullscreen=true;
199 else{
200 - printf("Invalid Data Dir\nUse pipenightdreams [--datadir <DATA DIR>] [--fullscreen]\n");
201 + printf("Invalid Data Dir\nUse pipenightdreams [--datadir <DATA DIR>] [--fullscreen] [--level <level>]\n");
202 printf("Using default: %s\n", GAME_DATADIR);
203 }
204 i++;
205 diff --git a/src/pipe.cpp b/src/pipe.cpp
206 index e39d547..cbfaebf 100644
207 --- a/src/pipe.cpp
208 +++ b/src/pipe.cpp
209 @@ -43,11 +43,11 @@ bool Pipe::isRemovable(){
210 return !(full_level>0) && !fixed;
211 }
212
213 -void Pipe::setFixed(bool flag=true){
214 +void Pipe::setFixed(bool flag){
215 fixed=flag;
216 }
217
218 -void Pipe::setBonus(Bonus bonus=NormalBonus){
219 +void Pipe::setBonus(Bonus bonus){
220 this->bonus=bonus;
221 }
222
223 diff --git a/src/pipenightdreams.cpp b/src/pipenightdreams.cpp
224 index 441c517..51e2f4e 100644
225 --- a/src/pipenightdreams.cpp
226 +++ b/src/pipenightdreams.cpp
227 @@ -99,6 +99,7 @@ void PipeNightDreams::run(){
228 switch (error){
229 case 1:{
230 showFinal();
231 + game_over=true;
232 break;
233 }
234 case -1:{
235 diff --git a/src/player.cpp b/src/player.cpp
236 index 5e923e9..96faa70 100644
237 --- a/src/player.cpp
238 +++ b/src/player.cpp
239 @@ -163,14 +163,6 @@ void Player::paint(VideoManager * vm){
240 queue->paint(vm);
241 }
242
243 -void Player::setRestrictionCoef(unsigned int coef){
244 - queue->setRestrictionCoef(coef);
245 -}
246 -
247 -void Player::setFixedCoef(unsigned int coef){
248 - queue->setFixedCoef(coef);
249 -}
250 -
251 void Player::tick(){
252 score->tick();
253
254 diff --git a/src/player.h b/src/player.h
255 index 92bda6d..c17d5ba 100644
256 --- a/src/player.h
257 +++ b/src/player.h
258 @@ -47,8 +47,13 @@ class Player : protected AnimatedCanvas{
259 void setStartRowColumn(int row, int column);
260 void setBoard(Board * bd);
261
262 - inline void setRestrictionCoef(unsigned int coef);
263 - inline void setFixedCoef(unsigned int coef);
264 + inline void setRestrictionCoef(unsigned int coef){
265 + queue->setRestrictionCoef(coef);
266 + }
267 +
268 + inline void setFixedCoef(unsigned int coef){
269 + queue->setFixedCoef(coef);
270 + }
271
272 void incLives();
273 void decLives();
274 diff --git a/src/pointer.cpp b/src/pointer.cpp
275 index 8e31394..2d15793 100644
276 --- a/src/pointer.cpp
277 +++ b/src/pointer.cpp
278 @@ -17,7 +17,7 @@
279
280 #include "pointer.h"
281
282 -Pointer::Pointer(int row=0, int column=0){
283 +Pointer::Pointer(int row, int column){
284 this->row=row;
285 this->column=column;
286 this->moved_flag=true;
287 @@ -25,27 +25,6 @@ Pointer::Pointer(int row=0, int column=0){
288
289 Pointer::~Pointer(){ delete image_name;}
290
291 -void Pointer::setRow(int row){
292 - this->row=row;
293 -}
294 -
295 -void Pointer::setColumn(int column){
296 - this->column=column;
297 -}
298 -
299 -void Pointer::setRowColumn(int row, int column){
300 - this->row=row;
301 - this->column=column;
302 -}
303 -
304 -void Pointer::setMoved(bool flag){
305 - moved_flag=flag;
306 -}
307 -
308 -bool Pointer::moved(){
309 - return moved_flag;
310 -}
311 -
312 int Pointer::getRow(){
313 return row;
314 }
315 diff --git a/src/pointer.h b/src/pointer.h
316 index be271cb..25ddd50 100644
317 --- a/src/pointer.h
318 +++ b/src/pointer.h
319 @@ -43,11 +43,27 @@ class Pointer: public Canvas{
320
321 friend class Board;
322
323 - inline void setRow(int row);
324 - inline void setColumn(int column);
325 - inline void setRowColumn(int row, int column);
326 - inline void setMoved(bool flag);
327 - inline bool moved();
328 + inline void setRow(int row){
329 + this->row=row;
330 + }
331 +
332 + inline void setColumn(int column){
333 + this->column=column;
334 + }
335 +
336 + inline void setRowColumn(int row, int column){
337 + this->row=row;
338 + this->column=column;
339 + }
340 +
341 + inline void setMoved(bool flag){
342 + moved_flag=flag;
343 + }
344 +
345 + inline bool moved(){
346 + return moved_flag;
347 + }
348 +
349
350 Str * image_name;
351 Image * ima;
352 diff --git a/src/score.cpp b/src/score.cpp
353 index 6e2e4b5..7744c16 100644
354 --- a/src/score.cpp
355 +++ b/src/score.cpp
356 @@ -18,7 +18,7 @@
357 #include "score.h"
358 #include <math.h>
359
360 -Score::Score(int value=0){
361 +Score::Score(int value){
362 this->value=value;
363 delta=0;
364 changed=true;
365 diff --git a/src/str.cpp b/src/str.cpp
366 index fca6e6c..f2338ad 100644
367 --- a/src/str.cpp
368 +++ b/src/str.cpp
369 @@ -11,7 +11,7 @@
370
371 const char Str::nul = '\0';
372
373 -Str::Str(const char * string=NULL){
374 +Str::Str(const char * string){
375 s=NULL;
376 set(string);
377 }
378 @@ -25,7 +25,7 @@ Str::~Str(){
379 if (s) delete[] s;
380 }
381
382 -void Str::set(const char * string=NULL){
383 +void Str::set(const char * string){
384 if (s) delete[] s;
385 if (string){
386 s=new char[strlen(string)+1];
387 @@ -71,7 +71,7 @@ int Str::lenght(){
388 return (strlen(s));
389 }
390
391 -bool Str::isEqual(Str * str, bool case_sensitive = true){
392 +bool Str::isEqual(Str * str, bool case_sensitive){
393 if (case_sensitive){
394 return (!strcmp(s, str->s));
395 }
+0
-1
debian/rules less more
33 dh $@ --parallel --with autoreconf
44
55 override_dh_auto_configure:
6 autoreconf -i --force
76 dh_auto_configure -- --prefix=/usr --bindir=/usr/games --mandir=/usr/share/man
87