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

Ralf Treinen treinen at free.fr
Fri May 13 19:26:14 UTC 2011 

The following commit has been merged in the master branch:
commit f786fa725c25a46103a0f5e2e04c4241d2735294
Author: Ralf Treinen <treinen at debian.org>
Date:   Thu Jan 6 20:48:05 2005 +0100

    Imported Debian patch 1.3.4-4

diff --git a/Makefile.Linux b/Makefile.Linux
index a2b8b0b..ec62679 100644
--- a/Makefile.Linux
+++ b/Makefile.Linux
@@ -16,8 +16,8 @@ CC = gcc
 EXTRA_INCLUDES =
 EXTRA_LIBS = -ldl# -lstlport
 DEFINES = -DHAS_REGEX -D_GNU_SOURCE -DHAS_GETOPT_LONG
-CFLAGS = -Wall -ansi -pedantic -g
-CXXFLAGS = $(CFLAGS) $(CXXOPTFLAGS) -Iport -fno-exceptions -fno-rtti# -I/usr/include/stlport
+CFLAGS = -Wall -ansi -pedantic -O3
+CXXFLAGS = $(CFLAGS) -Iport -fno-exceptions -fno-rtti# -I/usr/include/stlport
 
 all: real-all
 
diff --git a/debian/TODO b/debian/TODO
deleted file mode 100644
index bac22a0..0000000
--- a/debian/TODO
+++ /dev/null
@@ -1 +0,0 @@
-Better installation of emacs mode 
diff --git a/debian/changelog b/debian/changelog
index 33379d9..9c59920 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+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 <treinen at debian.org>  Thu,  6 Jan 2005 20:48:05 +0100
+
 maria (1.3.4-3) unstable; urgency=low
 
   * Switch from libreadline4 to libreadline5.
diff --git a/debian/control b/debian/control
index e60e938..894e724 100644
--- a/debian/control
+++ b/debian/control
@@ -2,17 +2,17 @@ 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
+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}, ${misc:Depends}
+Depends: ${shlibs:Depends}
 Recommends: maria-doc, lbt
 Suggests: maria-vis
-Description: Reachability analyzer for Algebraic System Nets
+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.
@@ -33,7 +33,7 @@ Package: maria-vis
 Section: contrib/math
 Architecture: all
 Depends: maria, graphviz
-Description: Interface between Maria and 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.
@@ -43,6 +43,6 @@ Section: doc
 Architecture: all
 Depends:
 Recommends: maria, infobrowser | info-browser | www-browser
-Description: Documentation of Maria
+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/patches/00list b/debian/patches/00list
new file mode 100644
index 0000000..b98b49f
--- /dev/null
+++ b/debian/patches/00list
@@ -0,0 +1,3 @@
+01lefty_path
+02compile_options
+03gcc40
diff --git a/debian/patches/01lefty_path.dpatch b/debian/patches/01lefty_path.dpatch
new file mode 100644
index 0000000..86b98c7
--- /dev/null
+++ b/debian/patches/01lefty_path.dpatch
@@ -0,0 +1,16 @@
+#! /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
+
+ 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 @@
+-#!/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.
+ #
diff --git a/debian/patches/02compile_options.dpatch b/debian/patches/02compile_options.dpatch
new file mode 100644
index 0000000..323ae29
--- /dev/null
+++ b/debian/patches/02compile_options.dpatch
@@ -0,0 +1,21 @@
+#! /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
+
+ 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 @@
+ 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
+ 
diff --git a/debian/patches/03gcc40.dpatch b/debian/patches/03gcc40.dpatch
new file mode 100644
index 0000000..8920973
--- /dev/null
+++ b/debian/patches/03gcc40.dpatch
@@ -0,0 +1,51 @@
+#! /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/rules b/debian/rules
index b5f4930..a88aebb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,8 @@
 # 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
@@ -12,7 +14,7 @@ endif
 
 build: build-stamp
 
-build-stamp:
+build-stamp: patch
 	dh_testdir
 	$(MAKE) CXXOPTFLAGS=$(R_COPTFLAGS)
 	touch build-stamp
@@ -26,7 +28,7 @@ build-doc-stamp:
 		 && texi2html -split chapter maria.texinfo
 	touch build-doc-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	-rm build-stamp build-doc-stamp
@@ -88,4 +90,4 @@ binary-arch: install-arch
 	dh_builddeb -a
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch install-indep install-arch
+.PHONY: build clean binary-indep binary-arch install-indep install-arch patch unpatch
diff --git a/maria-vis b/maria-vis
index 2e20a57..e92a3b2 100755
--- a/maria-vis
+++ b/maria-vis
@@ -1,4 +1,4 @@
-#!/usr/bin/lefty
+#!/usr/local/bin/lefty
 # This is a graphical user interface for maria(1).
 # It requires the lefty interpreter and the dotty*.lefty scripts of GraphViz.
 #

-- 
maria packaging

More information about the debian-science-commits mailing list