debian/0000755000000000000000000000000012220425576007173 5ustar debian/clean0000644000000000000000000000025512135617323010200 0ustar config.h config.log config.status libtool stamp-h1 debian/*.tar doc/mp4h.html doc/mp4h.pod modules/intl/gettext.mp4hp src/mp4h pcre/chartables.c pcre/dftables tests/*/*.out debian/rules0000755000000000000000000000400012220143730010232 0ustar #!/usr/bin/make -f # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 # 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 BUILT_USING=$(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W gettext) %: dh $@ override_dh_auto_configure: # Move everything we don't need away tar cvf debian/not-needed-for-build.tar \ intl ABOUT-NLS po/Makefile.in.in aclocal.m4 config.guess config.sub \ config.h.in configure depcomp install-sh ltmain.sh missing \ mkinstalldirs src/ltdl.* `find . -name Makefile.in` pcre # Use external PCRE and libtool only rm -rf src/ltdl.* ltmain.sh pcre 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 dh_autoreconf dh_auto_configure -- \ --without-included-ltdl \ --with-modules='intl:gettext' \ --with-tidy=/usr/bin/tidy override_dh_auto_clean: -tar cvf debian/needed-after-clean.tar ABOUT-NLS po/Makefile.in.in dh_autoreconf_clean # PO stuff cd po && rm -f ${GETTEXT_PO_FILES} stamp-po POTFILES Makefile.in rm -f ${GETTEXT_TOP_FILES} # Restore as much as possible for easy VCS usage [ ! -f debian/needed-after-clean.tar ] || tar xvf debian/needed-after-clean.tar [ ! -f debian/not-needed-for-build.tar ] || tar xvf debian/not-needed-for-build.tar find . -name .deps -o -name .libs | xargs -r rm -rv find . -not -path './debian/*' \ '(' -name '*.[ao13]' \ -o -name '*.l[ao]' \ -o -name Makefile ')' \ -delete override_dh_auto_install: dh_auto_install sed -e "/dependency_libs/ s/'.*'/''/" \ -i "`find $(CURDIR)/debian/mp4h/usr/lib -name gettext.la`" -find $(CURDIR)/debian/mp4h -type d -empty -delete override_dh_gencontrol: dh_gencontrol -- -VBuilt-Using="$(BUILT_USING)" debian/changelog0000644000000000000000000002227112220425434011042 0ustar mp4h (1.3.1-9) unstable; urgency=low [ Eric Dorland ] * Add patch to fix compatibility with newer automake versions [ Axel Beckert ] * Remove dependency on automake1.9: together with Eric's patch and dh-autoreconf it's no more necessary. (Closes: #724418) * Refresh patches 653362-fix-ftbfs-on-hurd and use-system-pcre -- Axel Beckert Wed, 25 Sep 2013 02:07:04 +0200 mp4h (1.3.1-8) unstable; urgency=low * Upload to unstable again. * Add Built-Using header due to copying files from gettext into the build directory. -- Axel Beckert Sat, 04 May 2013 11:03:20 +0200 mp4h (1.3.1-7) experimental; urgency=low * Fix FTBFS on GNU/Hurd (Closes: #653362) Thanks to Svante Signell for investigation and the patch! * Fix FTBFS with -Werror=format-security. * Remove manual DEB_BUILD_OPTIONS check around dh_strip as dh_strip does that itself. * Bump Standards-Version to 3.9.4 (no changes) * Bump debhelper compatibility to 9 + Add Pre-Depends on ${misc:Pre-Depends) * Switch to source format "3.0 (quilt)" + Drop build-dependency on quilt + Drop debian/README.source + Remove quilt traces from debian/rules * Switch from autotools-dev to dh-autoreconf + Update build-dependencies accordingly * Revamp debian/rules: + Use dh_auto_{configure,build,install} + Support multiarch lib directories + Make clean target more robust + Use debian/docs and don't list upstream changelog explicitly + Finally switch normalized debian/rules to minimal dh style * Build against system copy of PCRE3 + Add build-dependency on libpcre3-dev + No more install README.pcre into /usr/share/doc/mp4h * Enable test suite at build time * Apply wrap-and-sort * Fix the following lintian warnings: + vcs-field-not-canonical + spelling-error-in-manpage (fix added to lintian-cleanup-tg.diff) -- Axel Beckert Tue, 30 Apr 2013 00:23:40 +0200 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 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 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 Thu, 04 Mar 2010 19:30:06 +0000 mp4h (1.3.1-4) unstable; urgency=low * Remove me from Maintainers. -- Luk Claes 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 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 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 Sun, 12 Jan 2003 00:04:16 +0100 mp4h (1.3.0-3) unstable; urgency=low * Some argument checks were missing in and could cause memory fault. Thanks Jean-Michel Sauvage. -- Denis Barbier 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 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 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 Wed, 19 Jun 2002 21:50:44 +0200 mp4h (1.2.4-1) unstable; urgency=low * New upstream release -- Denis Barbier 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 Mon, 10 Dec 2001 23:43:27 +0100 mp4h (1.2.3-1) unstable; urgency=low * New upstream release -- Denis Barbier Fri, 26 Oct 2001 00:04:48 +0200 mp4h (1.2.2-1) unstable; urgency=low * New upstream release -- Denis Barbier Thu, 18 Oct 2001 10:36:20 +0200 mp4h (1.2.1-1) unstable; urgency=low * New upstream release -- Denis Barbier 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 Sun, 26 Aug 2001 01:25:55 +0200 mp4h (1.1.2-5) unstable; urgency=low * Upgrade config.{sub,guess} -- Denis Barbier Sun, 8 Jul 2001 11:14:27 +0200 mp4h (1.1.2-4) unstable; urgency=low * Fix , which caused a segmentation fault when applied to a file whose uid or gid cannot be resolved. -- Denis Barbier 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 Thu, 15 Feb 2001 22:57:22 +0100 mp4h (1.1.2-2) unstable; urgency=low * Fix another bug with some conditionals: , -- Denis Barbier 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 Wed, 8 Nov 2000 00:33:32 +0100 mp4h (1.1.1-1) unstable; urgency=low * New upstream version. * Sponsored upload. -- Josip Rodin 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 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 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 Fri, 23 Jun 2000 22:18:29 -0700 mp4h (1.0.0-0.1) unstable; urgency=low * New upstream release. * NMU. -- Brian Bassett 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 Sun, 18 Jun 2000 12:18:14 -0700 mp4h (0.8.0-1) unstable; urgency=low * Initial Release. -- Denis Barbier Mon, 28 Feb 2000 21:46:36 +0100 debian/control0000644000000000000000000000204212220143317010562 0ustar Source: mp4h Section: web Priority: optional Maintainer: Debian WML Packaging Team Uploaders: Axel Beckert Standards-Version: 3.9.4 Build-Depends: autoconf (>= 2.57~), debhelper (>= 9~), dh-autoreconf, dpkg (>= 1.16.2), gettext, libltdl-dev, libpcre3-dev, libtool, tidy Build-Conflicts: autoconf2.13, automake1.4 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-wml/mp4h.git Vcs-Git: git://anonscm.debian.org/pkg-wml/mp4h.git Package: mp4h Architecture: any Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} Built-Using: ${Built-Using} 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). debian/docs0000644000000000000000000000003512135630357010044 0ustar README CREDITS doc/mp4h.html debian/compat0000644000000000000000000000000212135617323010367 0ustar 9 debian/watch0000644000000000000000000000006412135563335010225 0ustar # there seems to be no homepage / upstream any more debian/patches/0000755000000000000000000000000012220422217010607 5ustar debian/patches/fix-ftbfs-with-hardening-flags.diff0000644000000000000000000000204312135617323017341 0ustar Description: Fixes FTBFS with -Werror=format-security mp4h.c:358:11: error: format not a string literal and no format arguments [-Werror=format-security] mp4h.c:472:17: error: format not a string literal and no format arguments [-Werror=format-security] Author: Axel Beckert Index: mp4h/src/mp4h.c =================================================================== --- mp4h.orig/src/mp4h.c 2013-04-23 21:54:05.780917115 +0200 +++ mp4h/src/mp4h.c 2013-04-24 00:30:39.825978669 +0200 @@ -355,7 +355,7 @@ case 'o': if (!debug_set_output (optarg)) - error (0, errno, optarg); + error (0, errno, "%s", optarg); break; case 's': @@ -469,7 +469,7 @@ fp = path_search (argv[optind], &filename); if (fp == NULL) { - error (0, errno, argv[optind]); + error (0, errno, "%s", argv[optind]); MP4HERROR ((warning_status, 0, _("%s: file skipped"), argv[optind])); continue; debian/patches/559822-nmu.diff0000644000000000000000000001463512135563335013041 0ustar 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; debian/patches/series0000644000000000000000000000026212220420743012026 0ustar 1.3.1-4.diff 559822-nmu.diff 573599-regression.diff mp4h-auto.diff lintian-cleanup-tg.diff 653362-fix-ftbfs-on-hurd.diff fix-ftbfs-with-hardening-flags.diff use-system-pcre.diff debian/patches/use-system-pcre.diff0000644000000000000000000000373012220422134014507 0ustar Description: Build against system copy of PCRE3 Author: Axel Beckert Index: mp4h/Makefile.am =================================================================== --- mp4h.orig/Makefile.am 2013-09-25 01:46:25.960808371 +0200 +++ mp4h/Makefile.am 2013-09-25 01:46:26.008809186 +0200 @@ -2,12 +2,12 @@ AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 -DIST_SUBDIRS = pcre lib src po doc modules tests +DIST_SUBDIRS = lib src po doc modules tests if LOADABLE_MODULES -SUBDIRS = pcre lib src po doc modules tests +SUBDIRS = lib src po doc modules tests else -SUBDIRS = pcre lib src po doc tests +SUBDIRS = lib src po doc tests endif EXTRA_DIST = config.rpath m4/ChangeLog CREDITS README README.pcre bootstrap.sh shtool Index: mp4h/src/Makefile.am =================================================================== --- mp4h.orig/src/Makefile.am 2013-09-25 01:46:25.960808371 +0200 +++ mp4h/src/Makefile.am 2013-09-25 01:46:26.008809186 +0200 @@ -1,5 +1,5 @@ -INCLUDES = -I$(top_srcdir)/pcre -I$(top_srcdir)/lib @INTLINCL@ $(LTDLINCL) +INCLUDES = -I$(top_srcdir)/lib @INTLINCL@ $(LTDLINCL) bin_PROGRAMS = mp4h @@ -17,7 +17,7 @@ if LOADABLE_MODULES mp4h_LDFLAGS = -export-dynamic endif -mp4h_LDADD = -lm $(top_builddir)/lib/libmp4h.a $(top_builddir)/pcre/libpcre.a @LIBINTL@ $(MODULE_LDADD) +mp4h_LDADD = -lm $(top_builddir)/lib/libmp4h.a @DEB_BUILD_MULTIARCH@/libpcre.a @LIBINTL@ $(MODULE_LDADD) include_HEADERS = mp4h.h noinst_HEADERS = builtin.h Index: mp4h/configure.ac =================================================================== --- mp4h.orig/configure.ac 2013-09-25 01:46:25.984808776 +0200 +++ mp4h/configure.ac 2013-09-25 01:46:26.008809186 +0200 @@ -140,10 +140,10 @@ dnl This line is needed for Debian builds AC_SUBST(CFLAGS) AC_SUBST([INTLINCL], []) +AC_SUBST([DEB_BUILD_MULTIARCH], [/usr/lib/`dpkg-architecture -qDEB_BUILD_MULTIARCH`]) AC_CONFIG_FILES([ Makefile - pcre/Makefile lib/Makefile src/Makefile po/Makefile.in debian/patches/lintian-cleanup-tg.diff0000644000000000000000000001000512135617323015141 0ustar Fix tons of lintian warnings, mostly common typos in documentation. Index: mp4h/doc/mp4h.mp4h =================================================================== --- mp4h.orig/doc/mp4h.mp4h 2013-04-24 01:45:37.756875790 +0200 +++ mp4h/doc/mp4h.mp4h 2013-04-24 01:46:16.717470267 +0200 @@ -663,7 +663,7 @@ This is version -Operating sytem is +Operating system is "" @@ -836,7 +836,7 @@ -Show informations on symbols. If it is a variable name, the word is printed as well as the number of lines contained within this variable. @@ -1892,7 +1892,7 @@ Returns if file exists. -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. @@ -2133,7 +2133,7 @@ macro used to generate all examples of this documentation is -This comand acts like the flag but can be ynamically +This command acts like the flag but can be ynamically changed. @@ -2158,7 +2158,7 @@ being processed. -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 flag or macro are used. @@ -2257,7 +2257,7 @@ A format specification as used with the strftime(3) C library routine. 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. @@ -2519,7 +2519,7 @@ Macros are characterized by container status (simple or complex) if attributes are expanded or not function type (primitive or user defined macro) -for primitives, adress of corresponding code in memory and for +for primitives, address of corresponding code in memory and for user defined macros the replacement text @@ -2652,7 +2652,7 @@ and footers with -... put here some informations .... +... put here some information .... 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 debian/patches/mp4h-auto.diff0000644000000000000000000000301412220422217013255 0ustar Description: Fix compatibility with newer automake versions Author: Eric Dorland Acked-By: Axel Beckert Bug-Debian: http://bugs.debian.org/724418 Index: mp4h/Makefile.am =================================================================== --- mp4h.orig/Makefile.am 2013-09-25 01:36:06.990597072 +0200 +++ mp4h/Makefile.am 2013-09-25 01:36:09.294634979 +0200 @@ -10,7 +10,7 @@ SUBDIRS = pcre lib src po doc tests endif -EXTRA_DIST = CREDITS README README.pcre bootstrap.sh shtool +EXTRA_DIST = config.rpath m4/ChangeLog CREDITS README README.pcre bootstrap.sh shtool deb: if test -f ../mp4h_$(VERSION).orig.tar.gz; then \ Index: mp4h/configure.ac =================================================================== --- mp4h.orig/configure.ac 2013-09-25 01:36:06.990597072 +0200 +++ mp4h/configure.ac 2013-09-25 01:36:09.294634979 +0200 @@ -29,7 +29,6 @@ AC_MINIX AC_ISC_POSIX -AM_C_PROTOTYPES AC_HEADER_STDC AC_TYPE_SIZE_T Index: mp4h/src/Makefile.am =================================================================== --- mp4h.orig/src/Makefile.am 2013-09-25 01:36:06.990597072 +0200 +++ mp4h/src/Makefile.am 2013-09-25 01:36:09.294634979 +0200 @@ -17,7 +17,7 @@ if LOADABLE_MODULES mp4h_LDFLAGS = -export-dynamic endif -mp4h_LDADD = -lm $(top_builddir)/lib/libmp4h.a $(top_builddir)/pcre/libpcre.a @LTLIBINTL@ $(MODULE_LDADD) +mp4h_LDADD = -lm $(top_builddir)/lib/libmp4h.a $(top_builddir)/pcre/libpcre.a @LIBINTL@ $(MODULE_LDADD) include_HEADERS = mp4h.h noinst_HEADERS = builtin.h debian/patches/653362-fix-ftbfs-on-hurd.diff0000644000000000000000000000363712220421003015452 0ustar Description: Fixes FTBFS on GNU Hurd Source: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=653362#5 Author: Svante Signell Index: mp4h/configure.ac =================================================================== --- mp4h.orig/configure.ac 2013-09-25 01:36:09.294634979 +0200 +++ mp4h/configure.ac 2013-09-25 01:36:29.122961324 +0200 @@ -37,7 +37,7 @@ AC_CHECK_HEADERS([limits.h locale.h memory.h stdarg.h string.h unistd.h time.h]) AC_CHECK_HEADERS([pwd.h grp.h dirent.h sys/param.h sys/stat.h sys/types.h sys/times.h]) -AC_CHECK_FUNCS([mkstemp strchr strerror tmpfile getpwuid getgrgid bcopy memmove]) +AC_CHECK_FUNCS([mkstemp strchr strerror tmpfile getpwuid getgrgid bcopy memmove canonicalize_file_name]) AC_FUNC_ALLOCA AC_FUNC_VPRINTF AC_REPLACE_FUNCS(strtol obstack xmalloc xstrdup) Index: mp4h/src/builtin.c =================================================================== --- mp4h.orig/src/builtin.c 2013-09-25 01:36:27.842940261 +0200 +++ mp4h/src/builtin.c 2013-09-25 01:36:29.126961385 +0200 @@ -1468,7 +1468,11 @@ mp4h_bp_real_path (MP4H_BUILTIN_ARGS) { const char *pathname; +#ifdef HAVE_CANONICALIZE_FILE_NAME + char *resolvedname = NULL; +#else char resolvedname[MAXPATHLEN]; +#endif CHECK_SAFETY_LEVEL(1); @@ -1478,12 +1482,22 @@ _("Warning:%s:%d: In <%s>, required attribute `%s' is not specified"), CURRENT_FILE_LINE, ARG (0), "pathname")); else +#ifdef HAVE_CANONICALIZE_FILE_NAME + if ((resolvedname = canonicalize_file_name(pathname)) == NULL) +#else if (!realpath(pathname, resolvedname)) +#endif MP4HERROR ((warning_status, errno, _("Error:%s:%d: Cannot form real path for `%s'"), CURRENT_FILE_LINE, pathname)); else + { obstack_grow(obs, resolvedname, strlen(resolvedname)); +#ifdef HAVE_CANONICALIZE_FILE_NAME + free(resolvedname); +#endif + + } } #endif /* HAVE_FILE_FUNCS */ debian/patches/573599-regression.diff0000644000000000000000000001205212135563335014420 0ustar 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}\"" debian/patches/1.3.1-4.diff0000644000000000000000000001021412135563335012254 0ustar 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. ;;; - + ##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. ;;; - + ##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. ;;; - + ##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; -() +() 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 , -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 @@ Mp4h has its own -. +.
Thanks
debian/source/0000755000000000000000000000000012135617323010471 5ustar debian/source/format0000644000000000000000000000001412135617323011677 0ustar 3.0 (quilt) debian/doc-base0000644000000000000000000000036412135563335010577 0ustar 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 debian/copyright0000644000000000000000000000235412135617323011130 0ustar This package was debianized by Denis Barbier 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 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'.