[SCM] an open source computer algebra system branch, master, updated. upstream/3-1-3-1-3664-g4d18530
Felix Salfelder
felix at salfelder.org
Wed Feb 8 20:32:24 UTC 2012
The following commit has been merged in the master branch:
commit 4d185307ca151347a5a083b63f82ef4eab2ea8de
Author: Felix Salfelder <felix at salfelder.org>
Date: Wed Feb 8 21:29:11 2012 +0100
3-1-4 release (preview)
diff --git a/debian/changelog b/debian/changelog
index 798a1bb..30d7fca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,16 @@
-singular (3.1.3-3) UNRELEASED; urgency=low
+singular (3-1-4) UNRELEASED; urgency=low
- * new upstream version (preview)
+ * new upstream release (take a bite!)
* removed cdbs, use plain debhelper
* install to $(DESTDIR)
- * sane, uscan friendly, version number pattern
+ * minus-friendly debian/watch (thanks, Bernhard)
* library package name: libsingular0
* FIXME:
- - file name for libsingular*.so
+ - soname and library package name
- is debian/copyright complete?
+ - clean target repair
- -- Felix Salfelder <felix at salfelder.org> Sat, 21 Jan 2012 19:05:47 +0100
+ -- Felix Salfelder <felix at salfelder.org> Wed, 08 Feb 2012 14:37:31 +0100
singular (3-0-4-3.dfsg-3.1) unstable; urgency=low
diff --git a/debian/libsingular-dev.install b/debian/libsingular-dev.install
index 92f1417..6968098 100644
--- a/debian/libsingular-dev.install
+++ b/debian/libsingular-dev.install
@@ -1,3 +1,3 @@
usr/include/ usr/
-usr/lib/singular/*.*a usr/lib/
-usr/lib/singular/libsingular.so usr/lib/
+
+#usr/lib/singular*.a usr/lib/
diff --git a/debian/libsingular0.install b/debian/libsingular0.install
index 76bf0bc..74b26ac 100644
--- a/debian/libsingular0.install
+++ b/debian/libsingular0.install
@@ -1,6 +1,6 @@
#usr/bin/*.so usr/lib/singular/
#usr/lib/*.lib usr/lib/singular/
-usr/lib/singular/libsingular-*.so usr/lib/
+usr/lib/libsingular*.so usr/lib/
#seems too specific to put in share
usr/share/singular/* usr/lib/singular/
diff --git a/debian/patches/IntegerProgramming_make.patch b/debian/patches/IntegerProgramming_make.patch
index 56dd1a3..8be33f4 100644
--- a/debian/patches/IntegerProgramming_make.patch
+++ b/debian/patches/IntegerProgramming_make.patch
@@ -1,32 +1,3 @@
---- a/IntegerProgramming/Makefile.in
-+++ b/IntegerProgramming/Makefile.in
-@@ -57,12 +57,12 @@
- install_all: install
-
- install install-libsingular: $(MAIN1) $(MAIN2) $(MAIN3) $(MAIN4) $(LLL)
-- ${MKINSTALLDIRS} ${bindir}
-- ${INSTALL_PROGRAM} $(MAIN1) ${bindir}
-- ${INSTALL_PROGRAM} $(MAIN2) ${bindir}
-- ${INSTALL_PROGRAM} $(MAIN3) ${bindir}
-- ${INSTALL_PROGRAM} $(MAIN4) ${bindir}
-- ${INSTALL_PROGRAM} $(LLL) ${bindir}
-+ ${MKINSTALLDIRS} $(DESTDIR)${bindir}
-+ ${INSTALL_PROGRAM} $(MAIN1) $(DESTDIR)${bindir}
-+ ${INSTALL_PROGRAM} $(MAIN2) $(DESTDIR)${bindir}
-+ ${INSTALL_PROGRAM} $(MAIN3) $(DESTDIR)${bindir}
-+ ${INSTALL_PROGRAM} $(MAIN4) $(DESTDIR)${bindir}
-+ ${INSTALL_PROGRAM} $(LLL) $(DESTDIR)${bindir}
-
- install-bindist: $(MAIN1) $(MAIN2) $(MAIN3) $(MAIN4)
- ${MKINSTALLDIRS} ${install_bindir}
-@@ -84,6 +84,7 @@
- -rm -f ${bindir}/$(MAIN3)
- -rm -f ${bindir}/$(MAIN4)
- -rm -f ${bindir}/$(LLL)
-+ -rm -f Makefile
-
- si_gcc_v.h:
- ./gccversion.sh
--- a/emacs/Makefile.in
+++ b/emacs/Makefile.in
@@ -42,9 +42,12 @@
diff --git a/debian/patches/Singular_make.patch b/debian/patches/Singular_make.patch
index dde3da8..4b6aa53 100644
--- a/debian/patches/Singular_make.patch
+++ b/debian/patches/Singular_make.patch
@@ -1,27 +1,23 @@
--- a/Singular/Makefile.in
+++ b/Singular/Makefile.in
-@@ -132,16 +132,19 @@
- #
- # Handle libSINGULAR stuff
- #
--LIBSINGULAR_LIBS =-lsingfac -lsingcf -lntl -lreadline -lgmp -lomalloc
-+LIBSINGULAR_LIBS =-lsingfac -lsingcf -lntl -lreadline -lgmp -lomalloc $(LDFLAGS)
-
+@@ -85,7 +85,7 @@
+ DEFS = -DNDEBUG -DOM_NDEBUG -D at SING_UNAME@ @DEFS@
+ LDFLAGS2 = @LDFLAGS@
+ ifneq ($(SINGUNAME),ix86-Win)
+-LDFLAGS = -L at prefix@/kernel -L../kernel -lkernel @LDFLAGS@
++LDFLAGS = -L at prefix@/kernel -L../kernel -L../omalloc -L../libfac -L../factory -lkernel @LDFLAGS@
+ LDFLAGSG = -L at prefix@/kernel -L../kernel -lkernel_g @LD_DYN_FLAGS1@ @LDFLAGS@
+ LDFLAGSP = -L at prefix@/kernel -L../kernel -lkernel_p @LD_DYN_FLAGS1@ @LDFLAGS@
+ else
+@@ -137,6 +137,7 @@
SO_SUFFIX = so
- #LIBSINGULAR_FLAGS = -export-dynamic
-+LIBSINGULAR_NAME = libsingular-`cat ../VERSION`.so
-+LIBSINGULAR_FLAGS = -shared -Wl,-soname,$(LIBSINGULAR_NAME) -fPIC
+ LIBSINGULAR_FLAGS = -shared
++LIBSINGULAR_NAME = libsingular.so
LIBSINGULAR_LD = $(CXX)
# correct suffix for dynamic linking
- ifeq ($(SINGUNAME),ix86Mac-darwin)
- SO_SUFFIX = dylib
-+LIBSINGULAR_NAME = libsingular.dylib
- MODULE_SUFFIX = bundle
- LIBSINGULAR_FLAGS = -single_module
- LIBSINGULAR_LD = $(LD)
-@@ -149,6 +152,7 @@
+@@ -149,6 +150,7 @@
ifeq ($(SINGUNAME),x86_64Mac-darwin)
SO_SUFFIX = dylib
@@ -29,7 +25,7 @@
MODULE_SUFFIX = bundle
LIBSINGULAR_FLAGS = -single_module
LIBSINGULAR_LD = $(LD)
-@@ -157,6 +161,7 @@
+@@ -157,6 +159,7 @@
ifeq ($(SINGUNAME),ppcMac-darwin)
MACOSX_DEPLOYMENT_TARGET=10.4
SO_SUFFIX = dylib
@@ -37,7 +33,7 @@
MODULE_SUFFIX = bundle
LIBSINGULAR_FLAGS = -single_module
LIBSINGULAR_LD = $(LD)
-@@ -165,6 +170,7 @@
+@@ -165,6 +168,7 @@
ifeq ($(SINGUNAME),ix86-Win)
SO_SUFFIX = dll
MODULE_SUFFIX = dll
@@ -45,7 +41,7 @@
LIBSINGULAR_FLAGS = -shared
LIBSINGULAR_LIBS = -lsingfac -lsingcf -lntl -lreadline -lgmp -lomalloc -lhtmlhelp
endif
-@@ -358,14 +364,14 @@
+@@ -358,14 +362,14 @@
fi
.cc.o:
@@ -63,7 +59,7 @@
Singular-static: version.h
sleep 1
-@@ -382,13 +388,16 @@
+@@ -382,13 +386,16 @@
tesths.cc iparith.o mpsr_Tok.o claptmpl.o\
${OBJS} ${LDFLAGS} ${LIBS} ../kernel/mmalloc.o
@@ -86,7 +82,7 @@
iparith.o libparse.cc claptmpl.o mpsr_Tok.o
mkdir libsingular.tmp
(cd libsingular.tmp; \
-@@ -418,18 +427,18 @@
+@@ -418,18 +425,18 @@
claptmpl.o: claptmpl.cc mod2.h
${CXX} ${CXXFLAGS} ${CPPFLAGS} ${DEFS} -c $<
@@ -108,7 +104,7 @@
svnver:
svnversion >svnver
-@@ -472,17 +481,17 @@
+@@ -472,17 +479,17 @@
feOpt.o: feOpt.inc feOptES.inc feOptTS.inc
extra.o: feOpt.inc
@@ -129,86 +125,36 @@
$(CXX) $(CXXFLAGS) -DGENERATE_OPTION_INDEX -DTSINGULAR -I../kernel feOpt.cc -o feOptTS
./feOptTS
rm -f feOptTS feOptTS.exe
-@@ -557,54 +566,46 @@
-
- install_all: install
-
--install-nolns: all installbin-nolns installslib-nolns
-+install-nolns: all installbin-nolns installslib-nolns install-libsingular
-
- installbin: ${SING_EXEC} libparse ESingular TSingular ${RUN_SINGULARS}
-- ${MKINSTALLDIRS} ${bindir}
-- ${INSTALL_PROGRAM} ${SING_EXEC} ${SINGULAR}
-- -for file in *.so; do \
-- ${INSTALL_PROGRAM} $$file ${bindir}; \
-+ ${MKINSTALLDIRS} $(DESTDIR)${bindir}
-+ ${MKINSTALLDIRS} $(DESTDIR)${libdir}
-+ ${INSTALL_PROGRAM} ${SING_EXEC} $(DESTDIR)${SINGULAR}
-+ for file in *.so; do \
-+ ${INSTALL_PROGRAM} $$file $(DESTDIR)${libdir}; \
- done
-- ${INSTALL_PROGRAM} libparse ${RUN_SINGULARS} ${bindir}
-- ${INSTALL_PROGRAM} ESingular TSingular ${bindir}
-- ${INSTALL_PROGRAM} surfex ${bindir}
-- chmod a+x ${SINGULAR}
-- rm -f ${bindir}/${SING_EXEC}${EXEC_EXT}
-- cd ${bindir}; ${LN_S} ${SINGULAR} Singular${EXEC_EXT};
--
--installbin-nolns: ${SING_EXEC} libparse ESingular TSingular ${RUN_SINGULARS}
-- ${MKINSTALLDIRS} ${bindir}
-- ${INSTALL_PROGRAM} ${SING_EXEC} ${SINGULAR}
-- -for file in *.so; do \
-- ${INSTALL_PROGRAM} $$file ${bindir}; \
-- done
-- ${INSTALL_PROGRAM} libparse ${RUN_SINGULARS} ${bindir}
-- ${INSTALL_PROGRAM} ESingular TSingular ${DL_LIBS} ${bindir}
-- chmod a+x ${SINGULAR}
-- rm -f ${bindir}/${SING_EXEC}${EXEC_EXT}
-- ${INSTALL_PROGRAM} ${SINGULAR} ${bindir}/Singular${EXEC_EXT};
-+ ${INSTALL_PROGRAM} libparse ${RUN_SINGULARS} $(DESTDIR)${bindir}
-+ ${INSTALL_PROGRAM} ESingular TSingular $(DESTDIR)${bindir}
-+ ${INSTALL_PROGRAM} surfex $(DESTDIR)${bindir}
-+ chmod a+x $(DESTDIR)${SINGULAR}
-+ rm -f $(DESTDIR)${bindir}/${SING_EXEC}${EXEC_EXT}
-+ cd $(DESTDIR)${bindir}; ${LN_S} ${SINGULAR} Singular${EXEC_EXT};
-+
-+installbin-nolns: installbin
-+ ${INSTALL_PROGRAM} ${SING_EXEC} $(DESTDIR)${bindir}/Singular${EXEC_EXT};
-
- installslib: LIB
- test -r ${slibdir} || ${LN_S} `pwd`/LIB ${slibdir}
-
- installslib-nolns: LIB
-- ${MKINSTALLDIRS} ${slibdir}
-+ ${MKINSTALLDIRS} $(DESTDIR)${slibdir}
- for file in `pwd`/LIB/*.lib; do \
-- ${INSTALL_DATA} $$file ${slibdir}; \
-+ ${INSTALL_DATA} $$file $(DESTDIR)${slibdir}; \
- done
-- ${MKINSTALLDIRS} ${slibdir}/gftables
-+ ${MKINSTALLDIRS} $(DESTDIR)${slibdir}/gftables
- for file in `pwd`/LIB/gftables/*; do \
-- ${INSTALL_DATA} $$file ${slibdir}/gftables/; \
-+ ${INSTALL_DATA} $$file $(DESTDIR)${slibdir}/gftables/; \
+@@ -553,9 +560,9 @@
+ ##
+ ## install targets
+ ##
+-install: all installbin installslib
++install: all installbin installslib install-libsingular
+
+-install_all: install
++install_all: install
+
+ install-nolns: all installbin-nolns installslib-nolns
+
+@@ -570,6 +577,7 @@
+ ${INSTALL_PROGRAM} ${SING_EXEC} $(DESTDIR)${SINGULAR}
+ for file in *.so; do \
+ ${INSTALL_PROGRAM} $$file $(DESTDIR)${libdir}; \
++ done
+ ${INSTALL_PROGRAM} libparse ${RUN_SINGULARS} $(DESTDIR)${bindir}
+ ${INSTALL_PROGRAM} ESingular TSingular $(DESTDIR)${bindir}
+ ${INSTALL_PROGRAM} surfex $(DESTDIR)${bindir}
+@@ -593,7 +601,7 @@
+ ${INSTALL_DATA} $$file $(DESTDIR)${slibdir}; \
done
-install-libsingular: libsingular
-- ${MKINSTALLDIRS} ${includedir}/singular
-+install-libsingular: $(LIBSINGULAR_NAME)
-+ ${MKINSTALLDIRS} $(DESTDIR)${includedir}/singular
++install-libsingular: ${LIBSINGULAR_NAME}
+ ${MKINSTALLDIRS} $(DESTDIR)${includedir}/singular
for file in *.$(SO_SUFFIX); do \
-- ${INSTALL_PROGRAM} $$file ${libdir}; \
-+ cp -a $$file $(DESTDIR)${libdir}; \
- done
-- ${INSTALL_PROGRAM} libsingular.h ${includedir}
-+ ${INSTALL_PROGRAM} libsingular.h $(DESTDIR)${includedir}
- for file in subexpr.h tok.h grammar.h ipid.h lists.h ipshell.h attrib.h; do \
-- sed -e "s:<kernel/:<singular/:" < $$file |sed -e "s:<Singular/:<singular/:"|sed -e "s:<omalloc/:<:"|sed -e "s:<factory/:<:" >${includedir}/singular/$$file ;\
-+ sed -e "s:<kernel/:<singular/:" < $$file |sed -e "s:<Singular/:<singular/:"|sed -e "s:<omalloc/:<:"|sed -e "s:<factory/:<:" > $(DESTDIR)${includedir}/singular/$$file ;\
- done
-
- uninstall: uninstallbin
-@@ -620,7 +621,7 @@
+ ${INSTALL_PROGRAM} $$file $(DESTDIR)${libdir}; \
+@@ -616,7 +624,7 @@
mostlyclean:
-rm -f Singular Singular-static Singularg Singularp libparse feOpt*.inc
-rm -f *.o *.og core *.op *.so* *.dl_o*
@@ -217,63 +163,3 @@
clean: mostlyclean
-rm -f *.bak *.d *.dd depend
-@@ -654,23 +655,23 @@
-
- install-bindist: $(HEADERS) $(SOURCES) Makefile depend
- echo "#define MAKE_DISTRIBUTION " > distrib.h
-- sleep 1
-- ${MAKE} ${SING_EXEC} ESingular TSingular libparse ${RUN_SINGULARS}
-- ${MKINSTALLDIRS} ${install_bindir}
-- ${INSTALL_PROGRAM} ${SING_EXEC} ${install_bindir}/Singular
-- -${INSTALL_PROGRAM} *.so ${install_bindir}
-- ${INSTALL_PROGRAM} -s libparse ${RUN_SINGULARS} ESingular TSingular ${install_bindir}
-- ${INSTALL_PROGRAM} surfex ${install_bindir}
-+ # sleep 1
-+ ${MAKE} ${SING_EXEC} ESingular TSingular libparse $(DESTDIR)${RUN_SINGULARS}
-+ ${MKINSTALLDIRS} $(DESTDIR)${install_bindir}
-+ ${INSTALL_PROGRAM} ${SING_EXEC} $(DESTDIR)${install_bindir}/Singular
-+ -${INSTALL_PROGRAM} *.so $(DESTDIR)${install_bindir}
-+ ${INSTALL_PROGRAM} -s libparse ${RUN_SINGULARS} ESingular TSingular $(DESTDIR)${install_bindir}
-+ ${INSTALL_PROGRAM} surfex $(DESTDIR)${install_bindir}
- echo "#undef MAKE_DISTRIBUTION " > distrib.h
-
- install-sharedist: ${SLIBS_FILES} LIB/gftables
-- ${MKINSTALLDIRS} ${install_slibdir}
-- cp ${SLIBS_FILES} ${install_slibdir}
-- ${MKINSTALLDIRS} ${install_slibdir}/gftables
-- cp ${GFTABLES} ${install_slibdir}/gftables
-- ${MKINSTALLDIRS} ${install_slibdir}/surfex
-- cp LIB/surfex/surfex.jar ${install_slibdir}/surfex
-- chmod -R +rX ${install_slibdir}/*
-+ ${MKINSTALLDIRS} $(DESTDIR)${install_slibdir}
-+ cp ${SLIBS_FILES} $(DESTDIR)${install_slibdir}
-+ ${MKINSTALLDIRS} $(DESTDIR)${install_slibdir}/gftables
-+ cp ${GFTABLES} $(DESTDIR)${install_slibdir}/gftables
-+ ${MKINSTALLDIRS} $(DESTDIR)${install_slibdir}/surfex
-+ cp LIB/surfex/surfex.jar $(DESTDIR)${install_slibdir}/surfex
-+ chmod -R +rX $(DESTDIR)${install_slibdir}/*
-
- tar:
- tar cf Singular-${SINGULAR_VERSION}-src.tar ${DISTFILES}
-@@ -768,8 +769,8 @@
- $(CXXG) ${CXXFLAGSG} ${CPPFLAGS} ${CXXTEMPLFLAGSG} ${DEFSG} -c mpsr_Tok.cc -o mpsr_Tok.og
-
- installg: Singularg
-- ${MKINSTALLDIRS} ${bindir}
-- ${INSTALL_PROGRAM} Singularg ${bindir}
-+ ${MKINSTALLDIRS} $(DESTDIR)${bindir}
-+ ${INSTALL_PROGRAM} Singularg $(DESTDIR)${bindir}
-
- ESingularg: mod2.h feOpt.cc version.h emacs.cc \
- feOptES.inc
-@@ -848,8 +849,8 @@
- $(CXXP) ${CXXFLAGSP} ${CPPFLAGS} ${CXXTEMPLFLAGSP} ${DEFSP} -c mpsr_Tok.cc -o mpsr_Tok.op
-
- installp: Singularp
-- ${MKINSTALLDIRS} ${bindir}
-- ${INSTALL_PROGRAM} Singularp ${bindir}
-+ ${MKINSTALLDIRS} $(DESTDIR)${bindir}
-+ ${INSTALL_PROGRAM} Singularp $(DESTDIR)${bindir}
-
- ##
- ## dependencies
diff --git a/debian/patches/factory_make.patch b/debian/patches/factory_make.patch
index 800d08a..ca7d045 100644
--- a/debian/patches/factory_make.patch
+++ b/debian/patches/factory_make.patch
@@ -2,7 +2,7 @@ lots of unclear dependencies removed.
e.g. factoryconf.h, config.h is generated during configure
--- a/factory/GNUmakefile.in
+++ b/factory/GNUmakefile.in
-@@ -453,24 +453,24 @@
+@@ -455,24 +455,24 @@
#
# how to create library objets
@@ -32,42 +32,7 @@ e.g. factoryconf.h, config.h is generated during configure
echo $*.d "\\" > $@
$(CXX) -MM $< $(DEPCXXFLAGS) >> $@
%.dtmp: %.template
-@@ -640,21 +640,22 @@
- install-nolns: install
-
- installcf: cf
-- $(MKINSTALLDIRS) $(libdir)
-- $(MKINSTALLDIRS) $(includedir)
-- $(MKINSTALLDIRS) $(templatedir)
-- $(INSTALL_DATA) $(libfactory) $(libdir)/$(libfactory)
-- -$(INSTALL_DATA) libsingcf_g.a $(libdir)/libsingcf_g.a
-- -$(INSTALL_DATA) libsingcf_p.a $(libdir)/libsingcf_p.a
-- $(INSTALL_DATA) factory.h $(includedir)/factory.h
-- $(INSTALL_DATA) cf_gmp.h $(includedir)/cf_gmp.h
-- $(INSTALL_DATA) factoryconf.h $(includedir)/factoryconf.h
-- $(INSTALL_DATA) $(srcdir)/ftmpl_inst.cc $(templatedir)/ftmpl_inst.cc
-+ $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
-+ $(MKINSTALLDIRS) $(DESTDIR)$(includedir)
-+ $(MKINSTALLDIRS) $(DESTDIR)$(templatedir)
-+ $(INSTALL_DATA) $(libfactory) $(DESTDIR)$(libdir)/$(libfactory)
-+ -$(INSTALL_DATA) libsingcf_g.a $(DESTDIR)$(libdir)/libsingcf_g.a
-+ -$(INSTALL_DATA) libsingcf_p.a $(DESTDIR)$(libdir)/libsingcf_p.a
-+ $(INSTALL_DATA) factory.h $(DESTDIR)$(includedir)/factory.h
-+ $(INSTALL_DATA) cf_gmp.h $(DESTDIR)$(includedir)/factory/cf_gmp.h
-+ $(INSTALL_DATA) factoryconf.h $(DESTDIR)$(includedir)/factory/factoryconf.h
-+ # FIXME: what is templatedir?
-+ $(INSTALL_DATA) $(srcdir)/ftmpl_inst.cc $(DESTDIR)$(templatedir)/ftmpl_inst.cc
- for file in $(templatesrc) $(templateincl); do \
-- $(INSTALL_DATA) $(srcdir)/templates/$$file $(templatedir)/$$file; \
-+ $(INSTALL_DATA) $(srcdir)/templates/$$file $(DESTDIR)$(templatedir)/$$file; \
- done
- # we run `ranlib' another time for SUN machines
-- $(RANLIB) $(libdir)/$(libfactory)
-+ $(RANLIB) $(DESTDIR)$(libdir)/$(libfactory)
-
- installmem: mem
- $(MKINSTALLDIRS) $(libdir)
-@@ -780,8 +781,10 @@
+@@ -783,8 +783,10 @@
# seems gmake needs at least a trivial command. otherwise all
# files which depend on config.h will be remade even if congig.h
# did not change.
@@ -80,7 +45,7 @@ e.g. factoryconf.h, config.h is generated during configure
stamp-h: config.h.in config.status
CONFIG_FILES= CONFIG_HEADERS=config.h ./config.status
-@@ -797,7 +800,7 @@
+@@ -800,7 +802,7 @@
./config.status --recheck
# create cf_gmp.h
diff --git a/debian/patches/kernel_make.patch b/debian/patches/kernel_make.patch
index 42a485b..033f291 100644
--- a/debian/patches/kernel_make.patch
+++ b/debian/patches/kernel_make.patch
@@ -1,77 +1,6 @@
--- a/kernel/Makefile.in
+++ b/kernel/Makefile.in
-@@ -48,7 +48,8 @@
- CFLAGS = @CFLAGS@ ${PIPE}
- CXXFLAGS = @CXXFLAGS@ ${PIPE}
- CXXTEMPLFLAGS = @CXXTEMPLFLAGS@
--CPPFLAGS = -I${srcdir} -I.. -I at prefix@ @CPPFLAGS@
-+# FIXME: inject extra -I via ./configure somehow
-+CPPFLAGS = -I${srcdir} -I.. -I at prefix@ @CPPFLAGS@
- DEFS = -DNDEBUG -DOM_NDEBUG -D at SING_UNAME@ @DEFS@
- LDFLAGS = @LDFLAGS@
- LD_DYN_FLAGS = @LD_DYN_FLAGS@
-@@ -239,7 +240,7 @@
- -rm -f libkernel.a
- ar cr $@ $^
-
--p_Procs_Lib.o: p_Procs_Lib.inc
-+p_Procs_Lib.o: p_Procs_Dynamic.inc
-
- # Hmm compiling with -fomit-frame-pointer resulted in access violation
- # under cygwin
-@@ -256,12 +257,12 @@
- p_Procs_Dynamic.inc p_Procs_Lib.inc: p_Procs_Dynamic.h
-
- # here is how p_Procs_[Static|Dynamic].inc is generated
--p_Procs_Static.inc: p_Procs_Generate.cc p_Procs_Impl.h mod2.h
-+p_Procs_Static.inc: p_Procs_Generate.cc p_Procs_Impl.h |mod2.h
- $(CXX) $(CPPFLAGS) -g -Dp_Procs_Static p_Procs_Generate.cc -o p_Procs_Static
- ./p_Procs_Static > p_Procs_Static.xx && mv p_Procs_Static.xx p_Procs_Static.inc
- -rm -f p_Procs_Static p_Procs_Static.exe
-
--p_Procs_Dynamic.inc: p_Procs_Generate.cc p_Procs_Impl.h mod2.h
-+p_Procs_Dynamic.inc: p_Procs_Generate.cc p_Procs_Impl.h |mod2.h
- $(CXX) $(CPPFLAGS) -g -Dp_Procs_Dynamic p_Procs_Generate.cc -o p_Procs_Dynamic
- ./p_Procs_Dynamic > p_Procs_Dynamic.xx && mv p_Procs_Dynamic.xx p_Procs_Dynamic.inc
- -rm -f p_Procs_Dynamic p_Procs_Dynamic.exe
-@@ -275,9 +276,9 @@
- install-nolns: install
-
- install-libsingular: install
-- -${MKINSTALLDIRS} ${includedir}
-- -${MKINSTALLDIRS} ${includedir}/singular
-- -for file in *.h kInline.cc; do sed -e "s:<kernel/:<singular/:"< $$file | sed -e "s:<Singular/:<singular/:"|sed -e "s:<omalloc/:<:"|sed -e "s:<factory/:<:" > ${includedir}/singular/$$file; done
-+ ${MKINSTALLDIRS} $(DESTDIR)${includedir}
-+ ${MKINSTALLDIRS} $(DESTDIR)${includedir}/singular
-+ for file in *.h kInline.cc; do sed -e "s:<kernel/:<singular/:"< $$file | sed -e "s:<Singular/:<singular/:"|sed -e "s:<omalloc/:<:"|sed -e "s:<factory/:<:" > $(DESTDIR)${includedir}/singular/$$file; done
-
- install: all installbin
-
-@@ -293,12 +294,12 @@
-
-
- installbin: ${DL_LIBS} ${DL_LIBSG} libkernel.a libkernel_g.a
-- ${MKINSTALLDIRS} ${bindir}
-+ ${MKINSTALLDIRS} $(DESTDIR)${bindir}
- - ranlib libkernel.a
- - ranlib libkernel_g.a
- ifeq (,${DL_LIBS})
- else
-- -${INSTALL_PROGRAM} ${DL_LIBS} ${bindir}
-+ ${INSTALL_PROGRAM} ${DL_LIBS} $(DESTDIR)${bindir}
- ifeq (,${DL_LIBSG})
- else
- -for file in ${DL_LIBS} ${DL_LIBSG}; do ${INSTALL_PROGRAM} $$file ../Singular; done
-@@ -310,7 +311,7 @@
- ${MKINSTALLDIRS} ${bindir}
- ifeq (,${DL_LIBS})
- else
-- -${INSTALL_PROGRAM} ${DL_LIBS} ${bindir}
-+ ${INSTALL_PROGRAM} ${DL_LIBS} $(DESTDIR)${bindir}
- endif
-
- ##
-@@ -448,15 +449,15 @@
+@@ -439,15 +439,15 @@
## dependencies
##
diff --git a/debian/patches/libfac_make.patch b/debian/patches/libfac_make.patch
index 7c4b6b3..9dfd944 100644
--- a/debian/patches/libfac_make.patch
+++ b/debian/patches/libfac_make.patch
@@ -53,24 +53,3 @@
$(CXX) -g $(CPPFLAGS) $(DEFS) -c $< -o $@
libfac: OPTOBJ libfac.a
-@@ -147,13 +147,13 @@
- install-nolns: install
-
- install install-libsingular: all
-- ${MKINSTALLDIRS} ${includedir}
-- ${MKINSTALLDIRS} ${libdir}
-- ${INSTALL_DATA} ${LIBFACINCLUDE} ${includedir}
-- ${INSTALL_DATA} ${TARGETNAME}.a ${libdir}
-- -${INSTALL_DATA} libsingfac_g.a ${libdir}
-- $(RANLIB) ${libdir}/${TARGETNAME}.a
-- -$(RANLIB) ${libdir}/libsingfac_g.a
-+ ${MKINSTALLDIRS} $(DESTDIR)${includedir}
-+ ${MKINSTALLDIRS} $(DESTDIR)${libdir}
-+ ${INSTALL_DATA} ${LIBFACINCLUDE} $(DESTDIR)${includedir}
-+ ${INSTALL_DATA} ${TARGETNAME}.a $(DESTDIR)${libdir}
-+ -${INSTALL_DATA} libsingfac_g.a $(DESTDIR)${libdir}
-+ $(RANLIB) $(DESTDIR)${libdir}/${TARGETNAME}.a
-+ -$(RANLIB) $(DESTDIR)${libdir}/libsingfac_g.a
-
- install_all: install libsingfac_p.a
- -${INSTALL_DATA} libsingfac_p.a ${libdir}
diff --git a/debian/patches/omalloc_make.patch b/debian/patches/omalloc_make.patch
index 4525ddd..c22a7d9 100644
--- a/debian/patches/omalloc_make.patch
+++ b/debian/patches/omalloc_make.patch
@@ -1,7 +1,7 @@
the target 'install-libsingular' is defined twice. this is a bug.
--- a/omalloc/Makefile.in
+++ b/omalloc/Makefile.in
-@@ -180,22 +180,22 @@
+@@ -180,9 +180,9 @@
##
install-nolns: install
@@ -13,28 +13,4 @@ the target 'install-libsingular' is defined twice. this is a bug.
+# $(INSTALL) omalloc.h $(includedir)/singular
install install-libsingular: all
-- $(MKINSTALLDIRS) $(libdir)
-- $(MKINSTALLDIRS) $(includedir)
-- $(INSTALL_DATA) libomalloc.a $(libdir)
-- $(RANLIB) $(libdir)/libomalloc.a
-- $(INSTALL_DATA) libomalloc_ndebug.a $(libdir)
-- $(RANLIB) $(libdir)/libomalloc_ndebug.a
-- $(INSTALL_DATA) omalloc.o $(libdir)
-- $(INSTALL_DATA) omalloc_debug.o $(libdir)
-- $(INSTALL_DATA) omalloc.h $(includedir)
-- $(INSTALL_DATA) omlimits.h $(includedir)
-- $(INSTALL_DATA) mylimits.h $(includedir)
-+ $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
-+ $(MKINSTALLDIRS) $(DESTDIR)$(includedir)
-+ $(INSTALL_DATA) libomalloc.a $(DESTDIR)$(libdir)
-+ $(RANLIB) $(DESTDIR)$(libdir)/libomalloc.a
-+ $(INSTALL_DATA) libomalloc_ndebug.a $(DESTDIR)$(libdir)
-+ $(RANLIB) $(DESTDIR)$(libdir)/libomalloc_ndebug.a
-+ $(INSTALL_DATA) omalloc.o $(DESTDIR)$(libdir)
-+ $(INSTALL_DATA) omalloc_debug.o $(DESTDIR)$(libdir)
-+ $(INSTALL_DATA) omalloc.h $(DESTDIR)$(includedir)
-+ $(INSTALL_DATA) omlimits.h $(DESTDIR)$(includedir)
-+ $(INSTALL_DATA) mylimits.h $(DESTDIR)$(includedir)
-
- install_all: install libomalloc_p.a
- $(INSTALL_DATA) libomalloc_p.a $(libdir)
+ $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
diff --git a/debian/patches/series b/debian/patches/series
index d5e4e37..9de5972 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,6 +6,9 @@ change-library-search-path.patch
architecture.patch
# upstream makefile bugs
+DESTDIR.patch
+
+# misc makefile patches
make.patch
Singular_make.patch
libfac_make.patch
diff --git a/debian/rules b/debian/rules
index 3761e4d..94ab739 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,13 +19,12 @@ CXXFLAGS += -Wall
#PREFIX=$(CURDIR)/debian/tmp/usr
# ouch. no
PREFIX=/usr
- #--enable-omalloc \
DEB_CONFIGURE_EXTRA_FLAGS += --with-apint=gmp --with-gmp=/usr/lib --disable-NTL \
--with-ntl --with-NTL --without-MP --enable-gmp=/usr/lib \
--enable-Singular --enable-factory --enable-libfac \
--enable-IntegerProgramming --disable-debug --prefix=$(PREFIX) \
- --exec_prefix=$(PREFIX) --libdir=$(PREFIX)/lib/singular \
- --libexecdir=$(PREFIX)/lib/singular --bindir=$(PREFIX)/bin \
+ --exec_prefix=$(PREFIX) --libdir=$(PREFIX)/lib \
+ --libexecdir=$(PREFIX)/lib --bindir=$(PREFIX)/bin \
--includedir=$(PREFIX)/include --without-lex \
--without-bison --enable-doc --without-Boost \
--with-factory=$(CURDIR)/factory \
@@ -166,7 +165,7 @@ install: install-stamp
install-stamp: build-stamp
dh_testdir
-# dh_testroot
+ dh_testroot
dh_prep
DESTDIR=$(CURDIR)/debian/tmp/ $(MAKE) $(DEB_MAKE_INVOKE) install-nolns
DESTDIR=$(CURDIR)/debian/tmp/ $(MAKE) $(DEB_MAKE_INVOKE) install-libsingular
--
an open source computer algebra system
More information about the debian-science-commits
mailing list