[calculix-ccx] 02/04: Adjust debian files for new upstream version
Wolfgang Fütterer
debian at wlf-online.de
Wed Nov 25 11:15:01 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 c8b542629dea484472903a2a1e317d7c5ec57a79
Author: Wolfgang Fütterer <debian at wlf-online.de>
Date: Wed Nov 25 09:48:50 2015 +0100
Adjust debian files for new upstream version
---
debian/calculix-ccx.install | 2 +-
debian/changelog | 9 +++++++
debian/copyright | 7 +++--
...001-Adjust-Makefile-for-Build-with-Debian.patch | 31 ++++++++++++++++++++++
debian/patches/0001-build-patch.patch | 31 ----------------------
debian/patches/series | 2 +-
debian/rules | 2 +-
7 files changed, 46 insertions(+), 38 deletions(-)
diff --git a/debian/calculix-ccx.install b/debian/calculix-ccx.install
index 4bcce98..4dc8100 100644
--- a/debian/calculix-ccx.install
+++ b/debian/calculix-ccx.install
@@ -1,2 +1,2 @@
-./ccx_2.8p2/src/ccx /usr/bin
+./ccx_2.9/src/ccx /usr/bin
debian/ccx.1 /usr/share/man/man1
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index e617296..91e5e0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+calculix-ccx (2.9-1~1.gbpa460da) UNRELEASED; urgency=medium
+
+ ** SNAPSHOT build @a460da041b70626d089f596bc4dd7726083f5c73 **
+
+ * [5c97fa5] Imported Upstream version 2.9
+ * [a460da0] Add new build patch
+
+ -- Wolfgang Fütterer <debian at wlf-online.de> Wed, 25 Nov 2015 09:54:05 +0100
+
calculix-ccx (2.8p2-1) unstable; urgency=medium
* Initial release (Closes: #767617)
diff --git a/debian/copyright b/debian/copyright
index c6b93d6..d9eba1a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,8 +3,7 @@ Upstream-Name: calculix-ccx
Source: http://www.calculix.de
Files: *
-Copyright: 2014 Guido Dhondt <dhondt at t-online.de>
- 2014 Klaus Wittig <klaus.h.wittig at t-online.de>
+Copyright: 1998-2015 Guido Dhondt <dhondt at t-online.de>
License: GPL-2
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -23,7 +22,7 @@ License: GPL-2
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
Files: debian/*
-Copyright: 2014 Wolfgang Fütterer <debian at wlf-online.de>
+Copyright: 2014-2015 Wolfgang Fütterer <debian at wlf-online.de>
License: GPL-2+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -41,7 +40,7 @@ License: GPL-2+
On Debian systems, the complete text of the GNU General
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-Files: cx_2.8p2/src/dgesv.f
+Files: ccx_2.9/src/dgesv.f
Copyright: (c) 1992-2013 The University of Tennessee and The University
of Tennessee Research Foundation.
(c) 2000-2013 The University of California Berkeley.
diff --git a/debian/patches/0001-Adjust-Makefile-for-Build-with-Debian.patch b/debian/patches/0001-Adjust-Makefile-for-Build-with-Debian.patch
new file mode 100644
index 0000000..da67dcb
--- /dev/null
+++ b/debian/patches/0001-Adjust-Makefile-for-Build-with-Debian.patch
@@ -0,0 +1,31 @@
+From: =?utf-8?q?Wolfgang_F=C3=BCtterer?= <debian at wlf-online.de>
+Date: Wed, 25 Nov 2015 09:48:17 +0100
+Subject: Adjust Makefile for Build with Debian
+
+---
+ ccx_2.9/src/Makefile | 10 ++--------
+ 1 file changed, 2 insertions(+), 8 deletions(-)
+
+diff --git a/ccx_2.9/src/Makefile b/ccx_2.9/src/Makefile
+index a76759b..6f7d347 100755
+--- a/ccx_2.9/src/Makefile
++++ b/ccx_2.9/src/Makefile
+@@ -19,16 +19,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
+-
+-ccx_2.9: $(OCCXMAIN) ccx_2.9.a $(LIBS)
++ccx_2.9: $(OCCXMAIN) ccx_2.9.a
+ ./date.pl; $(CC) $(CFLAGS) -c ccx_2.9.c; $(FC) -fopenmp -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.9.a $(LIBS)
+
+ ccx_2.9.a: $(OCCXF) $(OCCXC)
+ ar vr $@ $?
+-
diff --git a/debian/patches/0001-build-patch.patch b/debian/patches/0001-build-patch.patch
deleted file mode 100644
index 0c4dd5f..0000000
--- a/debian/patches/0001-build-patch.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Wolfgang Fütterer <debian at wlf-online.de>
-Date: Wed, 29 Apr 2015 14:25:51 +0200
-Subject: build patch Patch to build on debian systems
-
----
- src/Makefile | 10 ++--------
- 1 file changed, 2 insertions(+), 8 deletions(-)
-
-diff --git a/ccx_2.8p2/src/Makefile b/ccx_2.8p2/src/Makefile
-index 0cba0da..2ac64ea 100755
---- a/ccx_2.8p2/src/Makefile
-+++ b/ccx_2.8p2/src/Makefile
-@@ -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
--
--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.8p2.a: $(OCCXF) $(OCCXC)
- ar vr $@ $?
--
diff --git a/debian/patches/series b/debian/patches/series
index 4389cc3..5c863e2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-0001-build-patch.patch
+0001-Adjust-Makefile-for-Build-with-Debian.patch
diff --git a/debian/rules b/debian/rules
index 47992fc..9d4c804 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,5 @@
#!/usr/bin/make -f
-CCX_VERSION=2.8p2
+CCX_VERSION=2.9
CCX_SRC=ccx_${CCX_VERSION}/src
# See debhelper(7) (uncomment to enable)
# output every command that modifies files on the build system.
--
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