tags 470969 + patch thanks Hi,
Attached is a proposed diff for an alps-light1 1.2.2-2.2 NMU.
Regards,
Simon
diff -u alps-light1-1.2.2/debian/rules alps-light1-1.2.2/debian/rules
--- alps-light1-1.2.2/debian/rules
+++ alps-light1-1.2.2/debian/rules
@@ -12,6 +12,10 @@
DEB_INSTALL_DOCS_ALL := $(shell cat debian/docs)
DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+clean:: rm-config-cache
+rm-config-cache:
+ rm -f config/config.cache
+
$(patsubst %,binary-predeb/%,$(DEB_PACKAGES)) :: binary-predeb/%: binary-fixup/%
cat debian/common-description >> debian/$(cdbs_curpkg).substvars
diff -u alps-light1-1.2.2/debian/changelog alps-light1-1.2.2/debian/changelog
--- alps-light1-1.2.2/debian/changelog
+++ alps-light1-1.2.2/debian/changelog
@@ -1,3 +1,17 @@
+alps-light1 (1.2.2-2.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * #include <cstring> to fix FTBFS with g++-4.3 as g++ (Closes: #470969).
+ (debian/patches/cstring.patch added)
+ * Fix double build by removing nonexistent SUBDIRS from Makefile.am
+ and test/Makefile.am, thus fixing make distclean.
+ (debian/patches/fix-distclean.patch added)
+ * Regenerate all Makefile.in. (debian/patches/regen-autotools.patch
+ refreshed)
+ * Delete config/config.cache during clean, for a smaller Debian diff
+
+ -- Simon McVittie <[EMAIL PROTECTED]> Sun, 06 Apr 2008 14:41:47 +0000
+
alps-light1 (1.2.2-2.1) unstable; urgency=medium
* Non-maintainer upload.
diff -u alps-light1-1.2.2/debian/patches/series alps-light1-1.2.2/debian/patches/series
--- alps-light1-1.2.2/debian/patches/series
+++ alps-light1-1.2.2/debian/patches/series
@@ -3,2 +3,4 @@
fix-LIBADD.patch
+cstring.patch
+fix-distclean.patch
regen-autotools.patch
diff -u alps-light1-1.2.2/debian/patches/regen-autotools.patch alps-light1-1.2.2/debian/patches/regen-autotools.patch
--- alps-light1-1.2.2/debian/patches/regen-autotools.patch
+++ alps-light1-1.2.2/debian/patches/regen-autotools.patch
@@ -1,15 +1,20 @@
Index: alps-light1-1.2.2/Makefile.in
===================================================================
---- alps-light1-1.2.2.orig/Makefile.in 2005-07-01 23:12:40.000000000 +0200
-+++ alps-light1-1.2.2/Makefile.in 2005-07-01 23:16:35.000000000 +0200
-@@ -39,16 +39,42 @@
- @[EMAIL PROTECTED] = tool example
- @[EMAIL PROTECTED] = CITATIONS.txt LICENSE.txt README config/preamble.in
- @[EMAIL PROTECTED] = LICENSE-light.txt README-light config/preamble-light.in
+--- alps-light1-1.2.2.orig/Makefile.in 2004-11-10 02:01:19.000000000 +0000
++++ alps-light1-1.2.2/Makefile.in 2008-04-06 14:27:36.000000000 +0000
+@@ -36,19 +36,44 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
[EMAIL PROTECTED]@am__append_1 = tool example
[EMAIL PROTECTED]@am__append_2 = CITATIONS.txt LICENSE.txt README config/preamble.in
[EMAIL PROTECTED]@am__append_3 = LICENSE-light.txt README-light config/preamble-light.in
-DIST_COMMON = README $(am__configure_deps) \
- $(am__dist_noinst_DATA_DIST) $(dist_noinst_SCRIPTS) \
- $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/config/config.site.in \
[EMAIL PROTECTED]@am__append_1 = CITATIONS.txt LICENSE.txt README config/preamble.in
[EMAIL PROTECTED]@am__append_2 = LICENSE-light.txt README-light config/preamble-light.in
+DIST_COMMON = $(am__configure_deps) $(am__dist_noinst_DATA_DIST) \
+ $(dist_noinst_SCRIPTS) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(top_srcdir)/config/config.site.in \
@@ -53,7 +58,7 @@
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-@@ -67,7 +93,18 @@
+@@ -67,7 +92,18 @@
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/alps/config.h \
$(top_builddir)/src/boost/po_utf8_codecvt_facet.cpp
@@ -73,7 +78,82 @@
SCRIPTS = $(dist_noinst_SCRIPTS)
SOURCES =
DIST_SOURCES =
-@@ -264,15 +301,15 @@
+@@ -86,7 +122,7 @@
+ DATA = $(dist_noinst_DATA) $(nodist_data_DATA) $(nodist_pkgdata_DATA)
+ ETAGS = etags
+ CTAGS = ctags
+-DIST_SUBDIRS = lib tool example test src doc .
++DIST_SUBDIRS = $(SUBDIRS)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ top_distdir = $(distdir)
+ am__remove_distdir = \
+@@ -155,6 +191,7 @@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
++GREP = @GREP@
+ HAVE_MPI_FALSE = @HAVE_MPI_FALSE@
+ HAVE_MPI_TRUE = @HAVE_MPI_TRUE@
+ HAVE_PVM_FALSE = @HAVE_PVM_FALSE@
+@@ -206,12 +243,9 @@
+ XML_CPPFLAGS = @XML_CPPFLAGS@
+ XML_LDFLAGS = @XML_LDFLAGS@
+ XML_LIBS = @XML_LIBS@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-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@
+@@ -226,33 +260,42 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SUBDIRS = lib $(am__append_1) test src doc .
++#if ALPS_FULL
++#SUBDIRS += tool example
++#endif
++SUBDIRS = lib test src doc .
+ distdir = alps-$(VERSION)
+ distdir_light = alps-light-$(VERSION)
+ dist_noinst_SCRIPTS = config/make_snapshot config/run-test config/update_preamble
+-dist_noinst_DATA = ChangeLog ChangeLog.0 INSTALL TODO $(am__append_2) $(am__append_3)
++dist_noinst_DATA = ChangeLog ChangeLog.0 INSTALL TODO $(am__append_1) $(am__append_2)
+ nodist_data_DATA = config/config.site
+ nodist_pkgdata_DATA = config/include.mk
+ all: all-recursive
+@@ -264,15 +307,15 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -93,7 +173,7 @@
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
-@@ -322,6 +359,62 @@
+@@ -322,6 +365,62 @@
cd $(top_builddir) && $(SHELL) ./config.status $@
config/include.mk: $(top_builddir)/config.status $(top_srcdir)/config/include.mk.in
cd $(top_builddir) && $(SHELL) ./config.status $@
@@ -156,7 +236,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -490,7 +583,7 @@
+@@ -490,7 +589,7 @@
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
@@ -165,7 +245,16 @@
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
-@@ -744,9 +837,9 @@
+@@ -517,7 +616,7 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+ || mkdir "$(distdir)/$$subdir" \
+@@ -744,9 +843,9 @@
install-data-local : config/config.cache
@$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
@@ -179,9 +268,61 @@
update-preamble:
Index: alps-light1-1.2.2/doc/Makefile.in
===================================================================
---- alps-light1-1.2.2.orig/doc/Makefile.in 2005-07-01 23:12:40.000000000 +0200
-+++ alps-light1-1.2.2/doc/Makefile.in 2005-07-01 23:16:35.000000000 +0200
-@@ -301,9 +301,9 @@
+--- alps-light1-1.2.2.orig/doc/Makefile.in 2004-11-10 02:01:20.000000000 +0000
++++ alps-light1-1.2.2/doc/Makefile.in 2008-04-06 14:27:36.000000000 +0000
+@@ -151,6 +151,7 @@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
++GREP = @GREP@
+ HAVE_MPI_FALSE = @HAVE_MPI_FALSE@
+ HAVE_MPI_TRUE = @HAVE_MPI_TRUE@
+ HAVE_PVM_FALSE = @HAVE_PVM_FALSE@
+@@ -202,12 +203,9 @@
+ XML_CPPFLAGS = @XML_CPPFLAGS@
+ XML_LDFLAGS = @XML_LDFLAGS@
+ XML_LIBS = @XML_LIBS@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-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@
+@@ -222,24 +220,30 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+@@ -301,9 +305,9 @@
exit 1;; \
esac; \
done; \
@@ -195,9 +336,61 @@
@case '$?' in \
Index: alps-light1-1.2.2/lib/Makefile.in
===================================================================
---- alps-light1-1.2.2.orig/lib/Makefile.in 2005-07-01 23:12:40.000000000 +0200
-+++ alps-light1-1.2.2/lib/Makefile.in 2005-07-01 23:16:35.000000000 +0200
-@@ -228,9 +228,9 @@
+--- alps-light1-1.2.2.orig/lib/Makefile.in 2004-11-10 02:01:22.000000000 +0000
++++ alps-light1-1.2.2/lib/Makefile.in 2008-04-06 14:27:36.000000000 +0000
+@@ -122,6 +122,7 @@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
++GREP = @GREP@
+ HAVE_MPI_FALSE = @HAVE_MPI_FALSE@
+ HAVE_MPI_TRUE = @HAVE_MPI_TRUE@
+ HAVE_PVM_FALSE = @HAVE_PVM_FALSE@
+@@ -173,12 +174,9 @@
+ XML_CPPFLAGS = @XML_CPPFLAGS@
+ XML_LDFLAGS = @XML_LDFLAGS@
+ XML_LIBS = @XML_LIBS@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-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@
+@@ -193,24 +191,30 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+@@ -228,9 +232,9 @@
exit 1;; \
esac; \
done; \
@@ -211,8 +404,8 @@
@case '$?' in \
Index: alps-light1-1.2.2/lib/alps/Makefile.in
===================================================================
---- alps-light1-1.2.2.orig/lib/alps/Makefile.in 2005-07-01 23:12:40.000000000 +0200
-+++ alps-light1-1.2.2/lib/alps/Makefile.in 2005-07-01 23:16:40.000000000 +0200
+--- alps-light1-1.2.2.orig/lib/alps/Makefile.in 2004-11-10 02:01:27.000000000 +0000
++++ alps-light1-1.2.2/lib/alps/Makefile.in 2008-04-06 14:27:38.000000000 +0000
@@ -68,7 +68,10 @@
am__installdirs = "$(DESTDIR)$(libdir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
@@ -225,7 +418,59 @@
am__libalps_la_SOURCES_DIST = $(top_srcdir)/src/alps/copyright.C \
$(top_srcdir)/src/alps/evaluator.C \
$(top_srcdir)/src/alps/expression.C \
-@@ -601,6 +604,7 @@
+@@ -350,6 +353,7 @@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
++GREP = @GREP@
+ HAVE_MPI_FALSE = @HAVE_MPI_FALSE@
+ HAVE_MPI_TRUE = @HAVE_MPI_TRUE@
+ HAVE_PVM_FALSE = @HAVE_PVM_FALSE@
+@@ -401,12 +405,9 @@
+ XML_CPPFLAGS = @XML_CPPFLAGS@
+ XML_LDFLAGS = @XML_LDFLAGS@
+ XML_LIBS = @XML_LIBS@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-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@
+@@ -421,24 +422,30 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+@@ -601,6 +608,7 @@
$(BOOST_SRCDIR)/thread/src/barrier.cpp
lib_LTLIBRARIES = libalps.la
@@ -233,7 +478,7 @@
libalps_la_SOURCES = $(src_ALPS) $(src_OSIRIS) $(src_PARSER) $(src_RANDOM) $(am__append_1) $(am__append_2)
nodist_libalps_la_SOURCES = $(am__append_3) $(am__append_4) $(am__append_5) $(am__append_6) $(am__append_7) $(am__append_8) $(am__append_9) $(am__append_10)
all: all-am
-@@ -616,9 +620,9 @@
+@@ -616,9 +624,9 @@
exit 1;; \
esac; \
done; \
@@ -247,8 +492,8 @@
@case '$?' in \
Index: alps-light1-1.2.2/lib/comm-mpi/Makefile.in
===================================================================
---- alps-light1-1.2.2.orig/lib/comm-mpi/Makefile.in 2005-07-01 23:12:40.000000000 +0200
-+++ alps-light1-1.2.2/lib/comm-mpi/Makefile.in 2005-07-01 23:16:41.000000000 +0200
+--- alps-light1-1.2.2.orig/lib/comm-mpi/Makefile.in 2004-11-10 02:01:27.000000000 +0000
++++ alps-light1-1.2.2/lib/comm-mpi/Makefile.in 2008-04-06 14:27:38.000000000 +0000
@@ -59,7 +59,11 @@
am__installdirs = "$(DESTDIR)$(libdir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
@@ -262,7 +507,59 @@
am__objects_1 = buffer.lo os.lo process.lo comm.lo mpdump.lo
am_libcomm_mpi_la_OBJECTS = $(am__objects_1)
libcomm_mpi_la_OBJECTS = $(am_libcomm_mpi_la_OBJECTS)
-@@ -239,6 +243,7 @@
+@@ -139,6 +143,7 @@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
++GREP = @GREP@
+ HAVE_MPI_FALSE = @HAVE_MPI_FALSE@
+ HAVE_MPI_TRUE = @HAVE_MPI_TRUE@
+ HAVE_PVM_FALSE = @HAVE_PVM_FALSE@
+@@ -190,12 +195,9 @@
+ XML_CPPFLAGS = @XML_CPPFLAGS@
+ XML_LDFLAGS = @XML_LDFLAGS@
+ XML_LIBS = @XML_LIBS@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-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@
+@@ -210,24 +212,30 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+@@ -239,6 +247,7 @@
lib_LTLIBRARIES = $(am__append_1)
SRC = $(top_srcdir)/src/alps/osiris/buffer.C $(top_srcdir)/src/alps/osiris/os.C $(top_srcdir)/src/alps/osiris/process.C $(top_srcdir)/src/alps/osiris/comm.C $(top_srcdir)/src/alps/osiris/mpdump.C
libcomm_mpi_la_SOURCES = $(SRC)
@@ -270,7 +567,7 @@
all: all-am
.SUFFIXES:
-@@ -252,9 +257,9 @@
+@@ -252,9 +261,9 @@
exit 1;; \
esac; \
done; \
@@ -284,8 +581,8 @@
@case '$?' in \
Index: alps-light1-1.2.2/lib/comm-pvm/Makefile.in
===================================================================
---- alps-light1-1.2.2.orig/lib/comm-pvm/Makefile.in 2005-07-01 23:12:40.000000000 +0200
-+++ alps-light1-1.2.2/lib/comm-pvm/Makefile.in 2005-07-01 23:16:41.000000000 +0200
+--- alps-light1-1.2.2.orig/lib/comm-pvm/Makefile.in 2004-11-10 02:01:28.000000000 +0000
++++ alps-light1-1.2.2/lib/comm-pvm/Makefile.in 2008-04-06 14:27:38.000000000 +0000
@@ -59,7 +59,11 @@
am__installdirs = "$(DESTDIR)$(libdir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
@@ -299,7 +596,59 @@
am__objects_1 = os.lo process.lo comm.lo mpdump.lo
am_libcomm_pvm_la_OBJECTS = $(am__objects_1)
libcomm_pvm_la_OBJECTS = $(am_libcomm_pvm_la_OBJECTS)
-@@ -238,6 +242,7 @@
+@@ -138,6 +142,7 @@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
++GREP = @GREP@
+ HAVE_MPI_FALSE = @HAVE_MPI_FALSE@
+ HAVE_MPI_TRUE = @HAVE_MPI_TRUE@
+ HAVE_PVM_FALSE = @HAVE_PVM_FALSE@
+@@ -189,12 +194,9 @@
+ XML_CPPFLAGS = @XML_CPPFLAGS@
+ XML_LDFLAGS = @XML_LDFLAGS@
+ XML_LIBS = @XML_LIBS@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-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@
+@@ -209,24 +211,30 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+@@ -238,6 +246,7 @@
lib_LTLIBRARIES = $(am__append_1)
SRC = $(top_srcdir)/src/alps/osiris/os.C $(top_srcdir)/src/alps/osiris/process.C $(top_srcdir)/src/alps/osiris/comm.C $(top_srcdir)/src/alps/osiris/mpdump.C
libcomm_pvm_la_SOURCES = $(SRC)
@@ -307,7 +656,7 @@
all: all-am
.SUFFIXES:
-@@ -251,9 +256,9 @@
+@@ -251,9 +260,9 @@
exit 1;; \
esac; \
done; \
@@ -321,8 +670,8 @@
@case '$?' in \
Index: alps-light1-1.2.2/lib/comm-sgl/Makefile.in
===================================================================
---- alps-light1-1.2.2.orig/lib/comm-sgl/Makefile.in 2005-07-01 23:12:40.000000000 +0200
-+++ alps-light1-1.2.2/lib/comm-sgl/Makefile.in 2005-07-01 23:16:42.000000000 +0200
+--- alps-light1-1.2.2.orig/lib/comm-sgl/Makefile.in 2004-11-10 02:01:28.000000000 +0000
++++ alps-light1-1.2.2/lib/comm-sgl/Makefile.in 2008-04-06 14:27:39.000000000 +0000
@@ -58,7 +58,10 @@
am__installdirs = "$(DESTDIR)$(libdir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
@@ -335,7 +684,59 @@
am__objects_1 = os.lo process.lo comm.lo mpdump.lo
am_libcomm_sgl_la_OBJECTS = $(am__objects_1)
libcomm_sgl_la_OBJECTS = $(am_libcomm_sgl_la_OBJECTS)
-@@ -237,6 +240,7 @@
+@@ -137,6 +140,7 @@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
++GREP = @GREP@
+ HAVE_MPI_FALSE = @HAVE_MPI_FALSE@
+ HAVE_MPI_TRUE = @HAVE_MPI_TRUE@
+ HAVE_PVM_FALSE = @HAVE_PVM_FALSE@
+@@ -188,12 +192,9 @@
+ XML_CPPFLAGS = @XML_CPPFLAGS@
+ XML_LDFLAGS = @XML_LDFLAGS@
+ XML_LIBS = @XML_LIBS@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-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@
+@@ -208,24 +209,30 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+@@ -237,6 +244,7 @@
lib_LTLIBRARIES = libcomm-sgl.la
SRC = $(top_srcdir)/src/alps/osiris/os.C $(top_srcdir)/src/alps/osiris/process.C $(top_srcdir)/src/alps/osiris/comm.C $(top_srcdir)/src/alps/osiris/mpdump.C
libcomm_sgl_la_SOURCES = $(SRC)
@@ -343,7 +744,7 @@
all: all-am
.SUFFIXES:
-@@ -250,9 +254,9 @@
+@@ -250,9 +258,9 @@
exit 1;; \
esac; \
done; \
@@ -357,8 +758,8 @@
@case '$?' in \
Index: alps-light1-1.2.2/lib/heap/Makefile.in
===================================================================
---- alps-light1-1.2.2.orig/lib/heap/Makefile.in 2005-07-01 23:12:40.000000000 +0200
-+++ alps-light1-1.2.2/lib/heap/Makefile.in 2005-07-01 23:16:42.000000000 +0200
+--- alps-light1-1.2.2.orig/lib/heap/Makefile.in 2004-11-10 02:01:29.000000000 +0000
++++ alps-light1-1.2.2/lib/heap/Makefile.in 2008-04-06 14:27:39.000000000 +0000
@@ -58,7 +58,10 @@
am__installdirs = "$(DESTDIR)$(libdir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
@@ -371,7 +772,59 @@
am__objects_1 = heapwrapper.lo
am_libheap_la_OBJECTS = $(am__objects_1)
libheap_la_OBJECTS = $(am_libheap_la_OBJECTS)
-@@ -236,6 +239,7 @@
+@@ -136,6 +139,7 @@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
++GREP = @GREP@
+ HAVE_MPI_FALSE = @HAVE_MPI_FALSE@
+ HAVE_MPI_TRUE = @HAVE_MPI_TRUE@
+ HAVE_PVM_FALSE = @HAVE_PVM_FALSE@
+@@ -187,12 +191,9 @@
+ XML_CPPFLAGS = @XML_CPPFLAGS@
+ XML_LDFLAGS = @XML_LDFLAGS@
+ XML_LIBS = @XML_LIBS@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-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@
+@@ -207,24 +208,30 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+@@ -236,6 +243,7 @@
lib_LTLIBRARIES = libheap.la
SRC = $(top_srcdir)/src/heap/heapwrapper.C
libheap_la_SOURCES = $(SRC)
@@ -379,7 +832,7 @@
all: all-am
.SUFFIXES:
-@@ -249,9 +253,9 @@
+@@ -249,9 +257,9 @@
exit 1;; \
esac; \
done; \
@@ -393,8 +846,8 @@
@case '$?' in \
Index: alps-light1-1.2.2/src/Makefile.in
===================================================================
---- alps-light1-1.2.2.orig/src/Makefile.in 2005-07-01 23:12:40.000000000 +0200
-+++ alps-light1-1.2.2/src/Makefile.in 2005-07-01 23:16:43.000000000 +0200
+--- alps-light1-1.2.2.orig/src/Makefile.in 2004-11-10 02:01:29.000000000 +0000
++++ alps-light1-1.2.2/src/Makefile.in 2008-04-06 14:27:39.000000000 +0000
@@ -122,8 +122,8 @@
boost/numeric/bindings/traits/ublas_vector.hpp \
boost/numeric/bindings/traits/ublas_vector2.hpp \
@@ -406,7 +859,58 @@
alps/expression_impl.h alps/expression2.h \
alps/expression2_impl.h alps/evaluator.h alps/factory.h \
alps/functional.h alps/math.hpp alps/multi_array.hpp \
-@@ -350,7 +350,7 @@
+@@ -255,6 +255,7 @@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
++GREP = @GREP@
+ HAVE_MPI_FALSE = @HAVE_MPI_FALSE@
+ HAVE_MPI_TRUE = @HAVE_MPI_TRUE@
+ HAVE_PVM_FALSE = @HAVE_PVM_FALSE@
+@@ -306,12 +307,9 @@
+ XML_CPPFLAGS = @XML_CPPFLAGS@
+ XML_LDFLAGS = @XML_LDFLAGS@
+ XML_LIBS = @XML_LIBS@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-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@
+@@ -326,31 +324,37 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
target_alias = @target_alias@
headers_CONFIG = alps/config.h @BOOST_USER_CONFIG_H@
headers_BOOST = boost/function_objects.hpp boost/numeric/bindings/blas/blas.h boost/numeric/bindings/blas/blas.hpp boost/numeric/bindings/blas/blas1.hpp boost/numeric/bindings/blas/blas1_overloads.hpp boost/numeric/bindings/blas/blas2.hpp boost/numeric/bindings/blas/blas2_overloads.hpp boost/numeric/bindings/blas/blas3.hpp boost/numeric/bindings/blas/blas3_overloads.hpp boost/numeric/bindings/blas/blas_names.h boost/numeric/bindings/lapack/gees.hpp boost/numeric/bindings/lapack/geev.hpp boost/numeric/bindings/lapack/geqrf.hpp boost/numeric/bindings/lapack/gesdd.hpp boost/numeric/bindings/lapack/gesv.hpp boost/numeric/bindings/lapack/gesvd.hpp boost/numeric/bindings/lapack/hbev.hpp boost/numeric/bindings/lapack/heev.hpp boost/numeric/bindings/lapack/hesv.hpp boost/numeric/bindings/lapack/hpsv.hpp boost/numeric/bindings/lapack/ilaenv.hpp boost/numeric/bindings/lapack/lapack.h boost/numeric/bindings/lapack/lapack.hpp boost/numeric/bindings/lapack/lapack_names.h boost/numeric/bindings/lapack/ormqr.hpp boost/numeric/bindings/lapack/posv.hpp boost/numeric/bindings/lapack/ppsv.hpp boost/numeric/bindings/lapack/spsv.hpp boost/numeric/bindings/lapack/syev.hpp boost/numeric/bindings/lapack/sysv.hpp boost/numeric/bindings/lapack/trevc.hpp boost/numeric/bindings/lapack/trexc.hpp boost/numeric/bindings/lapack/workspace.hpp boost/numeric/bindings/traits/algorithm.hpp boost/numeric/bindings/traits/boost_array.hpp boost/numeric/bindings/traits/c_array.hpp boost/numeric/bindings/traits/config.hpp boost/numeric/bindings/traits/detail/array.hpp boost/numeric/bindings/traits/detail/array_impl.hpp boost/numeric/bindings/traits/detail/generate_const.hpp boost/numeric/bindings/traits/detail/symm_herm_traits.hpp boost/numeric/bindings/traits/detail/ublas_ordering.hpp boost/numeric/bindings/traits/detail/ublas_uplo.hpp boost/numeric/bindings/traits/detail/utils.hpp boost/numeric/bindings/traits/fortran.h boost/numeric/bindings/traits/matrix_raw.hpp boost/numeric/bindings/traits/matrix_traits.hpp boost/numeric/bindings/traits/sparse_traits.hpp boost/numeric/bindings/traits/std_valarray.hpp boost/numeric/bindings/traits/std_vector.hpp boost/numeric/bindings/traits/symm_herm_raw.hpp boost/numeric/bindings/traits/tnt.hpp boost/numeric/bindings/traits/traits.hpp boost/numeric/bindings/traits/transpose.hpp boost/numeric/bindings/traits/type.h boost/numeric/bindings/traits/type.hpp boost/numeric/bindings/traits/type_traits.hpp boost/numeric/bindings/traits/ublas_banded.hpp boost/numeric/bindings/traits/ublas_hermitian.hpp boost/numeric/bindings/traits/ublas_matrix.hpp boost/numeric/bindings/traits/ublas_sparse.hpp boost/numeric/bindings/traits/ublas_symmetric.hpp boost/numeric/bindings/traits/ublas_vector.hpp boost/numeric/bindings/traits/ublas_vector2.hpp boost/numeric/bindings/traits/vector_raw.hpp boost/numeric/bindings/traits/vector_traits.hpp
@@ -415,7 +919,7 @@
headers_ALEA = alps/alea.h alps/alea/detailedbinning.h alps/alea/histogram.h alps/alea/nan.h alps/alea/nobinning.h alps/alea/observable.h alps/alea/observableset.h alps/alea/obsvalue.h alps/alea/simplebinning.h alps/alea/simpleobsdata.h alps/alea/simpleobservable.h alps/alea/simpleobseval.h alps/alea/signedobservable.h alps/alea/hdf5.h alps/alea/recordableobservable.h alps/alea/abstractsimpleobservable.h alps/alea/abstractbinning.h alps/alea/output_helper.h alps/alea/histogramdata.h alps/alea/histogrameval.h
headers_FIXEDCAP = alps/fixed_capacity_deque.h alps/fixed_capacity_traits.h alps/fixed_capacity_fwd.h alps/fixed_capacity_vector.h alps/fixed_capacity/checking.h alps/fixed_capacity/deque_detail.h alps/fixed_capacity/uninitialized_array.h
headers_OSIRIS = alps/osiris.h alps/osiris/buffer.h alps/osiris/comm.h alps/osiris/dump.h alps/osiris/mpdump.h alps/osiris/os.h alps/osiris/process.h alps/osiris/xdrdump.h alps/osiris/std/impl.h alps/osiris/std/list.h alps/osiris/std/map.h alps/osiris/std/pair.h alps/osiris/std/set.h alps/osiris/std/string.h alps/osiris/std/valarray.h alps/osiris/std/vector.h
-@@ -376,9 +376,9 @@
+@@ -376,9 +380,9 @@
exit 1;; \
esac; \
done; \
@@ -429,9 +933,99 @@
@case '$?' in \
Index: alps-light1-1.2.2/test/Makefile.in
===================================================================
---- alps-light1-1.2.2.orig/test/Makefile.in 2005-07-01 23:12:40.000000000 +0200
-+++ alps-light1-1.2.2/test/Makefile.in 2005-07-01 23:16:43.000000000 +0200
-@@ -240,9 +240,9 @@
+--- alps-light1-1.2.2.orig/test/Makefile.in 2004-11-10 02:01:30.000000000 +0000
++++ alps-light1-1.2.2/test/Makefile.in 2008-04-06 14:27:39.000000000 +0000
+@@ -34,8 +34,7 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
[EMAIL PROTECTED]@am__append_1 = alea lattice model
[EMAIL PROTECTED]@am__append_2 = $(TESTS_ALEA) $(TESTS_LATTICE) $(TESTS_MODEL)
[EMAIL PROTECTED]@am__append_1 = $(TESTS_ALEA) $(TESTS_LATTICE) $(TESTS_MODEL)
+ subdir = test
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+@@ -64,8 +63,7 @@
+ uninstall-recursive
+ ETAGS = etags
+ CTAGS = ctags
+-DIST_SUBDIRS = fixed_capacity osiris parameter parser alea lattice \
+- model .
++DIST_SUBDIRS = $(SUBDIRS)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALPS_FULL_FALSE = @ALPS_FULL_FALSE@
+@@ -125,6 +123,7 @@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
++GREP = @GREP@
+ HAVE_MPI_FALSE = @HAVE_MPI_FALSE@
+ HAVE_MPI_TRUE = @HAVE_MPI_TRUE@
+ HAVE_PVM_FALSE = @HAVE_PVM_FALSE@
+@@ -176,12 +175,9 @@
+ XML_CPPFLAGS = @XML_CPPFLAGS@
+ XML_LDFLAGS = @XML_LDFLAGS@
+ XML_LIBS = @XML_LIBS@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-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@
+@@ -196,29 +192,38 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SUBDIRS = fixed_capacity osiris parameter parser $(am__append_1) .
++#if ALPS_FULL
++#SUBDIRS += alea lattice model
++#endif
++SUBDIRS = fixed_capacity osiris parameter parser .
+ TESTS_ENVIRONMENT = $(top_srcdir)/config/run-test $(srcdir)
+ TESTS_FC = fixed_capacity/fixed_capacity_deque fixed_capacity/fixed_capacity_traits fixed_capacity/fixed_capacity_vector fixed_capacity/test_deque fixed_capacity/test_vector
+ TESTS_OSIRIS = osiris/sizeof osiris/xdrdump osiris/xdrdump2
+@@ -227,7 +232,7 @@
+ TESTS_ALEA = alea/detailedbinning alea/signed alea/simpleobseval alea/testobservableset
+ TESTS_LATTICE = lattice/example1 lattice/example2 lattice/example3 lattice/example4 lattice/example5 lattice/example6 lattice/parity
+ TESTS_MODEL = model/example1 model/example2 model/example3 model/example4 model/example5 model/example6 model/example7 model/example8 model/example9 model/example10 model/example11 model/example12
+-TESTS = $(TESTS_FC) $(TESTS_OSIRIS) $(TESTS_PARAMETER) $(TESTS_PARSER) $(am__append_2)
++TESTS = $(TESTS_FC) $(TESTS_OSIRIS) $(TESTS_PARAMETER) $(TESTS_PARSER) $(am__append_1)
+ all: all-recursive
+
+ .SUFFIXES:
+@@ -240,9 +245,9 @@
exit 1;; \
esac; \
done; \
@@ -443,11 +1037,72 @@
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
+@@ -491,7 +496,7 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+ || mkdir "$(distdir)/$$subdir" \
Index: alps-light1-1.2.2/test/fixed_capacity/Makefile.in
===================================================================
---- alps-light1-1.2.2.orig/test/fixed_capacity/Makefile.in 2005-07-01 23:12:40.000000000 +0200
-+++ alps-light1-1.2.2/test/fixed_capacity/Makefile.in 2005-07-01 23:16:44.000000000 +0200
-@@ -332,9 +332,9 @@
+--- alps-light1-1.2.2.orig/test/fixed_capacity/Makefile.in 2004-11-10 02:01:31.000000000 +0000
++++ alps-light1-1.2.2/test/fixed_capacity/Makefile.in 2008-04-06 14:27:39.000000000 +0000
+@@ -212,6 +212,7 @@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
++GREP = @GREP@
+ HAVE_MPI_FALSE = @HAVE_MPI_FALSE@
+ HAVE_MPI_TRUE = @HAVE_MPI_TRUE@
+ HAVE_PVM_FALSE = @HAVE_PVM_FALSE@
+@@ -263,12 +264,9 @@
+ XML_CPPFLAGS = @XML_CPPFLAGS@
+ XML_LDFLAGS = @XML_LDFLAGS@
+ XML_LIBS = @XML_LIBS@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-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@
+@@ -283,24 +281,30 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+@@ -332,9 +336,9 @@
exit 1;; \
esac; \
done; \
@@ -461,9 +1116,61 @@
@case '$?' in \
Index: alps-light1-1.2.2/test/osiris/Makefile.in
===================================================================
---- alps-light1-1.2.2.orig/test/osiris/Makefile.in 2005-07-01 23:12:40.000000000 +0200
-+++ alps-light1-1.2.2/test/osiris/Makefile.in 2005-07-01 23:16:44.000000000 +0200
-@@ -270,9 +270,9 @@
+--- alps-light1-1.2.2.orig/test/osiris/Makefile.in 2004-11-10 02:01:33.000000000 +0000
++++ alps-light1-1.2.2/test/osiris/Makefile.in 2008-04-06 14:27:39.000000000 +0000
+@@ -156,6 +156,7 @@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
++GREP = @GREP@
+ HAVE_MPI_FALSE = @HAVE_MPI_FALSE@
+ HAVE_MPI_TRUE = @HAVE_MPI_TRUE@
+ HAVE_PVM_FALSE = @HAVE_PVM_FALSE@
+@@ -207,12 +208,9 @@
+ XML_CPPFLAGS = @XML_CPPFLAGS@
+ XML_LDFLAGS = @XML_LDFLAGS@
+ XML_LIBS = @XML_LIBS@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-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@
+@@ -227,24 +225,30 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+@@ -270,9 +274,9 @@
exit 1;; \
esac; \
done; \
@@ -477,9 +1184,61 @@
@case '$?' in \
Index: alps-light1-1.2.2/test/parameter/Makefile.in
===================================================================
---- alps-light1-1.2.2.orig/test/parameter/Makefile.in 2005-07-01 23:12:40.000000000 +0200
-+++ alps-light1-1.2.2/test/parameter/Makefile.in 2005-07-01 23:16:45.000000000 +0200
-@@ -302,9 +302,9 @@
+--- alps-light1-1.2.2.orig/test/parameter/Makefile.in 2004-11-10 02:01:33.000000000 +0000
++++ alps-light1-1.2.2/test/parameter/Makefile.in 2008-04-06 14:27:39.000000000 +0000
+@@ -185,6 +185,7 @@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
++GREP = @GREP@
+ HAVE_MPI_FALSE = @HAVE_MPI_FALSE@
+ HAVE_MPI_TRUE = @HAVE_MPI_TRUE@
+ HAVE_PVM_FALSE = @HAVE_PVM_FALSE@
+@@ -236,12 +237,9 @@
+ XML_CPPFLAGS = @XML_CPPFLAGS@
+ XML_LDFLAGS = @XML_LDFLAGS@
+ XML_LIBS = @XML_LIBS@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-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@
+@@ -256,24 +254,30 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+@@ -302,9 +306,9 @@
exit 1;; \
esac; \
done; \
@@ -493,9 +1252,61 @@
@case '$?' in \
Index: alps-light1-1.2.2/test/parser/Makefile.in
===================================================================
---- alps-light1-1.2.2.orig/test/parser/Makefile.in 2005-07-01 23:12:40.000000000 +0200
-+++ alps-light1-1.2.2/test/parser/Makefile.in 2005-07-01 23:16:45.000000000 +0200
-@@ -272,9 +272,9 @@
+--- alps-light1-1.2.2.orig/test/parser/Makefile.in 2004-11-10 02:01:34.000000000 +0000
++++ alps-light1-1.2.2/test/parser/Makefile.in 2008-04-06 14:27:40.000000000 +0000
+@@ -158,6 +158,7 @@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
++GREP = @GREP@
+ HAVE_MPI_FALSE = @HAVE_MPI_FALSE@
+ HAVE_MPI_TRUE = @HAVE_MPI_TRUE@
+ HAVE_PVM_FALSE = @HAVE_PVM_FALSE@
+@@ -209,12 +210,9 @@
+ XML_CPPFLAGS = @XML_CPPFLAGS@
+ XML_LDFLAGS = @XML_LDFLAGS@
+ XML_LIBS = @XML_LIBS@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-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@
+@@ -229,24 +227,30 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+@@ -272,9 +276,9 @@
exit 1;; \
esac; \
done; \
only in patch2:
unchanged:
--- alps-light1-1.2.2.orig/debian/patches/fix-distclean.patch
+++ alps-light1-1.2.2/debian/patches/fix-distclean.patch
@@ -0,0 +1,30 @@
+Index: alps-light1-1.2.2/Makefile.am
+===================================================================
+--- alps-light1-1.2.2.orig/Makefile.am 2008-04-06 14:26:22.000000000 +0000
++++ alps-light1-1.2.2/Makefile.am 2008-04-06 14:26:29.000000000 +0000
+@@ -1,7 +1,7 @@
+ SUBDIRS = lib
+-if ALPS_FULL
+-SUBDIRS += tool example
+-endif
++#if ALPS_FULL
++#SUBDIRS += tool example
++#endif
+ SUBDIRS += test src doc .
+
+ distdir = alps-$(VERSION)
+Index: alps-light1-1.2.2/test/Makefile.am
+===================================================================
+--- alps-light1-1.2.2.orig/test/Makefile.am 2008-04-06 14:26:33.000000000 +0000
++++ alps-light1-1.2.2/test/Makefile.am 2008-04-06 14:26:37.000000000 +0000
+@@ -1,7 +1,7 @@
+ SUBDIRS = fixed_capacity osiris parameter parser
+-if ALPS_FULL
+-SUBDIRS += alea lattice model
+-endif
++#if ALPS_FULL
++#SUBDIRS += alea lattice model
++#endif
+ SUBDIRS += .
+
+ TESTS_ENVIRONMENT = $(top_srcdir)/config/run-test $(srcdir)
only in patch2:
unchanged:
--- alps-light1-1.2.2.orig/debian/patches/cstring.patch
+++ alps-light1-1.2.2/debian/patches/cstring.patch
@@ -0,0 +1,12 @@
+Index: alps-light1-1.2.2/src/alps/osiris/buffer.C
+===================================================================
+--- alps-light1-1.2.2.orig/src/alps/osiris/buffer.C 2008-04-06 14:25:44.000000000 +0000
++++ alps-light1-1.2.2/src/alps/osiris/buffer.C 2008-04-06 14:25:51.000000000 +0000
+@@ -44,6 +44,7 @@
+ #include <alps/osiris/std/vector.h>
+
+ #include <boost/throw_exception.hpp>
++#include <cstring>
+ #include <stdexcept>
+
+ namespace alps {
signature.asc
Description: Digital signature
