summaryrefslogtreecommitdiff
diff options
authorMartin Quinson <mquinson@debian.org>2011-11-04 14:56:17 +0100
committergit-ubuntu importer <ubuntu-devel-discuss@lists.ubuntu.com>2011-11-05 03:20:35 +0000
commitedc3d165e607e97d11cc5bd47b27ee6d0aad39ab (patch)
tree3d4519cd66aa5a7866a5d173ec0ade4c48dac5f6
parentdfd069cc67d4f9344fe37c993eeee597cdff5ce2 (diff)
parent6959b16a6c7b6221a90f1b7d109f4b5881b14311 (diff)
1.9.2-1 (patches applied)applied/1.9.2-1applied/ubuntu/quantal-develapplied/ubuntu/quantalapplied/ubuntu/precise-develapplied/ubuntu/preciseapplied/debian/wheezy
Imported using git-ubuntu import.
Diffstat
-rw-r--r--ChangeLog7
-rw-r--r--Makefile.defs2
-rw-r--r--debian/changelog11
-rw-r--r--debian/control6
-rwxr-xr-xflexml.pl20
5 files changed, 33 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 293cb0a..2937840 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-11-04 Martin Quinson <Martin.Quinson@loria.fr>
+
+ * Integrate a patch from Arnaud Giersch to ensure that the
+ variable defined to check multiply defined attributes are
+ correctly added to the header. Thanks Arnaud.
+ * Release v1.9.2 with this fix.
+
2011-10-28 Martin Quinson <Martin.Quinson@loria.fr>
* Ensure that the generated parsers are robust to multiply
diff --git a/Makefile.defs b/Makefile.defs
index 707613c..4e78f4f 100644
--- a/Makefile.defs
+++ b/Makefile.defs
@@ -6,7 +6,7 @@
#SUFF ?=-$(VER)
SUFF ?=
-VER = 1.9.1
+VER = 1.9.2
# SETUP.
diff --git a/debian/changelog b/debian/changelog
index 5b2c69d..af783ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+flexml (1.9.2-1) unstable; urgency=low
+
+ * New upstream release:
+ - Declare *_isset variables properly, even when they are in a header
+ [Thx Arnaug Giersch for the BR and patch] Closes: #647605)
+ * debian/control:
+ - add VCS fields, and improve short description
+ - update Standard-Version to 3.9.2 (no change needed)
+
+ -- Martin Quinson <mquinson@debian.org> Fri, 04 Nov 2011 14:56:17 +0100
+
flexml (1.9.1-1) unstable; urgency=low
* New upstream release:
diff --git a/debian/control b/debian/control
index d643739..2564fe7 100644
--- a/debian/control
+++ b/debian/control
@@ -4,15 +4,17 @@ Priority: optional
Maintainer: Martin Quinson <mquinson@debian.org>
Build-Depends: libwww-perl, debhelper (>= 7.1), liburi-perl,
libdate-calc-perl, flex
-Standards-Version: 3.8.4
+Standards-Version: 3.9.2
Homepage: http://flexml.sourceforge.net/
+Vcs-Git: git://git.debian.org/git/collab-maint/flexml.git
+Vcs-Browser: http://git.debian.org/?p=collab-maint/flexml.git
Package: flexml
Architecture: any
Depends: ${shlibs:Depends}, libwww-perl, liburi-perl, libdate-calc-perl,
${misc:Depends}
Recommends: flex
-Description: generate fast validating XML processors and applications
+Description: Fast validating XML processors and applications generator
FleXML makes it easy to generate very fast validating XML processors
as flex(1) source.
.
diff --git a/flexml.pl b/flexml.pl
index 92deaa3..f3a341f 100755
--- a/flexml.pl
+++ b/flexml.pl
@@ -5,7 +5,7 @@
#
# This file is part of the FleXML XML processor generator system.
# Copyright (C) 1999 Kristoffer Rose. All rights reserved.
-# Copyright (C) 2003-2006 Martin Quinson. All rights reserved.
+# Copyright (C) 2003-2011 Martin Quinson. All rights reserved.
#
# 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
@@ -23,7 +23,7 @@
use warnings;
-my $Id = '$Id: flexml.pl,v 1.66 2011/10/30 21:03:48 mquinson Exp $ ';
+my $Id = '$Id: flexml.pl,v 1.67 2011/11/01 20:49:21 mquinson Exp $ ';
$Id =~ s/\s*\$\s*//go;
# IMPORTS.
@@ -180,7 +180,7 @@ sub redistribute { # Print C comment with generated file "license".
print <<EOT;
$pre This program was generated with the FleXML XML processor generator.
$pre FleXML is Copyright (C) 1999-2005 Kristoffer Rose. All rights reserved.
-$pre FleXML is Copyright (C) 2003-2006 Martin Quinson. All rights reserved.
+$pre FleXML is Copyright (C) 2003-2011 Martin Quinson. All rights reserved.
$pre ($Id).
$pre
$pre There are two, intertwined parts to this program, part A and part B.
@@ -190,7 +190,7 @@ $pre ------
$pre
$pre Some parts, here collectively called "Part A", are found in the
$pre FleXML package. They are Copyright (C) 1999-2005 Kristoffer Rose
-$pre and Copyright (C) 2003-2006 Martin Quinson. All rights reserved.
+$pre and Copyright (C) 2003-2011 Martin Quinson. All rights reserved.
$pre
$pre You can redistribute, use, perform, display and/or modify "Part A"
$pre provided the following two conditions hold:
@@ -239,7 +239,6 @@ sub api_types { # Print XML application interface types.
for (keys %atttype) {
if (m.($Nmtoken)[/]($Nmtoken).xo) {
my ($tag,$attribute) = ($1,$2);
- print "short int ${tagprefix}$ctag{$tag}_$catt{$attribute}_isset;\n";
print "typedef $typeof{$_} AT_${tagprefix}$ctag{$tag}_$catt{$attribute};\n";
print "#define AU_${tagprefix}$ctag{$tag}_$catt{$attribute} NULL\n"
if not $enumtype{$_};
@@ -265,6 +264,7 @@ sub api_data { # Print XML application interface parameters.
else {
print "(${tagprefix}bufferstack + AX_${tagprefix}$ctag{$1}_$catt{$2})\n";
}
+ print $pre . "short int ${tagprefix}$ctag{$1}_$catt{$2}_isset;\n";
}
}
}
@@ -886,11 +886,11 @@ while (@inputs) { # While there are lines...
# Special treatment of token types.
if ( $type eq 'ID' or $type eq 'IDREF' ) {
$literaltype{"$tag/$attribute"} = '{Name}';
- print STDERR place()."Warning: attribute type `$type' not validated.\n";
+ print STDERR place()."Warning: cannot validate attribute type `$type' (yet).\n";
}
elsif ( $type eq 'IDREFS' ) {
$literaltype{"$tag/$attribute"} = '{Names}';
- print STDERR place()."Warning: attribute type `$type' not validated.\n";
+ print STDERR place()."Warning: cannot validate attribute type `$type' (yet).\n";
}
elsif ( $type eq 'NMTOKEN' ) {
$literaltype{"$tag/$attribute"} = '{Nmtoken}';
@@ -901,12 +901,12 @@ while (@inputs) { # While there are lines...
elsif ( $type eq 'ENTITY' ) {
#die place()."ENTITY attribute type unimplemented.\n";
$literaltype{"$tag/$attribute"} = '{Name}';
- print STDERR place()."Warning: attribute type `$type' not validated.\n";
+ print STDERR place()."Warning: cannote validate attribute type `$type' (yet).\n";
}
elsif ( $type eq 'ENTITIES' ) {
#die place()."ENTITIES attribute type unimplemented.\n";
$literaltype{"$tag/$attribute"} = '{Names}';
- print STDERR place()."Warning: attribute type `$type' not validated.\n";
+ print STDERR place()."Warning: cannot validate attribute type `$type' (yet).\n";
}
elsif ( $type ne 'CDATA' ) {
@@ -923,7 +923,7 @@ while (@inputs) { # While there are lines...
}
$orig = ''; # in case there were no attributes...
- }
+ } # end of a <!ATTLIST> block
# Parse internal parameter entity declaration.
elsif ( m/^\s*<!ENTITY\s+%\s+($Name)\s+'([^'']*)'\s*>\s*/xo
generated by cgit v1.2.3 (git 2.25.1) at 2026-07-12 01:38:18 +0000