Description: Debian changes to the upstream tk707 package.

--- a/Makefile.am
+++ b/Makefile.am
@@ -42,9 +42,9 @@
 tcl2c_SOURCES     = tcl2c.c 
 texi2help_SOURCES = texi2help.l 
 
-tk707bin_LDFLAGS  = $(ALSA_LIBS)   $(TCLTK_LIBS)   $(X_LIBS)
-tk707tcl_LDFLAGS  = $(ALSA_LIBS)   $(TCLTK_LIBS)   $(X_LIBS)
-INCLUDES          = $(ALSA_CFLAGS) $(TCLTK_CFLAGS) $(X_CFLAGS)
+tk707bin_LDADD  = $(ALSA_LIBS)   $(TCLTK_LIBS)   $(X_LIBS)
+tk707tcl_LDADD  = $(ALSA_LIBS)   $(TCLTK_LIBS)   $(X_LIBS)
+AM_CPPFLAGS       = $(ALSA_CFLAGS) $(TCLTK_CFLAGS) $(X_CFLAGS)
 
 pkgdata_DATA      = 707.map 727.map 7b7.map 7c7.map \
 		    demo.dat son-montuno.dat carioca.dat \
@@ -151,11 +151,11 @@
 $(srcdir)/ports.c: ports.tcl tcl2c
 	./tcl2c tcl_ports < $(srcdir)/ports.tcl > $(srcdir)/ports.c
 $(srcdir)/defs.c: defs.tcl tcl2c
-	sed -e 's%set VERSION.*%set VERSION $(VERSION)%' < $(srcdir)/defs.tcl | ./tcl2c tcl_defs > $(srcdir)/defs.c
+	sed -e 's%set VERSION[^\\]*\\%set VERSION $(VERSION)\\%' < $(srcdir)/defs.tcl | ./tcl2c tcl_defs > $(srcdir)/defs.c
 $(srcdir)/playa.c: play.c
 	sed '1,8s%^$$%#define not_compile_tcl%' $(srcdir)/play.c > $(srcdir)/playa.c
 $(srcdir)/defsa.c: defs.c
-	sed 's%set PKGDATADIR.*%set PKGDATADIR $(pkgdatadir)%' $(srcdir)/defs.c > $(srcdir)/defsa.c
+	sed 's%set PKGDATADIR[^\\]*\\%set PKGDATADIR $(pkgdatadir)\\%' $(srcdir)/defs.c > $(srcdir)/defsa.c
 $(srcdir)/title.c: title.tcl tcl2c
 	./tcl2c tcl_title < $(srcdir)/title.tcl > $(srcdir)/title.c
 $(srcdir)/title_defs.c: title_defs.tcl tcl2c
@@ -189,12 +189,13 @@
 
 install-exec-local: tk707bin tk707.sh
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
-	sh $(srcdir)/install-sh -s -c tk707bin $(DESTDIR)$(bindir)/tk707bin
 	$(INSTALL_SCRIPT) tk707.sh $(DESTDIR)$(bindir)/tk707
+	$(mkinstalldirs) $(DESTDIR)$(libdir)/tk707
+	sh $(srcdir)/install-sh -c tk707bin $(DESTDIR)$(libdir)/tk707/tk707bin
 
 uninstall-local:
 	/bin/rm -f $(DESTDIR)$(bindir)/tk707
-	/bin/rm -f $(DESTDIR)$(bindir)/tk707bin
+	/bin/rm -f $(DESTDIR)$(libdir)/tk707bin
 
 maintainer-clean-local:
 	cd $(srcdir); /bin/rm -f ${BUILT_SOURCES} tk707.html tk707.help	\
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -18,27 +18,8 @@
 dnl    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 dnl
 dnl --------------------------------------------------------------
-AC_DEFUN(AC_VERSION_FROM_FILE,
-[
-  if test -f $srcdir/VERSION; then
-   [MINOR_VERSION=`cat $srcdir/VERSION | awk -F "." '{print $NF}'`]
-   [MAJOR_VERSION=`cat $srcdir/VERSION | \
-        awk -F "." '{
-                i=1; printf("%s", $i);
-                for(i=2;i<NF;i++) {
-                        printf(".%s", $i);
-                }
-                printf("\n");
-        }' `]
-  else
-   AC_MSG_WARN(file $srcdir/VERSION not defined)
-   [MAJOR_VERSION=1]
-   [MINOR_VERSION=0]
-  fi
-])
-dnl --------------------------------------------------------------
 dnl MY_DEFINE(VARIABLE)
-AC_DEFUN(MY_DEFINE,
+AC_DEFUN([MY_DEFINE],
 [cat >> confdefs.h <<EOF
 [#define] $1 1
 EOF
@@ -51,7 +32,7 @@
 dnl		     $5
 dnl		     action-if-yes,action-if-dynamic,action-if-no)
 dnl		     $6            $7                $8
-AC_DEFUN(CONFIG_INTERFACE,
+AC_DEFUN([CONFIG_INTERFACE],
 [AC_ARG_ENABLE($1,[$4],
 [case "x$enable_$1" in xyes|xdynamic) $5 ;; esac])
 case "x$enable_$1" in
@@ -71,7 +52,7 @@
 AC_SUBST($3_so_libs)
 ])
 dnl --------------------------------------------------------------
-AC_DEFUN(AM_CHECK_ALSA9,
+AC_DEFUN([AM_CHECK_ALSA9],
     [AC_MSG_CHECKING(for alsa-0.9.x)]
     [AH_TEMPLATE([HAVE_ALSA9], Defines if you have alsa-0.9.x)]
     [AC_TRY_RUN(
@@ -107,7 +88,7 @@
 dnl if there exit ALSA, define have_alsa=yes, otherwise no.
 dnl enables arguments --with-alsa-prefix= --with-alsa-enc-prefix= --disable-alsatest
 dnl
-AC_DEFUN(AM_PATH_ALSA_LOCAL,
+AC_DEFUN([AM_PATH_ALSA_LOCAL],
 [dnl
 dnl Get the clfags and libraries for alsa
 dnl
--- a/configure.in
+++ b/configure.in
@@ -32,7 +32,6 @@
 define([AC_CACHE_LOAD], )
 define([AC_CACHE_SAVE], )
 
-AC_INIT(README)
 AC_PREREQ(2.53)
 
 dnl-------------------------------------------------------------------------
@@ -52,17 +51,14 @@
 dnl	     the major version number; then reset it in the VERSION file:
 dnl		0.7.0
 
-AC_VERSION_FROM_FILE
-VERSION=$MAJOR_VERSION
-
-echo "configuring $PACKAGE $VERSION..."
-
 dnl-------------------------------------------------------------------------
 dnl   init automake
 dnl-------------------------------------------------------------------------
 
-AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
-dnl AC_ARG_PROGRAM
+AC_INIT([tk707], [0.7.21])
+AC_CONFIG_SRCDIR([README])
+AM_INIT_AUTOMAKE
+AC_ARG_PROGRAM
 AM_CONFIG_HEADER(config.h)
 
 dnl-------------------------------------------------------------------------
--- a/tk707.sh.in
+++ b/tk707.sh.in
@@ -2,11 +2,11 @@
 args=""
 for x in $*; do
     case $x in
-    -h|-help) args="$args --help";; # tcl/tk catch these options...
+    -h|-help) args="$args --help";; # tcl/tk catches these options...
     *)        args="$args $x";;
   esac
 done
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-echo | @bindir@/tk707bin $args
+echo | @libdir@/tk707/tk707bin $args
 
diff --git a/defs.tcl b/defs.tcl
index 03b2b5f..10d8ef7 100644
--- a/defs.tcl
+++ b/defs.tcl
@@ -70,7 +70,7 @@ set argc [llength $argv]
 # -----------------------------------------
 package require Tcl 8.0
 package require Tk 8.0
-set VERSION     0.6
+set VERSION     0.8
 set PKGDATADIR  [pwd]
 
 # uncomment to show sonme boxes: