[SCM] an open source computer algebra system branch, master, updated. upstream/3-1-3-1-5-g61e5b05

Felix Salfelder felix at em.cs.uni-frankfurt.de
Thu Jan 26 18:58:52 UTC 2012 

The following commit has been merged in the master branch:
commit 61e5b050fbd24fa1f941bf9d11a42585110a1f20
Author: Felix Salfelder <felix at em.cs.uni-frankfurt.de>
Date:   Thu Jan 26 19:55:29 2012 +0100

    dh_install fixed.

diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/libsingular-3-1.install b/debian/libsingular-3-1.install
index 7648bf4..eb6e3dc 100644
--- a/debian/libsingular-3-1.install
+++ b/debian/libsingular-3-1.install
@@ -1,3 +1,3 @@
-debian/tmp/usr/bin/*.so usr/lib/singular/
-debian/tmp/usr/lib/singular/libsingular-*.so usr/lib/
-debian/tmp/usr/share/singular/* usr/lib/singular/
+usr/bin/*.so usr/lib/singular/
+usr/lib/singular/libsingular-*.so usr/lib/
+usr/share/singular/* usr/lib/singular/
diff --git a/debian/libsingular-dev.install b/debian/libsingular-dev.install
index 47be8d7..92f1417 100644
--- a/debian/libsingular-dev.install
+++ b/debian/libsingular-dev.install
@@ -1,3 +1,3 @@
-debian/tmp/usr/include/ usr/
-debian/tmp/usr/lib/singular/*.*a usr/lib/
-debian/tmp/usr/lib/singular/libsingular.so usr/lib/
+usr/include/ usr/
+usr/lib/singular/*.*a usr/lib/
+usr/lib/singular/libsingular.so usr/lib/
diff --git a/debian/patches/Singular_make.patch b/debian/patches/Singular_make.patch
index fb18cbe..703fc58 100644
--- a/debian/patches/Singular_make.patch
+++ b/debian/patches/Singular_make.patch
@@ -1,6 +1,12 @@
 --- a/Singular/Makefile.in
 +++ b/Singular/Makefile.in
-@@ -137,11 +137,14 @@
+@@ -132,16 +132,19 @@
+ #
+ # Handle libSINGULAR stuff
+ #
+-LIBSINGULAR_LIBS =-lsingfac -lsingcf -lntl -lreadline -lgmp -lomalloc
++LIBSINGULAR_LIBS =-lsingfac -lsingcf -lntl -lreadline -lgmp -lomalloc $(LDFLAGS)
+ 
  SO_SUFFIX = so
  
  #LIBSINGULAR_FLAGS = -export-dynamic 
@@ -39,7 +45,7 @@
  LIBSINGULAR_FLAGS = -shared
  LIBSINGULAR_LIBS = -lsingfac -lsingcf -lntl -lreadline -lgmp -lomalloc  -lhtmlhelp
  endif
-@@ -358,9 +364,9 @@
+@@ -358,14 +364,14 @@
  	fi
  
  .cc.o:	
@@ -51,22 +57,29 @@
  
  %.dl_o : %.cc
  	${CXX} ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} ${SFLAGS} -c $< -o $@
-@@ -383,13 +389,17 @@
+ 
+-all:	$(SING_EXEC)
++all:	$(SING_EXEC) $(LIBSINGULAR_NAME)
+ 
+ Singular-static: version.h
+ 	sleep 1
+@@ -382,14 +388,17 @@
+ 	  tesths.cc iparith.o mpsr_Tok.o claptmpl.o\
  	  ${OBJS} ${LDFLAGS} ${LIBS} ../kernel/mmalloc.o 
  
- libsingular: mod2.h Makefile version.h $(WIN_LIBS) scanner.cc  ${OBJS} \
+-libsingular: mod2.h Makefile version.h $(WIN_LIBS) scanner.cc  ${OBJS} \
 -         iparith.o libparse.cc claptmpl.o mpsr_Tok.o $(DL_LIBS) 
 -	$(LIBSINGULAR_LD) ${SLDFLAGS} ${LIBSINGULAR_FLAGS} -o libsingular.${SO_SUFFIX} \
 -	iparith.o mpsr_Tok.o claptmpl.o \
 -	${OBJS} -lkernel -L../kernel -L../factory -L../libfac -L${libdir} ${LIBSINGULAR_LIBS}
-+         iparith.o libparse.cc claptmpl.o mpsr_Tok.o $(DL_LIBS) tesths.o
++${LIBSINGULAR_NAME}: version.h $(WIN_LIBS) scanner.cc  ${OBJS} \
++         iparith.o libparse.cc claptmpl.o mpsr_Tok.o $(DL_LIBS) tesths.o |mod2.h
 +	$(LIBSINGULAR_LD) ${SLDFLAGS} ${LIBSINGULAR_FLAGS} -o ${LIBSINGULAR_NAME} \
 + 	tesths.o iparith.o mpsr_Tok.o claptmpl.o \
 + 	${OBJS} -lkernel -L../kernel -L../factory -L../libfac -L${libdir} ${LIBSINGULAR_LIBS}
 +	if [ $(LIBSINGULAR_NAME) != libsingular.$(SO_SUFFIX) ]; then \
-+		ln -s $(LIBSINGULAR_NAME) libsingular.$(SO_SUFFIX); \
++		ln -fs $(LIBSINGULAR_NAME) libsingular.$(SO_SUFFIX); \
 +	fi
-+	touch $@
  
 -libsingular.a: mod2.h Makefile version.h $(WIN_LIBS) scanner.cc  ${OBJS} \
 -         iparith.o libparse.cc claptmpl.o mpsr_Tok.o
@@ -75,7 +88,7 @@
  	mkdir libsingular.tmp
  	(cd  libsingular.tmp; \
  	ar x ../../kernel/libkernel.a; \
-@@ -415,21 +425,21 @@
+@@ -415,21 +424,21 @@
  
  misc_ip.o emacs.o tesths.o: version.h
  
@@ -101,7 +114,7 @@
  
  svnver: 
  	svnversion >svnver
-@@ -472,17 +482,17 @@
+@@ -472,17 +481,17 @@
  feOpt.o: feOpt.inc feOptES.inc feOptTS.inc
  extra.o: feOpt.inc
  
@@ -122,7 +135,16 @@
  	$(CXX) $(CXXFLAGS) -DGENERATE_OPTION_INDEX  -DTSINGULAR -I../kernel feOpt.cc -o feOptTS
  	./feOptTS
  	rm -f feOptTS feOptTS.exe
-@@ -600,7 +610,7 @@
+@@ -576,7 +585,7 @@
+ 	${MKINSTALLDIRS} ${bindir}
+ 	${INSTALL_PROGRAM} ${SING_EXEC} ${SINGULAR}
+ 	-for file in *.so; do \
+-	  ${INSTALL_PROGRAM} $$file ${bindir}; \
++	  ${INSTALL_PROGRAM} $$file ${libdir}; \
+ 	done
+ 	${INSTALL_PROGRAM} libparse ${RUN_SINGULARS} ${bindir}
+ 	${INSTALL_PROGRAM} ESingular TSingular ${DL_LIBS} ${bindir}
+@@ -600,7 +609,7 @@
  install-libsingular: libsingular
  	${MKINSTALLDIRS} ${includedir}/singular
  	for file in *.$(SO_SUFFIX); do \
@@ -131,7 +153,7 @@
  	done
  	${INSTALL_PROGRAM} libsingular.h ${includedir}
  	for file in subexpr.h tok.h grammar.h ipid.h lists.h ipshell.h attrib.h; do \
-@@ -620,7 +630,7 @@
+@@ -620,7 +629,7 @@
  mostlyclean: 
  	-rm -f Singular Singular-static Singularg Singularp libparse feOpt*.inc
  	-rm -f *.o *.og core *.op *.so* *.dl_o*
diff --git a/debian/rules b/debian/rules
index b986dff..25e3ff4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,8 +7,6 @@ DH_VERBOSE=1
 #include /usr/share/cdbs/1/class/autotools.mk
 #include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-CFLAGS += -fPIC
-CXXFLAGS += -fPIC
 # Singular doesn't use DESTDIR, so we'll try to put DESTDIR in PREFIX
 PREFIX=$(CURDIR)/debian/tmp/usr
 DEB_CONFIGURE_EXTRA_FLAGS += --with-apint=gmp --with-gmp=/usr/lib --disable-NTL \
@@ -113,7 +111,7 @@ build-arch-stamp: configure-stamp
 binary-arch: install-stamp
 	dh_testdir
 	dh_testroot
-#	dh_install
+	dh_install
 	dh_installchangelogs
 	dh_installexamples
 	dh_installdocs
@@ -133,7 +131,10 @@ configure-stamp:
 	# hack/workaround
 	# this is used as .so VERSION in Singular/Makefile (injected via quilt patch)
 	echo 3-1 > VERSION
-	CPPFLAGS="-I../omalloc -I../factory" LDFLAGS=-L$(CURDIR)/factory ./configure $(DEB_CONFIGURE_EXTRA_FLAGS)
+	CFLAGS=-fPIC CXXFLAGS=-fPIC \
+	CPPFLAGS="-I../omalloc -I$(CURDIR)/factory" \
+	LDFLAGS="-L$(CURDIR)/factory -L$(CURDIR)/libfac -L$(CURDIR)/omalloc" \
+	./configure $(DEB_CONFIGURE_EXTRA_FLAGS)
 	touch $@
 
 build: build-stamp
diff --git a/debian/singular.install b/debian/singular.install
index 181aa91..95e971d 100644
--- a/debian/singular.install
+++ b/debian/singular.install
@@ -1,2 +1,6 @@
-debian/tmp/usr/bin/* usr/lib/singular
-debian/singular-bin/* /usr/bin
+usr/bin/Singular /usr/bin
+usr/bin/ESingular /usr/bin
+usr/bin/TSingular /usr/bin
+
+usr/bin/* usr/lib/singular
+#debian/singular-bin/* /usr/bin

-- 
an open source computer algebra system

More information about the debian-science-commits mailing list