[adms] 05/07: merge patched-debian into debian
felix salfelder
felix-guest at moszumanska.debian.org
Thu May 15 11:17:17 UTC 2014
This is an automated email from the git hooks/post-receive script.
felix-guest pushed a commit to branch debian
in repository adms.
commit 3a2b6ce4b8b59c4aa4144d8f682245cfec71ab27
Merge: 561569c f3076ba
Author: Felix Salfelder <felix at em.cs.uni-frankfurt.de>
Date: Thu May 15 13:04:16 2014 +0200
merge patched-debian into debian
._README.md | Bin 0 -> 171 bytes
ABOUT-NLS | 226 -
CMakeLists.txt | 16 +
ChangeLog | 30 +-
INSTALL | 15 +-
Makefile.am | 134 +-
Makefile.in | 450 +-
NEWS | 29 -
README | 120 -
README-NGSPICE | 42 +
README.md | 192 +
aclocal.m4 | 8711 +--------
adms.xml | 4 +
admsXml/{adms.implicit.xml => .adms.implicit.xml} | 12 +-
admsXml/CMakeLists.txt | 72 +
admsXml/Makefile.am | 150 +-
admsXml/Makefile.in | 562 +-
admsXml/adms.c | 8 +
admsXml/adms.h | 42 +-
admsXml/adms.implicit.xml | 4 +-
admsXml/adms.implicit.xml.c | 4 +-
admsXml/admsCheck.1 | 29 +
admsXml/admsXml.c | 36 +-
admsXml/admstpath.dtd | 14 +
admsXml/admstpathYacc.c | 1766 +-
admsXml/admstpathYacc.h | 5 +
admsXml/{admstpathYacc.c => admstpathYacc.y} | 3692 +---
admsXml/basicLibrary.xml | 1760 ++
admsXml/config.h | 9 +
admsXml/constants.vams | 4 +-
admsXml/constants.vams.c | 4 +-
admsXml/disciplines.vams | 2 +-
admsXml/disciplines.vams.c | 2 +-
admsXml/mkctext.pl | 10 +-
admsXml/mkelements.pl | 96 +-
admsXml/preprocessorLex.c | 224 +-
admsXml/preprocessorLex.l | 6 +-
admsXml/preprocessorYacc.c | 1282 +-
admsXml/preprocessorYacc.h | 70 +-
admsXml/preprocessorYacc.y | 732 +
admsXml/verilogaLex.c | 223 +-
admsXml/verilogaLex.l | 9 +-
admsXml/verilogaYacc.c | 3086 ++--
admsXml/verilogaYacc.h | 70 +-
admsXml/verilogaYacc.y | 2315 +++
admsXml/verilogaYacc.y.in | 1617 ++
admstpath.xml | 11 +-
auxconf/compile | 347 +
auxconf/config.guess | 399 +-
auxconf/config.sub | 277 +-
auxconf/depcomp | 531 +-
auxconf/install-sh | 35 +-
auxconf/ltmain.sh | 4039 ++--
auxconf/missing | 461 +-
auxconf/ylwrap | 199 +-
bootstrap.sh | 13 +
config.h.in | 6 +
configure | 18463 ++++++++++---------
configure.ac | 560 +-
create_files.sh | 9 +
debian/.git-dpm | 6 +-
..._AUTOMAKE_INIT-in-order-to-run-autoreconf.patch | 22 -
... => 0001-fix-instance-related-assertions.patch} | 4 +-
...tement.patch => 0002-fix-print-statement.patch} | 12 +-
debian/patches/series | 5 +-
images/Makefile.am | 105 +-
images/Makefile.in | 147 +-
images/adms-alias.png | Bin 143 -> 164 bytes
images/adms-element.png | Bin 146 -> 167 bytes
images/adms-enumeration.png | Bin 123 -> 144 bytes
images/adms-list.png | Bin 0 -> 162 bytes
images/adms-scalar.png | Bin 141 -> 162 bytes
images/adms-uid.png | Bin 143 -> 164 bytes
m4/ax_append_flag.m4 | 69 +
m4/ax_cflags_warn_all.m4 | 122 +
m4/ax_compare_version.m4 | 177 +
m4/ax_compiler_vendor.m4 | 84 +
m4/ax_perl_module_version.m4 | 85 +
m4/ax_prog_bison.m4 | 64 +
m4/ax_prog_flex.m4 | 59 +
aclocal.m4 => m4/libtool.m4 | 3903 ++--
m4/ltoptions.m4 | 384 +
m4/ltsugar.m4 | 123 +
m4/ltversion.m4 | 23 +
m4/lt~obsolete.m4 | 98 +
make.cyg | 74 -
make.win | 76 -
metaadms.xsd | 123 +
metaadmst.xsd | 82 +
metaadmstpath.xsd | 103 +
scripts/Makefile.am | 75 +-
scripts/Makefile.in | 150 +-
scripts/analogfunction.va | 76 +
scripts/dependency.xml | 408 +
scripts/strutils.xml | 53 +
scripts/vlatommlMODULE.htm.xml | 720 +
96 files changed, 30945 insertions(+), 29723 deletions(-)
diff --cc debian/.git-dpm
index c536d39,0000000..b9bb1c8
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
- 648fcc1222614979c049fa6b46ab010082ba325d
- 648fcc1222614979c049fa6b46ab010082ba325d
- ce6865d1329925b942e19f5ebaf60cd8f39555f1
++f3076babc6fc67d9eb6d106533ed3933e536d4cd
++f3076babc6fc67d9eb6d106533ed3933e536d4cd
++e39eabea3d6d46e117ef329fcec4228cd65dd76e
+e39eabea3d6d46e117ef329fcec4228cd65dd76e
+adms_2.3.2.orig.tar.gz
+ada4bcc90903a8b8bd698a888ee432a540fd42f5
+775414
diff --cc debian/patches/0001-fix-instance-related-assertions.patch
index 86f9f19,0000000..2a963f6
mode 100644,000000..100644
--- a/debian/patches/0001-fix-instance-related-assertions.patch
+++ b/debian/patches/0001-fix-instance-related-assertions.patch
@@@ -1,28 -1,0 +1,28 @@@
- From 98d1dd416ae162da4972bbe4784e544b77bba046 Mon Sep 17 00:00:00 2001
++From 3834a111f56e81681896c9c19e49aac4f7d93b18 Mon Sep 17 00:00:00 2001
+From: Felix Salfelder <felix at em.cs.uni-frankfurt.de>
+Date: Sat, 28 Jul 2012 18:09:55 +0200
+Subject: fix instance related assertions
+
+---
+ admsXml/adms.implicit.xml | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/admsXml/adms.implicit.xml b/admsXml/adms.implicit.xml
- index 9fde33e..c60982f 100644
++index 5d0d330..fa038a4 100644
+--- a/admsXml/adms.implicit.xml
++++ b/admsXml/adms.implicit.xml
+@@ -502,10 +502,10 @@
+ </admst:for-each>
+ <admst:for-each select="instance">
+ <admst:push into="module/instantiator" select=".." onduplicate="ignore"/>
+- <admst:assert select="terminal" test="nodefrommodule[location='external']"
+- format="%(../instantiator).%(nodefrommodule/name): is not terminal\n"/>
+- <admst:assert select="parameterset" test="parameter[input='yes']"
+- format="%(../instantiator).%(parameter/name): is not input parameter\n"/>
++ <admst:assert select="terminal" test="terminal[nodefrommodule/location='external']"
++ format="%(../instantiator).%(nodefrommodule/name): is not terminal\n"/>
++ <admst:assert select="parameterset" test="parameterset[parameter/input='yes']"
++ format="%(../instantiator).%(parameter/name): is not input parameter\n"/>
+ </admst:for-each>
+ <admst:apply-templates select="(analogfunction/tree)|(analog/code)" match="dependency"/>
+ <admst:for-each select="variable">
diff --cc debian/patches/0002-fix-print-statement.patch
index d303122,0000000..60644e1
mode 100644,000000..100644
--- a/debian/patches/0002-fix-print-statement.patch
+++ b/debian/patches/0002-fix-print-statement.patch
@@@ -1,37 -1,0 +1,37 @@@
- From 648fcc1222614979c049fa6b46ab010082ba325d Mon Sep 17 00:00:00 2001
++From f3076babc6fc67d9eb6d106533ed3933e536d4cd 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
++index 89b8459..e4cdb26 100644
+--- a/admsXml/preprocessorLex.c
++++ b/admsXml/preprocessorLex.c
- @@ -877,7 +877,7 @@ void preprocessorerror (const char *message)
++@@ -878,7 +878,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
++index 4ecbda2..b4800b1 100644
+--- a/admsXml/preprocessorLex.l
++++ b/admsXml/preprocessorLex.l
- @@ -82,7 +82,7 @@ void preprocessorerror (const char *message)
++@@ -85,7 +85,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)
+++ if (fputs (filedata, ofh)==EOF)
+ adms_message_fatal(("%s: cannot write file\n", filename))
+ fclose (ofh);
+ }
diff --cc debian/patches/series
index d183869,0000000..444cadf
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,2 @@@
- 0001-Correct-AM_AUTOMAKE_INIT-in-order-to-run-autoreconf.patch
- 0002-fix-instance-related-assertions.patch
- 0003-fix-print-statement.patch
++0001-fix-instance-related-assertions.patch
++0002-fix-print-statement.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/adms.git
More information about the debian-science-commits
mailing list