--- maria-1.3.4.orig/debian/maria-doc.install +++ maria-1.3.4/debian/maria-doc.install @@ -0,0 +1 @@ +doc/*.html usr/share/doc/maria-doc/html --- maria-1.3.4.orig/debian/maria-doc.dirs +++ maria-1.3.4/debian/maria-doc.dirs @@ -0,0 +1 @@ +usr/share/doc/maria-doc/html --- maria-1.3.4.orig/debian/control +++ maria-1.3.4/debian/control @@ -0,0 +1,37 @@ +Source: maria +Section: math +Priority: optional +Maintainer: Ralf Treinen +Build-Depends: debhelper (>= 4.0), libreadline5-dev, libncurses5-dev, flex, bison, xutils, dpatch +Build-Depends-Indep: texinfo, texi2html +Standards-Version: 3.6.1 + +Package: maria +Section: math +Architecture: any +Depends: ${shlibs:Depends} +Recommends: maria-doc, lbt, graphviz +Conflicts: maria-vis +Replaces: 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. + +Package: maria-doc +Section: doc +Architecture: all +Depends: +Recommends: maria, infobrowser | 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. --- maria-1.3.4.orig/debian/rules +++ maria-1.3.4/debian/rules @@ -0,0 +1,88 @@ +#!/usr/bin/make -f +# rules for maria + +# export DH_VERBOSE=1 +export MAKE=make -f Makefile.Linux + +include /usr/share/dpatch/dpatch.make + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + R_COPTFLAGS = -O0 +else + R_COPTFLAGS = -O3 +endif + +build: build-stamp + +build-stamp: patch + 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: unpatch + 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=debian/maria \ + EXDIR=/usr/share/doc/maria/examples + cp debian/README.examples debian/maria/usr/share/doc/maria/examples + $(MAKE) installman DESTDIR=debian/maria + +binary-indep: install-indep + dh_testdir -i + dh_testroot -i + dh_installdocs -i + 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 patch unpatch --- maria-1.3.4.orig/debian/NEWS.Debian +++ maria-1.3.4/debian/NEWS.Debian @@ -0,0 +1,6 @@ +maria (1.3.4-5) unstable; urgency=low + + * The functionality of the former debian-vis package is now included in + the maria package. + + -- Ralf Treinen Sun, 13 Feb 2005 16:06:12 +0100 \ No newline at end of file --- maria-1.3.4.orig/debian/watch +++ maria-1.3.4/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://www.tcs.hut.fi/Software/maria/src/maria-([\d.]*)\.tar\.gz --- maria-1.3.4.orig/debian/maria.install +++ maria-1.3.4/debian/maria.install @@ -0,0 +1 @@ +elisp/* usr/share/emacs/site-lisp/maria --- maria-1.3.4.orig/debian/maria-doc.doc-base +++ maria-1.3.4/debian/maria-doc.doc-base @@ -0,0 +1,9 @@ +Document: maria-doc +Title: Maria Manual +Authors: Marko Mäkelä +Abstract: This manual describes how to use maria. +Section: math + +Format: HTML +Index: /usr/share/doc/maria-doc/html/maria.html +Files: /usr/share/doc/maria-doc/html/*.html --- maria-1.3.4.orig/debian/emacsen-install +++ maria-1.3.4/debian/emacsen-install @@ -0,0 +1,45 @@ +#! /bin/sh -e +# /usr/lib/emacsen-common/packages/install/maria + +# Written by Jim Van Zandt , borrowing heavily +# from the install scripts for gettext by Santiago Vila +# and octave by Dirk Eddelbuettel . + +FLAVOR=$1 +PACKAGE=maria + +if [ ${FLAVOR} = emacs ]; then exit 0; fi + +echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR} + +#FLAVORTEST=`echo $FLAVOR | cut -c-6` +#if [ ${FLAVORTEST} = xemacs ] ; then +# SITEFLAG="-no-site-file" +#else +# SITEFLAG="--no-site-file" +#fi +FLAGS="${SITEFLAG} -q -batch -l path.el -f batch-byte-compile" + +ELDIR=/usr/share/emacs/site-lisp/${PACKAGE} +ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE} + +# Install-info-altdir does not actually exist. +# Maybe somebody will write it. +if test -x /usr/sbin/install-info-altdir; then + echo install/${PACKAGE}: install Info links for ${FLAVOR} + install-info-altdir --quiet --section "" "" --dirname=${FLAVOR} /usr/info/${PACKAGE}.info.gz +fi + +install -m 755 -d ${ELCDIR} +cd ${ELDIR} +FILES=`echo *.el` +cp ${FILES} ${ELCDIR} +cd ${ELCDIR} + +cat << EOF > path.el +(setq load-path (cons "." load-path) byte-compile-warnings nil) +EOF +${FLAVOR} ${FLAGS} ${FILES} +rm -f *.el path.el + +exit 0 --- maria-1.3.4.orig/debian/changelog +++ maria-1.3.4/debian/changelog @@ -0,0 +1,113 @@ +maria (1.3.4-5build1) breezy; urgency=low + + * Rebuild for new C++ ABI + + -- Matthias Klose Tue, 28 Jun 2005 08:35:01 +0000 + +maria (1.3.4-5) unstable; urgency=low + + * The binary package maria-vis is no longer build since graphviz is + now in main. The package maria now replaces and conflicts with + maria-vis. (closes: Bug#292595). + * debian/copyright: distinguish copyright and licence. + * Removed the lintian override concerning unusual interpreter lefty - + this is now a lintian bug. + * Wrote README.examples, put it in /usr/share/doc/maria/examples + * Removed spurious $(CURDIR) in debian/rules + + -- Ralf Treinen Sun, 13 Feb 2005 17:17:51 +0100 + +maria (1.3.4-4) unstable; urgency=low + + * Use dpatch. Dpatchify old patches: + - 01lefty_path: fix path of lefty interpreter + - 02compile_options: fix compile flags + * Patch 03gcc40: Fix compilation error for gcc4.0 on amd64. Patch + contributed by Andreas Jochens - thanks! (closes: Bug#288926) + * Short descriptions start on a lowercase letter. + * Removed useless ${misc:Depends} from maria's Dependency. + * Removed debian/TODO. + + -- Ralf Treinen Thu, 6 Jan 2005 20:48:05 +0100 + +maria (1.3.4-3) unstable; urgency=low + + * Switch from libreadline4 to libreadline5. + + -- Ralf Treinen Sat, 1 Jan 2005 18:19:33 +0100 + +maria (1.3.4-2) unstable; urgency=low + + * Converted this changelog file to UTF-8 + * Package maria-doc: added Recommends infobrowser + * Standards-version 3.6.1 (no change) + * Added a debian/watch file + * Added a lintian override for maria-vis concering the use of lefty as + an interpreter + + -- Ralf Treinen Wed, 4 Aug 2004 09:54:50 +0200 + +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 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 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 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 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 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 Thu, 21 Nov 2002 20:57:19 +0100 + +maria (1.2-0.alpha) experimental; urgency=low + + * Initial Release. + + -- Ralf Treinen Tue, 6 Aug 2002 23:15:53 +0200 + --- maria-1.3.4.orig/debian/README.examples +++ maria-1.3.4/debian/README.examples @@ -0,0 +1,32 @@ +How to use these examples +========================= + +To run the examples included in this directory you need write access +to the directory. The best way is to create a copy, say as a subdirectory +of the directory : + + cp -r /usr/share/maria/examples + cd /examples + gunzip *.gz + +You can start maria on one of the Petri nets contained in this directory, +for instance dining.pn, by typing + + maria -b dining.pn + +Note that this make take a *lot* of time for some of the examples +provided since a reachability analysis is performed when loading the +model. Then, you may issue at the maria shell prompt the following +commands (among others): + + dump to obtain a textual representation of the syntax graph + dumpgraph to obtain a textual representation of the reachability graph + +If the "graphviz" package is installed on your system you may also +obtain a graphical output by using instead "visual dump", +resp. "visual dumpgraph". + +Please refer to the maria documentation (available in the package +maria-doc) for more complete documentation. + +-- Ralf Treinen Feb 13, 2005. --- maria-1.3.4.orig/debian/compat +++ maria-1.3.4/debian/compat @@ -0,0 +1 @@ +4 --- maria-1.3.4.orig/debian/emacsen-remove +++ maria-1.3.4/debian/emacsen-remove @@ -0,0 +1,15 @@ +#!/bin/sh -e +# /usr/lib/emacsen-common/packages/remove/maria + +FLAVOR=$1 +PACKAGE=maria + +if [ ${FLAVOR} != emacs ]; then + if test -x /usr/sbin/install-info-altdir; then + echo remove/${PACKAGE}: removing Info links for ${FLAVOR} + install-info-altdir --quiet --remove --dirname=${FLAVOR} /usr/info/maria.info.gz + fi + + echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR} + rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE} +fi --- maria-1.3.4.orig/debian/maria.dirs +++ maria-1.3.4/debian/maria.dirs @@ -0,0 +1,3 @@ +usr/bin +usr/share/emacs/site-lisp/maria +usr/share/doc/maria/examples --- maria-1.3.4.orig/debian/emacsen-startup +++ maria-1.3.4/debian/emacsen-startup @@ -0,0 +1,18 @@ +;; -*-emacs-lisp-*- +;; +;; Emacs startup file for the Debian GNU/Linux maria package +;; +;; Originally contributed by Nils Naumann +;; Modified by Dirk Eddelbuettel +;; Adapted for dh-make by Jim Van Zandt + +;; The maria package follows the Debian/GNU Linux 'emacsen' policy and +;; byte-compiles its elisp files for each 'emacs flavor' (emacs19, +;; xemacs19, emacs20, xemacs20...). The compiled code is then +;; installed in a subdirectory of the respective site-lisp directory. +;; We have to add this to the load-path: +(setq load-path (cons (concat "/usr/share/" + (symbol-name flavor) + "/site-lisp/maria") load-path)) + + --- maria-1.3.4.orig/debian/patches/01lefty_path.dpatch +++ maria-1.3.4/debian/patches/01lefty_path.dpatch @@ -0,0 +1,16 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01leftypath.dpatch by Ralf Treinen +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: sanitize path of lefty interpreter + +@DPATCH@ +diff -urNad maria-1.3.4/maria-vis /tmp/dpep.8jLSBV/maria-1.3.4/maria-vis +--- maria-1.3.4/maria-vis 2005-01-06 20:09:21.000000000 +0100 ++++ /tmp/dpep.8jLSBV/maria-1.3.4/maria-vis 2005-01-06 20:13:55.000000000 +0100 +@@ -1,4 +1,4 @@ +-#!/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. + # --- maria-1.3.4.orig/debian/patches/02compile_options.dpatch +++ maria-1.3.4/debian/patches/02compile_options.dpatch @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02compile_options.dpatch by Ralf Treinen +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix compile flags CFLAGS and CXXOPTFLAGS + +@DPATCH@ +diff -urNad maria-1.3.4/Makefile.Linux /tmp/dpep.PkKMxS/maria-1.3.4/Makefile.Linux +--- maria-1.3.4/Makefile.Linux 2005-01-06 20:11:35.000000000 +0100 ++++ /tmp/dpep.PkKMxS/maria-1.3.4/Makefile.Linux 2005-01-06 20:15:40.000000000 +0100 +@@ -16,8 +16,8 @@ + EXTRA_INCLUDES = + EXTRA_LIBS = -ldl# -lstlport + DEFINES = -DHAS_REGEX -D_GNU_SOURCE -DHAS_GETOPT_LONG +-CFLAGS = -Wall -ansi -pedantic -O3 +-CXXFLAGS = $(CFLAGS) -Iport -fno-exceptions -fno-rtti# -I/usr/include/stlport ++CFLAGS = -Wall -ansi -pedantic -g ++CXXFLAGS = $(CFLAGS) $(CXXOPTFLAGS) -Iport -fno-exceptions -fno-rtti + + all: real-all + --- maria-1.3.4.orig/debian/patches/00list +++ maria-1.3.4/debian/patches/00list @@ -0,0 +1,3 @@ +01lefty_path +02compile_options +03gcc40 --- maria-1.3.4.orig/debian/patches/03gcc40.dpatch +++ maria-1.3.4/debian/patches/03gcc40.dpatch @@ -0,0 +1,51 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03gcc40.dpatch by Ralf Treinen +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Compilation for amd64/gcc 4.0. Patch provided by Andreas Jochens. + +@DPATCH@ +diff -urN ../tmp-orig/maria-1.3.4/port/s_list.h ./port/s_list.h +--- ../tmp-orig/maria-1.3.4/port/s_list.h ++++ ./port/s_list.h +@@ -27,21 +27,6 @@ + #ifndef SLIST + # define SLIST + +-# ifdef __GNUC__ +-# if __GNUC__ < 3 +-# include +-# else +-# include +-# if __GNUC_MINOR__ == 0 +-# define slist std::slist +-# else +-# define slist __gnu_cxx::slist +-# endif // __GNUC_MINOR__ == 0 +-# endif // __GNUC__ < 3 +-# elif defined __sgi +-# include +-# define slist std::slist +-# else // fall back to + # include + + /** Dummy singly-linked list template */ +@@ -99,5 +84,4 @@ + + void clear () { myList.clear (); } + }; +-# endif + #endif // SLIST + +diff -urN ../tmp-orig/maria-1.3.4/parser/VariableStackMap.C ./parser/VariableStackMap.C +--- ../tmp-orig/maria-1.3.4/parser/VariableStackMap.C ++++ ./parser/VariableStackMap.C +@@ -38,7 +38,7 @@ + } + + void +-VariableStackMap::push (class VariableDefinition* v) ++VariableStackMap::push (VariableDefinition* v) + { + myStack.push_front (v); + Map::iterator i = myMap.find (v->getName ()); --- maria-1.3.4.orig/debian/copyright +++ maria-1.3.4/debian/copyright @@ -0,0 +1,22 @@ +This package was debianized by Ralf Treinen on +Fri, 2 Aug 2002 22:20:09 +0200. + +It was downloaded from http://www.tcs.hut.fi/Software/maria/src/ + +Upstream Author: Marko Mäkelä + +Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Marko Mäkelä +(msmakela@tcs.hut.fi) + +Licence: + +Maria, with the exception of the maria-vis script, is covered by the +following licence: + +You are free to distribute this software under the terms of the GNU +General Public License, version 2. On Debian systems, the complete +text of the GNU General Public License can be found in the +/usr/share/common-licenses/GPL file. + +Maria-vis was written in 2001 by Marko Mäkelä , +and it is in the public domain.