[SCM] an open source computer algebra system branch, debian, updated. 6a34a75aa3a06dc2b2117624199f1f5c3cf4a1cf

Felix Salfelder felix at salfelder.org
Fri Feb 24 07:23:45 UTC 2012


The following commit has been merged in the debian branch:
commit a0ae4000e2ceae5eef1604cb1bbab2bf94caa1d1
Author: Felix Salfelder <felix at salfelder.org>
Date:   Tue Feb 21 13:13:24 2012 +0100

    VERSION variable in rules.
    symlink libsingular.so -> libsingular-$(VERSION).so in libsingular-dev

diff --git a/debian/libsingular-3-1-4.install b/debian/libsingular-3-1-4.install
index 74b26ac..2688c63 100644
--- a/debian/libsingular-3-1-4.install
+++ b/debian/libsingular-3-1-4.install
@@ -1,6 +1,6 @@
 #usr/bin/*.so usr/lib/singular/
 #usr/lib/*.lib usr/lib/singular/
-usr/lib/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/libsingular-dev.install b/debian/libsingular-dev.install
index 6968098..da818ba 100644
--- a/debian/libsingular-dev.install
+++ b/debian/libsingular-dev.install
@@ -1,3 +1,3 @@
 usr/include/ usr/
-
+usr/lib/libsingular.so usr/lib/
 #usr/lib/singular*.a usr/lib/
diff --git a/debian/rules b/debian/rules
index d40b969..c83a8ab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,9 @@
 
 DH_VERBOSE=1
 
+# fixme: fetch from changelog (how)?
+VERSION=3-1-4
+
 CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
 CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
 CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS)
@@ -127,7 +130,7 @@ binary-arch: install
 configure-stamp:
 	cp -f /usr/share/misc/config.guess config.guess
 	cp -f /usr/share/misc/config.sub config.sub
-	echo 3-1-4 > VERSION
+	echo $(VERSION) > VERSION
 	CFLAGS="$(CFLAGS) -fPIC" \
 	CXXFLAGS="$(CXXFLAGS) -fPIC" \
 	CPPFLAGS="$(CPPFLAGS) -I../omalloc -I$(CURDIR)/factory" \
@@ -151,5 +154,6 @@ install: build-stamp
 	# FIXME: why?
 #	DESTDIR=$(CURDIR)/debian/tmp/ $(MAKE) $(DEB_MAKE_INVOKE) install-libsingular
 	# PREFIX='$(PREFIX)' MAKE='$(MAKE) $(DEB_MAKE_INVOKE) PREFIX="$(PREFIX)"'
+	ln -sf libsingular-$(VERSION).so debian/tmp/usr/lib/libsingular.so
 
 .PHONY: build-arch build-indep build install binary-arch binary-indep binary clean

-- 
an open source computer algebra system



More information about the debian-science-commits mailing list