[calculix-ccx] 02/04: New upstream version 2.8p2
Wolfgang Fütterer
wlfuetter-guest at moszumanska.debian.org
Wed Apr 29 13:32:30 UTC 2015
This is an automated email from the git hooks/post-receive script.
wlfuetter-guest pushed a commit to branch master
in repository calculix-ccx.
commit 2815f19c464ccc4c6ca4252e5ba3563e383cb53f
Author: Wolfgang Fuetterer <debian at wlf-online.de>
Date: Wed Apr 29 14:17:14 2015 +0200
New upstream version 2.8p2
---
debian/calculix-ccx-doc.docs | 2 +-
debian/calculix-ccx.docs | 2 +-
debian/changelog | 6 ++++++
debian/patches/0001-build-patch.patch | 24 +++++++++++++-----------
debian/rules | 2 +-
5 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/debian/calculix-ccx-doc.docs b/debian/calculix-ccx-doc.docs
index d091411..d49f4a8 100644
--- a/debian/calculix-ccx-doc.docs
+++ b/debian/calculix-ccx-doc.docs
@@ -1,3 +1,3 @@
-doc/ccx_2.8.ps
+doc/ccx_2.8p2.ps
doc/ccx/
test/
diff --git a/debian/calculix-ccx.docs b/debian/calculix-ccx.docs
index 846ba32..0fc468f 100644
--- a/debian/calculix-ccx.docs
+++ b/debian/calculix-ccx.docs
@@ -1 +1 @@
-./ccx_2.8.README.INSTALL
+./ccx_2.8p2.README.INSTALL
diff --git a/debian/changelog b/debian/changelog
index 6075791..23ab7bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+calculix-ccx (2.8p2-1) UNRELEASED; urgency=medium
+
+ * New upstream version 2.8p2
+
+ -- Wolfgang Fuetterer <debian at wlf-online.de> Wed, 29 Apr 2015 14:11:47 +0200
+
calculix-ccx (2.8p1-1) unstable; urgency=medium
[ Anton Gladky ]
diff --git a/debian/patches/0001-build-patch.patch b/debian/patches/0001-build-patch.patch
index 7694e6f..c15a004 100644
--- a/debian/patches/0001-build-patch.patch
+++ b/debian/patches/0001-build-patch.patch
@@ -1,29 +1,31 @@
From: Wolfgang Fuetterer <debian at wlf-online.de>
-Date: Fri, 20 Feb 2015 10:34:08 +0100
+Date: Wed, 29 Apr 2015 14:25:51 +0200
Subject: build patch Patch to build on debian systems
---
- src/Makefile | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
+ src/Makefile | 10 ++--------
+ 1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/src/Makefile b/src/Makefile
-index b7128de..0569521 100755
+index 0cba0da..2ac64ea 100755
--- a/src/Makefile
+++ b/src/Makefile
-@@ -18,14 +18,10 @@ OCCXF = $(SCCXF:.f=.o)
+@@ -18,16 +18,10 @@ OCCXF = $(SCCXF:.f=.o)
OCCXC = $(SCCXC:.c=.o)
OCCXMAIN = $(SCCXMAIN:.c=.o)
-DIR=../../../SPOOLES.2.2
++LIBS = -lspooles -lpthread -larpack -llapack -lblas -lm -lc
-LIBS = \
- $(DIR)/spooles.a \
- ../../../ARPACK/libarpack_INTEL.a \
- -lpthread -lm -lc
-+LIBS = -lspooles -lpthread -larpack -llapack -lblas -lm -lc
-
--ccx_2.8: $(OCCXMAIN) ccx_2.8.a $(LIBS)
-+ccx_2.8: $(OCCXMAIN) ccx_2.8.a
- ./date.pl; $(CC) $(CFLAGS) -c ccx_2.8.c; $(FC) -fopenmp -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.8.a $(LIBS)
+-
+-ccx_2.8p2: $(OCCXMAIN) ccx_2.8p2.a $(LIBS)
++ccx_2.8p2: $(OCCXMAIN) ccx_2.8p2.a
+ ./date.pl; $(CC) $(CFLAGS) -c ccx_2.8p2.c; $(FC) -fopenmp -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.8p2.a $(LIBS)
- ccx_2.8.a: $(OCCXF) $(OCCXC)
+ ccx_2.8p2.a: $(OCCXF) $(OCCXC)
+ ar vr $@ $?
+-
diff --git a/debian/rules b/debian/rules
index e9fc264..d89fd7b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,5 @@
#!/usr/bin/make -f
-CCX_VERSION=2.8
+CCX_VERSION=2.8p2
# See debhelper(7) (uncomment to enable)
# output every command that modifies files on the build system.
DH_VERBOSE = 1
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/calculix-ccx.git
More information about the debian-science-commits
mailing list