[SCM] lcalc: program for computing zeros and values of L-functions branch, master, updated. debian/1.23-1-4-g64743e4

Fri Jun 7 18:58:12 UTC 2013

The following commit has been merged in the master branch:
commit fd68e31477c98b64ac8112e717d9f32b87b5895d
Author: Tobias Hansen <tobias.han at gmx.de>
Date:   Fri Jun 7 20:53:10 2013 +0200

    Package liblfunction.

diff --git a/debian/control b/debian/control
index 270165c..44c6471 100644
--- a/debian/control
+++ b/debian/control
@@ -17,3 +17,26 @@ Description: program for calculating with L-functions
  Supported L-functions include the Riemann zeta function, the
  L-function of the Ramanujan delta function, and L-functions
  of elliptic curves defined over the rationals.
+
+Package: liblfunction0
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: library for calculating with L-functions
+ liblfunction is a library for computing zeros and values of L-functions.
+ Supported L-functions include the Riemann zeta function, the
+ L-function of the Ramanujan delta function, and L-functions
+ of elliptic curves defined over the rationals.
+
+Package: liblfunction-dev
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends}, liblfunction0 (= ${binary:Version})
+Description: development files for liblfunction
+ liblfunction is a library for computing zeros and values of L-functions.
+ Supported L-functions include the Riemann zeta function, the
+ L-function of the Ramanujan delta function, and L-functions
+ of elliptic curves defined over the rationals.
+ .
+ This package contains the development files for the library.
diff --git a/debian/lcalc.install b/debian/lcalc.install
index ea651b0..761afd5 100644
--- a/debian/lcalc.install
+++ b/debian/lcalc.install
@@ -1 +1 @@
-src/lcalc usr/bin/
+usr/bin/lcalc
diff --git a/debian/liblfunction-dev.install b/debian/liblfunction-dev.install
new file mode 100644
index 0000000..5a802a7
--- /dev/null
+++ b/debian/liblfunction-dev.install
@@ -0,0 +1 @@
+usr/include/Lfunction/*
diff --git a/debian/liblfunction0.install b/debian/liblfunction0.install
new file mode 100644
index 0000000..52d6a73
--- /dev/null
+++ b/debian/liblfunction0.install
@@ -0,0 +1 @@
+usr/lib/*/libLfunction.so.*
diff --git a/debian/patches/Makefile.patch b/debian/patches/Makefile.patch
index 582abec..57e70eb 100644
--- a/debian/patches/Makefile.patch
+++ b/debian/patches/Makefile.patch
@@ -4,13 +4,18 @@ Description: Various Makefile adjustments.
  * Use $CC, $CXX, $CXXFLAGS and $CPPFLAGS (properly).
  * Change PARI location.
  * Remove some LDFLAGS.
+ * Add a SONAME to libLfunction.so.
 Origin: http://www.sagemath.org/packages/standard/lcalc-1.23.p10.spkg
 Author: Tobias Hansen <thansen at debian.org>
 
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -29,7 +29,15 @@
+@@ -26,10 +26,18 @@
+   GMP_FLAGS=
+ endif
  
+-
++SONAME := 0
  OS_NAME := $(shell uname)
  
 -CC = g++
@@ -100,7 +105,7 @@ Author: Tobias Hansen <thansen at debian.org>
 -#	make find_L
 -#	make test
 +#	$(MAKE) print_vars
-+	$(MAKE) libLfunction.so
++	$(MAKE) libLfunction.so.$(SONAME)
 +	$(MAKE) lcalc
 +	$(MAKE) examples
 +#	$(MAKE) find_L
@@ -115,20 +120,20 @@ Author: Tobias Hansen <thansen at debian.org>
  
  examples:
 -	$(CC) $(CCFLAGS) $(INCLUDEFILES) example_programs/example.cc libLfunction.so -o example_programs/example $(GMP_FLAGS)
-+	$(CXX) $(CCFLAGS) $(INCLUDEFILES) example_programs/example.cc libLfunction.so -o example_programs/example $(GMP_FLAGS)
++	$(CXX) $(CCFLAGS) $(INCLUDEFILES) example_programs/example.cc libLfunction.so.$(SONAME) -o example_programs/example $(GMP_FLAGS)
  
  
  proc:
 -	$(CC) $(CCFLAGS) $(INCLUDEFILES) example_programs/proc.cc libLfunction.so -o example_programs/proc $(GMP_FLAGS)
-+	$(CXX) $(CCFLAGS) $(INCLUDEFILES) example_programs/proc.cc libLfunction.so -o example_programs/proc $(GMP_FLAGS)
++	$(CXX) $(CCFLAGS) $(INCLUDEFILES) example_programs/proc.cc libLfunction.so.$(SONAME) -o example_programs/proc $(GMP_FLAGS)
  
  test:
 -	$(CC) $(CCFLAGS) $(INCLUDEFILES) example_programs/test.cc libLfunction.so -o example_programs/test $(GMP_FLAGS)
-+	$(CXX) $(CCFLAGS) $(INCLUDEFILES) example_programs/test.cc libLfunction.so -o example_programs/test $(GMP_FLAGS)
++	$(CXX) $(CCFLAGS) $(INCLUDEFILES) example_programs/test.cc libLfunction.so.$(SONAME) -o example_programs/test $(GMP_FLAGS)
  
  find_L:
 -	$(CC) $(CCFLAGS) $(INCLUDEFILES) find_L_functions/find_L_functions.cc libLfunction.so -o find_L_functions/find_L $(GMP_FLAGS)
-+	$(CXX) $(CCFLAGS) $(INCLUDEFILES) find_L_functions/find_L_functions.cc libLfunction.so -o find_L_functions/find_L $(GMP_FLAGS)
++	$(CXX) $(CCFLAGS) $(INCLUDEFILES) find_L_functions/find_L_functions.cc libLfunction.so.$(SONAME) -o find_L_functions/find_L $(GMP_FLAGS)
 +
  
  .cc.o:
@@ -157,7 +162,7 @@ Author: Tobias Hansen <thansen at debian.org>
  
  cmdline.o: ../include/cmdline.h ../include/getopt.h
  #$(CC) $(CCFLAGS) $(INCLUDEFILES) -DHAVE_LONG_LONG -c cmdline.c
-@@ -258,11 +253,11 @@
+@@ -258,19 +253,20 @@
  Lcommandline.o: ../include/Lcommandline_elliptic.h
  Lcommandline.o: ../include/Lcommandline_twist.h
  Lcommandline.o: ../include/Lcommandline_values_zeros.h
@@ -165,9 +170,21 @@ Author: Tobias Hansen <thansen at debian.org>
 +	$(CXX) $(CCFLAGS) $(INCLUDEFILES) -I$(LOCATION_PARI_H) $(PARI_DEFINE) -c Lcommandline.cc
  
  
- libLfunction.so: $(OBJ_L)
+-libLfunction.so: $(OBJ_L)
 -	g++ -$(DYN_OPTION)  -o libLfunction.so $(OBJ_L)
-+	$(CXX) -$(DYN_OPTION) -o libLfunction.so $(OBJ_L)
++libLfunction.so.$(SONAME): $(OBJ_L)
++	$(CXX) $(CCFLAGS) $(LDFLAGS) -$(DYN_OPTION) -Wl,-soname,libLfunction.so.$(SONAME) -o libLfunction.so.$(SONAME) $(OBJ_L)
  
  clean:
- 	rm -f *.o lcalc libLfunction.so example_programs/example
+-	rm -f *.o lcalc libLfunction.so example_programs/example
++	rm -f *.o lcalc libLfunction.so.$(SONAME) example_programs/example
+ 
+ install:
+ 	cp -f lcalc $(INSTALL_DIR)/bin/.
+-	cp -f libLfunction.so $(INSTALL_DIR)/lib/.
++	cp -f libLfunction.so.$(SONAME) $(INSTALL_DIR)/lib/.
+ 	cp -rf ../include $(INSTALL_DIR)/include/Lfunction
++	ln -s $(INSTALL_DIR)/lib/libLfunction.so.$(SONAME) $(INSTALL_DIR)/lib/libLfunction.so
+ 
+ 
+ SRCS = Lcommandline.cc Lcommandline_elliptic.cc Lcommandline_globals.cc Lcommandline_misc.cc Lcommandline_numbertheory.cc Lcommandline_twist.cc Lcommandline_values_zeros.cc Lgamma.cc Lglobals.cc Lmisc.cc Lriemannsiegel.cc Lriemannsiegel_blfi.cc cmdline.c
diff --git a/debian/rules b/debian/rules
index 1e31f8c..6079ddd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 %:
 	dh $@ --sourcedirectory=src --parallel
 
@@ -9,3 +11,16 @@ override_dh_auto_build:
 override_dh_auto_test:
 
 override_dh_auto_install:
+	mkdir -p debian/tmp/usr/bin
+	mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
+	mkdir -p debian/tmp/usr/include/Lfunction
+	cp src/lcalc debian/tmp/usr/bin
+	cp src/libLfunction.so.0 debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
+	cp include/*.h debian/tmp/usr/include/Lfunction
+
+override_dh_link:
+	dh_link -pliblfunction-dev usr/lib/$(DEB_HOST_MULTIARCH)/libLfunction.so.0 usr/lib/$(DEB_HOST_MULTIARCH)/libLfunction.so
+
+override_dh_auto_clean:
+	rm src/libLfunction.so.0
+	dh_auto_clean

-- 
lcalc: program for computing zeros and values of L-functions

