[adms] 18/20: merge patched-unstable into unstable

[felix salfelder]

This is an automated email from the git hooks/post-receive script.

felix-guest pushed a commit to branch unstable
in repository adms.

commit 900379ed87b8df1cc3e7b65d155b9b3656442783
Merge: 90805bc 1f1322e
Author: Felix Salfelder <felix at salfelder.org>
Date:   Fri May 9 21:24:40 2014 +0200

    merge patched-unstable into unstable

 admsXml/preprocessorLex.c                     |  2 +-
 admsXml/preprocessorLex.l                     |  2 +-
 debian/.git-dpm                               |  4 +--
 debian/patches/0001-fix-print-statement.patch | 37 +++++++++++++++++++++++++++
 debian/patches/series                         |  1 +
 5 files changed, 42 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 1b02224,0000000..47f126b
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- c3159f1cb9bbd385816c00f5f3ec96c9392373f8
- c3159f1cb9bbd385816c00f5f3ec96c9392373f8
++1f1322e64f8997e0cf8c1b6e42c6c702a33cbc70
++1f1322e64f8997e0cf8c1b6e42c6c702a33cbc70
 +c3159f1cb9bbd385816c00f5f3ec96c9392373f8
 +c3159f1cb9bbd385816c00f5f3ec96c9392373f8
 +adms_2.3.1.orig.tar.gz
 +79a83fbf051bf567e1e96e84cfd811bfd0b39a41
 +660395
diff --cc debian/patches/0001-fix-print-statement.patch
index 0000000,0000000..1a9c806
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-fix-print-statement.patch
@@@ -1,0 -1,0 +1,37 @@@
++From 1f1322e64f8997e0cf8c1b6e42c6c702a33cbc70 Mon Sep 17 00:00:00 2001
++From: Felix Salfelder <felix at salfelder.org>
++Date: Fri, 9 May 2014 21:23:56 +0200
++Subject: fix print statement.
++
++(twice, as autogenerated file is checked in.)
++---
++ admsXml/preprocessorLex.c | 2 +-
++ admsXml/preprocessorLex.l | 2 +-
++ 2 files changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/admsXml/preprocessorLex.c b/admsXml/preprocessorLex.c
++index cb3b2c0..86eb21b 100644
++--- a/admsXml/preprocessorLex.c
+++++ b/admsXml/preprocessorLex.c
++@@ -877,7 +877,7 @@ void preprocessorerror (const char *message)
++ static void adms_file_fprintf ( char *filename, const char *filedata)
++ {
++   FILE *ofh = fopen (filename,"w");
++-  if (fprintf (ofh, filedata)==EOF)
+++  if (fprintf (ofh, "%s", filedata)==EOF)
++     adms_message_fatal(("%s: cannot write file\n", filename))
++   fclose (ofh);
++ }
++diff --git a/admsXml/preprocessorLex.l b/admsXml/preprocessorLex.l
++index 5b35f08..00564dc 100644
++--- a/admsXml/preprocessorLex.l
+++++ b/admsXml/preprocessorLex.l
++@@ -82,7 +82,7 @@ void preprocessorerror (const char *message)
++ static void adms_file_fprintf ( char *filename, const char *filedata)
++ {
++   FILE *ofh = fopen (filename,"w");
++-  if (fprintf (ofh, filedata)==EOF)
+++  if (fprintf (ofh, "%s", filedata)==EOF)
++     adms_message_fatal(("%s: cannot write file\n", filename))
++   fclose (ofh);
++ }
diff --cc debian/patches/series
index 0000000,0000000..008f6e6
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-fix-print-statement.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/adms.git