[adms] 11/11: merge patched-debian into debian
felix salfelder
felix-guest at moszumanska.debian.org
Thu May 15 07:07:05 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 4be02b4fbafcb244a252879ecadcaf2fe5b19636
Merge: af3cbf7 648fcc1
Author: Felix Salfelder <felix at salfelder.org>
Date: Thu May 15 08:55:14 2014 +0200
merge patched-debian into debian
adms/ABOUT-NLS => ABOUT-NLS | 0
adms/AUTHORS => AUTHORS | 0
adms/COPYING => COPYING | 0
ChangeLog | 1 +
INSTALL | 365 +
adms/Makefile.am => Makefile.am | 2 +-
Makefile.in | 739 +
adms/NEWS => NEWS | 2 +-
adms/README => README | 2 +-
adms/TODO => TODO | 2 +-
aclocal.m4 | 8940 ++++++++
adms/adms.css => adms.css | 2 +-
adms/adms.xml => adms.xml | 4 -
adms/INSTALL | 236 -
adms/admsXml/admsCheck.1 | 29 -
adms/admsXml/basicLibrary.xml | 1760 --
adms/admsXml/preprocessorYacc.y | 729 -
adms/admsXml/verilogaYacc.y.in | 1615 --
adms/autogen.sh | 60 -
adms/images/adms-list.png | Bin 141 -> 0 bytes
adms/metaadms.xsd | 123 -
adms/metaadmst.xsd | 82 -
adms/metaadmstpath.xsd | 103 -
adms/scripts/analogfunction.va | 76 -
adms/scripts/dependency.xml | 408 -
adms/scripts/strutils.xml | 53 -
adms/scripts/vlatommlMODULE.htm.xml | 720 -
{adms/admsXml => admsXml}/Makefile.am | 41 +-
admsXml/Makefile.in | 839 +
admsXml/adms.c | 8705 +++++++
admsXml/adms.h | 3384 +++
{adms/admsXml => admsXml}/adms.implicit.xml | 4 +-
admsXml/adms.implicit.xml.c | 728 +
{adms/admsXml => admsXml}/admsCheck.c | 14 +-
{adms/admsXml => admsXml}/admsPreprocessor.h | 2 +-
{adms/admsXml => admsXml}/admsVeriloga.h | 2 +-
{adms/admsXml => admsXml}/admsXml.1 | 0
{adms/admsXml => admsXml}/admsXml.c | 30 +-
admsXml/admstpathYacc.c | 16854 ++++++++++++++
admsXml/admstpathYacc.h | 37 +
{adms/admsXml => admsXml}/constants.vams | 4 +-
admsXml/constants.vams.c | 46 +
{adms/admsXml => admsXml}/disciplines.vams | 2 +-
admsXml/disciplines.vams.c | 243 +
{adms/admsXml => admsXml}/dummy.va | 3 +
admsXml/dummy.va.c | 30 +
{adms/admsXml => admsXml}/dummy.xml | 0
admsXml/dummy.xml.c | 68 +
{adms/admsXml => admsXml}/mkctext.pl | 31 +
{adms/admsXml => admsXml}/mkelements.pl | 2 +-
{adms/admsXml => admsXml}/mkgrammar.pl | 0
admsXml/preprocessorLex.c | 3198 +++
{adms/admsXml => admsXml}/preprocessorLex.l | 2 +-
{adms/admsXml => admsXml}/preprocessorMain.c | 2 +-
admsXml/preprocessorYacc.c | 2728 +++
admsXml/preprocessorYacc.h | 98 +
admsXml/verilogaLex.c | 2513 +++
{adms/admsXml => admsXml}/verilogaLex.l | 6 +-
admsXml/verilogaYacc.c | 5242 +++++
admsXml/verilogaYacc.h | 118 +
adms/admsstyle.xsl => admsstyle.xsl | 2 +-
adms/admst.dtd => admst.dtd | 2 +-
adms/admst.xml => admst.xml | 2 +-
adms/admstpath.xml => admstpath.xml | 11 +-
adms/admstpathstyle.xsl => admstpathstyle.xsl | 2 +-
adms/admststyle.xsl => admststyle.xsl | 2 +-
auxconf/config.guess | 1501 ++
auxconf/config.sub | 1705 ++
auxconf/depcomp | 630 +
auxconf/install-sh | 520 +
auxconf/ltmain.sh | 8406 +++++++
auxconf/missing | 376 +
auxconf/ylwrap | 222 +
cgi-bin/makefile | 5 -
cgi-bin/mml/discipline.h | 19 -
cgi-bin/mml/getModule.xml | 11 -
cgi-bin/mml/makefile | 14 -
cgi-bin/mml/mml.pl | 172 -
cgi-bin/mml/mos1.va | 499 -
cgi-bin/traffic/makefile | 12 -
cgi-bin/traffic/traffic-display.pl | 49 -
cgi-bin/traffic/traffic.pl | 47 -
config.h.in | 196 +
configure | 18598 +++++++++++++++
adms/configure.ac => configure.ac | 4 +-
debian/.git-dpm | 6 +-
..._AUTOMAKE_INIT-in-order-to-run-autoreconf.patch | 12 +-
.../0002-fix-instance-related-assertions.patch | 12 +-
debian/patches/0003-fix-print-statement.patch | 37 +
debian/patches/series | 1 +
gadms/Make-lang.in | 98 -
gadms/config-lang.in | 9 -
gadms/cygwin-build.sh | 47 -
gadms/gadms.h | 33 -
gadms/lang-specs.h | 5 -
gadms/lang.opt | 16 -
gadms/lex.l | 63 -
gadms/test.gadms | 25 -
gadms/testmain.c | 16 -
gadms/yacc.y | 658 -
htdocs/README | 9 -
htdocs/applications.html | 28 -
htdocs/contents.html | 42 -
htdocs/examples/.adms.implicit.xml | 717 -
htdocs/examples/.mysource.va.adms | 220 -
htdocs/examples/mysource.html | 76 -
htdocs/examples/mysource.va | 14 -
htdocs/examples/myxml.xml | 43 -
htdocs/index.html | 28 -
htdocs/index.pl | 16 -
htdocs/introduction.html | 54 -
htdocs/livedemo.html | 22 -
htdocs/makefile | 11 -
htdocs/papers/introduction-adms.html | 1575 --
htdocs/papers/introduction-adms_files/filelist.xml | 15 -
htdocs/papers/introduction-adms_files/header.html | 50 -
htdocs/papers/introduction-adms_files/image001.gif | Bin 11517 -> 0 bytes
htdocs/papers/introduction-adms_files/image002.gif | Bin 8830 -> 0 bytes
htdocs/papers/introduction-adms_files/image003.gif | Bin 73 -> 0 bytes
htdocs/papers/introduction-adms_files/image004.gif | Bin 73 -> 0 bytes
htdocs/papers/introduction-adms_files/image005.gif | Bin 73 -> 0 bytes
htdocs/papers/introduction-adms_files/image006.gif | Bin 15835 -> 0 bytes
htdocs/papers/introduction-adms_files/image007.gif | Bin 8076 -> 0 bytes
htdocs/papers/introduction-adms_files/image008.png | Bin 911950 -> 0 bytes
htdocs/papers/introduction-adms_files/image009.jpg | Bin 5259 -> 0 bytes
htdocs/scripts.html | 86 -
htdocs/stats.txt | 21 -
htdocs/svn.html | 85 -
htdocs/title.html.in | 40 -
htdocs/tutorials.html | 350 -
.../tutorials/Ilya-Lisichkin/MOSlevel1/Ids_Vd.gif | Bin 15430 -> 0 bytes
.../tutorials/Ilya-Lisichkin/MOSlevel1/Ids_Vg.gif | Bin 14595 -> 0 bytes
htdocs/tutorials/Ilya-Lisichkin/MOSlevel1/MOS1.htm | 8147 -------
.../Ilya-Lisichkin/MOSlevel1/discipline.h | 19 -
htdocs/tutorials/Ilya-Lisichkin/MOSlevel1/gds.gif | Bin 15493 -> 0 bytes
htdocs/tutorials/Ilya-Lisichkin/MOSlevel1/gm.gif | Bin 15490 -> 0 bytes
.../tutorials/Ilya-Lisichkin/MOSlevel1/index.html | 287 -
.../tutorials/Ilya-Lisichkin/MOSlevel1/mkgraph.pl | 145 -
htdocs/tutorials/Ilya-Lisichkin/MOSlevel1/mos1.va | 499 -
.../tutorials/Ilya-Lisichkin/MOSlevel1/style.css | 49 -
htdocs/uploads/MyMOS1.htm | 10572 ---------
htdocs/uploads/R3.htm | 22421 -------------------
htdocs/uploads/dcmotor.htm | 2295 --
htdocs/uploads/mextram_TUD.htm | 1165 -
htdocs/uploads/mos1.htm | 8159 -------
htdocs/uploads/mybjt.htm | 1851 --
htdocs/uploads/mydiode.htm | 359 -
htdocs/uploads/mygp0.htm | 436 -
htdocs/uploads/noise.htm | 15333 -------------
htdocs/uploads/r.htm | 371 -
htdocs/uploads/res.htm | 305 -
htdocs/uploads/tmpvlafile.va | 14 -
htdocs/uploads/whileloopA.htm | 386 -
{adms/images => images}/Makefile.am | 2 +-
images/Makefile.in | 371 +
{adms/images => images}/adms-alias.png | Bin
{adms/images => images}/adms-element.png | Bin
{adms/images => images}/adms-enumeration.png | Bin
{adms/images => images}/adms-scalar.png | Bin
{adms/images => images}/adms-uid.png | Bin
{adms/images => images}/mkimages.pl | 2 +-
adms/make.cyg => make.cyg | 0
adms/make.win => make.win | 0
adms/metaadms.dtd => metaadms.dtd | 2 +-
adms/metaadmst.dtd => metaadmst.dtd | 2 +-
adms/metaadmstpath.dtd => metaadmstpath.dtd | 2 +-
{adms/scripts => scripts}/Makefile.am | 2 +-
scripts/Makefile.in | 369 +
{adms/scripts => scripts}/admstvariables.xml | 0
{adms/scripts => scripts}/analogfunction.xml | 2 +-
{adms/scripts => scripts}/arobavariable.xml | 0
{adms/scripts => scripts}/attributes.xml | 2 +-
{adms/scripts => scripts}/blockvariables.xml | 2 +-
{adms/scripts => scripts}/croixvariable.xml | 0
{adms/scripts => scripts}/getargv.xml | 0
{adms/scripts => scripts}/getenv.xml | 0
{adms/scripts => scripts}/getinstance.xml | 2 +-
{adms/scripts => scripts}/gettransform.xml | 0
{adms/scripts => scripts}/sort.xml | 0
{adms/scripts => scripts}/vlatovla.xml | 2 +-
tests/Makefile | 447 -
tests/e1/mint_1_0_0/mint.xml | 4072 ----
tests/e1/vlatovla_1_0_0/vlatovla.xml | 305 -
183 files changed, 87943 insertions(+), 89032 deletions(-)
diff --cc debian/.git-dpm
index a61e6e7,0000000..6f5256d
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
- 13125ce3d955e8669929e24484c6fd7c2ac3cc5f
- 13125ce3d955e8669929e24484c6fd7c2ac3cc5f
- 0848c9cdd88b26fe0186ddb0d9e6786ffd03d8df
++648fcc1222614979c049fa6b46ab010082ba325d
++648fcc1222614979c049fa6b46ab010082ba325d
++ce6865d1329925b942e19f5ebaf60cd8f39555f1
+ce6865d1329925b942e19f5ebaf60cd8f39555f1
+adms_2.3.1.orig.tar.gz
+79a83fbf051bf567e1e96e84cfd811bfd0b39a41
+660395
diff --cc debian/patches/0001-Correct-AM_AUTOMAKE_INIT-in-order-to-run-autoreconf.patch
index 3f4b32b,0000000..ed4b4f7
mode 100644,000000..100644
--- a/debian/patches/0001-Correct-AM_AUTOMAKE_INIT-in-order-to-run-autoreconf.patch
+++ b/debian/patches/0001-Correct-AM_AUTOMAKE_INIT-in-order-to-run-autoreconf.patch
@@@ -1,22 -1,0 +1,22 @@@
- From 501b5f2d84436e022872bec7333fb8c302a5bbdf Mon Sep 17 00:00:00 2001
++From eaea7f3ff7e438362273c7694d4693972deff243 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
+Date: Wed, 30 Mar 2011 11:38:31 +0200
+Subject: Correct AM_AUTOMAKE_INIT in order to run autoreconf
+
+---
- adms/configure.ac | 2 +-
++ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
- diff --git a/adms/configure.ac b/adms/configure.ac
- index bbf6dd1..a1e3547 100644
- --- a/adms/configure.ac
- +++ b/adms/configure.ac
++diff --git a/configure.ac b/configure.ac
++index 5ce3611..cd031b5 100644
++--- a/configure.ac
+++++ b/configure.ac
+@@ -509,7 +509,7 @@ AC_PROG_MAKE_SET
+ AC_PROG_RANLIB
+
+ # Automake Initialisation.
+-AM_INIT_AUTOMAKE(AC_PACKAGE_TARNAME, AC_PACKAGE_VERSION, -)
++AM_INIT_AUTOMAKE([foreign])
+
+ #force use of flex/bison
+ if test "x$LEX" != "xflex"; then
diff --cc debian/patches/0002-fix-instance-related-assertions.patch
index 59d86f6,0000000..86f9f19
mode 100644,000000..100644
--- a/debian/patches/0002-fix-instance-related-assertions.patch
+++ b/debian/patches/0002-fix-instance-related-assertions.patch
@@@ -1,28 -1,0 +1,28 @@@
- From 13125ce3d955e8669929e24484c6fd7c2ac3cc5f Mon Sep 17 00:00:00 2001
++From 98d1dd416ae162da4972bbe4784e544b77bba046 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
+
+---
- adms/admsXml/adms.implicit.xml | 8 ++++----
++ admsXml/adms.implicit.xml | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
- diff --git a/adms/admsXml/adms.implicit.xml b/adms/admsXml/adms.implicit.xml
- index bda42ac..974e571 100644
- --- a/adms/admsXml/adms.implicit.xml
- +++ b/adms/admsXml/adms.implicit.xml
++diff --git a/admsXml/adms.implicit.xml b/admsXml/adms.implicit.xml
++index 9fde33e..c60982f 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/0003-fix-print-statement.patch
index 0000000,0000000..d303122
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-fix-print-statement.patch
@@@ -1,0 -1,0 +1,37 @@@
++From 648fcc1222614979c049fa6b46ab010082ba325d 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 d1c3042,0000000..d183869
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
+0001-Correct-AM_AUTOMAKE_INIT-in-order-to-run-autoreconf.patch
+0002-fix-instance-related-assertions.patch
++0003-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