--- mp4h-1.3.1.orig/debian/README.source
+++ mp4h-1.3.1/debian/README.source
@@ -0,0 +1,58 @@
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To configure quilt to use debian/patches instead of patches, you want
+either to export QUILT_PATCHES=debian/patches in your environment
+or use this snippet in your ~/.quiltrc:
+
+    for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+        if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+                export QUILT_PATCHES=debian/patches
+                break
+        fi
+    done
+
+To get the fully patched source after unpacking the source package, cd to
+the root level of the source package and run:
+
+    quilt push -a
+
+The last patch listed in debian/patches/series will become the current
+patch.
+
+To add a new set of changes, first run quilt push -a, and then run:
+
+    quilt new <patch>
+
+where <patch> is a descriptive name for the patch, used as the filename in
+debian/patches.  Then, for every file that will be modified by this patch,
+run:
+
+    quilt add <file>
+
+before editing those files.  You must tell quilt with quilt add what files
+will be part of the patch before making changes or quilt will not work
+properly.  After editing the files, run:
+
+    quilt refresh
+
+to save the results as a patch.
+
+Alternately, if you already have an external patch and you just want to
+add it to the build system, run quilt push -a and then:
+
+    quilt import -P <patch> /path/to/patch
+    quilt push -a
+
+(add -p 0 to quilt import if needed). <patch> as above is the filename to
+use in debian/patches.  The last quilt push -a will apply the patch to
+make sure it works properly.
+
+To remove an existing patch from the list of patches that will be applied,
+run:
+
+    quilt delete <patch>
+
+You may need to run quilt pop -a to unapply patches first before running
+this command.
--- mp4h-1.3.1.orig/debian/compat
+++ mp4h-1.3.1/debian/compat
@@ -0,0 +1 @@
+7
--- mp4h-1.3.1.orig/debian/changelog
+++ mp4h-1.3.1/debian/changelog
@@ -0,0 +1,239 @@
+mp4h (1.3.1-6) unstable; urgency=low
+
+  * Bump Standards-Version to 3.9.2
+    + Clear the dependency_libs field of gettext.la.
+  * Bump debhelper compatibility to 7
+    + Replace "dh_clean -k" by "dh_prep"
+  * Remove Felipe Augusto van de Wiel (faw) from Uploaders on his own
+    request.
+  * Fix the following lintian warnings:
+    + debian-rules-missing-recommended-target
+    + copyright-refers-to-symlink-license
+
+ -- Axel Beckert <abe@debian.org>  Sat, 17 Dec 2011 19:39:12 +0100
+
+mp4h (1.3.1-5) unstable; urgency=low
+
+  [ Thorsten Glaser ]
+  * Do the equivalent of “gettextize -f” (which is interactive) manually
+    to upgrade the built-in gettext support (removing bundled libintl and
+    using the system one, as well as upgrading the po/ files).
+  * Fix a couple of lintian warnings:
+    - debian-watch-file-is-missing
+    - package-uses-deprecated-debhelper-compat-version 4
+    - possible-documentation-but-no-doc-base-registration
+    - spelling-error-in-manpage mp4h.1 adress address
+    - spelling-error-in-manpage mp4h.1 comand command
+    - spelling-error-in-manpage mp4h.1 dependant dependent
+    - spelling-error-in-manpage mp4h.1 informations information
+  * Calculate module path via make, not configure. (Closes: #573599)
+
+  [ Axel Beckert ]
+  * Move over to group maintenance
+    - Added Vcs-* headers to debian/control.
+  * Move over to quilt patch management
+    - Move all source code patches contained in the diff.gz into quilt
+      patches
+    - Split up in logical patches
+    - Update build dependencies
+    - Add patch targets and dependencies to debian/rules
+    - Remove patches for files removed in clean target now
+    - Add generic README.source
+  * Updated copyright file (new maintainers, refer to web.archive.org
+    mirror of original home page)
+  * Bumped Standards-Version to 3.8.4 (no changes)
+  * Added debian/source/format to silence lintian.
+  * Removed obsolete local variables from changelog.
+
+ -- Axel Beckert <abe@debian.org>  Wed, 24 Mar 2010 02:05:22 +0100
+
+mp4h (1.3.1-4.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Update the autotools/libtool subsystem, use libltdl from
+    the system instead of our own. (CVE-2009-3736) (Closes: #559822)
+  * Fix lintian copyright-without-copyright-notice (possible REJECT cause)
+  * Add missing ${misc:Depends} for debhelper to get them right
+
+ -- Thorsten Glaser <tg@mirbsd.de>  Thu, 04 Mar 2010 19:30:06 +0000
+
+mp4h (1.3.1-4) unstable; urgency=low
+
+  * Remove me from Maintainers.
+
+ -- Luk Claes <luk@debian.org>  Wed, 23 Jan 2008 22:42:50 +0000
+
+mp4h (1.3.1-3) unstable; urgency=low
+
+  * New maintainers.
+  * Updated Standards-Version to 3.7.2.
+  * Added debian/compat for debhelper 4.
+  * Updated debian/copyright.
+
+ -- Luk Claes <luk@debian.org>  Sat, 30 Sep 2006 11:34:45 +0200
+
+mp4h (1.3.1-2) unstable; urgency=low
+
+  * Some text was gobbled when run with -s flag.
+  * Add missing trailing slash in all provided modules, so that users
+    can output valid XHTML documents (Closes: Bug#218798).
+    Thanks Frank Lichtenheld.
+  * Update homepages for mp4h and WML.
+  * Dependency on debhelper is set to >= 2.
+  * Bump Standards-Version: 3.6.1, no changes needed.
+
+ -- Denis Barbier <barbier@debian.org>  Thu,  6 Nov 2003 20:34:24 +0100
+
+mp4h (1.3.1-1) unstable; urgency=low
+
+  * New upstream release
+  * Bump Standards-Version: 3.5.8
+
+ -- Denis Barbier <barbier@debian.org>  Sun, 12 Jan 2003 00:04:16 +0100
+
+mp4h (1.3.0-3) unstable; urgency=low
+
+  * Some argument checks were missing in <array-shift> and could
+    cause memory fault.  Thanks Jean-Michel Sauvage.
+
+ -- Denis Barbier <barbier@debian.org>  Fri, 27 Sep 2002 21:11:00 +0200
+
+mp4h (1.3.0-2) unstable; urgency=low
+
+  * Fix intl:gettext so that msgid can contain empty tags with a
+    trailing slash
+
+ -- Denis Barbier <barbier@debian.org>  Sun,  7 Jul 2002 16:56:04 +0200
+
+mp4h (1.3.0-1) unstable; urgency=low
+
+  * New upstream release
+  * Upgrade Standards-Version to 3.5.6
+
+ -- Denis Barbier <barbier@debian.org>  Sat,  6 Jul 2002 23:43:50 +0200
+
+mp4h (1.2.99+cvs20020619-1) unstable; urgency=low
+
+  * mp4h 1.3 will enable loadable modules by default.  The 1.2.99 series 
+    is used to debug this feature.
+
+ -- Denis Barbier <barbier@debian.org>  Wed, 19 Jun 2002 21:50:44 +0200
+
+mp4h (1.2.4-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Denis Barbier <barbier@debian.org>  Sat,  2 Mar 2002 23:22:32 +0100
+
+mp4h (1.2.3-2) unstable; urgency=low
+
+  * Apply upstream patches to keep track of line numbers in error messages.
+
+ -- Denis Barbier <barbier@debian.org>  Mon, 10 Dec 2001 23:43:27 +0100
+
+mp4h (1.2.3-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Denis Barbier <barbier@debian.org>  Fri, 26 Oct 2001 00:04:48 +0200
+
+mp4h (1.2.2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Denis Barbier <barbier@debian.org>  Thu, 18 Oct 2001 10:36:20 +0200
+
+mp4h (1.2.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Denis Barbier <barbier@debian.org>  Sun, 30 Sep 2001 01:19:31 +0200
+
+mp4h (1.2.0-1) unstable; urgency=low
+
+  * New upstream release
+  * Remove copyright mention from the control file (Closes: #103497)
+
+ -- Denis Barbier <barbier@debian.org>  Sun, 26 Aug 2001 01:25:55 +0200
+
+mp4h (1.1.2-5) unstable; urgency=low
+
+  * Upgrade config.{sub,guess}
+
+ -- Denis Barbier <barbier@debian.org>  Sun,  8 Jul 2001 11:14:27 +0200
+
+mp4h (1.1.2-4) unstable; urgency=low
+
+  * Fix <get-file-properties>, which caused a segmentation fault
+    when applied to a file whose uid or gid cannot be resolved.
+
+ -- Denis Barbier <barbier@debian.org>  Sat, 21 Apr 2001 01:49:18 +0200
+
+mp4h (1.1.2-3) unstable; urgency=low
+
+  * Fix broken original tarball, it differed from 1.1.2-1
+
+ -- Denis Barbier <barbier@debian.org>  Thu, 15 Feb 2001 22:57:22 +0100
+
+mp4h (1.1.2-2) unstable; urgency=low
+
+  * Fix another bug with some conditionals: <ifeq>, <ifneq>
+
+ -- Denis Barbier <barbier@debian.org>  Wed, 14 Feb 2001 22:03:46 +0100
+
+mp4h (1.1.2-1) unstable; urgency=low
+
+  * New upstream version.
+  * Fix bug with conditionals (Closes: #76049)
+
+ -- Denis Barbier <barbier@debian.org>  Wed,  8 Nov 2000 00:33:32 +0100
+
+mp4h (1.1.1-1) unstable; urgency=low
+
+  * New upstream version.
+  * Sponsored upload.
+
+ -- Josip Rodin <jrodin@jagor.srce.hr>  Thu, 31 Aug 2000 01:33:48 +0200
+
+mp4h (1.1.0-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Configure with --with-dmalloc to help solve the "disappearing 0xB3"
+    problem, as suggested by upstream author Denis Barbier.
+
+ -- Anthony Fok <foka@debian.org>  Tue, 29 Aug 2000 19:04:53 -0600
+
+mp4h (1.1.0-1) unstable; urgency=low
+
+  * New upstream version, closes: #69438.
+  * Sponsored upload.
+  * Updated to Standards-Version: 3.2.1.
+
+ -- Josip Rodin <jrodin@jagor.srce.hr>  Mon, 28 Aug 2000 00:19:06 +0200
+
+mp4h (1.0.2-0.1) unstable; urgency=low
+
+  * NMU of new upstream release to support WML 2.0.2
+
+ -- Brian Bassett <brianb@debian.org>  Fri, 23 Jun 2000 22:18:29 -0700
+
+mp4h (1.0.0-0.1) unstable; urgency=low
+
+  * New upstream release.
+  * NMU.
+
+ -- Brian Bassett <brianb@debian.org>  Tue, 20 Jun 2000 18:09:45 -0700
+
+mp4h (0.9.4-0.1) unstable; urgency=low
+
+  * NMU at request of upstream maintainer (and pending Debian developer)
+    to deal with WML issues.
+
+ -- Brian Bassett <brianb@debian.org>  Sun, 18 Jun 2000 12:18:14 -0700
+
+mp4h (0.8.0-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Denis Barbier <barbier@linuxfr.org>  Mon, 28 Feb 2000 21:46:36 +0100
+
--- mp4h-1.3.1.orig/debian/watch
+++ mp4h-1.3.1/debian/watch
@@ -0,0 +1 @@
+# there seems to be no homepage / upstream any more
--- mp4h-1.3.1.orig/debian/doc-base
+++ mp4h-1.3.1/debian/doc-base
@@ -0,0 +1,9 @@
+Document: mp4h
+Title: mp4h documentation
+Author: Denis Barbier
+Abstract: Manual page for mp4h - Macro Processor for HTML Documents
+Section: Web Development
+
+Format: HTML
+Index: /usr/share/doc/mp4h/mp4h.html
+Files: /usr/share/doc/mp4h/mp4h.html
--- mp4h-1.3.1.orig/debian/control
+++ mp4h-1.3.1/debian/control
@@ -0,0 +1,22 @@
+Source: mp4h
+Section: web
+Priority: optional
+Maintainer: Debian WML Packaging Team <pkg-wml-maintainers@lists.alioth.debian.org>
+Uploaders: Axel Beckert <abe@debian.org>
+Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 7~), tidy, quilt,
+ autoconf (>= 2.57~), automake1.9, autotools-dev, gettext,
+ libtool, libltdl-dev
+Build-Conflicts: autoconf2.13, automake1.4
+Vcs-Browser: http://git.debian.org/?p=pkg-wml/mp4h.git
+Vcs-Git: git://git.debian.org/pkg-wml/mp4h.git
+
+Package: mp4h
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Macro processor for HTML documents
+ Mp4h is a macro processor specifically designed for HTML documents,
+ with powerful programming features. It allows definition and expansion
+ of new tags with a syntax familiar to HTML authors.
+ .
+ Mp4h is a core component of the Website Meta Language (WML).
--- mp4h-1.3.1.orig/debian/rules
+++ mp4h-1.3.1/debian/rules
@@ -0,0 +1,102 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+  confflags += --build $(DEB_HOST_GNU_TYPE)
+else
+  confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
+
+CFLAGS := -O2 -Wall
+ifneq "$(findstring debug,$(DEB_BUILD_OPTIONS))" ""
+CFLAGS += -g
+endif
+
+include /usr/share/quilt/quilt.make
+
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
+build-stamp: configure-stamp
+	dh_testdir
+	$(MAKE)
+	touch build-stamp
+
+# aclocal (called from autoreconf) finds gettext *.m4 files
+GETTEXT_TOP_FILES=	ABOUT-NLS config.rpath
+GETTEXT_PO_FILES=	Makefile.in.in Rules-quot boldquot.sed \
+			en@boldquot.header en@quot.header insert-header.sin \
+			quot.sed remove-potcdate.sin
+
+configure-stamp: $(QUILT_STAMPFN)
+	test -d m4 || mkdir m4
+	for f in ${GETTEXT_TOP_FILES}; do \
+		cp -f /usr/share/gettext/$$f .; \
+	done
+	for f in ${GETTEXT_PO_FILES}; do \
+		cp -f /usr/share/gettext/po/$$f po/; \
+	done
+
+	ACLOCAL=aclocal-1.9 AUTOMAKE=automake-1.9 \
+	    autoreconf -fvi -Im4
+
+	CFLAGS="$(CFLAGS)" ./configure $(confflags) \
+    --without-included-ltdl \
+    --prefix=/usr \
+    --mandir='$${prefix}/share/man' \
+    --with-modules='intl:gettext' \
+    --with-tidy=/usr/bin/tidy
+	@:>$@
+
+clean: 
+	dh_testdir
+	dh_testroot
+	[ ! -f Makefile ] || $(MAKE) distclean
+	rm -rf autom4te.cache intl m4
+	cd po && rm -f ${GETTEXT_PO_FILES} stamp-po
+	rm -f src/ltdl.* ${GETTEXT_TOP_FILES} \
+	    aclocal.m4 config.guess config.h.in config.sub configure depcomp \
+	    install-sh ltmain.sh missing mkinstalldirs
+	find . -name Makefile.in | xargs -r rm
+	dh_clean build-stamp configure-stamp
+	$(MAKE) -f debian/rules unpatch
+
+install: build-stamp
+	dh_testdir
+	dh_testroot
+	dh_prep
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/mp4h
+	sed -e "/dependency_libs/ s/'.*'/''/" \
+	    -i "$(CURDIR)/debian/mp4h/usr/lib/mp4h/1.3.1/intl/gettext.la"
+
+binary: binary-arch binary-indep
+
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installdocs README README.pcre CREDITS doc/mp4h.html
+	dh_installchangelogs ChangeLog
+	-rmdir \
+   $(CURDIR)/debian/mp4h/usr/share/mp4h/WML \
+   $(CURDIR)/debian/mp4h/usr/share/mp4h/system \
+   $(CURDIR)/debian/mp4h/usr/lib/mp4h/1.3.1/system \
+   $(CURDIR)/debian/mp4h/usr/lib/mp4h/1.3.1/javascript
+ifeq "$(findstring nostrip,$(DEB_BUILD_OPTIONS))" ""
+	dh_strip
+endif
+	dh_compress
+	dh_fixperms
+	dh_shlibdeps
+	dh_gencontrol
+	dh_installdeb
+	dh_md5sums
+	dh_builddeb
+
+binary-indep:
+
+.PHONY: build clean binary-indep binary-arch binary
--- mp4h-1.3.1.orig/debian/copyright
+++ mp4h-1.3.1/debian/copyright
@@ -0,0 +1,30 @@
+This package was debianized by Denis Barbier <barbier@linuxfr.org>
+on Mon, 28 Feb 2000 21:46:36 +0100.
+
+Currently maintained by the Debian WML Packaging Team,
+http://pkg-wml.alioth.debian.org/
+
+Author: Copyright (C) 2000-2003, Denis Barbier <barbier@linuxfr.org>
+
+It was downloaded from
+
+   http://mp4h.tuxfamily.org/distrib/ (now accessible via
+   http://web.archive.org/web/20031206101441/http://mp4h.tuxfamily.org/distrib/)
+
+   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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+   USA.
+
+On Debian GNU/Linux systems, the complete text of the GNU General Public
+License may be found in `/usr/share/common-licenses/GPL-2'.
--- mp4h-1.3.1.orig/debian/patches/series
+++ mp4h-1.3.1/debian/patches/series
@@ -0,0 +1,4 @@
+1.3.1-4.diff
+559822-nmu.diff
+573599-regression.diff
+lintian-cleanup-tg.diff
--- mp4h-1.3.1.orig/debian/patches/1.3.1-4.diff
+++ mp4h-1.3.1/debian/patches/1.3.1-4.diff
@@ -0,0 +1,140 @@
+Source code patches as of Debian package 1.3.1-4
+
+--- mp4h-1.3.1.orig/src/output.c
++++ mp4h-1.3.1/src/output.c
+@@ -513,7 +513,7 @@
+         text += length - 1;
+       }
+   else
+-    for (; *(text+1) != '\0'; text++)
++    for (; *text != '\0'; text++)
+       {
+         if (start_of_output_line)
+           {
+--- mp4h-1.3.1.orig/src/readme.tmpl
++++ mp4h-1.3.1/src/readme.tmpl
+@@ -2,7 +2,7 @@
+    mp4h -- Macro Processor for HTML Documents
+    Version @PACKAGE_VERSION@ (@PACKAGE_DATE@)
+ 
+-              http://www.engelschall.com/sw/mp4h/
++              http://mp4h.tuxfamily.org/
+ 
+    Copyright (C) 2000-2003, Denis Barbier
+    All rights reserved.
+--- mp4h-1.3.1.orig/src/ltdl.c.patch
++++ mp4h-1.3.1/src/ltdl.c.patch
+@@ -0,0 +1,40 @@
++--- ltdl.c	Tue Jun 11 18:23:20 2002
+++++ ltdl.c	Sun Jun 30 23:23:36 2002
++@@ -2039,7 +2039,7 @@
++ 	}
++ 
++       /* try to open the not-installed module */
++-      if (!installed)
+++      if (!installed && objdir)
++ 	{
++ 	  if (tryall_dlopen_module (handle, dir, objdir, dlname) == 0)
++ 	    return 0;
++@@ -2047,7 +2047,7 @@
++ 
++       /* maybe it was moved to another directory */
++       {
++-	  if (tryall_dlopen_module (handle,
+++	  if (dir && tryall_dlopen_module (handle,
++ 				    (const char *) 0, dir, dlname) == 0)
++ 	    return 0;
++       }
++@@ -2691,10 +2691,6 @@
++ 	    }
++ #endif
++ 	}
++-      if (!file)
++-	{
++-	  file = fopen (filename, LT_READTEXT_MODE);
++-	}
++ 
++       /* If we didn't find the file by now, it really isn't there.  Set
++ 	 the status flag, and bail out.  */
++@@ -2990,7 +2986,7 @@
++      failed, it is better to return an error message here than to
++      report FILE_NOT_FOUND when the alternatives (foo.so etc) are not
++      in the module search path.  */
++-  if (handle || ((errors > 0) && file_not_found ()))
+++  if (handle || ((errors > 0) && !file_not_found ()))
++     {
++       LT_DLFREE (tmp);
++       return handle;
+--- mp4h-1.3.1.orig/modules/system/exec.src
++++ mp4h-1.3.1/modules/system/exec.src
+@@ -4,7 +4,7 @@
+ ;;;  Copyright (c) 2001-2003, Denis Barbier, All Rights Reserved. 
+ ;;;
+ 
+-<load module="system:exec">
++<load module="system:exec" />
+ 
+ ##EOF##
+ __END__
+--- mp4h-1.3.1.orig/modules/system/sh.src
++++ mp4h-1.3.1/modules/system/sh.src
+@@ -4,7 +4,7 @@
+ ;;;  Copyright (c) 2001-2003, Denis Barbier, All Rights Reserved. 
+ ;;;
+ 
+-<load module="system:sh">
++<load module="system:sh" />
+ 
+ ##EOF##
+ __END__
+--- mp4h-1.3.1.orig/modules/intl/gettext.src
++++ mp4h-1.3.1/modules/intl/gettext.src
+@@ -4,7 +4,7 @@
+ ;;;  Copyright (c) 2002-2003, Denis Barbier, All Rights Reserved. 
+ ;;;
+ 
+-<load module="intl:gettext">
++<load module="intl:gettext" />
+ 
+ ##EOF##
+ __END__
+--- mp4h-1.3.1.orig/README
++++ mp4h-1.3.1/README
+@@ -2,7 +2,7 @@
+    mp4h -- Macro Processor for HTML Documents
+    Version 1.3.1 (11-Jan-2003)
+ 
+-              http://www.engelschall.com/sw/mp4h/
++              http://mp4h.tuxfamily.org/
+ 
+    Copyright (C) 2000-2003, Denis Barbier
+    All rights reserved.
+--- mp4h-1.3.1.orig/doc/mp4h.mp4h
++++ mp4h-1.3.1/doc/mp4h.mp4h
+@@ -38,7 +38,7 @@
+ written by Brian J. Fox,  Even if both syntaxes look similar, source
+ code is completely different.  Indeed, a subset of &Meta-HTML; was used
+ as a part of a more complex program, &WML;
+-(<URL src="http://www.engelschall.com/sw/wml/" name="Website Meta Language" />)
++(<URL src="http://www.thewml.org/" name="Website Meta Language" />)
+ written by Ralf S. Engelschall and which I maintain since January 1999.
+ For licensing reasons, it was hard to hack &Meta-HTML; and so I decided
+ to write my own macro-processor.
+@@ -48,7 +48,7 @@
+ Instead of rewriting it from scratch, I preferred using another
+ macro-processor engine. I chose
+ <URL src="http://www.gnu.org/software/m4/" name="GNU &m4;" />,
+-written by Ren� Seindal, because of its numerous advantages :
++written by Rene Seindal, because of its numerous advantages :
+ this software is stable, robust and very well documented.
+ This version of &mp4h; is derived from GNU &m4; version 1.4n, which is a
+ development version.
+@@ -2786,7 +2786,7 @@
+ 
+ <para>
+ Mp4h has its own
+-<URL src="http://www.engelschall.com/sw/mp4h/" name="homepage" />.
++<URL src="http://mp4h.tuxfamily.org/" name="homepage" />.
+ </para>
+ 
+ <section>Thanks</section>
--- mp4h-1.3.1.orig/debian/patches/573599-regression.diff
+++ mp4h-1.3.1/debian/patches/573599-regression.diff
@@ -0,0 +1,160 @@
+Patches to fix #573599 (Regression introduced by the fix for #559822)
+
+diff --git a/Makefile.am b/Makefile.am
+index 5034f74..6a88ebd 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,12 +2,12 @@
+ AUTOMAKE_OPTIONS = foreign
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-DIST_SUBDIRS = intl pcre lib src po doc modules tests
++DIST_SUBDIRS = pcre lib src po doc modules tests
+ 
+ if LOADABLE_MODULES
+-SUBDIRS = intl pcre lib src po doc modules tests
++SUBDIRS = pcre lib src po doc modules tests
+ else
+-SUBDIRS = intl pcre lib src po doc tests
++SUBDIRS = pcre lib src po doc tests
+ endif
+ 
+ EXTRA_DIST = CREDITS README README.pcre bootstrap.sh shtool
+diff --git a/configure.ac b/configure.ac
+index 92badef..d2a9162 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -18,27 +18,6 @@ $shtool echo -e "Configuring for %B$PACKAGE_NAME $PACKAGE_VERSION ($PACKAGE_DATE
+ AM_INIT_AUTOMAKE([$PACKAGE_NAME], [$PACKAGE_VERSION])
+ AM_MAINTAINER_MODE
+ 
+-if test x$datadir = 'x${prefix}/share'; then
+-    if test x$prefix = xNONE; then
+-        MP4HDATADIR="$ac_default_prefix/share/mp4h"
+-    else
+-        MP4HDATADIR="$prefix/share/mp4h"
+-    fi
+-else
+-    MP4HDATADIR="$datadir/mp4h"
+-fi
+-if test x$libdir = 'x${exec_prefix}/lib'; then
+-    if test x$prefix = xNONE; then
+-        MP4HLIBDIR="$ac_default_prefix/lib/mp4h"
+-    else
+-        MP4HLIBDIR="$prefix/lib/mp4h"
+-    fi
+-else
+-    MP4HLIBDIR="$libdir/mp4h"
+-fi
+-AC_DEFINE_UNQUOTED([MP4HLIBDIR], ["$MP4HLIBDIR/$PACKAGE_VERSION:$MP4HDATADIR"],
+-        [Default location for mp4h modules]) 
+-
+ AC_PROG_CC
+ AC_PROG_CPP
+ AC_PROG_MAKE_SET
+@@ -80,13 +59,8 @@ AC_MSG_RESULT([no])
+ AC_SUBST([TIDY])
+ 
+ ALL_LINGUAS=
+-AM_GNU_GETTEXT
+-
++AM_GNU_GETTEXT([external])
+ 
+-if test ".$USE_INCLUDED_LIBINTL" = .yes; then
+-    INTLINCL='-I$(top_srcdir)/intl'
+-    AC_SUBST([INTLINCL])
+-fi
+ 
+ MP4H_LOADABLE_MODULES
+ 
+@@ -166,10 +140,10 @@ AM_CONDITIONAL([DO_MODULE_WML], [test ".$_do_module_wml" = .1])
+ 
+ dnl  This line is needed for Debian builds
+ AC_SUBST(CFLAGS)
++AC_SUBST([INTLINCL], [])
+ 
+ AC_CONFIG_FILES([
+    Makefile
+-   intl/Makefile
+    pcre/Makefile
+    lib/Makefile
+    src/Makefile
+diff --git a/modules/intl/Makefile.am b/modules/intl/Makefile.am
+index fa50340..627d3f5 100644
+--- a/modules/intl/Makefile.am
++++ b/modules/intl/Makefile.am
+@@ -24,7 +24,7 @@ endif
+ 
+ gettext_la_SOURCES =  gettext.c
+ gettext_la_LDFLAGS = -module
+-gettext_la_LIBADD  = @INTLLIBS@
++gettext_la_LIBADD  = @LTLIBINTL@
+ 
+ EXTRA_DIST = $(SRCFILES) $(TESTFILES)
+ 
+diff --git a/po/Makevars b/po/Makevars
+new file mode 100644
+index 0000000..7ebd306
+--- /dev/null
++++ b/po/Makevars
+@@ -0,0 +1,41 @@
++# Makefile variables for PO directory in any package using GNU gettext.
++
++# Usually the message domain is the same as the package name.
++DOMAIN = $(PACKAGE)
++
++# These two variables depend on the location of this directory.
++subdir = po
++top_builddir = ..
++
++# These options get passed to xgettext.
++XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
++
++# This is the copyright holder that gets inserted into the header of the
++# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
++# package.  (Note that the msgstr strings, extracted from the package's
++# sources, belong to the copyright holder of the package.)  Translators are
++# expected to transfer the copyright for their translations to this person
++# or entity, or to disclaim their copyright.  The empty string stands for
++# the public domain; in this case the translators are expected to disclaim
++# their copyright.
++COPYRIGHT_HOLDER = Denis Barbier
++
++# This is the email address or URL to which the translators shall report
++# bugs in the untranslated strings:
++# - Strings which are not entire sentences, see the maintainer guidelines
++#   in the GNU gettext documentation, section 'Preparing Strings'.
++# - Strings which use unclear terms or require additional context to be
++#   understood.
++# - Strings which make invalid assumptions about notation of date, time or
++#   money.
++# - Pluralisation problems.
++# - Incorrect English spelling.
++# - Incorrect formatting.
++# It can be your email address, or a mailing list address where translators
++# can write to without being subscribed, or the URL of a web page through
++# which the translators can contact you.
++MSGID_BUGS_ADDRESS = pkg-wml-maintainers@lists.alioth.debian.org
++
++# This is the list of locale categories, beyond LC_MESSAGES, for which the
++# message catalogs shall be used.  It is usually empty.
++EXTRA_LOCALE_CATEGORIES =
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 7c2973a..3a73192 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -17,8 +17,13 @@ mp4h_SOURCES = builtin.c debug.c devel.c freeze.c input.c \
+ if LOADABLE_MODULES
+ mp4h_LDFLAGS = -export-dynamic
+ endif
+-mp4h_LDADD   = -lm $(top_builddir)/lib/libmp4h.a $(top_builddir)/pcre/libpcre.a @INTLLIBS@ $(MODULE_LDADD)
++mp4h_LDADD   = -lm $(top_builddir)/lib/libmp4h.a $(top_builddir)/pcre/libpcre.a @LTLIBINTL@ $(MODULE_LDADD)
+ 
+ include_HEADERS = mp4h.h
+ noinst_HEADERS  = builtin.h
+ 
++MP4HLIBDIR=	${libdir}/mp4h
++MP4HDATADIR=	${datadir}/mp4h
++MP4H_PATH=	${MP4HLIBDIR}/${PACKAGE_VERSION}:${MP4HDATADIR}
++
++AM_CPPFLAGS=	-D"MP4HLIBDIR=\"${MP4H_PATH}\""
--- mp4h-1.3.1.orig/debian/patches/lintian-cleanup-tg.diff
+++ mp4h-1.3.1/debian/patches/lintian-cleanup-tg.diff
@@ -0,0 +1,104 @@
+Fix tons of lintian warnings, mostly common typos in documentation.
+
+diff --git a/doc/mp4h.mp4h b/doc/mp4h.mp4h
+index 383159a..fcc8ebb 100755
+--- a/doc/mp4h.mp4h
++++ b/doc/mp4h.mp4h
+@@ -836,7 +836,7 @@ it is set to the second argument.
+ </tag:description>
+ 
+ <para>
+-Show informations on symbols.  If it is a variable name, the <command
++Show information on symbols.  If it is a variable name, the <command
+ STRING /> word is printed as well as the number of lines contained within
+ this variable.
+ 
+@@ -1892,7 +1892,7 @@ Returns <true/> if file exists.
+ </tag:description>
+ 
+ <para>
+-Returns an array of informations on this file.  These informations are:
++Returns an array of information on this file.  These information are:
+ size, type, ctime, mtime, atime, owner and group.
+ </para>
+ 
+@@ -2133,7 +2133,7 @@ macro used to generate all examples of this documentation is
+ </tag:description>
+ 
+ <para>
+-This comand acts like the <optflag d /> flag but can be ynamically
++This command acts like the <optflag d /> flag but can be ynamically
+ changed.
+ </para>
+ 
+@@ -2158,7 +2158,7 @@ being processed.
+ </tag:description>
+ 
+ <para>
+-Declare these macros traced, i.e. informations about these macros will
++Declare these macros traced, i.e. information about these macros will
+ be printed if <optflag d /> flag or <command debugmode /> macro are used.
+ </para>
+ 
+@@ -2257,7 +2257,7 @@ A format specification as used with the strftime(3) C library routine.
+ 
+ <para>
+ Prints the time spent since last call to this macro.  The printed value
+-is the number of clock ticks, and so is dependant of your CPU.
++is the number of clock ticks, and so is dependent of your CPU.
+ </para>
+ 
+ <example>
+@@ -2519,7 +2519,7 @@ Macros are characterized by
+ <item>container status (simple or complex)</item>
+ <item>if attributes are expanded or not</item>
+ <item>function type (primitive or user defined macro)</item>
+-<item>for primitives, adress of corresponding code in memory and for
++<item>for primitives, address of corresponding code in memory and for
+ user defined macros the replacement text</item>
+ </list>
+ 
+@@ -2652,7 +2652,7 @@ and footers with
+ <define-tag header>
+ <html*>
+ <head>
+-... put here some informations ....
++... put here some information ....
+ </head>
+ <body* bgcolor="#ffffff" text="#000000">
+ </define-tag>
+diff --git a/src/builtin.c b/src/builtin.c
+index c861799..694531a 100644
+--- a/src/builtin.c
++++ b/src/builtin.c
+@@ -1312,7 +1312,7 @@ mp4h_bp_function_def (MP4H_BUILTIN_ARGS)
+ #ifdef HAVE_FILE_FUNCS
+ 
+ /*-----------------------------------------------------------------.
+-| Informations on a file.  A newline separated string is printed:  |
++| Information on a file.  A newline separated string is printed:   |
+ |    Line 1: file size                                             |
+ |    Line 2: file type                                             |
+ |    Line 3: time of last change                                   |
+@@ -4279,7 +4279,7 @@ mp4h_bp_decrement (MP4H_BUILTIN_ARGS)
+ }
+ 
+ /*--------------------------------.
+-| Dumps informations of symbols.  |
++| Dumps information of symbols.   |
+ `--------------------------------*/
+ static void
+ mp4h_bp_symbol_info (MP4H_BUILTIN_ARGS)
+diff --git a/src/module.c b/src/module.c
+index 54316fa..fe4031a 100755
+--- a/src/module.c
++++ b/src/module.c
+@@ -56,7 +56,7 @@
+  *
+  * The code implementing loadable modules is modest.  It is divided
+  * between the files builtin.c (user interface and support for multiple
+- * builtin tables) and this file (OS dependant routines).
++ * builtin tables) and this file (OS dependent routines).
+  *
+  * To load a module, use `loadmodule(modulename)'.  The function
+  * `m4_loadmodule' calls module_load() in this file, which uses
--- mp4h-1.3.1.orig/debian/patches/559822-nmu.diff
+++ mp4h-1.3.1/debian/patches/559822-nmu.diff
@@ -0,0 +1,215 @@
+Patch to fix #559822 (Additional source code patches as of Debian package 1.3.1-4.1).
+
+diff --git a/Makefile.am b/Makefile.am
+index ef51e6f..5034f74 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,5 +1,6 @@
+ 
+ AUTOMAKE_OPTIONS = foreign
++ACLOCAL_AMFLAGS = -I m4
+ 
+ DIST_SUBDIRS = intl pcre lib src po doc modules tests
+ 
+diff --git a/acinclude.m4 b/acinclude.m4
+index f010988..13d1caa 100755
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -8,7 +8,7 @@
+ 
+ # serial 1
+ 
+-AC_DEFUN(MP4H_LOADABLE_MODULES,
++AC_DEFUN([MP4H_LOADABLE_MODULES],
+   [AC_MSG_CHECKING(if support for loadable modules is requested)
+   AC_ARG_WITH(modules,
+   [  --with-modules=x,y,z    select loadable modules to compile],
+diff --git a/configure.ac b/configure.ac
+index 4a10699..92badef 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,5 +1,6 @@
+ dnl  As this file is called configure.ac, Autoconf 2.50 is required
+ AC_PREREQ([2.50])
++AC_CONFIG_MACRO_DIR([m4])
+ 
+ AC_INIT([mp4h], [1.3.1])
+ PACKAGE_DATE="11-Jan-2003"
+@@ -40,7 +41,6 @@ AC_DEFINE_UNQUOTED([MP4HLIBDIR], ["$MP4HLIBDIR/$PACKAGE_VERSION:$MP4HDATADIR"],
+ 
+ AC_PROG_CC
+ AC_PROG_CPP
+-AC_PROG_RANLIB
+ AC_PROG_MAKE_SET
+ AC_PROG_INSTALL 
+ 
+@@ -105,13 +105,8 @@ test ".$with_modules" = .yes && with_modules=`echo $module_list | sed -e 's/  */
+ if test ".$with_modules" != .no; then
+     echo ''
+     $shtool echo -e "Checking for %Bloadable modules%b support"
+-    AC_LIBTOOL_WIN32_DLL
+-    AC_LIBLTDL_CONVENIENCE
+-    AC_ENABLE_SHARED
+-    AC_DISABLE_STATIC
+-    AC_LIBTOOL_DLOPEN
+-    AC_LIBTOOL_SETUP
+-    AC_PROG_LIBTOOL
++    LT_INIT([dlopen win32-dll shared disable-static])
++    LTDL_INIT([])
+ 
+     case ,$with_modules, in
+       *,intl:gettext,* )
+@@ -157,10 +152,6 @@ fi
+ 
+ test ".$with_modules" = . && with_modules=none
+ 
+-AC_LIB_LTDL
+-AC_SUBST(INCLTDL)
+-AC_SUBST(LIBLTDL)
+-
+ AC_MSG_CHECKING([which modules to compile])
+ AC_MSG_RESULT([$with_modules])
+ 
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 3a2be18..665b1a9 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -40,6 +40,9 @@ $(PROGRAM):
+ 
+ EXTRA_DIST = mp4h.mp4h list-tags html.out pod.out texinfo.out
+ 
++html.out pod.out texinfo.out:
++	: # defeat GNU make's implicit rules
++
+ CLEANFILES = \
+    mp4h.pod mp4h.1 \
+    mp4h.html \
+diff --git a/modules/example/Makefile.am b/modules/example/Makefile.am
+index fafba10..b36251d 100644
+--- a/modules/example/Makefile.am
++++ b/modules/example/Makefile.am
+@@ -1,6 +1,6 @@
+ 
+ INCLUDES = -I$(top_srcdir)/lib  -I$(top_srcdir)/src @INTLINCL@
+-LDFLAGS  = -no-undefined -module -avoid-version -rpath $(pkglibdir) @DLLDFLAGS@
++AM_LDFLAGS  = -no-undefined -module -avoid-version -rpath $(pkglibdir) @DLLDFLAGS@
+ 
+ if DO_MODULE_TEST
+ noinst_LTLIBRARIES = test.la
+diff --git a/modules/intl/Makefile.am b/modules/intl/Makefile.am
+index aab636a..fa50340 100644
+--- a/modules/intl/Makefile.am
++++ b/modules/intl/Makefile.am
+@@ -13,7 +13,7 @@ TESTFILES = gettext.mp4h
+ man3ext   = 3
+ 
+ INCLUDES  = -I$(top_srcdir)/lib  -I$(top_srcdir)/src @INTLINCL@
+-LDFLAGS   = -no-undefined -module -avoid-version -rpath $(mp4mdir) @DLLDFLAGS@
++AM_LDFLAGS   = -no-undefined -module -avoid-version -rpath $(mp4mdir) @DLLDFLAGS@
+ 
+ if DO_MODULE_INTL_GETTEXT
+ mp4m_LTLIBRARIES   = gettext.la
+diff --git a/modules/javascript/Makefile.am b/modules/javascript/Makefile.am
+index 8dd230c..e08f490 100644
+--- a/modules/javascript/Makefile.am
++++ b/modules/javascript/Makefile.am
+@@ -5,7 +5,7 @@ thisdir  = javascript
+ mp4mdir = $(pkglibdir)/@VERSION@/$(thisdir)
+ 
+ INCLUDES = -I$(top_srcdir)/lib  -I$(top_srcdir)/src @INTLINCL@
+-LDFLAGS  = -no-undefined -module -avoid-version -rpath $(mp4mdir) @DLLDFLAGS@
++AM_LDFLAGS  = -no-undefined -module -avoid-version -rpath $(mp4mdir) @DLLDFLAGS@
+ 
+ if DO_MODULE_JAVASCRIPT_MOZJS
+ MODULE_JAVASCRIPT_MOZJS = mozjs.la
+diff --git a/modules/system/Makefile.am b/modules/system/Makefile.am
+index 0fcf7c1..8e6b218 100644
+--- a/modules/system/Makefile.am
++++ b/modules/system/Makefile.am
+@@ -13,7 +13,7 @@ TESTFILES = sh.mp4h
+ man3ext   = 3
+ 
+ INCLUDES  = -I$(top_srcdir)/lib  -I$(top_srcdir)/src @INTLINCL@
+-LDFLAGS   = -no-undefined -module -avoid-version -rpath $(mp4mdir) @DLLDFLAGS@
++AM_LDFLAGS   = -no-undefined -module -avoid-version -rpath $(mp4mdir) @DLLDFLAGS@
+ 
+ if DO_MODULE_SYSTEM
+ mp4m_LTLIBRARIES = sh.la exec.la
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 2e43b62..7c2973a 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,5 +1,5 @@
+ 
+-INCLUDES = -I$(top_srcdir)/pcre -I$(top_srcdir)/lib @INTLINCL@
++INCLUDES = -I$(top_srcdir)/pcre -I$(top_srcdir)/lib @INTLINCL@ $(LTDLINCL)
+ 
+ bin_PROGRAMS = mp4h
+ 
+@@ -8,7 +8,8 @@ EXTRA_mp4h_SOURCES = module.c
+ EXTRA_DIST = readme.tmpl
+ 
+ if LOADABLE_MODULES
+-MODULE_C = module.c ltdl.c
++MODULE_C = module.c
++MODULE_LDADD = $(LIBLTDL)
+ endif
+ 
+ mp4h_SOURCES = builtin.c debug.c devel.c freeze.c input.c \
+@@ -16,8 +17,8 @@ mp4h_SOURCES = builtin.c debug.c devel.c freeze.c input.c \
+ if LOADABLE_MODULES
+ mp4h_LDFLAGS = -export-dynamic
+ endif
+-mp4h_LDADD   = -lm $(top_builddir)/lib/libmp4h.a $(top_builddir)/pcre/libpcre.a @INTLLIBS@
++mp4h_LDADD   = -lm $(top_builddir)/lib/libmp4h.a $(top_builddir)/pcre/libpcre.a @INTLLIBS@ $(MODULE_LDADD)
+ 
+ include_HEADERS = mp4h.h
+-noinst_HEADERS  = builtin.h ltdl.h
++noinst_HEADERS  = builtin.h
+ 
+diff --git a/src/ltdl.c.patch b/src/ltdl.c.patch
+deleted file mode 100644
+index a6fbf64..0000000
+--- a/src/ltdl.c.patch
++++ /dev/null
+@@ -1,40 +0,0 @@
+---- ltdl.c	Tue Jun 11 18:23:20 2002
+-+++ ltdl.c	Sun Jun 30 23:23:36 2002
+-@@ -2039,7 +2039,7 @@
+- 	}
+- 
+-       /* try to open the not-installed module */
+--      if (!installed)
+-+      if (!installed && objdir)
+- 	{
+- 	  if (tryall_dlopen_module (handle, dir, objdir, dlname) == 0)
+- 	    return 0;
+-@@ -2047,7 +2047,7 @@
+- 
+-       /* maybe it was moved to another directory */
+-       {
+--	  if (tryall_dlopen_module (handle,
+-+	  if (dir && tryall_dlopen_module (handle,
+- 				    (const char *) 0, dir, dlname) == 0)
+- 	    return 0;
+-       }
+-@@ -2691,10 +2691,6 @@
+- 	    }
+- #endif
+- 	}
+--      if (!file)
+--	{
+--	  file = fopen (filename, LT_READTEXT_MODE);
+--	}
+- 
+-       /* If we didn't find the file by now, it really isn't there.  Set
+- 	 the status flag, and bail out.  */
+-@@ -2990,7 +2986,7 @@
+-      failed, it is better to return an error message here than to
+-      report FILE_NOT_FOUND when the alternatives (foo.so etc) are not
+-      in the module search path.  */
+--  if (handle || ((errors > 0) && file_not_found ()))
+-+  if (handle || ((errors > 0) && !file_not_found ()))
+-     {
+-       LT_DLFREE (tmp);
+-       return handle;
--- mp4h-1.3.1.orig/debian/source/format
+++ mp4h-1.3.1/debian/source/format
@@ -0,0 +1 @@
+1.0