[SCM] maria packaging branch, master, updated. upstream/1.2-22-gc4c33c2

Fri May 13 19:26:16 UTC 2011

The following commit has been merged in the master branch:
commit e12d6bcc20c10ec343648a3b2438f5412ffc7a2b
Author: Ralf Treinen <treinen at debian.org>
Date:   Sun Feb 13 17:17:51 2005 +0100

    Imported Debian patch 1.3.4-5

diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian
new file mode 100644
index 0000000..d8f525b
--- /dev/null
+++ b/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 <treinen at debian.org>  Sun, 13 Feb 2005 16:06:12 +0100
\ No newline at end of file
diff --git a/debian/README.examples b/debian/README.examples
new file mode 100644
index 0000000..c505411
--- /dev/null
+++ b/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 <someplace>:
+
+  cp -r /usr/share/maria/examples <someplace>
+  cd <someplace>/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 <treinen at debian.org>  Feb 13, 2005.
diff --git a/debian/changelog b/debian/changelog
index 9c59920..71736ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+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 <treinen at debian.org>  Sun, 13 Feb 2005 17:17:51 +0100
+
 maria (1.3.4-4) unstable; urgency=low
 
   * Use dpatch. Dpatchify old patches:
diff --git a/debian/control b/debian/control
index 894e724..bb2f6ae 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,9 @@ Package: maria
 Section: math
 Architecture: any
 Depends: ${shlibs:Depends}
-Recommends: maria-doc, lbt
-Suggests: maria-vis
+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
@@ -25,18 +26,6 @@ Description: reachability analyzer for Algebraic System Nets
  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
diff --git a/debian/copyright b/debian/copyright
index f055723..6e58d60 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,7 +5,10 @@ It was downloaded from http://www.tcs.hut.fi/Software/maria/src/
 
 Upstream Author: Marko Mäkelä <msmakela at tcs.hut.fi>
 
-Copyright:
+Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Marko Mäkelä
+(msmakela at tcs.hut.fi)
+
+Licence:
 
 Maria, with the exception of the maria-vis script, is covered by the
 following licence:
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
deleted file mode 100644
index 7e0deac..0000000
--- a/debian/lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-maria-vis: unusual-interpreter ./usr/bin/maria-vis #!/usr/bin/lefty
diff --git a/debian/maria-vis.dirs b/debian/maria-vis.dirs
deleted file mode 100644
index 6cc45f3..0000000
--- a/debian/maria-vis.dirs
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/bin
-usr/share/man/man1
-usr/share/lintian/overrides
-
diff --git a/debian/maria-vis.install b/debian/maria-vis.install
deleted file mode 100644
index 273ff29..0000000
--- a/debian/maria-vis.install
+++ /dev/null
@@ -1,2 +0,0 @@
-maria-vis	usr/bin
-maria-vis.1	usr/share/man/man1
diff --git a/debian/maria.dirs b/debian/maria.dirs
index bb9bc69..cb9974b 100644
--- a/debian/maria.dirs
+++ b/debian/maria.dirs
@@ -1,4 +1,3 @@
 usr/bin
 usr/share/emacs/site-lisp/maria
 usr/share/doc/maria/examples
-
diff --git a/debian/rules b/debian/rules
index a88aebb..e4b894a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,8 +42,6 @@ install-indep: build-doc
 	dh_clean -k
 	dh_installdirs -i
 	dh_install -i
-	cp debian/lintian-overrides \
-		debian/maria-vis/usr/share/lintian/overrides/maria-vis
 
 install-arch: build
 	dh_testdir -a
@@ -51,13 +49,10 @@ install-arch: build
 	dh_clean -k
 	dh_installdirs -a
 	dh_install -a
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/maria \
+	$(MAKE) install DESTDIR=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
+	cp debian/README.examples debian/maria/usr/share/doc/maria/examples
+	$(MAKE) installman DESTDIR=debian/maria
 
 binary-indep: install-indep
 	dh_testdir -i

-- 
maria packaging

