[adms] 04/11: merge patched-debian into debian

[felix salfelder]

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

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

commit 9ecfd178d5f90b5ff796b992701450d4f9e52b2c
Merge: ab1b3dd 13125ce
Author: Felix Salfelder <felix at salfelder.org>
Date:   Thu May 15 08:50:23 2014 +0200

    merge patched-debian into debian

 adms/admsXml/adms.implicit.xml                     |  8 +++----
 adms/configure.ac                                  |  2 +-
 debian/.git-dpm                                    |  4 ++--
 ..._AUTOMAKE_INIT-in-order-to-run-autoreconf.patch | 22 +++++++++++++++++
 .../0002-fix-instance-related-assertions.patch     | 28 ++++++++++++++++++++++
 debian/patches/series                              |  2 ++
 6 files changed, 59 insertions(+), 7 deletions(-)

diff --cc debian/.git-dpm
index 3da0c64,0000000..14d27c6
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
- 0848c9cdd88b26fe0186ddb0d9e6786ffd03d8df
- 0848c9cdd88b26fe0186ddb0d9e6786ffd03d8df
++13125ce3d955e8669929e24484c6fd7c2ac3cc5f
++13125ce3d955e8669929e24484c6fd7c2ac3cc5f
 +0848c9cdd88b26fe0186ddb0d9e6786ffd03d8df
 +0848c9cdd88b26fe0186ddb0d9e6786ffd03d8df
 +adms_2.3.0+r29173.orig.tar.gz
 +e84ba384dc0cbb613cdd2db7225775fc85817a16
 +1317532
diff --cc debian/patches/0001-Correct-AM_AUTOMAKE_INIT-in-order-to-run-autoreconf.patch
index 0000000,0000000..3f4b32b
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Correct-AM_AUTOMAKE_INIT-in-order-to-run-autoreconf.patch
@@@ -1,0 -1,0 +1,22 @@@
++From 501b5f2d84436e022872bec7333fb8c302a5bbdf 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 +-
++ 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
++@@ -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 0000000,0000000..59d86f6
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-fix-instance-related-assertions.patch
@@@ -1,0 -1,0 +1,28 @@@
++From 13125ce3d955e8669929e24484c6fd7c2ac3cc5f 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 ++++----
++ 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
++@@ -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/series
index 0000000,0000000..d1c3042
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,2 @@@
++0001-Correct-AM_AUTOMAKE_INIT-in-order-to-run-autoreconf.patch
++0002-fix-instance-related-assertions.patch

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