rocklinux/package/blindcoder/arson/fixes.patch

Benjamin Schieder:
	Thanks to debian.
--- arson-0.9.8beta2.orig/doc/arson/Makefile
+++ arson-0.9.8beta2/doc/arson/Makefile
@@ -0,0 +1,573 @@
+# Generated automatically from Makefile.in by config.pl.
+# KDE tags expanded automatically by am_edit - $Revision: 1.1 $ 
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
+
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+# the SUBDIRS is filled automatically by am_edit. If files are 
+# in this directory they are installed into the english dir
+
+SHELL = /bin/ksh
+
+srcdir = .
+top_srcdir = ../..
+VPATH = .
+prefix = /usr
+exec_prefix = ${prefix}
+
+bindir = ${exec_prefix}/bin
+sbindir = ${exec_prefix}/sbin
+libexecdir = ${exec_prefix}/libexec
+datadir = ${prefix}/share
+sysconfdir = ${prefix}/etc
+sharedstatedir = ${prefix}/com
+localstatedir = ${prefix}/var
+libdir = ${exec_prefix}/lib
+infodir = ${prefix}/share/info
+mandir = ${prefix}/share/man
+includedir = ${prefix}/include
+oldincludedir = /usr/include
+pkgdatadir = $(datadir)/arson
+pkglibdir = $(libdir)/arson
+pkgincludedir = $(includedir)/arson
+top_builddir = ../..
+
+ACLOCAL = ${SHELL} /home/madhack/packages/arson/arson-0.9.7-kde3/admin/missing --run aclocal
+AUTOCONF = ${SHELL} /home/madhack/packages/arson/arson-0.9.7-kde3/admin/missing --run autoconf
+AUTOMAKE = ${SHELL} /home/madhack/packages/arson/arson-0.9.7-kde3/admin/missing --run automake
+AUTOHEADER = ${SHELL} /home/madhack/packages/arson/arson-0.9.7-kde3/admin/missing --run autoheader
+
+INSTALL = /usr/bin/install -c -p
+INSTALL_PROGRAM = ${INSTALL} $(INSTALL_STRIP_FLAG)
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = s,x,x,
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_alias = @build_alias@
+build_triplet = i386-pc-linux-gnu
+host_alias = @host_alias@
+host_triplet = i386-pc-linux-gnu
+target_alias = @target_alias@
+target_triplet = i386-pc-linux-gnu
+AMTAR = ${SHELL} /home/madhack/packages/arson/arson-0.9.7-kde3/admin/missing --run tar
+ARTSCCONFIG = /usr/bin/artsc-config
+AS = @AS@
+AUTODIRS = 
+AWK = mawk
+CC = gcc
+CONF_FILES =  $(top_srcdir)/./admin/configure.in.min $(top_srcdir)/configure.in.in
+CPP = gcc -E
+CXX = g++
+CXXCPP = g++ -E
+DCOPIDL = /usr/bin/dcopidl
+DCOPIDL2CPP = /usr/bin/dcopidl2cpp
+DCOP_DEPENDENCIES = $(DCOPIDL)
+DEPDIR = .deps
+DLLTOOL = @DLLTOOL@
+DPMSINC = @DPMSINC@
+DPMSLIB = @DPMSLIB@
+ECHO = print -r
+EXEEXT = 
+GCJ = @GCJ@
+GCJFLAGS = @GCJFLAGS@
+GLINC = @GLINC@
+GLLIB = @GLLIB@
+GMSGFMT = /usr/bin/msgfmt
+IDL = @IDL@
+IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
+INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
+JAR = @JAR@
+JAVAC = @JAVAC@
+JAVAH = @JAVAH@
+JVMLIBS = @JVMLIBS@
+KDECONFIG = /usr/bin/kde-config
+KDE_CXXFLAGS = 
+KDE_EXTRA_RPATH = 
+KDE_INCLUDES = -I/usr/include/kde
+KDE_LDFLAGS = -L/usr/lib
+KDE_MT_LDFLAGS = 
+KDE_MT_LIBS = -lpthread
+KDE_PLUGIN = -avoid-version -module -no-undefined $(KDE_RPATH) $(KDE_MT_LDFLAGS)
+KDE_RPATH = 
+KDE_USE_CLOSURE_FALSE = #
+KDE_USE_CLOSURE_TRUE = 
+KDE_USE_FINAL_FALSE = 
+KDE_USE_FINAL_TRUE = #
+KDE_XSL_STYLESHEET = /usr/share/apps/ksgmltools2/customization/kde-chunk.xsl
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LIBCOMPAT = 
+LIBCRYPT = -lcrypt
+LIBDL = -ldl
+LIBGEN = @LIBGEN@
+LIBJPEG = -ljpeg
+LIBMICO = @LIBMICO@
+LIBOBJS = @LIBOBJS@
+LIBPNG = -lpng -lz -lm
+LIBPTHREAD = -lpthread
+LIBPYTHON = @LIBPYTHON@
+LIBQIMGIO = @LIBQIMGIO@
+LIBRESOLV = -lresolv
+LIBSHADOW = @LIBSHADOW@
+LIBSM = -lSM -lICE
+LIBSOCKET =  -lresolv
+LIBTIFF = -ltiff -ljpeg -lz
+LIBTOOL = $(SHELL) $(top_builddir)/libtool
+LIBUCB = 
+LIBUTIL = -lutil
+LIBXINERAMA = -lXinerama
+LIBZ = -lz
+LIB_KAB = -lkab
+LIB_KDECORE = -lkdecore
+LIB_KDEPRINT = -lkdeprint
+LIB_KDEUI = -lkdeui
+LIB_KFILE = -lkio
+LIB_KFM = 
+LIB_KHTML = -lkhtml
+LIB_KIMGIO = -lkimgio
+LIB_KIO = -lkio
+LIB_KPARTS = -lkparts
+LIB_KSPELL = -lkspell
+LIB_KSYCOCA = -lkio
+LIB_QPE = 
+LIB_QT = -lqt-mt  $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread
+LIB_QTOPIA = @LIB_QTOPIA@
+LIB_SMB = -lsmb
+LIB_X11 = -lX11 $(LIBSOCKET)
+LIB_XEXT = -lXext
+LN_S = ln -s
+MCOPIDL = /usr/bin/mcopidl
+MEINPROC = /usr/bin/meinproc
+MICO_INCLUDES = @MICO_INCLUDES@
+MICO_LDFLAGS = @MICO_LDFLAGS@
+MOC = /usr/bin/moc
+MSGFMT = /usr/bin/msgfmt
+NOOPT_CFLAGS = 
+NOOPT_CXXFLAGS =  -fno-exceptions -fno-check-new
+NOREPO = -fno-repo
+OBJDUMP = @OBJDUMP@
+OBJEXT = o
+PACKAGE = arson
+PAMLIBS = @PAMLIBS@
+PASSWDLIBS = @PASSWDLIBS@
+PYTHONINC = @PYTHONINC@
+PYTHONLIB = @PYTHONLIB@
+PYTHONMODDIR = @PYTHONMODDIR@
+QTE_NORTTI = 
+QTOPIA_INCLUDES = @QTOPIA_INCLUDES@
+QT_INCLUDES = -I/usr/include/qt
+QT_LDFLAGS = 
+RANLIB = ranlib
+RC = @RC@
+REPO = -frepo
+SETUIDFLAGS = @SETUIDFLAGS@
+STRIP = strip
+TOPSUBDIRS =  doc po src
+UIC = /usr/bin/uic -L $(kde_widgetdir) -nounload
+UIC_TR = tr2i18n
+USER_INCLUDES = 
+USER_LDFLAGS = 
+USE_EXCEPTIONS = -fexceptions
+USE_RTTI = 
+USE_THREADS = 
+VERSION = 0.9.7
+WOVERLOADED_VIRTUAL = 
+XGETTEXT = /usr/bin/xgettext
+XPMINC = @XPMINC@
+XPMLIB = @XPMLIB@
+X_EXTRA_LIBS =  -lresolv
+X_INCLUDES = -I/usr/X11R6/include
+X_LDFLAGS = -L/usr/X11R6/lib
+X_PRE_LIBS = 
+all_includes = -I/usr/include/kde -I/usr/include/qt -I/usr/X11R6/include 
+all_libraries = -L/usr/X11R6/lib -L/usr/lib 
+am__include = include
+am__quote = 
+idldir = @idldir@
+install_sh = /home/madhack/packages/arson/arson-0.9.7-kde3/admin/install-sh
+jni_includes = @jni_includes@
+kde_appsdir = ${prefix}/share/applnk
+kde_bindir = ${exec_prefix}/bin
+kde_confdir = ${prefix}/share/config
+kde_datadir = ${prefix}/share/apps
+kde_htmldir = ${prefix}/share/doc/HTML
+kde_icondir = ${prefix}/share/icons
+kde_includes = /usr/include/kde
+kde_libraries = /usr/lib
+kde_libs_htmldir = /usr/share/doc/kde/HTML
+kde_libs_prefix = /usr
+kde_locale = ${prefix}/share/locale
+kde_mimedir = ${prefix}/share/mimelnk
+kde_moduledir = ${exec_prefix}/lib/kde3
+kde_qtver = 3
+kde_servicesdir = ${prefix}/share/services
+kde_servicetypesdir = ${prefix}/share/servicetypes
+kde_sounddir = ${prefix}/share/sounds
+kde_styledir = ${exec_prefix}/lib/kde3/plugins/styles
+kde_templatesdir = ${prefix}/share/templates
+kde_wallpaperdir = ${prefix}/share/wallpapers
+kde_widgetdir = ${exec_prefix}/lib/kde3/plugins/designer
+micodir = @micodir@
+qt_includes = /usr/include/qt
+qt_libraries = 
+x_includes = /usr/X11R6/include
+x_libraries = /usr/X11R6/lib
+
+KDE_LANG = en
+KDE_DOCS = arson
+#>- SUBDIRS = $(AUTODIRS)  
+#>+ 2
+SUBDIRS =.
+
+subdir = doc/arson
+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+
+RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
+	uninstall-info-recursive all-recursive install-data-recursive \
+	install-exec-recursive installdirs-recursive install-recursive \
+	uninstall-recursive check-recursive installcheck-recursive
+DIST_COMMON = Makefile.am Makefile.in
+DIST_SUBDIRS = $(SUBDIRS)
+#>- all: all-recursive
+#>+ 1
+all: docs-am  all-recursive
+
+.SUFFIXES:
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+#>- 	cd $(top_srcdir) && \
+#>- $(AUTOMAKE) --gnu  doc/arson/Makefile
+#>+ 3
+	cd $(top_srcdir) && \
+	$(AUTOMAKE) --gnu  doc/arson/Makefile
+	cd $(top_srcdir) && perl admin/am_edit doc/arson/Makefile.in
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && \
+	CONFIG_HEADERS= CONFIG_LINKS= \
+	CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+uninstall-info-am:
+
+# 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,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@set fnord $(MAKEFLAGS); amf=$$2; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	echo "Making $$target in $$subdir"; \
+	if test "$$subdir" = "."; then \
+	dot_seen=yes; \
+	local_target="$$target-am"; \
+	else \
+	local_target="$$target"; \
+	fi; \
+	(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+	maintainer-clean-recursive:
+	@set fnord $(MAKEFLAGS); amf=$$2; \
+	dot_seen=no; \
+	case "$@" in \
+	distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	*) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	if test "$$subdir" = "."; then :; else \
+	rev="$$subdir $$rev"; \
+	fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	echo "Making $$target in $$subdir"; \
+	if test "$$subdir" = "."; then \
+	local_target="$$target-am"; \
+	else \
+	local_target="$$target"; \
+	fi; \
+	(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	done | \
+	$(AWK) '    { files[$$0] = 1; } \
+	END { for (i in files) print i; }'`; \
+	mkid -fID $$unique $(LISP)
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+	$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	if test "$$subdir" = .; then :; else \
+	test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+	fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	done | \
+	$(AWK) '    { files[$$0] = 1; } \
+	END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+	|| etags $(ETAGS_ARGS) $$tags  $$unique $(LISP)
+
+GTAGS:
+	here=`CDPATH=: && cd $(top_builddir) && pwd` \
+	&& cd $(top_srcdir) \
+	&& gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 4
+KDE_DIST=index.docbook 
+
+DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+#>- distdir: $(DISTFILES)
+#>+ 1
+distdir: distdir-nls  $(DISTFILES)
+	@for file in $(DISTFILES); do \
+	if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	$(mkinstalldirs) "$(distdir)/$$dir"; \
+	fi; \
+	if test -d $$d/$$file; then \
+	cp -pR $$d/$$file $(distdir) \
+	|| exit 1; \
+	else \
+	test -f $(distdir)/$$file \
+	|| cp -p $$d/$$file $(distdir)/$$file \
+	|| exit 1; \
+	fi; \
+	done
+	for subdir in $(SUBDIRS); do \
+	if test "$$subdir" = .; then :; else \
+	test -d $(distdir)/$$subdir \
+	|| mkdir $(distdir)/$$subdir \
+	|| exit 1; \
+	(cd $$subdir && \
+	$(MAKE) $(AM_MAKEFLAGS) \
+	top_distdir="$(top_distdir)" \
+	distdir=../$(distdir)/$$subdir \
+	distdir) \
+	|| exit 1; \
+	fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+#>- uninstall: uninstall-recursive
+#>+ 1
+uninstall: uninstall-docs uninstall-nls  uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	`test -z '$(STRIP)' || \
+	echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+#>- clean: clean-recursive
+#>+ 1
+clean: kde-rpo-clean  clean-recursive
+
+#>- clean-am: clean-generic clean-libtool mostlyclean-am
+#>+ 1
+clean-am: clean-docs  clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+
+distclean-am: clean-am distclean-generic distclean-libtool \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+info: info-recursive
+
+info-am:
+
+#>- install-data-am:
+#>+ 1
+install-data-am: install-docs install-nls
+
+install-exec-am:
+
+install-info: install-info-recursive
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+uninstall-am: uninstall-info-am
+
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
+	clean-generic clean-libtool clean-recursive distclean \
+	distclean-generic distclean-libtool distclean-recursive \
+	distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
+	info-recursive install install-am install-data install-data-am \
+	install-data-recursive install-exec install-exec-am \
+	install-exec-recursive install-info install-info-am \
+	install-info-recursive install-man install-recursive \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am installdirs-recursive maintainer-clean \
+	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
+	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+	tags tags-recursive uninstall uninstall-am uninstall-info-am \
+	uninstall-info-recursive uninstall-recursive
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
+
+#>+ 21
+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook 
+	-@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+
+docs-am: index.cache.bz2
+
+install-docs: docs-am install-nls
+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/arson
+	@if test -f index.cache.bz2; then \
+	echo $(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/arson/; \
+	$(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/arson/; \
+	fi
+	-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/arson/common
+	$(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/arson/common
+
+uninstall-docs:
+	-rm -rf $(kde_htmldir)/$(KDE_LANG)/arson
+
+clean-docs:
+	-rm -f index.cache.bz2
+
+
+#>+ 13
+install-nls:
+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/arson
+	@for base in index.docbook ; do \
+	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/arson/$$base ;\
+	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/arson/$$base ;\
+	done
+
+uninstall-nls:
+	for base in index.docbook ; do \
+	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/arson/$$base ;\
+	done
+
+
+#>+ 5
+distdir-nls:
+	for file in index.docbook ; do \
+	  cp $(srcdir)/$$file $(distdir); \
+	done
+
+#>+ 6
+force-reedit:
+		cd $(top_srcdir) && \
+	$(AUTOMAKE) --gnu  doc/arson/Makefile
+	cd $(top_srcdir) && perl admin/am_edit doc/arson/Makefile.in
+
+
+#>+ 2
+final:
+	$(MAKE) all-am
+#>+ 2
+final-install:
+	$(MAKE) install-am
+#>+ 2
+no-final:
+	$(MAKE) all-am
+#>+ 2
+no-final-install:
+	$(MAKE) install-am
+#>+ 3
+cvs-clean:
+	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
+
+#>+ 3
+kde-rpo-clean:
+	-rm -f *.rpo
--- arson-0.9.8beta2.orig/src/vcddoc.cpp
+++ arson-0.9.8beta2/src/vcddoc.cpp
@@ -54,7 +54,7 @@
 	_VCDTYPE_MAX,
 };
 
-struct {
+static struct {
 	QString desc;			//	Description
 	const char *flag;		//	Command line switch to vcdxgen
 
--- arson-0.9.8beta2.orig/src/konfig.cpp
+++ arson-0.9.8beta2/src/konfig.cpp
@@ -86,7 +86,7 @@
 	ArsonProgramDef("shnlen",		"-h",			NULL,			NULL,											"http://etree.org/linux.html",						I18N_NOOP("Determines track length of SHN files.")),
 	ArsonProgramDef("md5sum",		"-help",		NULL,			NULL,											NULL,												I18N_NOOP("Checks the MD5 checksum of files specified in MD5 file.")),
 	ArsonProgramDef("sox",			"-help",		"-help",		"sox: Version ([0-9]+).([0-9]+).([0-9]+)",		"http://www.spies.com/Sox/",						I18N_NOOP("Fixes invalid audio tracks (that are not in 44100Khz/16bps/stereo).")),
-	ArsonProgramDef("normalize",	"--help",		"--version",	"normalize ([0-9]+).([0-9]+).([0-9]+)",			"http://www.cs.columbia.edu/~cvaill/normalize/",	I18N_NOOP("Evens out the volumes of different audio tracks.")),
+	ArsonProgramDef("normalize-audio",	"--help",		"--version",	"normalize ([0-9]+).([0-9]+).([0-9]+)",			"http://www.cs.columbia.edu/~cvaill/normalize/",	I18N_NOOP("Evens out the volumes of different audio tracks.")),
 	ArsonProgramDef("vcdxbuild",	"--help",		"--version",	"vcdxbuild .+ ([0-9]+).([0-9]+).([0-9]+)",		"http://www.vcdimager.org/",						I18N_NOOP("Builds [S]VCD image suitable for burning to CDR.")),
 	ArsonProgramDef("vcdxgen",		"--help",		"--version",	"vcdxgen .+ ([0-9]+).([0-9]+).([0-9]+)",		"http://www.vcdimager.org/",						I18N_NOOP("Generates XML files required by vcdxbuild.")),
 	ArsonProgramDef("id3v2",		"--help",		"--version",	"id3v2 ([0-9]+).([0-9]+)",						"http://id3v2.sourceforge.net/",					I18N_NOOP("Adds id3v2 tag information to MP3 files.")),
--- arson-0.9.8beta2.orig/src/wizard.cpp
+++ arson-0.9.8beta2/src/wizard.cpp
@@ -209,10 +209,10 @@
 	sidebarWidget (QWidget *parent, const char *name = NULL)
 		: QFrame(parent, name), XTRA(24)
 	{
-		QFont font (font());
+		QFont _font (font());
 //		font.setPointSize(48);
-		font.setPointSize(12);
-		setFont(font);
+		_font.setPointSize(12);
+		setFont(_font);
 
 		setFrameStyle(Panel | Sunken);
 		setLineWidth(2);