[SCM] an open source computer algebra system branch, debian, updated. 3f1c419ac4981d4babdd737ac18bd16c080a761a

Bernhard R. Link brlink at debian.org
Sat Mar 3 21:58:08 UTC 2012


The following commit has been merged in the debian branch:
commit a5fbc1600873c7e598a12f845e4bb38a1544303a
Author: Bernhard R. Link <brlink at debian.org>
Date:   Sat Mar 3 10:26:06 2012 +0100

    some work towards building the documentation

diff --git a/debian/control b/debian/control
index 95047bb..2f3b059 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
 Uploaders: Felix Salfelder <felix at salfelder.org>
 Homepage: http://www.singular.uni-kl.de/
 DM-Upload-Allowed: yes
-Build-Depends: autotools-dev, debhelper (>= 7), patchutils (>= 0.2.25), libgmp3-dev, libntl-dev (>=5.2), libncurses5-dev, libreadline-dev, libmpfr-dev
+Build-Depends: autotools-dev, debhelper (>= 7), patchutils (>= 0.2.25), libgmp3-dev, libntl-dev (>=5.2), libncurses5-dev, libreadline-dev, libmpfr-dev, sharutils
 Standards-Version: 3.8.0
 Vcs-Browser: http://git.debian.org/?p=debian-science/packages/singular.git
 Vcs-Git: git://git.debian.org/git/debian-science/packages/singular.git
diff --git a/debian/rules b/debian/rules
index d259cb5..5d670b8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,12 +45,16 @@ DEB_CONFIGURE_EXTRA_FLAGS += --with-apint=gmp --with-gmp=/usr/lib --disable-NTL
 #	rm -f debian/singular/usr/lib/singular/*.so
 
 clean::
+	if [ -f doc/Makefile ] ; then $(MAKE) -C doc clean ; fi
 	if [ -f Makefile ] ; then $(MAKE) distclean ; fi
 	rm -f *-stamp
 #?
 	dh_clean
 	rm -f VERSION
 
+	find Singular -name "p_*.so" -delete
+	find doc \( -name "T*.txt" -o -name "*.dot" -o -name "*.ssi" \
+		-o -name "temp_*" -o -name "exmpl.tex" \) -delete
 	#sanity checks
 	find . -name *.dl_o -exec echo clean failed \{\} \;
 	find . -name *.o -exec echo clean failed \{\} \;
@@ -107,6 +111,11 @@ binary-arch: install
 	ln -sf ../lib/singular-$(VERSION)/Singular debian/singular/usr/bin/
 	ln -sf ../lib/singular-$(VERSION)/TSingular debian/singular/usr/bin/
 	ln -sf ../lib/singular-$(VERSION)/ESingular debian/singular/usr/bin/
+	for dir in info html doc examples emacs ; do \
+		mkdir -p debian/libsingular-$(VERSION)/usr/share/singular-$(VERSION)/$$dir ; \
+		ln -sf /usr/share/singular-$(VERSION)/$$dir \
+			debian/libsingular-$(VERSION)/usr/lib/singular-$(VERSION)/$$dir ; \
+	done
 	dh_installchangelogs
 	dh_installexamples
 	dh_installdocs
@@ -149,8 +158,19 @@ configure-stamp:
 
 build build-arch: build-stamp
 
+EXAMPLE_EXCLUDE=-exclude MP -exclude gfan -exclude normaliz -exclude sing4ti2 -exclude memory -exclude dynlib
+
 build-stamp: configure-stamp
 	$(MAKE) LIBSINGULAR_LD='$(CXX) $(LDFLAGS) -L../omalloc' DL_LIBSG='' GLIBC_DYN_FIX="-lc"
+	$(MAKE) -C Singular libparse
+	cd Singular && ln -sf ../kernel/p_*.so .
+	SINGULAR_BIN_DIR=$(CURDIR)/Singular \
+	 PATH="$(CURDIR)/Singular:$(CURDIR)/kernel:$(CURDIR)/IntegerProgramming:$$PATH" \
+	 $(MAKE) \
+		DOC2TEX_EXAMPLE_EXCLUSIONS="$(EXAMPLE_EXCLUDE)" \
+		bindir="$(CURDIR)/Singular" \
+		-C doc \
+		standalone-txt standalone-html html singular.idx singular.hlp
 	touch $@
 
 install: build-stamp
@@ -161,6 +181,7 @@ install: build-stamp
 	$(MAKE) -C Singular DESTDIR=$(CURDIR)/debian/tmp/ DL_LIBSG='' install
 	# TODO: 
 	# $(MAKE) -C Singular DESTDIR=$(CURDIR)/debian/tmp/ DL_LIBSG='' install-sharedist
+	$(MAKE) -C doc install-sharedist install_prefix=$(CURDIR)/debian/tmp/usr/share/singular-$(VERSION)
 	# replace with symlink:
 	ln -sf libsingular-$(VERSION).so debian/tmp/usr/lib/libsingular.so
 	# surfex is not included due to missing sources, so do not install wrappers, either:
@@ -172,5 +193,7 @@ install: build-stamp
 	rm debian/tmp/usr/include/*limits.h
 	#don't use them
 	sed -e 's#mylimits\.h#limits.h#' -i debian/tmp/usr/include/singular/*.h
+	# remove executeable bits from .gif files:
+	find debian/tmp -name "*.gif" -exec chmod a-x {} \;
 
 .PHONY: build-arch build-indep build install binary-arch binary-indep binary clean
diff --git a/debian/singular.install b/debian/singular.install
index ed8ccfb..e384b76 100644
--- a/debian/singular.install
+++ b/debian/singular.install
@@ -1 +1,5 @@
 /usr/lib/singular-*/*Singular*
+/usr/share/singular-*/info
+/usr/share/singular-*/examples
+/usr/share/singular-*/html
+/usr/share/singular-*/doc

-- 
an open source computer algebra system



More information about the debian-science-commits mailing list