[SCM] maria packaging branch, master, updated. upstream/1.2-22-gc4c33c2
Ralf Treinen
treinen at free.fr
Fri May 13 19:26:23 UTC 2011
The following commit has been merged in the master branch:
commit 20025273c5983d5b27d010a4159dfc3833e86be3
Author: Ralf Treinen <treinen at debian.org>
Date: Sun Nov 22 13:02:15 2009 +0100
Imported Debian patch 1.3.5-2
diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian
index d8f525b..c70d96c 100644
--- a/debian/NEWS.Debian
+++ b/debian/NEWS.Debian
@@ -3,4 +3,5 @@ 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
+ -- Ralf Treinen <treinen at debian.org> Sun, 13 Feb 2005 16:06:12 +0100
+
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index e638413..307d7fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,36 @@
+maria (1.3.5-2) unstable; urgency=low
+
+ * debhelper compatibility level 7.
+ * Standards-Version 3.8.3 (no change)
+ * Convert to source format 3.0 (quilt):
+ - debian/patches in quilt style
+ - no more patching in debian/rules
+ - no more build-dependency on dpatch
+ - added debian/source/format
+ - remove debian/README.source
+ * debian/control:
+ - add dependency on ${misc:Depends}
+ - change dependency on libreadline5-dev to libreadline-dev (closes: #553809)
+ - remove obsolete build-dependency on xutils
+ - add Homepage field
+ * debian/copyright:
+ - converted to UTF-8
+ - point to GPL-2 file instead of GPL file
+ * debian/maria-doc.doc-base:
+ - section Science/Mathematics
+ - fieldname "authors" corrected to "author"
+ - converted to UTF-8
+ * debian/rules:
+ - "dh_clean -k" => "dh_prep"
+ - "make reallyclean" => "make clean" since the former seems to be
+ the cause of segfaults, explicitly remove maria and doc/maria.info
+ (closes: Bug#544575).
+ - do not ignore errors of "make clean"
+ - fix clean target to remove generate html files in doc
+ * Changed recommendation of infobrowser to info (package maria-doc)
+
+ -- Ralf Treinen <treinen at debian.org> Sun, 22 Nov 2009 13:02:15 +0100
+
maria (1.3.5-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/compat b/debian/compat
index b8626c4..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7
diff --git a/debian/control b/debian/control
index c7b3012..808f26c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,15 @@ Source: maria
Section: math
Priority: optional
Maintainer: Ralf Treinen <treinen at debian.org>
-Build-Depends: debhelper (>= 4.0), libreadline5-dev, libncurses5-dev, flex, bison, xutils, dpatch
+Build-Depends: debhelper (>= 7.0), libreadline-dev, libncurses5-dev, flex, bison
Build-Depends-Indep: texinfo, texi2html
-Standards-Version: 3.6.2
+Standards-Version: 3.8.3
+Homepage: http://www.tcs.hut.fi/Software/maria/
Package: maria
Section: math
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: maria-doc, lbt, graphviz
Conflicts: maria-vis
Replaces: maria-vis
@@ -30,8 +31,8 @@ Description: reachability analyzer for Algebraic System Nets
Package: maria-doc
Section: doc
Architecture: all
-Depends:
-Recommends: maria, infobrowser | info-browser | www-browser
+Depends: ${misc:Depends}
+Recommends: maria, info | 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/copyright b/debian/copyright
index 6e58d60..5722365 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,9 +3,9 @@ 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ä <msmakela at tcs.hut.fi>
+Upstream Author: Marko Mäkelä <msmakela at tcs.hut.fi>
-Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Marko Mäkelä
+Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Marko Mäkelä
(msmakela at tcs.hut.fi)
Licence:
@@ -16,7 +16,7 @@ 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.
+/usr/share/common-licenses/GPL-2 file.
-Maria-vis was written in 2001 by Marko Mäkelä <msmakela at tcs.hut.fi>,
+Maria-vis was written in 2001 by Marko Mäkelä <msmakela at tcs.hut.fi>,
and it is in the public domain.
diff --git a/debian/maria-doc.doc-base b/debian/maria-doc.doc-base
index 6f589f7..89b77d4 100644
--- a/debian/maria-doc.doc-base
+++ b/debian/maria-doc.doc-base
@@ -1,8 +1,8 @@
Document: maria-doc
Title: Maria Manual
-Authors: Marko Mäkelä
+Author: Marko Mäkelä
Abstract: This manual describes how to use maria.
-Section: math
+Section: Science/Mathematics
Format: HTML
Index: /usr/share/doc/maria-doc/html/maria.html
diff --git a/debian/maria-doc.install b/debian/maria-doc.install
index bb3f4be..ed73d48 100644
--- a/debian/maria-doc.install
+++ b/debian/maria-doc.install
@@ -1 +1 @@
-doc/maria/*.html usr/share/doc/maria-doc/html
+doc/maria*.html usr/share/doc/maria-doc/html
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 9c9065a..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-01lefty_path
-02compile_options
-# 03gcc40
diff --git a/debian/patches/03gcc40.dpatch b/debian/patches/03gcc40.dpatch
deleted file mode 100644
index 8920973..0000000
--- a/debian/patches/03gcc40.dpatch
+++ /dev/null
@@ -1,51 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03gcc40.dpatch by Ralf Treinen <treinen at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Compilation for amd64/gcc 4.0. Patch provided by Andreas Jochens.
-
- at 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 <slist>
--# else
--# include <ext/slist>
--# 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 <slist>
--# define slist std::slist
--# else // fall back to <list>
- # include <list>
-
- /** 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 ());
diff --git a/debian/patches/02compile_options.dpatch b/debian/patches/compile_options
similarity index 61%
rename from debian/patches/02compile_options.dpatch
rename to debian/patches/compile_options
index 323ae29..887c170 100644
--- a/debian/patches/02compile_options.dpatch
+++ b/debian/patches/compile_options
@@ -1,11 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02compile_options.dpatch by Ralf Treinen <treinen at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix compile flags CFLAGS and CXXOPTFLAGS
+Author: Ralf Treinen <treinen at debian.org>
+Description: Fix compile flags CFLAGS and CXXOPTFLAGS
- at 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 @@
diff --git a/debian/patches/include-stdlib b/debian/patches/include-stdlib
new file mode 100644
index 0000000..dc1c962
--- /dev/null
+++ b/debian/patches/include-stdlib
@@ -0,0 +1,72 @@
+Index: maria-1.3.5/parser/VariableStackMap.C
+===================================================================
+--- maria-1.3.5.orig/parser/VariableStackMap.C 2011-05-03 06:41:32.000000000 +0200
++++ maria-1.3.5/parser/VariableStackMap.C 2011-05-03 06:42:17.000000000 +0200
+@@ -6,6 +6,7 @@
+ #include "VariableStackMap.h"
+ #include "VariableDefinition.h"
+ #include <assert.h>
++#include <cstddef>
+
+ /** @file VariableStackMap.C
+ * Nested symbol tables for variable names
+Index: maria-1.3.5/parser/NameList.h
+===================================================================
+--- maria-1.3.5.orig/parser/NameList.h 2011-05-03 06:41:32.000000000 +0200
++++ maria-1.3.5/parser/NameList.h 2011-05-03 06:42:17.000000000 +0200
+@@ -7,6 +7,7 @@
+ # endif // __GNUC__
+
+ # include <list>
++#include <cstddef>
+
+ /** @file NameList.h
+ * List of names
+Index: maria-1.3.5/Expression/Substitution.h
+===================================================================
+--- maria-1.3.5.orig/Expression/Substitution.h 2011-05-03 06:42:43.000000000 +0200
++++ maria-1.3.5/Expression/Substitution.h 2011-05-03 06:43:08.000000000 +0200
+@@ -7,6 +7,7 @@
+ # endif // __GNUC__
+
+ # include <map>
++#include <cstddef>
+
+ /** @file Substitution.h
+ * Map from variables (quantifiers or function parameters) to expressions
+Index: maria-1.3.5/Net/PlaceMarking.h
+===================================================================
+--- maria-1.3.5.orig/Net/PlaceMarking.h 2011-05-03 06:43:52.000000000 +0200
++++ maria-1.3.5/Net/PlaceMarking.h 2011-05-03 06:44:23.000000000 +0200
+@@ -8,6 +8,7 @@
+
+ # include "Value.h"
+ # include <map>
++#include <cstddef>
+
+ /** @file PlaceMarking.h
+ * Assignment of a place to a multi-set
+Index: maria-1.3.5/Expression/VariableSet.h
+===================================================================
+--- maria-1.3.5.orig/Expression/VariableSet.h 2011-05-03 06:45:02.000000000 +0200
++++ maria-1.3.5/Expression/VariableSet.h 2011-05-03 06:45:26.000000000 +0200
+@@ -7,6 +7,7 @@
+ # endif // __GNUC__
+
+ # include <set>
++#include <cstddef>
+
+ /** @file VariableSet.h
+ * Set of variables, a transient class used in preprocessing
+Index: maria-1.3.5/Value/Valuation.C
+===================================================================
+--- maria-1.3.5.orig/Value/Valuation.C 2011-05-03 06:46:29.000000000 +0200
++++ maria-1.3.5/Value/Valuation.C 2011-05-03 06:46:59.000000000 +0200
+@@ -9,6 +9,7 @@
+ #ifndef NDEBUG
+ # include "Type.h"
+ #endif // NDEBUG
++#include <cstddef>
+
+ /** @file Valuation.C
+ * Assignment of variables to values
diff --git a/debian/patches/01lefty_path.dpatch b/debian/patches/lefty_path
similarity index 53%
rename from debian/patches/01lefty_path.dpatch
rename to debian/patches/lefty_path
index 86b98c7..8c31867 100644
--- a/debian/patches/01lefty_path.dpatch
+++ b/debian/patches/lefty_path
@@ -1,11 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01leftypath.dpatch by Ralf Treinen <treinen at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: sanitize path of lefty interpreter
+Author: Ralf Treinen <treinen at debian.org>
+Description: use standard path to call lefty interpreter
- at 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 @@
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..dbf3263
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+lefty_path
+compile_options
+include-stdlib
diff --git a/debian/rules b/debian/rules
index 236fe13..aef6229 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,9 +2,7 @@
# rules for maria
# export DH_VERBOSE=1
-export MAKE=make -f Makefile.Linux
-
-include /usr/share/dpatch/dpatch.make
+export MAKE=make
# workaround for gcc-4.0 bug on m68k
export DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH)
@@ -19,9 +17,9 @@ endif
build: build-stamp
-build-stamp: patch
+build-stamp:
dh_testdir
- $(MAKE) CXXOPTFLAGS=$(OPTFLAGS)
+ $(MAKE) -f Makefile.Linux CXXOPTFLAGS=$(OPTFLAGS)
touch build-stamp
build-doc: build-doc-stamp
@@ -33,25 +31,25 @@ build-doc-stamp:
&& texi2html -split chapter maria.texinfo
touch build-doc-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
-rm build-stamp build-doc-stamp
- -$(MAKE) reallyclean
- cd doc && rm -f maria.info maria.info-* maria/maria*.html
+ $(MAKE) clean
+ rm -f maria doc/maria*.html doc/maria.info
dh_clean
install-indep: build-doc
dh_testdir -i
dh_testroot -i
- dh_clean -k
+ dh_prep
dh_installdirs -i
dh_install -i
install-arch: build
dh_testdir -a
dh_testroot -a
- dh_clean -k
+ dh_prep
dh_installdirs -a
dh_install -a
$(MAKE) install DESTDIR=debian/maria \
@@ -90,4 +88,4 @@ binary-arch: install-arch
dh_builddeb -a
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch install-indep install-arch patch unpatch
+.PHONY: build clean binary-indep binary-arch install-indep install-arch
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
maria packaging
More information about the debian-science-commits
mailing list