summaryrefslogtreecommitdiff
diff options
authorMartin Quinson <mquinson@debian.org>2013-01-29 16:12:03 +0100
committergit-ubuntu importer <ubuntu-devel-discuss@lists.ubuntu.com>2013-01-29 22:19:31 +0000
commitea5660138c4b3d564fa63891730de4b88ec54fd3 (patch)
tree3983beeb734313fcfe76e4ab2cb2f6900e68796e
parent8ae4f30f829b4916cbb9b52ec7985f38fac25672 (diff)
1.9.6-1 (patches unapplied)import/1.9.6-1ubuntu/utopic-develubuntu/utopicubuntu/trusty-develubuntu/trustyubuntu/saucy-develubuntu/saucyubuntu/raring-proposedubuntu/raring-develubuntu/raringdebian/jessie
Imported using git-ubuntu import.
Notes
Notes: * New upstream release: Don't install any file under /usr/share/doc/flexml/flexml/* Thanks lintian for noticing, and sorry for the short lived v1.9.5. * New upstream release. - flexml --version now returns the package version (instead of the file release in upstream RCS). * debian/control: Use canonical values in fields VCS (thanks lintian)
Diffstat
-rw-r--r--ChangeLog13
-rw-r--r--Makefile3
-rw-r--r--Makefile.defs2
-rw-r--r--debian/changelog17
-rw-r--r--debian/control4
-rw-r--r--examples/Makefile4
-rwxr-xr-xflexml.pl18
-rw-r--r--skel2
8 files changed, 45 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog
index 3ca8c8a..a979fd3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2013-01-29 Martin Quinson <Martin.Quinson@loria.fr>
+
+ * Don't install any file under examples/flexml/flexml/*
+ * Release v1.9.6 with these fixes.
+
+2013-01-29 Martin Quinson <Martin.Quinson@loria.fr>
+
+ * "flexml --version" now reports the package version, not the
+ file version in CVS. Users often don't care about the
+ internal rcs numbering schema.
+ * Update the Copyright notices: we are in 2013 already.
+ * Release v1.9.5 with these cosmetics.
+
2012-12-20 Martin Quinson <Martin.Quinson@loria.fr>
* New patch from Arnaud Giersch, this time to ensure that
diff --git a/Makefile b/Makefile
index c5df77a..143ef10 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@
# with this program; if not, write to the Free Software Foundation, Inc., 59
# Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-# $Id: Makefile,v 1.45 2011/10/30 19:26:34 mquinson Exp $
+# $Id: Makefile,v 1.47 2013/01/29 14:35:24 mquinson Exp $
# SUFF (defined in Makefile.defs) is the versioning suffix added to binaries and
# resource files. To get rid of it (and do a non-versioned install,
@@ -90,6 +90,7 @@ clean::; $(RM) $(FLEXML) $(FLEXML_ACT) flexml-act flexml-act.c
$(FLEXML): flexml.pl
sed \
+ -e "s;FLEXMLVERSION;$(VER);g" \
-e "s;[.][/]flexml-act;$(ACT);g" \
-e "s;[.][/]skel;$(SKEL);g" \
-e "s;/var/tmp;$(TMPDIR);g" \
diff --git a/Makefile.defs b/Makefile.defs
index 574c429..96186d2 100644
--- a/Makefile.defs
+++ b/Makefile.defs
@@ -6,7 +6,7 @@
#SUFF ?=-$(VER)
SUFF ?=
-VER = 1.9.4
+VER = 1.9.6
# SETUP.
diff --git a/debian/changelog b/debian/changelog
index d43adfa..a92b0bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+flexml (1.9.6-1) unstable; urgency=low
+
+ * New upstream release:
+ Don't install any file under /usr/share/doc/flexml/flexml/*
+ Thanks lintian for noticing, and sorry for the short lived v1.9.5.
+
+ -- Martin Quinson <mquinson@debian.org> Tue, 29 Jan 2013 16:12:03 +0100
+
+flexml (1.9.5-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ - flexml --version now returns the package version (instead of the
+ file release in upstream RCS).
+ * debian/control: Use canonical values in fields VCS (thanks lintian)
+
+ -- Martin Quinson <mquinson@debian.org> Tue, 29 Jan 2013 15:37:08 +0100
+
flexml (1.9.4-2) unstable; urgency=low
* Update Standards-Version to 3.9.4 (no change)
diff --git a/debian/control b/debian/control
index c76cde6..9928052 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,8 @@ Build-Depends: libwww-perl, debhelper (>= 9), liburi-perl,
libdate-calc-perl, flex
Standards-Version: 3.9.4
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
+Vcs-Git: git://anonscm.debian.org/collab-maint/flexml.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/flexml.git
Package: flexml
Architecture: any
diff --git a/examples/Makefile b/examples/Makefile
index 69fafee..6d2ac65 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -44,8 +44,8 @@ start: test
all: $(ALL)
install: $(ALL)
- mkdir -p $(DESTDIR)$(DOCDIR)/flexml/examples
- $(INSTALL) -m444 $(SAMPS) $(DESTDIR)$(DOCDIR)/flexml/examples/
+ mkdir -p $(DESTDIR)$(DOCDIR)/examples
+ $(INSTALL) -m444 $(SAMPS) $(DESTDIR)$(DOCDIR)/examples/
dist: clean
#rsync -v FleXML.html $(WEBHOME)/FleXML.html
diff --git a/flexml.pl b/flexml.pl
index cc066d0..04578b5 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-2011 Martin Quinson. All rights reserved.
+# Copyright (C) 2003-2013 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,8 +23,7 @@
use warnings;
-my $Id = '$Id: flexml.pl,v 1.69 2012/12/20 00:13:40 mquinson Exp $ ';
-$Id =~ s/\s*\$\s*//go;
+my $Id = 'FLEXMLVERSION';
# IMPORTS.
@@ -181,8 +180,8 @@ 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-2011 Martin Quinson. All rights reserved.
-$pre ($Id).
+$pre FleXML is Copyright (C) 2003-2013 Martin Quinson. All rights reserved.
+$pre (FLEXMLVERSION).
$pre
$pre There are two, intertwined parts to this program, part A and part B.
$pre
@@ -191,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-2011 Martin Quinson. All rights reserved.
+$pre and Copyright (C) 2003-2013 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:
@@ -542,7 +541,7 @@ GetOptions(
"quiet|q" => \$quiet_parser,
# Version!
- "version|V" => sub { print "FleXML version $Id.\n"; exit 0; },
+ "version|V" => sub { print "FleXML version FLEXMLVERSION.\n"; exit 0; },
# dry-run ?
"dry-run|n" => \$dryrun,
@@ -589,7 +588,7 @@ GetOptions(
"actions|a=s" => \$actions
);
-print "FleXML version $Id.\n" if $verbose;
+print "FleXML version FLEXMLVERSION.\n" if $verbose;
# Set DTD file name...and extract prefix for later
my $prefix = $ARGV[0];
@@ -1239,8 +1238,7 @@ if ($scanner or $standalone) {
if ( /^FLEXML_VERSION$/ ) {
- print "const char rcs_${tagprefix}flexml[] =\n"
- . " \"\$\" \"$Id \$\";\n";
+ print "const char ${tagprefix}flexml_version[] = \"FLEXMLVERSION\";\n";
print "const char rcs_${cdtd}_dtd[] =\n"
. " \"\$\" \"$dtdrevision \$\";\n" if $dtdrevision;
diff --git a/skel b/skel
index 0c04eb9..9d6e917 100644
--- a/skel
+++ b/skel
@@ -24,8 +24,6 @@
%{
/* Version strings. */
-const char rcs_flexml_skeleton[] =
- "$Id: skel,v 1.40 2007/10/11 09:57:24 mquinson Exp $";
FLEXML_VERSION
/* ANSI headers. */
generated by cgit v1.2.3 (git 2.25.1) at 2026-07-12 01:18:00 +0000