[SCM] mona packaging branch, master, updated. upstream/1.4-2-17-g7d5620d
Ralf Treinen
treinen at free.fr
Wed May 11 20:35:06 UTC 2011
The following commit has been merged in the master branch:
commit f94eae97f5f3944a618254c1a39c01b660f49149
Merge: 01f469d20c9e915faa5de70b0358f0f228fce478 af03929654d3e441494fe5662d84dfb855c18dc8
Author: Ralf Treinen <treinen at debian.org>
Date: Wed Dec 29 17:09:44 2004 +0100
Imported Debian patch 1.4-7-2
diff --combined Examples/makefile
index fb2d8ff,e03da9d..553ed15
--- a/Examples/makefile
+++ b/Examples/makefile
@@@ -1,7 -1,7 +1,7 @@@
- # makefile.in generated by automake 1.6.1 from makefile.am.
+ # makefile.in generated by automake 1.7.8 from makefile.am.
-# @configure_input@
+# Examples/makefile. Generated from makefile.in by configure.
- # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@@ -12,76 -12,111 +12,111 @@@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
- at SET_MAKE@
- SHELL = /bin/sh
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
+
+srcdir = .
+top_srcdir = ..
+
- prefix = /usr
- exec_prefix = ${prefix}
-
- bindir = ${exec_prefix}/bin
- sbindir = ${exec_prefix}/sbin
- libexecdir = ${exec_prefix}/libexec
- datadir = ${prefix}/share
- sysconfdir = ${prefix}/etc
- sharedstatedir = ${prefix}/com
- localstatedir = ${prefix}/var
- libdir = ${exec_prefix}/lib
- infodir = ${prefix}/info
- mandir = ${prefix}/man
- includedir = ${prefix}/include
- oldincludedir = /usr/include
+pkgdatadir = $(datadir)/mona
+pkglibdir = $(libdir)/mona
+pkgincludedir = $(includedir)/mona
top_builddir = ..
- ACLOCAL = ${SHELL} /home/rt/debian/own/mona/mona-1.4-5/config/missing --run aclocal-1.6
- AUTOCONF = ${SHELL} /home/rt/debian/own/mona/mona-1.4-5/config/missing --run autoconf
- AUTOMAKE = ${SHELL} /home/rt/debian/own/mona/mona-1.4-5/config/missing --run automake-1.6
- AUTOHEADER = ${SHELL} /home/rt/debian/own/mona/mona-1.4-5/config/missing --run autoheader
-
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
+INSTALL = /usr/bin/install -c
- INSTALL_PROGRAM = ${INSTALL}
- INSTALL_DATA = ${INSTALL} -m 644
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
- INSTALL_SCRIPT = ${INSTALL}
+ install_sh_SCRIPT = $(install_sh) -c
INSTALL_HEADER = $(INSTALL_DATA)
- transform = s,x,x,
+ transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-
- EXEEXT =
- OBJEXT = o
- PATH_SEPARATOR = :
- AMTAR = ${SHELL} /home/rt/debian/own/mona/mona-1.4-5/config/missing --run tar
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFG = @CFG@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LEXLIB = @LEXLIB@
-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-RELEASE = @RELEASE@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-YACC = @YACC@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
++ACLOCAL = ${SHELL} /home/rt/debian/own/mona/mona-1.4-7/config/missing --run aclocal-1.7
++AMDEP_FALSE = #
++AMDEP_TRUE =
++AMTAR = ${SHELL} /home/rt/debian/own/mona/mona-1.4-7/config/missing --run tar
++AUTOCONF = ${SHELL} /home/rt/debian/own/mona/mona-1.4-7/config/missing --run autoconf
++AUTOHEADER = ${SHELL} /home/rt/debian/own/mona/mona-1.4-7/config/missing --run autoheader
++AUTOMAKE = ${SHELL} /home/rt/debian/own/mona/mona-1.4-7/config/missing --run automake-1.7
+AWK = gawk
+CC = gcc
++CCDEPMODE = depmode=gcc3
+CFG =
+CFLAGS = -O3 -DNDEBUG -Wall
++CPP = gcc -E
++CPPFLAGS =
+CXX = g++
++CXXDEPMODE = depmode=gcc3
++CXXFLAGS = -O3 -DNDEBUG -Wall
++CYGPATH_W = echo
++DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
++ECHO_C =
++ECHO_N = -n
++ECHO_T =
++EGREP = grep -E
++EXEEXT =
++INSTALL_DATA = ${INSTALL} -m 644
++INSTALL_PROGRAM = ${INSTALL}
++INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
++LDFLAGS =
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
++LIBOBJS =
++LIBS =
++LTLIBOBJS =
++MAKEINFO = ${SHELL} /home/rt/debian/own/mona/mona-1.4-7/config/missing --run makeinfo
++OBJEXT = o
+PACKAGE = mona
++PACKAGE_BUGREPORT =
++PACKAGE_NAME = mona
++PACKAGE_STRING = mona 1.4
++PACKAGE_TARNAME = mona
++PACKAGE_VERSION = 1.4
++PATH_SEPARATOR = :
+RANLIB = ranlib
- RELEASE = 5
++RELEASE = 7
++SET_MAKE =
++SHELL = /bin/sh
+STRIP =
+VERSION = 1.4
+YACC = bison -y
++ac_ct_CC = gcc
++ac_ct_CXX = g++
++ac_ct_RANLIB = ranlib
++ac_ct_STRIP =
++am__fastdepCC_FALSE = #
++am__fastdepCC_TRUE =
++am__fastdepCXX_FALSE = #
++am__fastdepCXX_TRUE =
+am__include = include
++am__leading_dot = .
+am__quote =
- install_sh = /home/rt/debian/own/mona/mona-1.4-5/config/install-sh
++bindir = ${exec_prefix}/bin
++build_alias =
++datadir = ${prefix}/share
++exec_prefix = ${prefix}
++host_alias =
++includedir = ${prefix}/include
++infodir = ${prefix}/info
++install_sh = /home/rt/debian/own/mona/mona-1.4-7/config/install-sh
++libdir = ${exec_prefix}/lib
++libexecdir = ${exec_prefix}/libexec
++localstatedir = ${prefix}/var
++mandir = ${prefix}/man
++oldincludedir = /usr/include
++prefix = /usr
++program_transform_name = s,x,x,
++sbindir = ${exec_prefix}/sbin
++sharedstatedir = ${prefix}/com
++sysconfdir = ${prefix}/etc
++target_alias =
MAINTAINERCLEANFILES = makefile.in makefile html.gta \
presburger_plus_012.dfa presburger_less_01.dfa \
presburger_timestwo_01.dfa presburger_const42.dfa
@@@ -95,13 -130,14 +130,14 @@@ EXTRA_DIST = bdd_volatility ab1.mona ev
bdd_example.c gta_example.c presburger_analysis.c presburger_transduction.c
-COMPILE = $(CC) @CFLAGS@
+COMPILE = $(CC) -O3 -DNDEBUG -Wall
subdir = Examples
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
DIST_SOURCES =
- DIST_COMMON = makefile.am makefile.in
+ DIST_COMMON = $(srcdir)/makefile.in makefile.am
all: all-am
.SUFFIXES:
@@@ -114,13 -150,22 +150,22 @@@ uninstall-info-am
tags: TAGS
TAGS:
+ ctags: CTAGS
+ CTAGS:
+
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
top_distdir = ..
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @for file in $(DISTFILES); do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+ case $$file in \
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+ esac; \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@@ -145,7 -190,6 +190,6 @@@ check: check-a
all-am: makefile
installdirs:
-
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@@ -166,7 -210,7 +210,7 @@@ clean-generic
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
+ -rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@@ -177,7 -221,7 +221,7 @@@ clean: clean-a
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
@@@ -199,13 -243,21 +243,21 @@@ install-man
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
+ pdf: pdf-am
+
+ pdf-am:
+
+ ps: ps-am
+
+ ps-am:
+
uninstall-am: uninstall-info-am
.PHONY: all all-am check check-am clean clean-generic distclean \
@@@ -214,7 -266,8 +266,8 @@@
install-exec-am install-info install-info-am install-man \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic uninstall uninstall-am uninstall-info-am
+ mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
+ uninstall-info-am
examples: bdd_example gta_example presburger_analysis presburger_transduction
diff --combined config/makefile
index 2392342,a1ae7f0..ab79534
--- a/config/makefile
+++ b/config/makefile
@@@ -1,7 -1,7 +1,7 @@@
- # makefile.in generated by automake 1.6.1 from makefile.am.
+ # makefile.in generated by automake 1.7.8 from makefile.am.
-# @configure_input@
+# config/makefile. Generated from makefile.in by configure.
- # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@@ -12,87 -12,123 +12,123 @@@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
- at SET_MAKE@
- SHELL = /bin/sh
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
+
+srcdir = .
+top_srcdir = ..
+
- prefix = /usr
- exec_prefix = ${prefix}
-
- bindir = ${exec_prefix}/bin
- sbindir = ${exec_prefix}/sbin
- libexecdir = ${exec_prefix}/libexec
- datadir = ${prefix}/share
- sysconfdir = ${prefix}/etc
- sharedstatedir = ${prefix}/com
- localstatedir = ${prefix}/var
- libdir = ${exec_prefix}/lib
- infodir = ${prefix}/info
- mandir = ${prefix}/man
- includedir = ${prefix}/include
- oldincludedir = /usr/include
+pkgdatadir = $(datadir)/mona
+pkglibdir = $(libdir)/mona
+pkgincludedir = $(includedir)/mona
top_builddir = ..
- ACLOCAL = ${SHELL} /home/rt/debian/own/mona/mona-1.4-5/config/missing --run aclocal-1.6
- AUTOCONF = ${SHELL} /home/rt/debian/own/mona/mona-1.4-5/config/missing --run autoconf
- AUTOMAKE = ${SHELL} /home/rt/debian/own/mona/mona-1.4-5/config/missing --run automake-1.6
- AUTOHEADER = ${SHELL} /home/rt/debian/own/mona/mona-1.4-5/config/missing --run autoheader
-
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
+INSTALL = /usr/bin/install -c
- INSTALL_PROGRAM = ${INSTALL}
- INSTALL_DATA = ${INSTALL} -m 644
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
- INSTALL_SCRIPT = ${INSTALL}
+ install_sh_SCRIPT = $(install_sh) -c
INSTALL_HEADER = $(INSTALL_DATA)
- transform = s,x,x,
+ transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-
- EXEEXT =
- OBJEXT = o
- PATH_SEPARATOR = :
- AMTAR = ${SHELL} /home/rt/debian/own/mona/mona-1.4-5/config/missing --run tar
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFG = @CFG@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LEXLIB = @LEXLIB@
-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-RELEASE = @RELEASE@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-YACC = @YACC@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
++ACLOCAL = ${SHELL} /home/rt/debian/own/mona/mona-1.4-7/config/missing --run aclocal-1.7
++AMDEP_FALSE = #
++AMDEP_TRUE =
++AMTAR = ${SHELL} /home/rt/debian/own/mona/mona-1.4-7/config/missing --run tar
++AUTOCONF = ${SHELL} /home/rt/debian/own/mona/mona-1.4-7/config/missing --run autoconf
++AUTOHEADER = ${SHELL} /home/rt/debian/own/mona/mona-1.4-7/config/missing --run autoheader
++AUTOMAKE = ${SHELL} /home/rt/debian/own/mona/mona-1.4-7/config/missing --run automake-1.7
+AWK = gawk
+CC = gcc
++CCDEPMODE = depmode=gcc3
+CFG =
+CFLAGS = -O3 -DNDEBUG -Wall
++CPP = gcc -E
++CPPFLAGS =
+CXX = g++
++CXXDEPMODE = depmode=gcc3
++CXXFLAGS = -O3 -DNDEBUG -Wall
++CYGPATH_W = echo
++DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
++ECHO_C =
++ECHO_N = -n
++ECHO_T =
++EGREP = grep -E
++EXEEXT =
++INSTALL_DATA = ${INSTALL} -m 644
++INSTALL_PROGRAM = ${INSTALL}
++INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
++LDFLAGS =
+LEX = flex
+LEXLIB = -lfl
+LEX_OUTPUT_ROOT = lex.yy
++LIBOBJS =
++LIBS =
++LTLIBOBJS =
++MAKEINFO = ${SHELL} /home/rt/debian/own/mona/mona-1.4-7/config/missing --run makeinfo
++OBJEXT = o
+PACKAGE = mona
++PACKAGE_BUGREPORT =
++PACKAGE_NAME = mona
++PACKAGE_STRING = mona 1.4
++PACKAGE_TARNAME = mona
++PACKAGE_VERSION = 1.4
++PATH_SEPARATOR = :
+RANLIB = ranlib
- RELEASE = 5
++RELEASE = 7
++SET_MAKE =
++SHELL = /bin/sh
+STRIP =
+VERSION = 1.4
+YACC = bison -y
++ac_ct_CC = gcc
++ac_ct_CXX = g++
++ac_ct_RANLIB = ranlib
++ac_ct_STRIP =
++am__fastdepCC_FALSE = #
++am__fastdepCC_TRUE =
++am__fastdepCXX_FALSE = #
++am__fastdepCXX_TRUE =
+am__include = include
++am__leading_dot = .
+am__quote =
- install_sh = /home/rt/debian/own/mona/mona-1.4-5/config/install-sh
++bindir = ${exec_prefix}/bin
++build_alias =
++datadir = ${prefix}/share
++exec_prefix = ${prefix}
++host_alias =
++includedir = ${prefix}/include
++infodir = ${prefix}/info
++install_sh = /home/rt/debian/own/mona/mona-1.4-7/config/install-sh
++libdir = ${exec_prefix}/lib
++libexecdir = ${exec_prefix}/libexec
++localstatedir = ${prefix}/var
++mandir = ${prefix}/man
++oldincludedir = /usr/include
++prefix = /usr
++program_transform_name = s,x,x,
++sbindir = ${exec_prefix}/sbin
++sharedstatedir = ${prefix}/com
++sysconfdir = ${prefix}/etc
++target_alias =
MAINTAINERCLEANFILES = makefile.in makefile mkinstalldirs install-sh \
ltmain.sh ltconfig config.sub config.guess depcomp
EXTRA_DIST = rpm-config init devel
subdir = config
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
DIST_SOURCES =
- DIST_COMMON = compile depcomp install-sh makefile.am makefile.in \
- missing mkinstalldirs
+ DIST_COMMON = $(srcdir)/makefile.in compile depcomp install-sh \
+ makefile.am missing mkinstalldirs
all: all-am
.SUFFIXES:
@@@ -105,13 -141,22 +141,22 @@@ uninstall-info-am
tags: TAGS
TAGS:
+ ctags: CTAGS
+ CTAGS:
+
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
top_distdir = ..
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @for file in $(DISTFILES); do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+ case $$file in \
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+ esac; \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@@ -136,7 -181,6 +181,6 @@@ check: check-a
all-am: makefile
installdirs:
-
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@@ -156,7 -200,7 +200,7 @@@ mostlyclean-generic
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
+ -rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@@ -167,7 -211,7 +211,7 @@@ clean: clean-a
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
@@@ -189,13 -233,21 +233,21 @@@ install-man
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
+ pdf: pdf-am
+
+ pdf-am:
+
+ ps: ps-am
+
+ ps-am:
+
uninstall-am: uninstall-info-am
.PHONY: all all-am check check-am clean clean-generic distclean \
@@@ -204,7 -256,8 +256,8 @@@
install-exec-am install-info install-info-am install-man \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic uninstall uninstall-am uninstall-info-am
+ mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
+ uninstall-info-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --combined debian/changelog
index 71e2b4e,0000000..5f11f94
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,47 -1,0 +1,65 @@@
++mona (1.4-7-2) unstable; urgency=low
++
++ * Patch 02_gcc4.0 fixes compilation error with gcc4.0 on amd64. Patch
++ provided by Andreas Jochens - thanks! (closes: Bug#287662).
++
++ -- Ralf Treinen <treinen at debian.org> Wed, 29 Dec 2004 17:09:44 +0100
++
++mona (1.4-7-1) unstable; urgency=low
++
++ * New upstream release
++ * Clean target: do a make distclean, and remove all generated makefiles
++ * Removed phony configure target
++ * Dpatch-ified
++ * Patch 01_gcc3.4: fix to compile with gcc-3.4. Thanks a lot to Andreas
++ Jochens for sending in this patch (closes: Bug#260596)
++
++ -- Ralf Treinen <treinen at debian.org> Wed, 4 Aug 2004 01:17:41 +0200
++
+mona (1.4-5-1) unstable; urgency=low
+
+ * New upstream release.
+ * Standards-Version 3.6.1:
+ - Honor "noopt" in the value of DEB_BUILD_OPTIONS
+ * Use the new ./configure script.
+ * Replace DH_COMPAT variable by file debian/compat, set to level 4.
+ * Build-dependency on debhelper: specify >= 4.0
+ * Removed "g++" from Build-Depends since it is build-essential.
+ * Dependencies in debian/rules: replace configure-stamp by makefile and
+ build-stamp by mona.
+ * Target clean in debian/rules: remove config.{status,log}, makefile.
+ * Upstream fixed his clean target to properly cleanup Examples and Lib,
+ remove according cleanup code in debian/rules stemming from 1.4-3.1.
+ * copyright: reformatted and fixed typos, specified v2 of GPL, added
+ GPL copyright declaration.
+
+ -- Ralf Treinen <treinen at debian.org> Sat, 6 Mar 2004 07:58:18 +0100
+
+mona (1.4-3-1) unstable; urgency=low
+
+ * Standards-version 3.5.6.0.
+ * DH_COMPAT=3. This marks all files in /etc as conffiles (closes:
+ Bug#132122).
+ * Some cleanup in debian/rules.
+ * Removed local emacs variable in debian/changelog.
+ * Removed from the source package the following binary files (no idea
+ how they have slipped in the first place). Also, have them removed
+ by the clean target of debian/rules:
+ Examples/presburger_transduction, Examples/presburger_analysis,
+ Examples/gta_example, Examples/bdd_example, Lib/dfa2dot, Lib/gta2dot.
+ * Removed debian/docs and debian/dirs. Instead, pass arguments directly
+ to dh_installdocs and dh_installdirs.
+ * Add invocation of dh_installdeb in debian/rules.
+ * Changed in description the sentence on documentation, added url of
+ the upstream webpage.
+
+ -- Ralf Treinen <treinen at debian.org> Tue, 5 Feb 2002 21:23:09 +0100
+
+mona (1.4-2-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Ralf Treinen <treinen at debian.org> Mon, 23 Oct 2000 20:25:27 +0200
+
+Local variables:
+End:
diff --combined debian/control
index 75b915c,0000000..15d2742
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,20 -1,0 +1,20 @@@
+Source: mona
+Section: misc
+Priority: optional
+Maintainer: Ralf Treinen <treinen at debian.org>
- Build-Depends: debhelper (>= 4.0), bison, flex
++Build-Depends: debhelper (>= 4.0), bison, flex, dpatch
+Standards-Version: 3.6.1
+
+Package: mona
+Suggests: graphviz
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: a theorem prover based on automata
+ MONA is a tool that translates formulas in the logics WS1S or WS2S
+ into finite-state automata represented by BDDs. The formulas may
+ express search patterns, temporal properties of reactive systems,
+ parse tree constraints, etc. MONA also analyses the automaton
+ resulting from the compilation, and determines whether the formula is
+ valid and, if the formula is not valid, generates a counter-example.
+ .
+ Documentation is available from the MONA website http://www.brics.dk/mona/.
diff --combined debian/patches/00list
index 0000000,0000000..6070dff
new file mode 100644
--- /dev/null
+++ b/debian/patches/00list
@@@ -1,0 -1,0 +1,2 @@@
++01_gcc3.4
++02_gcc4.0
diff --combined debian/patches/01_gcc3.4.dpatch
index 0000000,0000000..9034ee3
new file mode 100644
--- /dev/null
+++ b/debian/patches/01_gcc3.4.dpatch
@@@ -1,0 -1,0 +1,46 @@@
++#! /bin/sh -e
++## 01_gcc3.4.dpatch by Ralf Treinen <treinen at debian.org>
++##
++## All lines beginning with `## DP:' are a description of the patch.
++## DP: Patch to compile with gcc-3.4 (thanks a lot to Andreas Jochens)
++
++if [ $# -lt 1 ]; then
++ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
++ exit 1
++fi
++
++[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
++patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
++
++case "$1" in
++ -patch) patch -p1 ${patch_opts} < $0;;
++ -unpatch) patch -R -p1 ${patch_opts} < $0;;
++ *)
++ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
++ exit 1;;
++esac
++
++exit 0
++
++ at DPATCH@
++diff -urNad /home/rt/debian/own/mona/mona-1.4-7/Front/deque.h mona-1.4-7/Front/deque.h
++--- /home/rt/debian/own/mona/mona-1.4-7/Front/deque.h 2004-07-08 09:00:13.000000000 +0200
+++++ mona-1.4-7/Front/deque.h 2004-08-04 01:14:19.000000000 +0200
++@@ -241,7 +241,7 @@
++ public:
++ ~DequeGC()
++ {
++- for (T *i = begin(); i != end(); i++)
+++ for (T *i = this->begin(); i != this->end(); i++)
++ delete *i;
++ }
++ };
++@@ -251,7 +251,7 @@
++ public:
++ ~DequeGCA()
++ {
++- for (T *i = begin(); i != end(); i++)
+++ for (T *i = this->begin(); i != this->end(); i++)
++ delete[] *i;
++ }
++ };
diff --combined debian/patches/02_gcc4.0.dpatch
index 0000000,0000000..cdc9370
new file mode 100644
--- /dev/null
+++ b/debian/patches/02_gcc4.0.dpatch
@@@ -1,0 -1,0 +1,146 @@@
++#! /bin/sh -e
++## 01_gcc4.0.dpatch by Ralf Treinen <treinen at debian.org>
++##
++## All lines beginning with `## DP:' are a description of the patch.
++## DP: Patch to compile with gcc-4.0 (patch provided by Andreas Jochens)
++
++if [ $# -lt 1 ]; then
++ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
++ exit 1
++fi
++
++[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
++patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
++
++case "$1" in
++ -patch) patch -p1 ${patch_opts} < $0;;
++ -unpatch) patch -R -p1 ${patch_opts} < $0;;
++ *)
++ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
++ exit 1;;
++esac
++
++exit 0
++
++ at DPATCH@
++diff -urN ../tmp-orig/mona-1.4-7/Front/code.cpp ./Front/code.cpp
++--- ../tmp-orig/mona-1.4-7/Front/code.cpp 2004-07-08 09:00:14.000000000 +0200
+++++ ./Front/code.cpp 2004-12-29 12:46:47.000000000 +0100
++@@ -401,7 +401,7 @@
++ unsigned
++ Code_c::hash()
++ {
++- return kind + ((int) vc.code)*128;
+++ return kind + ((long) vc.code)*128;
++ }
++
++ ////////// Code_cc ////////////////////////////////////////////////////////////
++@@ -439,7 +439,7 @@
++ unsigned
++ Code_cc::hash()
++ {
++- return kind*2 + ((int) vc1.code)*5 + ((int) vc2.code)*7;
+++ return kind*2 + ((long) vc1.code)*5 + ((long) vc2.code)*7;
++ }
++
++ void
++@@ -1221,7 +1221,7 @@
++ unsigned
++ Code_Import::hash()
++ {
++- return kind + (int) file;
+++ return kind + (long) file;
++ }
++
++ void
++@@ -1345,7 +1345,7 @@
++ unsigned
++ Code_Export::hash()
++ {
++- return kind + (int) file;
+++ return kind + (long) file;
++ }
++
++ void
++diff -urN ../tmp-orig/mona-1.4-7/Front/codedump.cpp ./Front/codedump.cpp
++--- ../tmp-orig/mona-1.4-7/Front/codedump.cpp 2004-07-08 09:00:14.000000000 +0200
+++++ ./Front/codedump.cpp 2004-12-29 12:48:36.000000000 +0100
++@@ -107,7 +107,7 @@
++ for (VarCodeList::iterator i = begin(); i != end(); i++) {
++ if (i != begin())
++ cout << ",";
++- printf("(%x,", (unsigned) (*i).code);
+++ printf("(%lx,", (unsigned long) (*i).code);
++ if ((*i).vars)
++ (*i).vars->dumplist();
++ printf(")");
++@@ -121,7 +121,7 @@
++ Code::viz()
++ {
++ if (!mark) {
++- printf(" L%x [label=\"", (unsigned) this);
+++ printf(" L%lx [label=\"", (unsigned long) this);
++ dump(false);
++ // printf(" {%d}", refs);
++ printf("\"];\n");
++@@ -135,7 +135,7 @@
++ if (!mark) {
++ vc.code->viz();
++ Code::viz();
++- printf(" L%x -> L%x [label=\"", (unsigned) this, (unsigned) vc.code);
+++ printf(" L%lx -> L%lx [label=\"", (unsigned long) this, (unsigned long) vc.code);
++ vc.dumpsubst();
++ printf("\"];\n");
++ mark = true;
++@@ -149,10 +149,10 @@
++ vc1.code->viz();
++ vc2.code->viz();
++ Code::viz();
++- printf(" L%x -> L%x [label=\"", (unsigned) this, (unsigned) vc1.code);
+++ printf(" L%lx -> L%lx [label=\"", (unsigned long) this, (unsigned long) vc1.code);
++ vc1.dumpsubst();
++ printf("\"];\n");
++- printf(" L%x -> L%x [label=\"", (unsigned) this, (unsigned) vc2.code);
+++ printf(" L%lx -> L%lx [label=\"", (unsigned long) this, (unsigned long) vc2.code);
++ vc2.dumpsubst();
++ printf("\"];\n");
++ mark = true;
++diff -urN ../tmp-orig/mona-1.4-7/Front/mona.cpp ./Front/mona.cpp
++--- ../tmp-orig/mona-1.4-7/Front/mona.cpp 2004-07-08 09:00:14.000000000 +0200
+++++ ./Front/mona.cpp 2004-12-29 12:50:26.000000000 +0100
++@@ -507,16 +507,16 @@
++ printf("digraph MONA_CODE_DAG {\n"
++ " size = \"7.5,10.5\";\n"
++ " main [shape = plaintext];\n"
++- " main -> L%x;\n",
++- (unsigned) formulaCode.code);
+++ " main -> L%lx;\n",
+++ (unsigned long) formulaCode.code);
++ formulaCode.code->viz();
++ Deque<VarCode>::iterator i;
++ Deque<char *>::iterator j;
++ for (i = verifyCode.begin(), j = ast->verifytitlelist.begin();
++ i != verifyCode.end(); i++, j++) {
++ printf(" \"%s\" [shape = plaintext];\n"
++- " \"%s\" -> L%x;\n",
++- *j, *j, (unsigned) (*i).code);
+++ " \"%s\" -> L%lx;\n",
+++ *j, *j, (unsigned long) (*i).code);
++ (*i).code->viz();
++ }
++ formulaCode.unmark();
++diff -urN ../tmp-orig/mona-1.4-7/Front/symboltable.cpp ./Front/symboltable.cpp
++--- ../tmp-orig/mona-1.4-7/Front/symboltable.cpp 2004-07-08 09:00:15.000000000 +0200
+++++ ./Front/symboltable.cpp 2004-12-29 12:51:48.000000000 +0100
++@@ -76,7 +76,7 @@
++ int
++ SymbolTable::hash(char *s)
++ {
++- return (int) s % size;
+++ return (long) s % size;
++ }
++
++ SymbolTable::SymbolTable(int s)
++
++
++
diff --combined debian/rules
index db034d3,0000000..489a91b
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,56 -1,0 +1,60 @@@
+#!/usr/bin/make -f
+#export DH_VERBOSE=1
+
++include /usr/share/dpatch/dpatch.make
++
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ OPTFLAGS = -O0
+else
+ OPTFLAGS = -O3
+endif
+
- configure: makefile
- makefile:
++# these files are generated by configure but not purged by make distclean
++GENERATED_MAKEFILES = makefile BDD/makefile DFA/makefile GTA/makefile Lib/makefile Mem/makefile Front/makefile
++
++makefile: patch
+ dh_testdir
+ ./configure --prefix=/usr CFLAGS=$(OPTFLAGS) CXXFLAGS=$(OPTFLAGS)
+
+build: makefile mona
+mona:
+ dh_testdir
+ $(MAKE) CFLAGS=$(OPTFLAGS) CXXFLAGS=$(OPTFLAGS)
+ $(MAKE) libCFLAGS=$(OPTFLAGS) CXXFLAGS=$(OPTFLAGS)
+
- clean:
++clean: unpatch
+ dh_testdir
+ dh_testroot
- -$(MAKE) clean
- -rm config.{log,status} makefile
++ -$(MAKE) distclean
++ -rm config.{log,status} $(GENERATED_MAKEFILES)
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs usr/bin usr/share/emacs/site-lisp/mona
+ cp mona `pwd`/debian/mona/usr/bin
+ cp mona-mode.el `pwd`/debian/mona/usr/share/emacs/site-lisp/mona
+
+binary-indep: build install
+
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installdocs README
+ dh_installexamples Examples/*
+ dh_installemacsen
+ dh_installmanpages
+ dh_installchangelogs
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
- .PHONY: build clean binary-indep binary-arch binary install configure
++.PHONY: build clean binary-indep binary-arch binary install patch unpatch
--
mona packaging
More information about the debian-science-commits
mailing list