diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..845ca06 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.pc diff --git a/Makefile.in b/Makefile.in index 3dc9eaa..ad2016c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -67,7 +67,6 @@ LEX = @LEX@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ NM = @NM@ OBJDUMP = @OBJDUMP@ @@ -86,59 +85,31 @@ CONFIG_HEADER = ./src/config.h CONFIG_CLEAN_FILES = DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ -Makefile.in NEWS TODO acconfig.h acinclude.m4 aclocal.m4 config.guess \ -config.sub configure configure.in install-sh ltconfig ltmain.sh missing \ -mkinstalldirs src/config.h.in src/stamp-h.in +Makefile.in NEWS TODO acinclude.m4 aclocal.m4 config.guess config.sub \ +configure configure.in install-sh ltconfig ltmain.sh missing \ +mkinstalldirs DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4 +$(ACLOCAL_M4): configure.in acinclude.m4 cd $(srcdir) && $(ACLOCAL) config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck -$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) +$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) - -src/config.h: src/stamp-h - @if test ! -f $@; then \ - rm -f src/stamp-h; \ - $(MAKE) src/stamp-h; \ - else :; fi -src/stamp-h: $(srcdir)/src/config.h.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES= CONFIG_HEADERS=src/config.h \ - $(SHELL) ./config.status - @echo timestamp > src/stamp-h 2> /dev/null -$(srcdir)/src/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/src/stamp-h.in - @if test ! -f $@; then \ - rm -f $(srcdir)/src/stamp-h.in; \ - $(MAKE) $(srcdir)/src/stamp-h.in; \ - else :; fi -$(srcdir)/src/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h - cd $(top_srcdir) && $(AUTOHEADER) - @echo timestamp > $(srcdir)/src/stamp-h.in 2> /dev/null - -mostlyclean-hdr: - -clean-hdr: - -distclean-hdr: - -rm -f src/config.h - -maintainer-clean-hdr: # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -218,7 +189,7 @@ awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: @@ -328,32 +299,32 @@ -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-hdr mostlyclean-tags mostlyclean-generic +mostlyclean-am: mostlyclean-tags mostlyclean-generic mostlyclean: mostlyclean-recursive -clean-am: clean-hdr clean-tags clean-generic mostlyclean-am +clean-am: clean-tags clean-generic mostlyclean-am clean: clean-recursive -distclean-am: distclean-hdr distclean-tags distclean-generic clean-am +distclean-am: distclean-tags distclean-generic clean-am distclean: distclean-recursive -rm -f config.status -maintainer-clean-am: maintainer-clean-hdr maintainer-clean-tags \ - maintainer-clean-generic distclean-am +maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." maintainer-clean: maintainer-clean-recursive -rm -f config.status -.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ -install-data-recursive uninstall-data-recursive install-exec-recursive \ -uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ -all-recursive check-recursive installcheck-recursive info-recursive \ -dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ +.PHONY: install-data-recursive uninstall-data-recursive \ +install-exec-recursive uninstall-exec-recursive installdirs-recursive \ +uninstalldirs-recursive all-recursive check-recursive \ +installcheck-recursive info-recursive dvi-recursive \ +mostlyclean-recursive distclean-recursive clean-recursive \ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ diff --git a/aclocal.m4 b/aclocal.m4 index b5cc7e3..9641c3c 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4-p6 +dnl aclocal.m4 generated automatically by aclocal 1.4-p5 dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation @@ -646,8 +646,7 @@ dnl AM_INIT_AUTOMAKE(package,version, [no-define]) AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -AC_REQUIRE([AC_PROG_INSTALL]) +[AC_REQUIRE([AC_PROG_INSTALL]) PACKAGE=[$1] AC_SUBST(PACKAGE) VERSION=[$2] @@ -663,41 +662,12 @@ AC_REQUIRE([AC_ARG_PROGRAM]) dnl FIXME This is truly gross. missing_dir=`cd $ac_aux_dir && pwd` -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir) +AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir) AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir) +AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) AC_REQUIRE([AC_PROG_MAKE_SET])]) - -# Copyright 2002 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# generated from the m4 files accompanying Automake X.Y. -AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"]) - -# AM_SET_CURRENT_AUTOMAKE_VERSION -# ------------------------------- -# Call AM_AUTOMAKE_VERSION so it can be traced. -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.4-p6])]) # # Check to make sure that the build environment is sane. @@ -757,39 +727,6 @@ AC_MSG_RESULT(missing) fi AC_SUBST($1)]) - -# Add --enable-maintainer-mode option to configure. -# From Jim Meyering - -# serial 1 - -AC_DEFUN([AM_MAINTAINER_MODE], -[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) - dnl maintainer-mode is disabled by default - AC_ARG_ENABLE(maintainer-mode, -[ --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer], - USE_MAINTAINER_MODE=$enableval, - USE_MAINTAINER_MODE=no) - AC_MSG_RESULT($USE_MAINTAINER_MODE) - AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes) - MAINT=$MAINTAINER_MODE_TRUE - AC_SUBST(MAINT)dnl -] -) - -# Define a conditional. - -AC_DEFUN([AM_CONDITIONAL], -[AC_SUBST($1_TRUE) -AC_SUBST($1_FALSE) -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi]) # Like AC_CONFIG_HEADER, but automatically create stamp file. diff --git a/configure b/configure index 5a392b6..45d594a 100755 --- a/configure +++ b/configure @@ -11,9 +11,6 @@ ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: -ac_help="$ac_help - --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer" ac_default_prefix=/usr/local ac_help="$ac_help --with-sdl-prefix=PFX Prefix where SDL is installed (optional)" @@ -532,7 +529,7 @@ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:536: checking how to run the C preprocessor" >&5 +echo "configure:533: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -547,13 +544,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:557: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:554: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -564,13 +561,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:574: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:571: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -581,13 +578,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:591: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:588: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -617,7 +614,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:621: checking for $ac_word" >&5 +echo "configure:618: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -650,7 +647,7 @@ # Extract the first word of "flex", so it can be a program name with args. set dummy flex; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:654: checking for $ac_word" >&5 +echo "configure:651: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -684,7 +681,7 @@ *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:688: checking for yywrap in -l$ac_lib" >&5 +echo "configure:685: checking for yywrap in -l$ac_lib" >&5 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -692,7 +689,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$ac_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -726,7 +723,7 @@ fi echo $ac_n "checking lex output file root""... $ac_c" 1>&6 -echo "configure:730: checking lex output file root" >&5 +echo "configure:727: checking lex output file root" >&5 if eval "test \"`echo '$''{'ac_cv_prog_lex_root'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -747,7 +744,7 @@ LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root echo $ac_n "checking whether yytext is a pointer""... $ac_c" 1>&6 -echo "configure:751: checking whether yytext is a pointer" >&5 +echo "configure:748: checking whether yytext is a pointer" >&5 if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -759,14 +756,14 @@ ac_save_LIBS="$LIBS" LIBS="$LIBS $LEXLIB" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_prog_lex_yytext_pointer=yes else @@ -811,7 +808,6 @@ ac_config_sub=$ac_aux_dir/config.sub ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. -am__api_version="1.4" # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -824,7 +820,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:828: checking for a BSD compatible install" >&5 +echo "configure:824: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -877,7 +873,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:881: checking whether build environment is sane" >&5 +echo "configure:877: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -934,7 +930,7 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:938: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:934: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -979,21 +975,21 @@ missing_dir=`cd $ac_aux_dir && pwd` -echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6 -echo "configure:984: checking for working aclocal-${am__api_version}" >&5 +echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 +echo "configure:980: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. -if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then - ACLOCAL=aclocal-${am__api_version} +if (aclocal --version) < /dev/null > /dev/null 2>&1; then + ACLOCAL=aclocal echo "$ac_t""found" 1>&6 else - ACLOCAL="$missing_dir/missing aclocal-${am__api_version}" + ACLOCAL="$missing_dir/missing aclocal" echo "$ac_t""missing" 1>&6 fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:997: checking for working autoconf" >&5 +echo "configure:993: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1005,21 +1001,21 @@ echo "$ac_t""missing" 1>&6 fi -echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6 -echo "configure:1010: checking for working automake-${am__api_version}" >&5 +echo $ac_n "checking for working automake""... $ac_c" 1>&6 +echo "configure:1006: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. -if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake-${am__api_version} +if (automake --version) < /dev/null > /dev/null 2>&1; then + AUTOMAKE=automake echo "$ac_t""found" 1>&6 else - AUTOMAKE="$missing_dir/missing automake-${am__api_version}" + AUTOMAKE="$missing_dir/missing automake" echo "$ac_t""missing" 1>&6 fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:1023: checking for working autoheader" >&5 +echo "configure:1019: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1032,7 +1028,7 @@ fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:1036: checking for working makeinfo" >&5 +echo "configure:1032: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1045,40 +1041,18 @@ fi -echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1050: checking whether to enable maintainer-specific portions of Makefiles" >&5 - # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. -if test "${enable_maintainer_mode+set}" = set; then - enableval="$enable_maintainer_mode" - USE_MAINTAINER_MODE=$enableval -else - USE_MAINTAINER_MODE=no -fi - - echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6 - - -if test $USE_MAINTAINER_MODE = yes; then - MAINTAINER_MODE_TRUE= - MAINTAINER_MODE_FALSE='#' -else - MAINTAINER_MODE_TRUE='#' - MAINTAINER_MODE_FALSE= -fi - MAINT=$MAINTAINER_MODE_TRUE - - - - - - + + + + +CXXFLAGS="-O2" # We now have a list of macros which tell autoconf what tools we need to # build our software, in this case "make", a C++ compiler, and "install". # If we were creating a C program, we would use AC_PROC_CC instead of CXX. echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1082: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1056: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1109,7 +1083,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1113: checking for $ac_word" >&5 +echo "configure:1087: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1141,7 +1115,7 @@ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1145: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1119: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1152,12 +1126,12 @@ cat > conftest.$ac_ext << EOF -#line 1156 "configure" +#line 1130 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1183,12 +1157,12 @@ { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1187: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1161: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1192: checking whether we are using GNU C++" >&5 +echo "configure:1166: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1197,7 +1171,7 @@ yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1201: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1175: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1216,7 +1190,7 @@ ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1220: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1194: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1259,7 +1233,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1263: checking for a BSD compatible install" >&5 +echo "configure:1237: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1319,7 +1293,7 @@ #AC_CANONICAL_HOST echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:1323: checking target system type" >&5 +echo "configure:1297: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -1387,7 +1361,7 @@ # Extract the first word of "sdl-config", so it can be a program name with args. set dummy sdl-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1391: checking for $ac_word" >&5 +echo "configure:1365: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SDL_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1422,7 +1396,7 @@ min_sdl_version=$SDL_VERSION echo $ac_n "checking for SDL - version >= $min_sdl_version""... $ac_c" 1>&6 -echo "configure:1426: checking for SDL - version >= $min_sdl_version" >&5 +echo "configure:1400: checking for SDL - version >= $min_sdl_version" >&5 no_sdl="" if test "$SDL_CONFIG" = "no" ; then no_sdl=yes @@ -1446,7 +1420,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -1504,7 +1478,7 @@ EOF -if { (eval echo configure:1508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1538,7 +1512,7 @@ CFLAGS="$CFLAGS $SDL_CFLAGS" LIBS="$LIBS $SDL_LIBS" cat > conftest.$ac_ext < @@ -1548,7 +1522,7 @@ return 0; ; return 0; } EOF -if { (eval echo configure:1552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding SDL or finding the wrong" @@ -1587,7 +1561,7 @@ LIBS="$LIBS $SDL_LIBS" echo $ac_n "checking for IMG_Load in -lSDL_image""... $ac_c" 1>&6 -echo "configure:1591: checking for IMG_Load in -lSDL_image" >&5 +echo "configure:1565: checking for IMG_Load in -lSDL_image" >&5 ac_lib_var=`echo SDL_image'_'IMG_Load | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1595,7 +1569,7 @@ ac_save_LIBS="$LIBS" LIBS="-lSDL_image $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1825,9 +1799,6 @@ s%@AUTOHEADER@%$AUTOHEADER%g s%@MAKEINFO@%$MAKEINFO%g s%@SET_MAKE@%$SET_MAKE%g -s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g -s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g -s%@MAINT@%$MAINT%g s%@CXX@%$CXX%g s%@target@%$target%g s%@target_alias@%$target_alias%g diff --git a/configure.in b/configure.in index 44b0ec9..c148040 100644 --- a/configure.in +++ b/configure.in @@ -9,9 +9,9 @@ # archive. AM_INIT_AUTOMAKE(pipenightdreams, 0.10.0) -AM_MAINTAINER_MODE AC_PREFIX_DEFAULT(/usr/local) AM_CONFIG_HEADER(src/config.h) +CXXFLAGS="-O2" # We now have a list of macros which tell autoconf what tools we need to # build our software, in this case "make", a C++ compiler, and "install". diff --git a/debian/patches/migrate.patch b/debian/patches/migrate.patch new file mode 100644 index 0000000..4c29b6a --- /dev/null +++ b/debian/patches/migrate.patch @@ -0,0 +1,2126 @@ +--- pipenightdreams-0.10.0.orig/man/pipenightdreams.6 ++++ pipenightdreams-0.10.0/man/pipenightdreams.6 +@@ -1,15 +1,12 @@ + .TH PIPENIGHTDREAMS 6 "23rd May 2002" + + .SH NAME +- + pipenightdreams \- Just another pipe trip (PipeDream clon). + + .SH SYNOPSIS +- + \fB pipenightdreams\fP [\--datadir ] [\--fullscreen] + + .SH DESCRIPTION +- + \fB pipenightdreams\fP is a PipeDream style game. The objetive of the game is to carry + liquid from some point to the exit using different kinds of pipes. On each level + there is a minimum number of required pipes that should be at least reached for it +@@ -46,7 +43,6 @@ + .IP HYPER\ BONUS + The green one. + +- + .SH OPTIONS + \fB --datadir \fP is used when + the data directory is not the default one (\fB /usr/share/games/pipenightdreams\fP +@@ -64,6 +60,4 @@ + http://www.libsdl.org/projects/pipenightdreams + + .SH AUTHORS +- + Waldemar A. Baraldi +- +--- pipenightdreams-0.10.0.orig/man/Makefile.in ++++ pipenightdreams-0.10.0/man/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am ++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am + + # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation +@@ -67,6 +67,7 @@ + LEX = @LEX@ + LIBTOOL = @LIBTOOL@ + LN_S = @LN_S@ ++MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + NM = @NM@ + OBJDUMP = @OBJDUMP@ +@@ -92,11 +93,11 @@ + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +-TAR = gtar ++TAR = tar + GZIP_ENV = --best + all: all-redirect + .SUFFIXES: +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile + + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +--- pipenightdreams-0.10.0.orig/src/pointer.cpp ++++ pipenightdreams-0.10.0/src/pointer.cpp +@@ -17,7 +17,7 @@ + + #include "pointer.h" + +-Pointer::Pointer(int row=0, int column=0){ ++Pointer::Pointer(int row, int column){ + this->row=row; + this->column=column; + this->moved_flag=true; +@@ -25,27 +25,6 @@ + + Pointer::~Pointer(){ delete image_name;} + +-void Pointer::setRow(int row){ +- this->row=row; +-} +- +-void Pointer::setColumn(int column){ +- this->column=column; +-} +- +-void Pointer::setRowColumn(int row, int column){ +- this->row=row; +- this->column=column; +-} +- +-void Pointer::setMoved(bool flag){ +- moved_flag=flag; +-} +- +-bool Pointer::moved(){ +- return moved_flag; +-} +- + int Pointer::getRow(){ + return row; + } +--- pipenightdreams-0.10.0.orig/src/score.cpp ++++ pipenightdreams-0.10.0/src/score.cpp +@@ -18,7 +18,7 @@ + #include "score.h" + #include + +-Score::Score(int value=0){ ++Score::Score(int value){ + this->value=value; + delta=0; + changed=true; +--- pipenightdreams-0.10.0.orig/src/main.cpp ++++ pipenightdreams-0.10.0/src/main.cpp +@@ -36,10 +36,12 @@ + if (data_dir) delete data_dir; + data_dir=new Str(argv[++i]); + }else +- if (!strcmp("--fullscreen", argv[i])) ++ if (!strcmp("--level", argv[i])) { ++ level = atoi(argv[++i]); ++ } else if (!strcmp("--fullscreen", argv[i])) + fullscreen=true; + else{ +- printf("Invalid Data Dir\nUse pipenightdreams [--datadir ] [--fullscreen]\n"); ++ printf("Invalid Data Dir\nUse pipenightdreams [--datadir ] [--fullscreen] [--level ]\n"); + printf("Using default: %s\n", GAME_DATADIR); + } + i++; +--- pipenightdreams-0.10.0.orig/src/level.ll ++++ pipenightdreams-0.10.0/src/level.ll +@@ -93,6 +93,20 @@ + #define INVALID 100 + + int nline; ++ ++int Level::load(Str * filename){ ++ YY_FLUSH_BUFFER; ++ nline=1; ++ if (!(yyin=fopen(filename->get(), "r"))){ ++ delete filename; ++ return 1; ++ } ++ delete filename; ++ level(); ++ fclose(yyin); ++ if (error) return -1; ++ return 0; ++} + %} + + %option noyywrap +@@ -599,17 +613,3 @@ + }else printError(new Str("'pipenightdreams' not found")); + } + +-int Level::load(Str * filename){ +- YY_FLUSH_BUFFER; +- nline=1; +- if (!(yyin=fopen(filename->get(), "r"))){ +- delete filename; +- return 1; +- } +- delete filename; +- level(); +- fclose(yyin); +- if (error) return -1; +- return 0; +-} +- +--- pipenightdreams-0.10.0.orig/src/graphic.cpp ++++ pipenightdreams-0.10.0/src/graphic.cpp +@@ -44,11 +44,11 @@ + if (pixels) free(pixels); + } + +-void Graphic::setAlpha(char value=OPAQUE){ ++void Graphic::setAlpha(char value){ + SDL_SetAlpha(surface, SDL_SRCALPHA, value); + } + +-void Graphic::enableClipping(bool flag=true){ ++void Graphic::enableClipping(bool flag){ + + if (flag){ + SDL_Rect rect; +@@ -68,7 +68,7 @@ + clip_height=height; + } + +-void Graphic::flip(Axis a=HAxis){ ++void Graphic::flip(Axis a){ + if (surface){ + if (SDL_MUSTLOCK(surface)) + if (SDL_LockSurface(surface)<0) return; +--- pipenightdreams-0.10.0.orig/src/str.cpp ++++ pipenightdreams-0.10.0/src/str.cpp +@@ -11,7 +11,7 @@ + + const char Str::nul = '\0'; + +-Str::Str(const char * string=NULL){ ++Str::Str(const char * string){ + s=NULL; + set(string); + } +@@ -25,7 +25,7 @@ + if (s) delete[] s; + } + +-void Str::set(const char * string=NULL){ ++void Str::set(const char * string){ + if (s) delete[] s; + if (string){ + s=new char[strlen(string)+1]; +@@ -71,7 +71,7 @@ + return (strlen(s)); + } + +-bool Str::isEqual(Str * str, bool case_sensitive = true){ ++bool Str::isEqual(Str * str, bool case_sensitive){ + if (case_sensitive){ + return (!strcmp(s, str->s)); + } +--- pipenightdreams-0.10.0.orig/src/Makefile.in ++++ pipenightdreams-0.10.0/src/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am ++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am + + # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation +@@ -67,6 +67,7 @@ + LEX = @LEX@ + LIBTOOL = @LIBTOOL@ + LN_S = @LN_S@ ++MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + NM = @NM@ + OBJDUMP = @OBJDUMP@ +@@ -118,7 +119,7 @@ + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +-TAR = gtar ++TAR = tar + GZIP_ENV = --best + DEP_FILES = .deps/board.P .deps/canvas.P .deps/cross.P \ + .deps/elbowdownleft.P .deps/elbowdownright.P .deps/elbowupleft.P \ +@@ -137,7 +138,7 @@ + all: all-redirect + .SUFFIXES: + .SUFFIXES: .S .c .cc .cpp .ll .o .s +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile + + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +@@ -155,7 +156,7 @@ + && CONFIG_FILES= CONFIG_HEADERS=src/config.h \ + $(SHELL) ./config.status + @echo timestamp > stamp-h 2> /dev/null +-$(srcdir)/config.h.in: $(srcdir)/stamp-h.in ++$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-h.in + @if test ! -f $@; then \ + rm -f $(srcdir)/stamp-h.in; \ + $(MAKE) $(srcdir)/stamp-h.in; \ +@@ -242,7 +243,7 @@ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \ +- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS) ++ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP)) + + mostlyclean-tags: + +@@ -382,7 +383,7 @@ + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + + maintainer-clean-generic: +- -test -z "levelll" || rm -f levelll ++ -test -z "levelcc" || rm -f levelcc + mostlyclean-am: mostlyclean-hdr mostlyclean-binPROGRAMS \ + mostlyclean-compile mostlyclean-tags mostlyclean-depend \ + mostlyclean-generic +--- pipenightdreams-0.10.0.orig/src/pipe.cpp ++++ pipenightdreams-0.10.0/src/pipe.cpp +@@ -43,11 +43,11 @@ + return !(full_level>0) && !fixed; + } + +-void Pipe::setFixed(bool flag=true){ ++void Pipe::setFixed(bool flag){ + fixed=flag; + } + +-void Pipe::setBonus(Bonus bonus=NormalBonus){ ++void Pipe::setBonus(Bonus bonus){ + this->bonus=bonus; + } + +--- pipenightdreams-0.10.0.orig/src/image.cpp ++++ pipenightdreams-0.10.0/src/image.cpp +@@ -19,7 +19,7 @@ + #include "SDL_image.h" + #include + +-Image::Image(Str * filename=NULL):Graphic(){ ++Image::Image(Str * filename):Graphic(){ + if (filename) load(filename); + } + +--- pipenightdreams-0.10.0.orig/src/config.h.in ++++ pipenightdreams-0.10.0/src/config.h.in +@@ -1,4 +1,4 @@ +-/* src/config.h.in. Generated automatically from configure.in by autoheader. */ ++/* src/config.h.in. Generated automatically from configure.in by autoheader 2.13. */ + + /* Define if lex declares yytext as a char * by default, not a char[]. */ + #undef YYTEXT_POINTER +--- pipenightdreams-0.10.0.orig/src/list.cpp ++++ pipenightdreams-0.10.0/src/list.cpp +@@ -125,7 +125,7 @@ + return (insert(indexOf(i), obj)); + } + +-List::Result List::remove(Index * index, bool del=false){ ++List::Result List::remove(Index * index, bool del){ + if (isEmpty()) return EmptyList; + if (!index) return NullIndex; + +@@ -155,7 +155,7 @@ + return Removed; + } + +-void List::empty(bool del=true){ ++void List::empty(bool del){ + while (!isEmpty()) + remove(getFirst(), del); + } +--- pipenightdreams-0.10.0.orig/src/pipenightdreams.cpp ++++ pipenightdreams-0.10.0/src/pipenightdreams.cpp +@@ -99,6 +99,7 @@ + switch (error){ + case 1:{ + showFinal(); ++ game_over=true; + break; + } + case -1:{ +--- pipenightdreams-0.10.0.orig/src/player.cpp ++++ pipenightdreams-0.10.0/src/player.cpp +@@ -163,14 +163,6 @@ + queue->paint(vm); + } + +-void Player::setRestrictionCoef(unsigned int coef){ +- queue->setRestrictionCoef(coef); +-} +- +-void Player::setFixedCoef(unsigned int coef){ +- queue->setFixedCoef(coef); +-} +- + void Player::tick(){ + score->tick(); + +--- pipenightdreams-0.10.0.orig/src/pointer.h ++++ pipenightdreams-0.10.0/src/pointer.h +@@ -43,11 +43,27 @@ + + friend class Board; + +- inline void setRow(int row); +- inline void setColumn(int column); +- inline void setRowColumn(int row, int column); +- inline void setMoved(bool flag); +- inline bool moved(); ++ inline void setRow(int row){ ++ this->row=row; ++ } ++ ++ inline void setColumn(int column){ ++ this->column=column; ++ } ++ ++ inline void setRowColumn(int row, int column){ ++ this->row=row; ++ this->column=column; ++ } ++ ++ inline void setMoved(bool flag){ ++ moved_flag=flag; ++ } ++ ++ inline bool moved(){ ++ return moved_flag; ++ } ++ + + Str * image_name; + Image * ima; +--- pipenightdreams-0.10.0.orig/src/player.h ++++ pipenightdreams-0.10.0/src/player.h +@@ -47,8 +47,13 @@ + void setStartRowColumn(int row, int column); + void setBoard(Board * bd); + +- inline void setRestrictionCoef(unsigned int coef); +- inline void setFixedCoef(unsigned int coef); ++ inline void setRestrictionCoef(unsigned int coef){ ++ queue->setRestrictionCoef(coef); ++ } ++ ++ inline void setFixedCoef(unsigned int coef){ ++ queue->setFixedCoef(coef); ++ } + + void incLives(); + void decLives(); +--- pipenightdreams-0.10.0.orig/src/hash.cpp ++++ pipenightdreams-0.10.0/src/hash.cpp +@@ -55,10 +55,10 @@ + return(sum % nbuckets); + } + +-Hash::Hash(int bs=256){ ++Hash::Hash(int bs){ + int i; + nbuckets=bs; +- lbuckets=new (List *)[nbuckets]; ++ lbuckets=new List *[nbuckets]; + + for (i=0;iremove(lista_streams->indexOf(s)); + } + +-void EventManager::pumpEvents(bool wait=false){ ++void EventManager::pumpEvents(bool wait){ + SDL_Event event; + Index * stream; + bool got=false; +--- pipenightdreams-0.10.0.orig/debian/svn-deblayout ++++ pipenightdreams-0.10.0/debian/svn-deblayout +@@ -0,0 +1,4 @@ ++origDir=../tarballs ++tagsUrl=svn://tonberry/debian/pipenightdreams/tag ++upsCurrentUrl=svn://tonberry/debian/pipenightdreams/branch/upstream/current ++upsTagUrl=svn://tonberry/debian/pipenightdreams/branch/upstream +--- pipenightdreams-0.10.0.orig/debian/changelog ++++ pipenightdreams-0.10.0/debian/changelog +@@ -0,0 +1,204 @@ ++pipenightdreams (0.10.0-13) unstable; urgency=low ++ ++ * Make package binNMU-able (closes: #432991) ++ * Updated to policy 3.7.2.2 (no changes necessary) ++ * Fixed a few minor lintian warnings. ++ ++ -- Wesley J. Landaker Fri, 13 Jul 2007 12:51:44 -0600 ++ ++pipenightdreams (0.10.0-12) unstable; urgency=low ++ ++ * New maintainer (closes: #349325) ++ * Added watch file ++ * Minor updates to the package description ++ ++ -- Wesley J. Landaker Sun, 22 Jan 2006 16:40:09 -0700 ++ ++pipenightdreams (0.10.0-11) unstable; urgency=low ++ ++ * Orphaned. ++ ++ -- Michael Fedrowitz Sun, 22 Jan 2006 11:42:01 +0100 ++ ++pipenightdreams (0.10.0-10) unstable; urgency=low ++ ++ * Standards-Version 3.6.2 (no changes required). ++ * Rebuilt with g++ 4.0. ++ ++ -- Michael Fedrowitz Sun, 10 Jul 2005 13:11:04 +0200 ++ ++pipenightdreams (0.10.0-9) unstable; urgency=low ++ ++ * Applied a patch by Andreas Jochens to fix build failure with ++ gcc 3.4. (Closes: #259623) ++ ++ -- Michael Fedrowitz Mon, 19 Jul 2004 19:58:44 +0200 ++ ++pipenightdreams (0.10.0-8) unstable; urgency=low ++ ++ * Applied a patch by Wesley J. Landaker which adds a '--level' option to ++ select the starting level. (Closes: #237568) ++ * Avoid segfault when an invalid starting level is selected. ++ * Use 'Replaces' rather than 'Conflicts'. ++ ++ -- Michael Fedrowitz Sun, 21 Mar 2004 16:18:32 +0100 ++ ++pipenightdreams (0.10.0-7) unstable; urgency=low ++ ++ * Build pipenightdreams-data in binary-indep, not binary-arch. ++ ++ -- Michael Fedrowitz Sun, 29 Feb 2004 19:14:49 +0100 ++ ++pipenightdreams (0.10.0-6) unstable; urgency=low ++ ++ * Standards-Version 3.6.1: ++ - Recoded changelog to UTF-8. ++ * Split out architecture independent data. (Closes: #233433) ++ * Quote all strings in the menu file to make lintian happy. ++ ++ -- Michael Fedrowitz Sun, 29 Feb 2004 18:58:18 +0100 ++ ++pipenightdreams (0.10.0-5) unstable; urgency=low ++ ++ * Standards-Version 3.5.9 (no changes required). ++ * Fix to build with flex 2.5.31. ++ ++ -- Michael Fedrowitz Wed, 30 Apr 2003 23:32:20 +0200 ++ ++pipenightdreams (0.10.0-4) unstable; urgency=low ++ ++ * Rebuild with g++ 3.2. ++ * Remove full stop from short description. ++ * Remove spurious newlines from manpage. ++ ++ -- Michael Fedrowitz Fri, 10 Jan 2003 19:23:10 +0100 ++ ++pipenightdreams (0.10.0-3) unstable; urgency=low ++ ++ * Build depend on autotools-dev. ++ * Fix typo in copyright file. ++ ++ -- Michael Fedrowitz Mon, 16 Sep 2002 16:54:27 +0200 ++ ++pipenightdreams (0.10.0-2) unstable; urgency=low ++ ++ * New maintainer. (closes: #160775) ++ * Fix to build with g++-3.x: ++ - Remove default arguments from function definitions. ++ - Move inline function definitions to header files. ++ - This should fix building on hppa. (closes: #133916) ++ * Use debhelper v4. ++ * Standards-Version 3.5.7: ++ - Support DEB_BUILD_OPTIONS, DEB_BUILD_GNU_TYPE and DEB_HOST_GNU_TYPE. ++ - Build depend on debhelper (>= 4.1.0) to get rid of /usr/doc link. ++ * Rerun autotools (supporting DEB_BUILD_OPTIONS required modifying ++ configure.in). ++ * Use AM_MAINTAINER_MODE to make sure autotools won't be run during build. ++ * Symlink config.{sub,guess} from autotools-dev at build time. ++ * Use upstream manpage. ++ * Various minor packaging tweaks. ++ ++ -- Michael Fedrowitz Sat, 14 Sep 2002 17:41:28 +0200 ++ ++pipenightdreams (0.10.0-1) unstable; urgency=low ++ ++ * New upstream release ++ - level 8 fixed (Closes: #145333) ++ * NMU by Søren Boll Overgaard, since maintainers new key has not yet ++ been accepted into the keyring. Identity of maintainer has been ++ rechecked. ++ ++ -- Kenneth Vestergaard Schmidt Tue, 23 Apr 2002 22:53:26 +0200 ++ ++pipenightdreams (0.9.0-2) unstable; urgency=low ++ ++ * Fixed description (Closes: #120138) ++ ++ -- Kenneth Vestergaard Schmidt Mon, 19 Nov 2001 21:22:33 +0100 ++ ++pipenightdreams (0.9.0-1) unstable; urgency=low ++ ++ * New upstream release ++ * Fixed Build-Depends (Closes: #115488) ++ * Fixed Depends (Closes: #117527) ++ ++ -- Kenneth Vestergaard Schmidt Tue, 6 Nov 2001 10:49:46 +0100 ++ ++pipenightdreams (0.8.0-2) unstable; urgency=low ++ ++ * Correct libraries used in compile (Closes: #109985) ++ ++ -- Kenneth Vestergaard Schmidt Sat, 25 Aug 2001 09:19:59 +0200 ++ ++pipenightdreams (0.8.0-1) unstable; urgency=low ++ ++ * New upstream release ++ * Changelog from website: ++ -> Background now can be a wallpaper. ++ -> Memory leak when loading images eliminated. ++ -> Almost all graphics redrawn. ++ -> All levels rewritten (5 levels added). ++ -> Score added. ++ -> Levels format improved. ++ -> Pipe block added. ++ -> Background tag added. ++ -> Some small bugs eliminated. ++ -> Screen updating routines improved (speed). ++ -> Btw, web page rewritten. ++ ++ -- Kenneth Vestergaard Schmidt Wed, 1 Aug 2001 20:22:28 +0200 ++ ++pipenightdreams (0.6.1-6) unstable; urgency=low ++ ++ * Rebuilt for libsdl1.2 ++ * New description (Closes: #99856) ++ ++ -- Kenneth Vestergaard Schmidt Sun, 3 Jun 2001 23:15:39 +0200 ++ ++pipenightdreams (0.6.1-5) unstable; urgency=low ++ ++ * Fixed a brainfart on my behalf (menu pointing to /usr/bin/.., should be ++ /usr/games/..) (Closes: #93519) ++ ++ -- Kenneth Vestergaard Schmidt Tue, 10 Apr 2001 15:07:48 +0200 ++ ++pipenightdreams (0.6.1-4) unstable; urgency=low ++ ++ * Man-page typo ++ ++ -- Kenneth Vestergaard Schmidt Tue, 6 Mar 2001 23:25:41 +0100 ++ ++pipenightdreams (0.6.1-3) unstable; urgency=low ++ ++ * Fixed a few non-compliances with the FHS, namely moving the manpage from ++ man1 to man6, and the binary from usr/bin to usr/games ++ ++ -- Kenneth Vestergaard Schmidt Tue, 6 Mar 2001 23:14:49 +0100 ++ ++pipenightdreams (0.6.1-2) unstable; urgency=low ++ ++ * Rejoice! I have become an official Debian maintainer, and as such my ++ email-address is quite different :) ++ This is the only update. ++ ++ -- Kenneth Vestergaard Schmidt Sun, 4 Mar 2001 02:07:52 +0100 ++ ++pipenightdreams (0.6.1-1) unstable; urgency=low ++ ++ * New upstream release ++ ++ -- Kenneth Vestergaard Schmidt Sat, 3 Mar 2001 01:18:13 +0100 ++ ++pipenightdreams (0.6.0-2) unstable; urgency=low ++ ++ * Build-Depends was all wrong - hopefully should give more meaning now! ++ * Few minor errors in the packaging fixed. ++ ++ -- Kenneth Vestergaard Schmidt Fri, 23 Feb 2001 10:52:17 +0100 ++ ++pipenightdreams (0.6.0-1) unstable; urgency=low ++ ++ * Initial Release. ++ * Changed default data dir from /usr/local/share/ to /usr/share/ ++ ++ -- Kenneth Vestergaard Schmidt Thu, 22 Feb 2001 00:23:15 +0100 +--- pipenightdreams-0.10.0.orig/debian/pipenightdreams-data.install ++++ pipenightdreams-0.10.0/debian/pipenightdreams-data.install +@@ -0,0 +1 @@ ++usr/share/games +--- pipenightdreams-0.10.0.orig/debian/pipenightdreams.menu ++++ pipenightdreams-0.10.0/debian/pipenightdreams.menu +@@ -0,0 +1,2 @@ ++?package(pipenightdreams):needs="X11" section="Games/Puzzles"\ ++ title="pipenightdreams" command="/usr/games/pipenightdreams" +--- pipenightdreams-0.10.0.orig/debian/pipenightdreams.install ++++ pipenightdreams-0.10.0/debian/pipenightdreams.install +@@ -0,0 +1,2 @@ ++usr/games ++usr/share/man +--- pipenightdreams-0.10.0.orig/debian/control ++++ pipenightdreams-0.10.0/debian/control +@@ -0,0 +1,30 @@ ++Source: pipenightdreams ++Section: games ++Priority: optional ++Maintainer: Wesley J. Landaker ++Build-Depends: debhelper (>= 4.1.0), autotools-dev, flex, libsdl-image1.2-dev (>= 1.2.2-2) ++Standards-Version: 3.7.2.2 ++ ++Package: pipenightdreams ++Architecture: any ++Depends: ${shlibs:Depends}, pipenightdreams-data (= ${source:Version}) ++Description: connect pipes to get the water flowing from inlet to outlet ++ If you know the old arcade-game "Pipe Dreams", you'll instantly recognize ++ this. The goal is to connect different pipe segments to let the water flow ++ from the inlet and through as many pipes as possible, until it finally ++ reaches the outlet. This requires an even combination of speed, skill and ++ foresight. ++ ++Package: pipenightdreams-data ++Architecture: all ++Recommends: pipenightdreams (>= ${source:Version}) ++Replaces: pipenightdreams (<< 0.10.0-6) ++Description: connect pipes to get the water flowing from inlet to outlet (data files) ++ If you know the old arcade-game "Pipe Dreams", you'll instantly recognize ++ this. The goal is to connect different pipe segments to let the water flow ++ from the inlet and through as many pipes as possible, until it finally ++ reaches the outlet. This requires an even combination of speed, skill and ++ foresight. ++ . ++ (This package contains just the data files; you'll need the pipenightdreams ++ package as well in order to actually play the game.) +--- pipenightdreams-0.10.0.orig/debian/compat ++++ pipenightdreams-0.10.0/debian/compat +@@ -0,0 +1 @@ ++4 +--- pipenightdreams-0.10.0.orig/debian/pipenightdreams.docs ++++ pipenightdreams-0.10.0/debian/pipenightdreams.docs +@@ -0,0 +1,3 @@ ++AUTHORS ++NEWS ++README +--- pipenightdreams-0.10.0.orig/debian/watch ++++ pipenightdreams-0.10.0/debian/watch +@@ -0,0 +1,2 @@ ++version=3 ++http://www.libsdl.org/projects/pipenightdreams/packages/pipenightdreams-(.*).tar.gz +--- pipenightdreams-0.10.0.orig/debian/rules ++++ pipenightdreams-0.10.0/debian/rules +@@ -0,0 +1,83 @@ ++#!/usr/bin/make -f ++ ++DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) ++DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) ++ ++ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) ++CONFFLAGS = $(DEB_HOST_GNU_TYPE) ++else ++CONFFLAGS = --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) ++endif ++ ++CFLAGS = -g ++ ++ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) ++CFLAGS += -O2 ++endif ++ ++configure: configure-stamp ++configure-stamp: ++ dh_testdir ++ ln -sf /usr/share/misc/config.sub . ++ ln -sf /usr/share/misc/config.guess . ++ CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)" \ ++ ./configure $(CONFFLAGS) --prefix=/usr \ ++ --bindir=\$${prefix}/games --mandir=\$${prefix}/share/man ++ touch configure-stamp ++ ++build: configure build-stamp ++build-stamp: ++ dh_testdir ++ $(MAKE) ++ touch build-stamp ++ ++clean: ++ dh_testdir ++ dh_testroot ++ rm -f build-stamp configure-stamp ++ -$(MAKE) distclean ++ dh_clean src/level.cc config.guess config.sub config.status config.log ++ ++install: build ++ dh_testdir ++ dh_testroot ++ dh_clean -k ++ dh_installdirs ++ $(MAKE) install prefix=$(CURDIR)/debian/tmp/usr ++ dh_install --sourcedir=debian/tmp --autodest ++ ++binary-arch: configure build install ++ dh_testdir -a ++ dh_testroot -a ++ dh_installchangelogs -a ChangeLog ++ dh_installdocs -a ++ dh_installmenu -a ++ dh_link -a ++ dh_strip -a ++ dh_compress -a ++ dh_fixperms -a ++ dh_installdeb -a ++ dh_shlibdeps -a ++ dh_gencontrol -a ++ dh_md5sums -a ++ dh_builddeb -a ++ ++binary-indep: configure build install ++ dh_testdir -i ++ dh_testroot -i ++ dh_installchangelogs -i ++ dh_installdocs -i ++ dh_installmenu -i ++ dh_link -i ++ dh_strip -i ++ dh_compress -i ++ dh_fixperms -i ++ dh_installdeb -i ++ dh_shlibdeps -i ++ dh_gencontrol -i ++ dh_md5sums -i ++ dh_builddeb -i ++ ++binary: binary-indep binary-arch ++ ++.PHONY: configure build clean install binary-arch binary-indep binary +--- pipenightdreams-0.10.0.orig/debian/copyright ++++ pipenightdreams-0.10.0/debian/copyright +@@ -0,0 +1,19 @@ ++This package was debianized by Kenneth Vestergaard Schmidt ++on Thu, 22 Feb 2001 00:15:25 +0100 and was maintained by ++Michael Fedrowitz until 22 Jan 2006 11:42:01 +0100. It ++is currently maintained by Wesley J. Landaker . ++ ++It was downloaded from `http://www.libsdl.org/projects/pipenightdreams/'. ++Upstream Author: Waldemar A. Baraldi ++ ++Copyright: ++ ++ Copyright (C) 2000 by Waldemar Baraldi ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 2 of the License, or ++ (at your option) any later version. ++ ++On Debian systems the complete text of the GNU General Public License can ++be found in `/usr/share/common-licenses/GPL'. +--- pipenightdreams-0.10.0.orig/Makefile.in ++++ pipenightdreams-0.10.0/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am ++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am + + # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation +@@ -67,6 +67,7 @@ + LEX = @LEX@ + LIBTOOL = @LIBTOOL@ + LN_S = @LN_S@ ++MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + NM = @NM@ + OBJDUMP = @OBJDUMP@ +@@ -85,32 +86,60 @@ + CONFIG_HEADER = ./src/config.h + CONFIG_CLEAN_FILES = + DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ +-Makefile.in NEWS TODO acinclude.m4 aclocal.m4 config.guess config.sub \ +-configure configure.in install-sh ltconfig ltmain.sh missing \ +-mkinstalldirs ++Makefile.in NEWS TODO acconfig.h acinclude.m4 aclocal.m4 config.guess \ ++config.sub configure configure.in install-sh ltconfig ltmain.sh missing \ ++mkinstalldirs src/config.h.in src/stamp-h.in + + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +-TAR = gtar ++TAR = tar + GZIP_ENV = --best + all: all-redirect + .SUFFIXES: +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile + + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status + +-$(ACLOCAL_M4): configure.in acinclude.m4 ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4 + cd $(srcdir) && $(ACLOCAL) + + config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck +-$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) ++$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) + cd $(srcdir) && $(AUTOCONF) + ++src/config.h: src/stamp-h ++ @if test ! -f $@; then \ ++ rm -f src/stamp-h; \ ++ $(MAKE) src/stamp-h; \ ++ else :; fi ++src/stamp-h: $(srcdir)/src/config.h.in $(top_builddir)/config.status ++ cd $(top_builddir) \ ++ && CONFIG_FILES= CONFIG_HEADERS=src/config.h \ ++ $(SHELL) ./config.status ++ @echo timestamp > src/stamp-h 2> /dev/null ++$(srcdir)/src/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/src/stamp-h.in ++ @if test ! -f $@; then \ ++ rm -f $(srcdir)/src/stamp-h.in; \ ++ $(MAKE) $(srcdir)/src/stamp-h.in; \ ++ else :; fi ++$(srcdir)/src/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h ++ cd $(top_srcdir) && $(AUTOHEADER) ++ @echo timestamp > $(srcdir)/src/stamp-h.in 2> /dev/null ++ ++mostlyclean-hdr: ++ ++clean-hdr: ++ ++distclean-hdr: ++ -rm -f src/config.h ++ ++maintainer-clean-hdr: ++ + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, +@@ -189,7 +218,7 @@ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ +- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) ++ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) + + mostlyclean-tags: + +@@ -299,32 +328,32 @@ + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + + maintainer-clean-generic: +-mostlyclean-am: mostlyclean-tags mostlyclean-generic ++mostlyclean-am: mostlyclean-hdr mostlyclean-tags mostlyclean-generic + + mostlyclean: mostlyclean-recursive + +-clean-am: clean-tags clean-generic mostlyclean-am ++clean-am: clean-hdr clean-tags clean-generic mostlyclean-am + + clean: clean-recursive + +-distclean-am: distclean-tags distclean-generic clean-am ++distclean-am: distclean-hdr distclean-tags distclean-generic clean-am + + distclean: distclean-recursive + -rm -f config.status + +-maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ +- distclean-am ++maintainer-clean-am: maintainer-clean-hdr maintainer-clean-tags \ ++ maintainer-clean-generic distclean-am + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + + maintainer-clean: maintainer-clean-recursive + -rm -f config.status + +-.PHONY: install-data-recursive uninstall-data-recursive \ +-install-exec-recursive uninstall-exec-recursive installdirs-recursive \ +-uninstalldirs-recursive all-recursive check-recursive \ +-installcheck-recursive info-recursive dvi-recursive \ +-mostlyclean-recursive distclean-recursive clean-recursive \ ++.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ ++install-data-recursive uninstall-data-recursive install-exec-recursive \ ++uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ ++all-recursive check-recursive installcheck-recursive info-recursive \ ++dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ + maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ + distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ + dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +--- pipenightdreams-0.10.0.orig/configure ++++ pipenightdreams-0.10.0/configure +@@ -11,6 +11,9 @@ + ac_help= + ac_default_prefix=/usr/local + # Any additions from configure.in: ++ac_help="$ac_help ++ --enable-maintainer-mode enable make rules and dependencies not useful ++ (and sometimes confusing) to the casual installer" + ac_default_prefix=/usr/local + ac_help="$ac_help + --with-sdl-prefix=PFX Prefix where SDL is installed (optional)" +@@ -529,7 +532,7 @@ + + + echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 +-echo "configure:533: checking how to run the C preprocessor" >&5 ++echo "configure:536: checking how to run the C preprocessor" >&5 + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then + CPP= +@@ -544,13 +547,13 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. + cat > conftest.$ac_ext < + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:554: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:557: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : +@@ -561,13 +564,13 @@ + rm -rf conftest* + CPP="${CC-cc} -E -traditional-cpp" + cat > conftest.$ac_ext < + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:571: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:574: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : +@@ -578,13 +581,13 @@ + rm -rf conftest* + CPP="${CC-cc} -nologo -E" + cat > conftest.$ac_ext < + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:588: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:591: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : +@@ -614,7 +617,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:618: checking for $ac_word" >&5 ++echo "configure:621: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -647,7 +650,7 @@ + # Extract the first word of "flex", so it can be a program name with args. + set dummy flex; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:651: checking for $ac_word" >&5 ++echo "configure:654: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -681,7 +684,7 @@ + *) ac_lib=l ;; + esac + echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 +-echo "configure:685: checking for yywrap in -l$ac_lib" >&5 ++echo "configure:688: checking for yywrap in -l$ac_lib" >&5 + ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -689,7 +692,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-l$ac_lib $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -723,7 +726,7 @@ + fi + + echo $ac_n "checking lex output file root""... $ac_c" 1>&6 +-echo "configure:727: checking lex output file root" >&5 ++echo "configure:730: checking lex output file root" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_lex_root'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -744,7 +747,7 @@ + LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root + + echo $ac_n "checking whether yytext is a pointer""... $ac_c" 1>&6 +-echo "configure:748: checking whether yytext is a pointer" >&5 ++echo "configure:751: checking whether yytext is a pointer" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -756,14 +759,14 @@ + ac_save_LIBS="$LIBS" + LIBS="$LIBS $LEXLIB" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_prog_lex_yytext_pointer=yes + else +@@ -808,6 +811,7 @@ + ac_config_sub=$ac_aux_dir/config.sub + ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. + ++am__api_version="1.4" + # Find a good install program. We prefer a C program (faster), + # so one script is as good as another. But avoid the broken or + # incompatible versions: +@@ -820,7 +824,7 @@ + # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" + # ./install, which can be erroneously created by make from ./install.sh. + echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 +-echo "configure:824: checking for a BSD compatible install" >&5 ++echo "configure:828: checking for a BSD compatible install" >&5 + if test -z "$INSTALL"; then + if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -873,7 +877,7 @@ + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + + echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 +-echo "configure:877: checking whether build environment is sane" >&5 ++echo "configure:881: checking whether build environment is sane" >&5 + # Just in case + sleep 1 + echo timestamp > conftestfile +@@ -930,7 +934,7 @@ + test "$program_transform_name" = "" && program_transform_name="s,x,x," + + echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 +-echo "configure:934: checking whether ${MAKE-make} sets \${MAKE}" >&5 ++echo "configure:938: checking whether ${MAKE-make} sets \${MAKE}" >&5 + set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -975,21 +979,21 @@ + + + missing_dir=`cd $ac_aux_dir && pwd` +-echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 +-echo "configure:980: checking for working aclocal" >&5 ++echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6 ++echo "configure:984: checking for working aclocal-${am__api_version}" >&5 + # Run test in a subshell; some versions of sh will print an error if + # an executable is not found, even if stderr is redirected. + # Redirect stdin to placate older versions of autoconf. Sigh. +-if (aclocal --version) < /dev/null > /dev/null 2>&1; then +- ACLOCAL=aclocal ++if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then ++ ACLOCAL=aclocal-${am__api_version} + echo "$ac_t""found" 1>&6 + else +- ACLOCAL="$missing_dir/missing aclocal" ++ ACLOCAL="$missing_dir/missing aclocal-${am__api_version}" + echo "$ac_t""missing" 1>&6 + fi + + echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 +-echo "configure:993: checking for working autoconf" >&5 ++echo "configure:997: checking for working autoconf" >&5 + # Run test in a subshell; some versions of sh will print an error if + # an executable is not found, even if stderr is redirected. + # Redirect stdin to placate older versions of autoconf. Sigh. +@@ -1001,21 +1005,21 @@ + echo "$ac_t""missing" 1>&6 + fi + +-echo $ac_n "checking for working automake""... $ac_c" 1>&6 +-echo "configure:1006: checking for working automake" >&5 ++echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6 ++echo "configure:1010: checking for working automake-${am__api_version}" >&5 + # Run test in a subshell; some versions of sh will print an error if + # an executable is not found, even if stderr is redirected. + # Redirect stdin to placate older versions of autoconf. Sigh. +-if (automake --version) < /dev/null > /dev/null 2>&1; then +- AUTOMAKE=automake ++if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then ++ AUTOMAKE=automake-${am__api_version} + echo "$ac_t""found" 1>&6 + else +- AUTOMAKE="$missing_dir/missing automake" ++ AUTOMAKE="$missing_dir/missing automake-${am__api_version}" + echo "$ac_t""missing" 1>&6 + fi + + echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 +-echo "configure:1019: checking for working autoheader" >&5 ++echo "configure:1023: checking for working autoheader" >&5 + # Run test in a subshell; some versions of sh will print an error if + # an executable is not found, even if stderr is redirected. + # Redirect stdin to placate older versions of autoconf. Sigh. +@@ -1028,7 +1032,7 @@ + fi + + echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 +-echo "configure:1032: checking for working makeinfo" >&5 ++echo "configure:1036: checking for working makeinfo" >&5 + # Run test in a subshell; some versions of sh will print an error if + # an executable is not found, even if stderr is redirected. + # Redirect stdin to placate older versions of autoconf. Sigh. +@@ -1041,18 +1045,40 @@ + fi + + ++echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 ++echo "configure:1050: checking whether to enable maintainer-specific portions of Makefiles" >&5 ++ # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. ++if test "${enable_maintainer_mode+set}" = set; then ++ enableval="$enable_maintainer_mode" ++ USE_MAINTAINER_MODE=$enableval ++else ++ USE_MAINTAINER_MODE=no ++fi ++ ++ echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6 ++ ++ ++if test $USE_MAINTAINER_MODE = yes; then ++ MAINTAINER_MODE_TRUE= ++ MAINTAINER_MODE_FALSE='#' ++else ++ MAINTAINER_MODE_TRUE='#' ++ MAINTAINER_MODE_FALSE= ++fi ++ MAINT=$MAINTAINER_MODE_TRUE ++ ++ + + + + +-CXXFLAGS="-O2" + + # We now have a list of macros which tell autoconf what tools we need to + # build our software, in this case "make", a C++ compiler, and "install". + # If we were creating a C program, we would use AC_PROC_CC instead of CXX. + + echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 +-echo "configure:1056: checking whether ${MAKE-make} sets \${MAKE}" >&5 ++echo "configure:1082: checking whether ${MAKE-make} sets \${MAKE}" >&5 + set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1083,7 +1109,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1087: checking for $ac_word" >&5 ++echo "configure:1113: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1115,7 +1141,7 @@ + + + echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:1119: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ++echo "configure:1145: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 + + ac_ext=C + # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +@@ -1126,12 +1152,12 @@ + + cat > conftest.$ac_ext << EOF + +-#line 1130 "configure" ++#line 1156 "configure" + #include "confdefs.h" + + int main(){return(0);} + EOF +-if { (eval echo configure:1135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cxx_works=yes + # If we can't run a trivial program, we are probably using a cross compiler. + if (./conftest; exit) 2>/dev/null; then +@@ -1157,12 +1183,12 @@ + { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } + fi + echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +-echo "configure:1161: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:1187: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 + echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 + cross_compiling=$ac_cv_prog_cxx_cross + + echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 +-echo "configure:1166: checking whether we are using GNU C++" >&5 ++echo "configure:1192: checking whether we are using GNU C++" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1171,7 +1197,7 @@ + yes; + #endif + EOF +-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1175: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ++if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1201: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gxx=yes + else + ac_cv_prog_gxx=no +@@ -1190,7 +1216,7 @@ + ac_save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS= + echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 +-echo "configure:1194: checking whether ${CXX-g++} accepts -g" >&5 ++echo "configure:1220: checking whether ${CXX-g++} accepts -g" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1233,7 +1259,7 @@ + # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" + # ./install, which can be erroneously created by make from ./install.sh. + echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 +-echo "configure:1237: checking for a BSD compatible install" >&5 ++echo "configure:1263: checking for a BSD compatible install" >&5 + if test -z "$INSTALL"; then + if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1293,7 +1319,7 @@ + + #AC_CANONICAL_HOST + echo $ac_n "checking target system type""... $ac_c" 1>&6 +-echo "configure:1297: checking target system type" >&5 ++echo "configure:1323: checking target system type" >&5 + + target_alias=$target + case "$target_alias" in +@@ -1361,7 +1387,7 @@ + # Extract the first word of "sdl-config", so it can be a program name with args. + set dummy sdl-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1365: checking for $ac_word" >&5 ++echo "configure:1391: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_SDL_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1396,7 +1422,7 @@ + + min_sdl_version=$SDL_VERSION + echo $ac_n "checking for SDL - version >= $min_sdl_version""... $ac_c" 1>&6 +-echo "configure:1400: checking for SDL - version >= $min_sdl_version" >&5 ++echo "configure:1426: checking for SDL - version >= $min_sdl_version" >&5 + no_sdl="" + if test "$SDL_CONFIG" = "no" ; then + no_sdl=yes +@@ -1420,7 +1446,7 @@ + echo $ac_n "cross compiling; assumed OK... $ac_c" + else + cat > conftest.$ac_ext < +@@ -1478,7 +1504,7 @@ + + + EOF +-if { (eval echo configure:1482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:1508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -1512,7 +1538,7 @@ + CFLAGS="$CFLAGS $SDL_CFLAGS" + LIBS="$LIBS $SDL_LIBS" + cat > conftest.$ac_ext < +@@ -1522,7 +1548,7 @@ + return 0; + ; return 0; } + EOF +-if { (eval echo configure:1526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding SDL or finding the wrong" +@@ -1561,7 +1587,7 @@ + LIBS="$LIBS $SDL_LIBS" + + echo $ac_n "checking for IMG_Load in -lSDL_image""... $ac_c" 1>&6 +-echo "configure:1565: checking for IMG_Load in -lSDL_image" >&5 ++echo "configure:1591: checking for IMG_Load in -lSDL_image" >&5 + ac_lib_var=`echo SDL_image'_'IMG_Load | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1569,7 +1595,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lSDL_image $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -1799,6 +1825,9 @@ + s%@AUTOHEADER@%$AUTOHEADER%g + s%@MAKEINFO@%$MAKEINFO%g + s%@SET_MAKE@%$SET_MAKE%g ++s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g ++s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g ++s%@MAINT@%$MAINT%g + s%@CXX@%$CXX%g + s%@target@%$target%g + s%@target_alias@%$target_alias%g +--- pipenightdreams-0.10.0.orig/configure.in ++++ pipenightdreams-0.10.0/configure.in +@@ -9,9 +9,9 @@ + # archive. + + AM_INIT_AUTOMAKE(pipenightdreams, 0.10.0) ++AM_MAINTAINER_MODE + AC_PREFIX_DEFAULT(/usr/local) + AM_CONFIG_HEADER(src/config.h) +-CXXFLAGS="-O2" + + # We now have a list of macros which tell autoconf what tools we need to + # build our software, in this case "make", a C++ compiler, and "install". +--- pipenightdreams-0.10.0.orig/aclocal.m4 ++++ pipenightdreams-0.10.0/aclocal.m4 +@@ -1,4 +1,4 @@ +-dnl aclocal.m4 generated automatically by aclocal 1.4-p5 ++dnl aclocal.m4 generated automatically by aclocal 1.4-p6 + + dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation +@@ -646,7 +646,8 @@ + dnl AM_INIT_AUTOMAKE(package,version, [no-define]) + + AC_DEFUN([AM_INIT_AUTOMAKE], +-[AC_REQUIRE([AC_PROG_INSTALL]) ++[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl ++AC_REQUIRE([AC_PROG_INSTALL]) + PACKAGE=[$1] + AC_SUBST(PACKAGE) + VERSION=[$2] +@@ -662,13 +663,42 @@ + AC_REQUIRE([AC_ARG_PROGRAM]) + dnl FIXME This is truly gross. + missing_dir=`cd $ac_aux_dir && pwd` +-AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir) ++AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir) + AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) +-AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) ++AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir) + AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) + AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) + AC_REQUIRE([AC_PROG_MAKE_SET])]) + ++# Copyright 2002 Free Software Foundation, Inc. ++ ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2, or (at your option) ++# any later version. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++ ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ++ ++# AM_AUTOMAKE_VERSION(VERSION) ++# ---------------------------- ++# Automake X.Y traces this macro to ensure aclocal.m4 has been ++# generated from the m4 files accompanying Automake X.Y. ++AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"]) ++ ++# AM_SET_CURRENT_AUTOMAKE_VERSION ++# ------------------------------- ++# Call AM_AUTOMAKE_VERSION so it can be traced. ++# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. ++AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], ++ [AM_AUTOMAKE_VERSION([1.4-p6])]) ++ + # + # Check to make sure that the build environment is sane. + # +@@ -728,6 +758,39 @@ + fi + AC_SUBST($1)]) + ++# Add --enable-maintainer-mode option to configure. ++# From Jim Meyering ++ ++# serial 1 ++ ++AC_DEFUN([AM_MAINTAINER_MODE], ++[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) ++ dnl maintainer-mode is disabled by default ++ AC_ARG_ENABLE(maintainer-mode, ++[ --enable-maintainer-mode enable make rules and dependencies not useful ++ (and sometimes confusing) to the casual installer], ++ USE_MAINTAINER_MODE=$enableval, ++ USE_MAINTAINER_MODE=no) ++ AC_MSG_RESULT($USE_MAINTAINER_MODE) ++ AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes) ++ MAINT=$MAINTAINER_MODE_TRUE ++ AC_SUBST(MAINT)dnl ++] ++) ++ ++# Define a conditional. ++ ++AC_DEFUN([AM_CONDITIONAL], ++[AC_SUBST($1_TRUE) ++AC_SUBST($1_FALSE) ++if $2; then ++ $1_TRUE= ++ $1_FALSE='#' ++else ++ $1_TRUE='#' ++ $1_FALSE= ++fi]) ++ + # Like AC_CONFIG_HEADER, but automatically create stamp file. + + AC_DEFUN([AM_CONFIG_HEADER], +--- pipenightdreams-0.10.0.orig/levels/Makefile.in ++++ pipenightdreams-0.10.0/levels/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am ++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am + + # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation +@@ -65,6 +65,7 @@ + LEX = @LEX@ + LIBTOOL = @LIBTOOL@ + LN_S = @LN_S@ ++MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + NM = @NM@ + OBJDUMP = @OBJDUMP@ +@@ -88,11 +89,11 @@ + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +-TAR = gtar ++TAR = tar + GZIP_ENV = --best + all: all-redirect + .SUFFIXES: +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu levels/Makefile + + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +--- pipenightdreams-0.10.0.orig/images/flow_green/Makefile.in ++++ pipenightdreams-0.10.0/images/flow_green/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am ++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am + + # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation +@@ -65,6 +65,7 @@ + LEX = @LEX@ + LIBTOOL = @LIBTOOL@ + LN_S = @LN_S@ ++MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + NM = @NM@ + OBJDUMP = @OBJDUMP@ +@@ -88,11 +89,11 @@ + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +-TAR = gtar ++TAR = tar + GZIP_ENV = --best + all: all-redirect + .SUFFIXES: +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu images/flow_green/Makefile + + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +--- pipenightdreams-0.10.0.orig/images/pipes_metal/Makefile.in ++++ pipenightdreams-0.10.0/images/pipes_metal/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am ++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am + + # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation +@@ -65,6 +65,7 @@ + LEX = @LEX@ + LIBTOOL = @LIBTOOL@ + LN_S = @LN_S@ ++MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + NM = @NM@ + OBJDUMP = @OBJDUMP@ +@@ -88,11 +89,11 @@ + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +-TAR = gtar ++TAR = tar + GZIP_ENV = --best + all: all-redirect + .SUFFIXES: +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu images/pipes_metal/Makefile + + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +--- pipenightdreams-0.10.0.orig/images/flow_light/Makefile.in ++++ pipenightdreams-0.10.0/images/flow_light/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am ++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am + + # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation +@@ -65,6 +65,7 @@ + LEX = @LEX@ + LIBTOOL = @LIBTOOL@ + LN_S = @LN_S@ ++MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + NM = @NM@ + OBJDUMP = @OBJDUMP@ +@@ -88,11 +89,11 @@ + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +-TAR = gtar ++TAR = tar + GZIP_ENV = --best + all: all-redirect + .SUFFIXES: +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu images/flow_light/Makefile + + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +--- pipenightdreams-0.10.0.orig/images/arrows_yellow/Makefile.in ++++ pipenightdreams-0.10.0/images/arrows_yellow/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am ++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am + + # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation +@@ -65,6 +65,7 @@ + LEX = @LEX@ + LIBTOOL = @LIBTOOL@ + LN_S = @LN_S@ ++MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + NM = @NM@ + OBJDUMP = @OBJDUMP@ +@@ -88,11 +89,11 @@ + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +-TAR = gtar ++TAR = tar + GZIP_ENV = --best + all: all-redirect + .SUFFIXES: +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu images/arrows_yellow/Makefile + + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +--- pipenightdreams-0.10.0.orig/images/pipes_space/back01/Makefile.in ++++ pipenightdreams-0.10.0/images/pipes_space/back01/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am ++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am + + # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation +@@ -65,6 +65,7 @@ + LEX = @LEX@ + LIBTOOL = @LIBTOOL@ + LN_S = @LN_S@ ++MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + NM = @NM@ + OBJDUMP = @OBJDUMP@ +@@ -88,11 +89,11 @@ + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +-TAR = gtar ++TAR = tar + GZIP_ENV = --best + all: all-redirect + .SUFFIXES: +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu images/pipes_space/back01/Makefile + + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +--- pipenightdreams-0.10.0.orig/images/pipes_space/back02/Makefile.in ++++ pipenightdreams-0.10.0/images/pipes_space/back02/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am ++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am + + # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation +@@ -65,6 +65,7 @@ + LEX = @LEX@ + LIBTOOL = @LIBTOOL@ + LN_S = @LN_S@ ++MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + NM = @NM@ + OBJDUMP = @OBJDUMP@ +@@ -88,11 +89,11 @@ + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +-TAR = gtar ++TAR = tar + GZIP_ENV = --best + all: all-redirect + .SUFFIXES: +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu images/pipes_space/back02/Makefile + + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +--- pipenightdreams-0.10.0.orig/images/pipes_space/back04/Makefile.in ++++ pipenightdreams-0.10.0/images/pipes_space/back04/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am ++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am + + # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation +@@ -65,6 +65,7 @@ + LEX = @LEX@ + LIBTOOL = @LIBTOOL@ + LN_S = @LN_S@ ++MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + NM = @NM@ + OBJDUMP = @OBJDUMP@ +@@ -88,11 +89,11 @@ + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +-TAR = gtar ++TAR = tar + GZIP_ENV = --best + all: all-redirect + .SUFFIXES: +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu images/pipes_space/back04/Makefile + + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +--- pipenightdreams-0.10.0.orig/images/pipes_space/back05/Makefile.in ++++ pipenightdreams-0.10.0/images/pipes_space/back05/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am ++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am + + # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation +@@ -65,6 +65,7 @@ + LEX = @LEX@ + LIBTOOL = @LIBTOOL@ + LN_S = @LN_S@ ++MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + NM = @NM@ + OBJDUMP = @OBJDUMP@ +@@ -88,11 +89,11 @@ + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +-TAR = gtar ++TAR = tar + GZIP_ENV = --best + all: all-redirect + .SUFFIXES: +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu images/pipes_space/back05/Makefile + + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +--- pipenightdreams-0.10.0.orig/images/pipes_space/back03/Makefile.in ++++ pipenightdreams-0.10.0/images/pipes_space/back03/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am ++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am + + # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation +@@ -65,6 +65,7 @@ + LEX = @LEX@ + LIBTOOL = @LIBTOOL@ + LN_S = @LN_S@ ++MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + NM = @NM@ + OBJDUMP = @OBJDUMP@ +@@ -88,11 +89,11 @@ + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +-TAR = gtar ++TAR = tar + GZIP_ENV = --best + all: all-redirect + .SUFFIXES: +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu images/pipes_space/back03/Makefile + + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +--- pipenightdreams-0.10.0.orig/images/pipes_space/Makefile.in ++++ pipenightdreams-0.10.0/images/pipes_space/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am ++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am + + # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation +@@ -65,6 +65,7 @@ + LEX = @LEX@ + LIBTOOL = @LIBTOOL@ + LN_S = @LN_S@ ++MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + NM = @NM@ + OBJDUMP = @OBJDUMP@ +@@ -90,11 +91,11 @@ + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +-TAR = gtar ++TAR = tar + GZIP_ENV = --best + all: all-redirect + .SUFFIXES: +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu images/pipes_space/Makefile + + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +@@ -199,7 +200,7 @@ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ +- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) ++ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) + + mostlyclean-tags: + +--- pipenightdreams-0.10.0.orig/images/default/Makefile.in ++++ pipenightdreams-0.10.0/images/default/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am ++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am + + # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation +@@ -65,6 +65,7 @@ + LEX = @LEX@ + LIBTOOL = @LIBTOOL@ + LN_S = @LN_S@ ++MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + NM = @NM@ + OBJDUMP = @OBJDUMP@ +@@ -88,11 +89,11 @@ + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +-TAR = gtar ++TAR = tar + GZIP_ENV = --best + all: all-redirect + .SUFFIXES: +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu images/default/Makefile + + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +--- pipenightdreams-0.10.0.orig/images/flow_blue/Makefile.in ++++ pipenightdreams-0.10.0/images/flow_blue/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am ++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am + + # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation +@@ -65,6 +65,7 @@ + LEX = @LEX@ + LIBTOOL = @LIBTOOL@ + LN_S = @LN_S@ ++MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + NM = @NM@ + OBJDUMP = @OBJDUMP@ +@@ -88,11 +89,11 @@ + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +-TAR = gtar ++TAR = tar + GZIP_ENV = --best + all: all-redirect + .SUFFIXES: +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu images/flow_blue/Makefile + + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +--- pipenightdreams-0.10.0.orig/images/Makefile.in ++++ pipenightdreams-0.10.0/images/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am ++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am + + # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation +@@ -65,6 +65,7 @@ + LEX = @LEX@ + LIBTOOL = @LIBTOOL@ + LN_S = @LN_S@ ++MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + NM = @NM@ + OBJDUMP = @OBJDUMP@ +@@ -90,11 +91,11 @@ + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +-TAR = gtar ++TAR = tar + GZIP_ENV = --best + all: all-redirect + .SUFFIXES: +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu images/Makefile + + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +@@ -199,7 +200,7 @@ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ +- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) ++ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) + + mostlyclean-tags: + +--- pipenightdreams-0.10.0.orig/images/arrows_grey/Makefile.in ++++ pipenightdreams-0.10.0/images/arrows_grey/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am ++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am + + # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation +@@ -65,6 +65,7 @@ + LEX = @LEX@ + LIBTOOL = @LIBTOOL@ + LN_S = @LN_S@ ++MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + NM = @NM@ + OBJDUMP = @OBJDUMP@ +@@ -88,11 +89,11 @@ + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +-TAR = gtar ++TAR = tar + GZIP_ENV = --best + all: all-redirect + .SUFFIXES: +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu images/arrows_grey/Makefile + + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +--- pipenightdreams-0.10.0.orig/images/pipes_toys/Makefile.in ++++ pipenightdreams-0.10.0/images/pipes_toys/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am ++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am + + # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation +@@ -65,6 +65,7 @@ + LEX = @LEX@ + LIBTOOL = @LIBTOOL@ + LN_S = @LN_S@ ++MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + NM = @NM@ + OBJDUMP = @OBJDUMP@ +@@ -88,11 +89,11 @@ + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +-TAR = gtar ++TAR = tar + GZIP_ENV = --best + all: all-redirect + .SUFFIXES: +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu images/pipes_toys/Makefile + + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +--- pipenightdreams-0.10.0.orig/images/pipes_cables/Makefile.in ++++ pipenightdreams-0.10.0/images/pipes_cables/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am ++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am + + # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation +@@ -65,6 +65,7 @@ + LEX = @LEX@ + LIBTOOL = @LIBTOOL@ + LN_S = @LN_S@ ++MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + NM = @NM@ + OBJDUMP = @OBJDUMP@ +@@ -88,11 +89,11 @@ + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +-TAR = gtar ++TAR = tar + GZIP_ENV = --best + all: all-redirect + .SUFFIXES: +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu images/pipes_cables/Makefile + + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +--- pipenightdreams-0.10.0.orig/images/pipes_wire/Makefile.in ++++ pipenightdreams-0.10.0/images/pipes_wire/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am ++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am + + # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation +@@ -65,6 +65,7 @@ + LEX = @LEX@ + LIBTOOL = @LIBTOOL@ + LN_S = @LN_S@ ++MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + NM = @NM@ + OBJDUMP = @OBJDUMP@ +@@ -88,11 +89,11 @@ + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +-TAR = gtar ++TAR = tar + GZIP_ENV = --best + all: all-redirect + .SUFFIXES: +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu images/pipes_wire/Makefile + + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..8802488 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +migrate.patch diff --git a/images/Makefile.in b/images/Makefile.in index 6eb3656..8a2e593 100644 --- a/images/Makefile.in +++ b/images/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -65,7 +65,6 @@ LEX = @LEX@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ NM = @NM@ OBJDUMP = @OBJDUMP@ @@ -91,11 +90,11 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu images/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) @@ -200,7 +199,7 @@ awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: diff --git a/images/arrows_grey/Makefile.in b/images/arrows_grey/Makefile.in index 666f3c1..50ecde1 100644 --- a/images/arrows_grey/Makefile.in +++ b/images/arrows_grey/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -65,7 +65,6 @@ LEX = @LEX@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ NM = @NM@ OBJDUMP = @OBJDUMP@ @@ -89,11 +88,11 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu images/arrows_grey/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) diff --git a/images/arrows_yellow/Makefile.in b/images/arrows_yellow/Makefile.in index a3c0686..c5e974c 100644 --- a/images/arrows_yellow/Makefile.in +++ b/images/arrows_yellow/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -65,7 +65,6 @@ LEX = @LEX@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ NM = @NM@ OBJDUMP = @OBJDUMP@ @@ -89,11 +88,11 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu images/arrows_yellow/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) diff --git a/images/default/Makefile.in b/images/default/Makefile.in index 447cb47..2e16f7f 100644 --- a/images/default/Makefile.in +++ b/images/default/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -65,7 +65,6 @@ LEX = @LEX@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ NM = @NM@ OBJDUMP = @OBJDUMP@ @@ -89,11 +88,11 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu images/default/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) diff --git a/images/flow_blue/Makefile.in b/images/flow_blue/Makefile.in index fec41c8..8baa822 100644 --- a/images/flow_blue/Makefile.in +++ b/images/flow_blue/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -65,7 +65,6 @@ LEX = @LEX@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ NM = @NM@ OBJDUMP = @OBJDUMP@ @@ -89,11 +88,11 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu images/flow_blue/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) diff --git a/images/flow_green/Makefile.in b/images/flow_green/Makefile.in index 9a31d12..b1dcb06 100644 --- a/images/flow_green/Makefile.in +++ b/images/flow_green/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -65,7 +65,6 @@ LEX = @LEX@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ NM = @NM@ OBJDUMP = @OBJDUMP@ @@ -89,11 +88,11 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu images/flow_green/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) diff --git a/images/flow_light/Makefile.in b/images/flow_light/Makefile.in index 790890f..746eea0 100644 --- a/images/flow_light/Makefile.in +++ b/images/flow_light/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -65,7 +65,6 @@ LEX = @LEX@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ NM = @NM@ OBJDUMP = @OBJDUMP@ @@ -89,11 +88,11 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu images/flow_light/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) diff --git a/images/pipes_cables/Makefile.in b/images/pipes_cables/Makefile.in index dabea67..03c2e4c 100644 --- a/images/pipes_cables/Makefile.in +++ b/images/pipes_cables/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -65,7 +65,6 @@ LEX = @LEX@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ NM = @NM@ OBJDUMP = @OBJDUMP@ @@ -89,11 +88,11 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu images/pipes_cables/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) diff --git a/images/pipes_metal/Makefile.in b/images/pipes_metal/Makefile.in index 6764f95..2b6bfb6 100644 --- a/images/pipes_metal/Makefile.in +++ b/images/pipes_metal/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -65,7 +65,6 @@ LEX = @LEX@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ NM = @NM@ OBJDUMP = @OBJDUMP@ @@ -89,11 +88,11 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu images/pipes_metal/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) diff --git a/images/pipes_space/Makefile.in b/images/pipes_space/Makefile.in index 7cb4433..b7b163b 100644 --- a/images/pipes_space/Makefile.in +++ b/images/pipes_space/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -65,7 +65,6 @@ LEX = @LEX@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ NM = @NM@ OBJDUMP = @OBJDUMP@ @@ -91,11 +90,11 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu images/pipes_space/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) @@ -200,7 +199,7 @@ awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: diff --git a/images/pipes_space/back01/Makefile.in b/images/pipes_space/back01/Makefile.in index d3840c4..df70e8a 100644 --- a/images/pipes_space/back01/Makefile.in +++ b/images/pipes_space/back01/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -65,7 +65,6 @@ LEX = @LEX@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ NM = @NM@ OBJDUMP = @OBJDUMP@ @@ -89,11 +88,11 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu images/pipes_space/back01/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) diff --git a/images/pipes_space/back02/Makefile.in b/images/pipes_space/back02/Makefile.in index 74045b8..00bb98a 100644 --- a/images/pipes_space/back02/Makefile.in +++ b/images/pipes_space/back02/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -65,7 +65,6 @@ LEX = @LEX@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ NM = @NM@ OBJDUMP = @OBJDUMP@ @@ -89,11 +88,11 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu images/pipes_space/back02/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) diff --git a/images/pipes_space/back03/Makefile.in b/images/pipes_space/back03/Makefile.in index 7392be8..14dc741 100644 --- a/images/pipes_space/back03/Makefile.in +++ b/images/pipes_space/back03/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -65,7 +65,6 @@ LEX = @LEX@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ NM = @NM@ OBJDUMP = @OBJDUMP@ @@ -89,11 +88,11 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu images/pipes_space/back03/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) diff --git a/images/pipes_space/back04/Makefile.in b/images/pipes_space/back04/Makefile.in index c4de7d0..7bc3660 100644 --- a/images/pipes_space/back04/Makefile.in +++ b/images/pipes_space/back04/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -65,7 +65,6 @@ LEX = @LEX@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ NM = @NM@ OBJDUMP = @OBJDUMP@ @@ -89,11 +88,11 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu images/pipes_space/back04/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) diff --git a/images/pipes_space/back05/Makefile.in b/images/pipes_space/back05/Makefile.in index 3b59404..7a8bf18 100644 --- a/images/pipes_space/back05/Makefile.in +++ b/images/pipes_space/back05/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -65,7 +65,6 @@ LEX = @LEX@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ NM = @NM@ OBJDUMP = @OBJDUMP@ @@ -89,11 +88,11 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu images/pipes_space/back05/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) diff --git a/images/pipes_toys/Makefile.in b/images/pipes_toys/Makefile.in index 812a6ec..b7a9ee2 100644 --- a/images/pipes_toys/Makefile.in +++ b/images/pipes_toys/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -65,7 +65,6 @@ LEX = @LEX@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ NM = @NM@ OBJDUMP = @OBJDUMP@ @@ -89,11 +88,11 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu images/pipes_toys/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) diff --git a/images/pipes_wire/Makefile.in b/images/pipes_wire/Makefile.in index c6a320a..e3d12a7 100644 --- a/images/pipes_wire/Makefile.in +++ b/images/pipes_wire/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -65,7 +65,6 @@ LEX = @LEX@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ NM = @NM@ OBJDUMP = @OBJDUMP@ @@ -89,11 +88,11 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu images/pipes_wire/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) diff --git a/levels/Makefile.in b/levels/Makefile.in index d344cf9..9b4cf48 100644 --- a/levels/Makefile.in +++ b/levels/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -65,7 +65,6 @@ LEX = @LEX@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ NM = @NM@ OBJDUMP = @OBJDUMP@ @@ -89,11 +88,11 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu levels/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) diff --git a/man/Makefile.in b/man/Makefile.in index 4779d02..9e40d62 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -67,7 +67,6 @@ LEX = @LEX@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ NM = @NM@ OBJDUMP = @OBJDUMP@ @@ -93,11 +92,11 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) diff --git a/man/pipenightdreams.6 b/man/pipenightdreams.6 index 10d8d01..92d79a1 100644 --- a/man/pipenightdreams.6 +++ b/man/pipenightdreams.6 @@ -1,12 +1,15 @@ .TH PIPENIGHTDREAMS 6 "23rd May 2002" .SH NAME + pipenightdreams \- Just another pipe trip (PipeDream clon). .SH SYNOPSIS + \fB pipenightdreams\fP [\--datadir ] [\--fullscreen] .SH DESCRIPTION + \fB pipenightdreams\fP is a PipeDream style game. The objetive of the game is to carry liquid from some point to the exit using different kinds of pipes. On each level there is a minimum number of required pipes that should be at least reached for it @@ -43,6 +46,7 @@ .IP HYPER\ BONUS The green one. + .SH OPTIONS \fB --datadir \fP is used when the data directory is not the default one (\fB /usr/share/games/pipenightdreams\fP @@ -60,4 +64,6 @@ http://www.libsdl.org/projects/pipenightdreams .SH AUTHORS + Waldemar A. Baraldi + diff --git a/src/Makefile.in b/src/Makefile.in index e267bc5..fbddd31 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -67,7 +67,6 @@ LEX = @LEX@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ NM = @NM@ OBJDUMP = @OBJDUMP@ @@ -119,7 +118,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best DEP_FILES = .deps/board.P .deps/canvas.P .deps/cross.P \ .deps/elbowdownleft.P .deps/elbowdownright.P .deps/elbowupleft.P \ @@ -138,7 +137,7 @@ all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .cc .cpp .ll .o .s -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) @@ -156,7 +155,7 @@ && CONFIG_FILES= CONFIG_HEADERS=src/config.h \ $(SHELL) ./config.status @echo timestamp > stamp-h 2> /dev/null -$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-h.in +$(srcdir)/config.h.in: $(srcdir)/stamp-h.in @if test ! -f $@; then \ rm -f $(srcdir)/stamp-h.in; \ $(MAKE) $(srcdir)/stamp-h.in; \ @@ -243,7 +242,7 @@ awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP)) + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: @@ -383,7 +382,7 @@ -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: - -test -z "levelcc" || rm -f levelcc + -test -z "levelll" || rm -f levelll mostlyclean-am: mostlyclean-hdr mostlyclean-binPROGRAMS \ mostlyclean-compile mostlyclean-tags mostlyclean-depend \ mostlyclean-generic diff --git a/src/config.h.in b/src/config.h.in index 60e0680..31064ca 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -1,4 +1,4 @@ -/* src/config.h.in. Generated automatically from configure.in by autoheader 2.13. */ +/* src/config.h.in. Generated automatically from configure.in by autoheader. */ /* Define if lex declares yytext as a char * by default, not a char[]. */ #undef YYTEXT_POINTER diff --git a/src/eventmanager.cpp b/src/eventmanager.cpp index e2e7cd4..e31941a 100644 --- a/src/eventmanager.cpp +++ b/src/eventmanager.cpp @@ -40,7 +40,7 @@ lista_streams->remove(lista_streams->indexOf(s)); } -void EventManager::pumpEvents(bool wait){ +void EventManager::pumpEvents(bool wait=false){ SDL_Event event; Index * stream; bool got=false; diff --git a/src/graphic.cpp b/src/graphic.cpp index 4360c22..9e0867e 100644 --- a/src/graphic.cpp +++ b/src/graphic.cpp @@ -44,11 +44,11 @@ if (pixels) free(pixels); } -void Graphic::setAlpha(char value){ +void Graphic::setAlpha(char value=OPAQUE){ SDL_SetAlpha(surface, SDL_SRCALPHA, value); } -void Graphic::enableClipping(bool flag){ +void Graphic::enableClipping(bool flag=true){ if (flag){ SDL_Rect rect; @@ -68,7 +68,7 @@ clip_height=height; } -void Graphic::flip(Axis a){ +void Graphic::flip(Axis a=HAxis){ if (surface){ if (SDL_MUSTLOCK(surface)) if (SDL_LockSurface(surface)<0) return; diff --git a/src/hash.cpp b/src/hash.cpp index 3560842..a8be35d 100644 --- a/src/hash.cpp +++ b/src/hash.cpp @@ -55,10 +55,10 @@ return(sum % nbuckets); } -Hash::Hash(int bs){ +Hash::Hash(int bs=256){ int i; nbuckets=bs; - lbuckets=new List *[nbuckets]; + lbuckets=new (List *)[nbuckets]; for (i=0;i -Image::Image(Str * filename):Graphic(){ +Image::Image(Str * filename=NULL):Graphic(){ if (filename) load(filename); } diff --git a/src/level.ll b/src/level.ll index 9877572..26e7608 100644 --- a/src/level.ll +++ b/src/level.ll @@ -93,20 +93,6 @@ #define INVALID 100 int nline; - -int Level::load(Str * filename){ - YY_FLUSH_BUFFER; - nline=1; - if (!(yyin=fopen(filename->get(), "r"))){ - delete filename; - return 1; - } - delete filename; - level(); - fclose(yyin); - if (error) return -1; - return 0; -} %} %option noyywrap @@ -613,3 +599,17 @@ }else printError(new Str("'pipenightdreams' not found")); } +int Level::load(Str * filename){ + YY_FLUSH_BUFFER; + nline=1; + if (!(yyin=fopen(filename->get(), "r"))){ + delete filename; + return 1; + } + delete filename; + level(); + fclose(yyin); + if (error) return -1; + return 0; +} + diff --git a/src/list.cpp b/src/list.cpp index 7d4f5ed..836527e 100644 --- a/src/list.cpp +++ b/src/list.cpp @@ -125,7 +125,7 @@ return (insert(indexOf(i), obj)); } -List::Result List::remove(Index * index, bool del){ +List::Result List::remove(Index * index, bool del=false){ if (isEmpty()) return EmptyList; if (!index) return NullIndex; @@ -155,7 +155,7 @@ return Removed; } -void List::empty(bool del){ +void List::empty(bool del=true){ while (!isEmpty()) remove(getFirst(), del); } diff --git a/src/main.cpp b/src/main.cpp index fca6e76..36adf7a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -36,12 +36,10 @@ if (data_dir) delete data_dir; data_dir=new Str(argv[++i]); }else - if (!strcmp("--level", argv[i])) { - level = atoi(argv[++i]); - } else if (!strcmp("--fullscreen", argv[i])) + if (!strcmp("--fullscreen", argv[i])) fullscreen=true; else{ - printf("Invalid Data Dir\nUse pipenightdreams [--datadir ] [--fullscreen] [--level ]\n"); + printf("Invalid Data Dir\nUse pipenightdreams [--datadir ] [--fullscreen]\n"); printf("Using default: %s\n", GAME_DATADIR); } i++; diff --git a/src/pipe.cpp b/src/pipe.cpp index cbfaebf..e39d547 100644 --- a/src/pipe.cpp +++ b/src/pipe.cpp @@ -43,11 +43,11 @@ return !(full_level>0) && !fixed; } -void Pipe::setFixed(bool flag){ +void Pipe::setFixed(bool flag=true){ fixed=flag; } -void Pipe::setBonus(Bonus bonus){ +void Pipe::setBonus(Bonus bonus=NormalBonus){ this->bonus=bonus; } diff --git a/src/pipenightdreams.cpp b/src/pipenightdreams.cpp index 51e2f4e..441c517 100644 --- a/src/pipenightdreams.cpp +++ b/src/pipenightdreams.cpp @@ -99,7 +99,6 @@ switch (error){ case 1:{ showFinal(); - game_over=true; break; } case -1:{ diff --git a/src/player.cpp b/src/player.cpp index 96faa70..5e923e9 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -163,6 +163,14 @@ queue->paint(vm); } +void Player::setRestrictionCoef(unsigned int coef){ + queue->setRestrictionCoef(coef); +} + +void Player::setFixedCoef(unsigned int coef){ + queue->setFixedCoef(coef); +} + void Player::tick(){ score->tick(); diff --git a/src/player.h b/src/player.h index c17d5ba..92bda6d 100644 --- a/src/player.h +++ b/src/player.h @@ -47,13 +47,8 @@ void setStartRowColumn(int row, int column); void setBoard(Board * bd); - inline void setRestrictionCoef(unsigned int coef){ - queue->setRestrictionCoef(coef); - } - - inline void setFixedCoef(unsigned int coef){ - queue->setFixedCoef(coef); - } + inline void setRestrictionCoef(unsigned int coef); + inline void setFixedCoef(unsigned int coef); void incLives(); void decLives(); diff --git a/src/pointer.cpp b/src/pointer.cpp index 2d15793..8e31394 100644 --- a/src/pointer.cpp +++ b/src/pointer.cpp @@ -17,13 +17,34 @@ #include "pointer.h" -Pointer::Pointer(int row, int column){ +Pointer::Pointer(int row=0, int column=0){ this->row=row; this->column=column; this->moved_flag=true; } Pointer::~Pointer(){ delete image_name;} + +void Pointer::setRow(int row){ + this->row=row; +} + +void Pointer::setColumn(int column){ + this->column=column; +} + +void Pointer::setRowColumn(int row, int column){ + this->row=row; + this->column=column; +} + +void Pointer::setMoved(bool flag){ + moved_flag=flag; +} + +bool Pointer::moved(){ + return moved_flag; +} int Pointer::getRow(){ return row; diff --git a/src/pointer.h b/src/pointer.h index 25ddd50..be271cb 100644 --- a/src/pointer.h +++ b/src/pointer.h @@ -43,27 +43,11 @@ friend class Board; - inline void setRow(int row){ - this->row=row; - } - - inline void setColumn(int column){ - this->column=column; - } - - inline void setRowColumn(int row, int column){ - this->row=row; - this->column=column; - } - - inline void setMoved(bool flag){ - moved_flag=flag; - } - - inline bool moved(){ - return moved_flag; - } - + inline void setRow(int row); + inline void setColumn(int column); + inline void setRowColumn(int row, int column); + inline void setMoved(bool flag); + inline bool moved(); Str * image_name; Image * ima; diff --git a/src/score.cpp b/src/score.cpp index 7744c16..6e2e4b5 100644 --- a/src/score.cpp +++ b/src/score.cpp @@ -18,7 +18,7 @@ #include "score.h" #include -Score::Score(int value){ +Score::Score(int value=0){ this->value=value; delta=0; changed=true; diff --git a/src/str.cpp b/src/str.cpp index f2338ad..fca6e6c 100644 --- a/src/str.cpp +++ b/src/str.cpp @@ -11,7 +11,7 @@ const char Str::nul = '\0'; -Str::Str(const char * string){ +Str::Str(const char * string=NULL){ s=NULL; set(string); } @@ -25,7 +25,7 @@ if (s) delete[] s; } -void Str::set(const char * string){ +void Str::set(const char * string=NULL){ if (s) delete[] s; if (string){ s=new char[strlen(string)+1]; @@ -71,7 +71,7 @@ return (strlen(s)); } -bool Str::isEqual(Str * str, bool case_sensitive){ +bool Str::isEqual(Str * str, bool case_sensitive = true){ if (case_sensitive){ return (!strcmp(s, str->s)); }