[SCM] maria packaging branch, master, updated. upstream/1.2-22-gc4c33c2
Ralf Treinen
treinen at free.fr
Fri May 13 19:26:09 UTC 2011
The following commit has been merged in the master branch:
commit 27afee32534a7007b009cabde9b44742acd88928
Merge: eb4073656b63f3a5f4b326c5b1308d5d4c39060a b40c55be4d5c6afd0859e1023f5eadec791807e0
Author: Ralf Treinen <treinen at debian.org>
Date: Mon Aug 4 23:01:40 2003 +0200
Imported Debian patch 1.3.4-1
diff --combined debian/changelog
index 09e4bf3,0000000..603709c
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,55 -1,0 +1,64 @@@
++maria (1.3.4-1) unstable; urgency=low
++
++ * New upstream release
++ * Standards-Version: 3.6.0
++ * Use a file debian/compat instead of variable DH_COMPAT in debian/rules
++ * Installation of info files: don't attempt to install maria.info-*
++
++ -- Ralf Treinen <treinen at debian.org> Mon, 4 Aug 2003 23:01:40 +0200
++
+maria (1.3.3-1) unstable; urgency=low
+
+ * New upstream release. This release should compile on gcc 3.0 (closes:
+ Bug#171226).
+
+ -- Ralf Treinen <treinen at debian.org> Mon, 9 Dec 2002 21:48:45 +0100
+
+maria (1.3.2-1) unstable; urgency=low
+
+ * New upstream release.
+ * Applied a patch to maria.texinfo sent by Marko Mäkelä.
+ * Compilation/runtime/codec.h, and Graph/BitBuffer.h: Put the test for
+ __linux before tests on specific architectures (solution suggested by
+ Marko Mäkelä). This should resolve the autobuilder failure on alpha.
+
+ -- Ralf Treinen <treinen at debian.org> Thu, 5 Dec 2002 21:32:26 +0100
+
+maria (1.3.1-3) unstable; urgency=low
+
+ * Build-Dependency on debhelper bumped up to >= 4.0
+ * debian/rules: target "build" does no longer depend on target "build-doc"
+
+ -- Ralf Treinen <treinen at debian.org> Fri, 29 Nov 2002 23:02:38 +0100
+
+maria (1.3.1-2) unstable; urgency=low
+
+ * Added build-dependency on xutils (needed since Makefile calls makedepend).
+ This should resolve the autobuilder failures on 1.3.1-1.
+ * DH_COMPAT=4 in debian/rules, and added ${misc:Depends} to the Depends
+ field in debian/control.
+
+ -- Ralf Treinen <treinen at debian.org> Thu, 28 Nov 2002 19:50:02 +0100
+
+maria (1.3.1-1) unstable; urgency=low
+
+ * New upstream release, and first version actually uploaded to unstable
+ (closes: Bug#146320).
+ * Standards-Version: 3.5.8.
+ * debian/copyright: corrected email address of upstream author.
+ * debian/copyright: the maria-vis script is now in the public domain.
+ * debian/rules: change value of EXDIR, since Makefile uses it relativ
+ to the value of DESTDIR.
+ * debian/rules: pass debug and noopt option to make.
+ * Makefile.Linux: /usr/local/{lib,include} -> /usr/{lib,include}
+ * Makefile.Linux: add a COPTFLAGS variable, to pass optimization flags
+ to the makefile.
+
+ -- Ralf Treinen <treinen at debian.org> Thu, 21 Nov 2002 20:57:19 +0100
+
+maria (1.2-0.alpha) experimental; urgency=low
+
+ * Initial Release.
+
+ -- Ralf Treinen <treinen at debian.org> Tue, 6 Aug 2002 23:15:53 +0200
+
diff --combined debian/compat
index 0000000,0000000..b8626c4
new file mode 100644
--- /dev/null
+++ b/debian/compat
@@@ -1,0 -1,0 +1,1 @@@
++4
diff --combined debian/control
index 0f42394,0000000..9151e76
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,48 -1,0 +1,48 @@@
+Source: maria
+Section: math
+Priority: optional
+Maintainer: Ralf Treinen <treinen at debian.org>
+Build-Depends: debhelper (>= 4.0), libreadline4-dev, libncurses5-dev, flex, bison, xutils
+Build-Depends-Indep: texinfo, texi2html
- Standards-Version: 3.5.8
++Standards-Version: 3.6.0
+
+Package: maria
+Section: math
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: maria-doc, lbt
+Suggests: maria-vis
+Description: Reachability analyzer for Algebraic System Nets
+ Maria is a powerful tool designed to aid engineers in modelling and
+ solving concurrency related problems in parallel and distributed
+ computing systems.
+ .
+ Maria finds deadlocks and violations against safety or liveness
+ requirements by exploring all states that can be reached from the
+ initial state of a system. The tool manages tens or hundreds of
+ millions of reachable states and enabled actions.
+ .
+ The expressive power of Maria's formalism is close to high-level
+ programming languages, thanks to its rich data type system and
+ powerful algebraic operations.
+ .
+ If you want to use the graph visualization functionality of Maria then
+ you have to install the maria-vis package from the contrib section.
+
+Package: maria-vis
+Section: contrib/math
+Architecture: all
+Depends: maria, graphviz
+Description: Interface between Maria and Graphviz
+ This script is needed to make Maria, a reachability analyzer for
+ algebraic system nets, interact with graphviz, a non-free software
+ package for the visualisation of graphs.
+
+Package: maria-doc
+Section: doc
+Architecture: all
+Depends:
+Recommends: maria, info-browser | www-browser
+Description: Documentation of Maria
+ This package contains the documentation of Maria, a reachability
+ analyzer for algebraic system nets, both in the formats info and html.
diff --combined debian/rules
index 5edc828,0000000..a7afb6f
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,90 -1,0 +1,89 @@@
+#!/usr/bin/make -f
+# rules for maria
+
+# export DH_VERBOSE=1
- export DH_COMPAT=4
+export MAKE=make -f Makefile.Linux
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ R_COPTFLAGS = -O0
+else
+ R_COPTFLAGS = -O3
+endif
+
+build: build-stamp
+
+build-stamp:
+ dh_testdir
+ $(MAKE) CXXOPTFLAGS=$(R_COPTFLAGS)
+ touch build-stamp
+
+build-doc: build-doc-stamp
+
+build-doc-stamp:
+ dh_testdir
+ cd doc \
+ && makeinfo maria.texinfo \
+ && texi2html -split chapter maria.texinfo
+ touch build-doc-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+ -rm build-stamp build-doc-stamp
+ -$(MAKE) reallyclean
+ cd doc && rm -f maria.info maria.info-* maria*.html
+ dh_clean
+
+install-indep: build-doc
+ dh_testdir -i
+ dh_testroot -i
+ dh_clean -k
+ dh_installdirs -i
+ dh_install -i
+
+install-arch: build
+ dh_testdir -a
+ dh_testroot -a
+ dh_clean -k
+ dh_installdirs -a
+ dh_install -a
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/maria \
+ EXDIR=/usr/share/doc/maria/examples
+ # the maria-vis executable goes into the maria-vis package
+ -rm $(CURDIR)/debian/maria/usr/bin/maria-vis
+ $(MAKE) installman DESTDIR=$(CURDIR)/debian/maria
+ # the man page for maria-vis goes into the maria-vis package
+ -rm $(CURDIR)/debian/maria/usr/share/man/man1/maria-vis.1
+
+binary-indep: install-indep
+ dh_testdir -i
+ dh_testroot -i
+ dh_installdocs -i
- dh_installinfo -pmaria-doc doc/maria.info doc/maria.info-*
++ dh_installinfo -pmaria-doc doc/maria.info
+ dh_installchangelogs -i
+ dh_link -i
+ dh_compress -i
+ dh_fixperms -i
+ dh_installdeb -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
+
+binary-arch: install-arch
+ dh_testdir -a
+ dh_testroot -a
+ dh_installemacsen -a
+ dh_installchangelogs -a
+ dh_installdocs -a
+ dh_link -a
+ dh_strip -a
+ dh_compress -a
+ dh_fixperms -a
+ dh_installdeb -a
+ dh_shlibdeps -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch install-indep install-arch
diff --combined maria-vis
index 1916fe0,e92a3b2..2e20a57
--- a/maria-vis
+++ b/maria-vis
@@@ -1,9 -1,10 +1,10 @@@
-#!/usr/local/bin/lefty
+#!/usr/bin/lefty
# This is a graphical user interface for maria(1).
# It requires the lefty interpreter and the dotty*.lefty scripts of GraphViz.
#
# This script was written in 2001 by Marko Mäkelä <msmakela at tcs.hut.fi>,
# and it is in the public domain. See maria-vis(1) for documentation.
+ # The "subnet" commands (support for modular state spaces) were added in 2003.
load ('dotty.lefty');
checkpath = function () {
@@@ -105,12 -106,12 +106,12 @@@ maria.init = function ()
'middledown' = function (data) {
maria.gt = dotty.graphs[dotty.views[data.widget].gtid];
if (data.obj.nid >= 0)
- writeline (1, concat ("visual visual pred ", data.obj.name));
+ writeline (1, concat ("subnet ", maria.gt.graph.name, "; visual visual pred ", data.obj.name));
};
'leftdown' = function (data) {
maria.gt = dotty.graphs[dotty.views[data.widget].gtid];
if (data.obj.nid >= 0)
- writeline (1, concat ("visual visual succ ", data.obj.name));
+ writeline (1, concat ("subnet ", maria.gt.graph.name, "; visual visual succ ", data.obj.name));
};
'redraw' = function (data) {
maria.gt = dotty.graphs[dotty.views[data.widget].gtid];
@@@ -184,17 -185,17 +185,17 @@@
'node' = [
"successors (n)" = function (gt, vt, obj, data) {
if (obj.nid >= 0)
- writeline (1, concat ("visual visual succ ", obj.name));
+ writeline (1, concat ("subnet ", maria.gt.graph.name, "; visual visual succ ", obj.name));
maria.gt = gt;
};
"predecessors (p)" = function (gt, vt, obj, data) {
if (obj.nid >= 0)
- writeline (1, concat ("visual visual pred ", obj.name));
+ writeline (1, concat ("subnet ", maria.gt.graph.name, "; visual visual pred ", obj.name));
maria.gt = gt;
};
"path (P)" = function (gt, vt, obj, data) {
if (obj.nid >= 0)
- writeline (1, concat ("visual visual path ", obj.name));
+ writeline (1, concat ("subnet ", maria.gt.graph.name, "; visual visual path ", obj.name));
maria.gt = gt;
};
"delete (d)" = function (gt, vt, obj, data) {
@@@ -247,7 -248,7 +248,7 @@@ add = function ()
if (maria.gt == null) {
maria.gt = gt;
gt.createview (gt, maria.protovt);
- gt.loadgraph (gt, '-', 'file', copy (dotty.protogt.graph), 1);
+ gt.loadgraph (gt, '-', 'file', copy (dotty.protogt.graph), 0);
}
else {
gt.loadgraph (gt, '-', 'file', copy (dotty.protogt.graph), 0);
--
maria packaging
More information about the debian-science-commits
mailing list