Commit ede6c277 authored by Luk Claes's avatar Luk Claes Committed by Axel Beckert

Imported Debian patch 1.3.1-4

parent 2e0e034e
......@@ -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-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
Local variables:
mode: debian-changelog
End:
Source: mp4h
Section: web
Priority: optional
Maintainer: Felipe Augusto van de Wiel (faw) <faw@debian.org>
Standards-Version: 3.7.2
Build-Depends: debhelper (>= 4), tidy
Package: mp4h
Architecture: any
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).
This package was debianized by Denis Barbier <barbier@linuxfr.org>
on Mon, 28 Feb 2000 21:46:36 +0100.
Currently maintained by Luk Claes <luk@debian.org> and
Felipe Augusto van de Wiel <felipe@cathedrallabs.org>
Author: (C) 2000-2003, Denis Barbier <barbier@linuxfr.org>
It was downloaded from
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'.
#!/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
build: build-stamp
build-stamp: config.status
dh_testdir
$(MAKE)
touch build-stamp
config.status: configure
CFLAGS="$(CFLAGS)" ./configure $(confflags) \
--prefix=/usr \
--mandir='$${prefix}/share/man' \
--with-modules='intl:gettext' \
--with-tidy=/usr/bin/tidy
clean:
dh_testdir
dh_testroot
[ ! -f Makefile ] || $(MAKE) distclean
dh_clean build-stamp
install: build-stamp
dh_testdir
dh_testroot
dh_clean -k
$(MAKE) install DESTDIR=$(CURDIR)/debian/mp4h
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
......@@ -38,7 +38,7 @@ This software is based on
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 @@ to write my own macro-processor.
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 @@ tend to zero when XHTML syntax becomes more familiar.
<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>
......
......@@ -4,7 +4,7 @@
;;; Copyright (c) 2002-2003, Denis Barbier, All Rights Reserved.
;;;
<load module="intl:gettext">
<load module="intl:gettext" />
##EOF##
__END__
......
......@@ -4,7 +4,7 @@
;;; Copyright (c) 2001-2003, Denis Barbier, All Rights Reserved.
;;;
<load module="system:exec">
<load module="system:exec" />
##EOF##
__END__
......
......@@ -4,7 +4,7 @@
;;; Copyright (c) 2001-2003, Denis Barbier, All Rights Reserved.
;;;
<load module="system:sh">
<load module="system:sh" />
##EOF##
__END__
......
--- 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;
......@@ -513,7 +513,7 @@ shipout_text (struct obstack *obs, char *text)
text += length - 1;
}
else
for (; *(text+1) != '\0'; text++)
for (; *text != '\0'; text++)
{
if (start_of_output_line)
{
......
......@@ -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.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment