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

[Ralf Treinen]

The following commit has been merged in the master branch:
commit d9eb51d183112d3b1ea83d3e5d948abf4c636b7b
Author: Ralf Treinen <treinen at debian.org>
Date:   Wed Aug 4 09:54:50 2004 +0200

    Imported Debian patch 1.3.4-2

diff --git a/debian/changelog b/debian/changelog
index 603709c..222d177 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+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 <treinen at debian.org>  Wed,  4 Aug 2004 09:54:50 +0200
+
 maria (1.3.4-1) unstable; urgency=low
 
   * New upstream release
@@ -17,10 +28,10 @@ maria (1.3.3-1) unstable; urgency=low
 maria (1.3.2-1) unstable; urgency=low
 
   * New upstream release.
-  * Applied a patch to maria.texinfo sent by Marko Mäkelä.
+  * 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.
+    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
 
diff --git a/debian/control b/debian/control
index 9151e76..6fd732c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ 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.6.0
+Standards-Version: 3.6.1
 
 Package: maria
 Section: math
@@ -42,7 +42,7 @@ Package: maria-doc
 Section: doc
 Architecture: all
 Depends:
-Recommends: maria, info-browser | www-browser
+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.
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
new file mode 100644
index 0000000..7e0deac
--- /dev/null
+++ b/debian/lintian-overrides
@@ -0,0 +1 @@
+maria-vis: unusual-interpreter ./usr/bin/maria-vis #!/usr/bin/lefty
diff --git a/debian/maria-vis.dirs b/debian/maria-vis.dirs
index 98d1583..6cc45f3 100644
--- a/debian/maria-vis.dirs
+++ b/debian/maria-vis.dirs
@@ -1,2 +1,4 @@
 usr/bin
 usr/share/man/man1
+usr/share/lintian/overrides
+
diff --git a/debian/maria.dirs b/debian/maria.dirs
index cb9974b..bb9bc69 100644
--- a/debian/maria.dirs
+++ b/debian/maria.dirs
@@ -1,3 +1,4 @@
 usr/bin
 usr/share/emacs/site-lisp/maria
 usr/share/doc/maria/examples
+
diff --git a/debian/rules b/debian/rules
index a7afb6f..b5f4930 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,6 +40,8 @@ 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
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..9ccc875
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=2
+http://www.tcs.hut.fi/Software/maria/src/maria-([\d.]*)\.tar\.gz

-- 
maria packaging