[calculix-cgx] 05/09: Updated patches w new upstream version
Wolfgang Fütterer
debian at wlf-online.de
Wed Mar 16 12:24:26 UTC 2016
This is an automated email from the git hooks/post-receive script.
wlfuetter-guest pushed a commit to branch master
in repository calculix-cgx.
commit a4638feddc4f8fa7e44c652ab19472e46e753f6c
Author: Wolfgang Fütterer <debian at wlf-online.de>
Date: Wed Mar 16 10:37:29 2016 +0100
Updated patches w new upstream version
---
debian/patches/0001-Debian-Build-Patch.patch | 8 +--
debian/patches/0002-Using-freeglut.patch | 10 +--
debian/patches/0003-Shebang-for-script.patch | 15 ++---
debian/patches/0004-No-format-arg-in-sprintf.patch | 24 ++++----
.../0005-Removed-spelling-errors-in-binary.patch | 72 +++++++++++-----------
5 files changed, 65 insertions(+), 64 deletions(-)
diff --git a/debian/patches/0001-Debian-Build-Patch.patch b/debian/patches/0001-Debian-Build-Patch.patch
index c697605..147933a 100644
--- a/debian/patches/0001-Debian-Build-Patch.patch
+++ b/debian/patches/0001-Debian-Build-Patch.patch
@@ -3,13 +3,13 @@ Date: Wed, 20 Jan 2016 14:46:21 +0100
Subject: Debian Build Patch to build with freeglut and libsnl from debian
---
- cgx_2.9/src/Makefile | 54 +++++-----------------------------------------------
+ cgx_2.10/src/Makefile | 54 +++++----------------------------------------------
1 file changed, 5 insertions(+), 49 deletions(-)
-diff --git a/cgx_2.9/src/Makefile b/cgx_2.9/src/Makefile
+diff --git a/cgx_2.10/src/Makefile b/cgx_2.10/src/Makefile
index 78055f5..1b785e6 100644
---- a/cgx_2.9/src/Makefile
-+++ b/cgx_2.9/src/Makefile
+--- a/cgx_2.10/src/Makefile
++++ b/cgx_2.10/src/Makefile
@@ -1,20 +1,12 @@
-CFLAGS = -O3 -Wall \
+CFLAGS += -O3 -Wall \
diff --git a/debian/patches/0002-Using-freeglut.patch b/debian/patches/0002-Using-freeglut.patch
index 574d42b..361bd04 100644
--- a/debian/patches/0002-Using-freeglut.patch
+++ b/debian/patches/0002-Using-freeglut.patch
@@ -3,13 +3,13 @@ Date: Wed, 20 Jan 2016 14:48:41 +0100
Subject: Using freeglut. Include standard header from freeglut
---
- cgx_2.9/src/extUtil.h | 2 +-
+ cgx_2.10/src/extUtil.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/cgx_2.9/src/extUtil.h b/cgx_2.9/src/extUtil.h
-index 9cd46e0..43bfab2 100644
---- a/cgx_2.9/src/extUtil.h
-+++ b/cgx_2.9/src/extUtil.h
+diff --git a/cgx_2.10/src/extUtil.h b/cgx_2.10/src/extUtil.h
+index b9180b9..80c7995 100644
+--- a/cgx_2.10/src/extUtil.h
++++ b/cgx_2.10/src/extUtil.h
@@ -34,7 +34,7 @@ void printf_fflush(const char *fmt,...);
}
#endif
diff --git a/debian/patches/0003-Shebang-for-script.patch b/debian/patches/0003-Shebang-for-script.patch
index 11126d3..de693a7 100644
--- a/debian/patches/0003-Shebang-for-script.patch
+++ b/debian/patches/0003-Shebang-for-script.patch
@@ -3,15 +3,16 @@ Date: Wed, 20 Jan 2016 14:53:53 +0100
Subject: Shebang for script Added shebang to satisfy lintian
---
- cgx_2.9/examples/clean | 2 ++
+ cgx_2.10/examples/clean | 2 ++
1 file changed, 2 insertions(+)
-diff --git a/cgx_2.9/examples/clean b/cgx_2.9/examples/clean
-index 76c4692..c5cc660 100755
---- a/cgx_2.9/examples/clean
-+++ b/cgx_2.9/examples/clean
-@@ -1,2 +1,4 @@
+diff --git a/cgx_2.10/examples/clean b/cgx_2.10/examples/clean
+index 3ff69fc..18585ed 100755
+--- a/cgx_2.10/examples/clean
++++ b/cgx_2.10/examples/clean
+@@ -1,3 +1,5 @@
+#!/bin/sh
+
- rm */mesh.ned */mesh.stl */*/isaac.grd */*/*.sur */*/*.dfl */*/*.sta */*/*.dat */*/*.frd */*/*.equ */*/*.bou */*/*.nam */*/*.msh */*.sta */*.dat */*.frd */*.equ */*.bou */*.nam */*.msh */*.dlo */*.flm */*.rad */*.ps */*~ */tets.inp */spooles.out */TriMasterCyclicSymmetryModel1
+ rm */*.gif */*.gnu */*.out */*.sta */*.cvg */*.dat */*.frd */*.equ */*.bou */*.nam */*.sur */*.msh */*.dlo */*.flm */*.rad */*.ps */*~ */tets.inp */spooles.out */TriMasterCyclicSymmetryModel1 */mesh.ned */mesh.stl
+ rm */*/isaac.grd */*/*.sur */*/*.dfl */*/*.sta */*/*.dat */*/*.frd */*/*.equ */*/*.bou */*/*.nam */*/*.msh
diff --git a/debian/patches/0004-No-format-arg-in-sprintf.patch b/debian/patches/0004-No-format-arg-in-sprintf.patch
index b304f54..2fce80c 100644
--- a/debian/patches/0004-No-format-arg-in-sprintf.patch
+++ b/debian/patches/0004-No-format-arg-in-sprintf.patch
@@ -3,15 +3,15 @@ Date: Wed, 20 Jan 2016 15:15:54 +0100
Subject: No format arg in sprintf Adding format arguments to some sprintf
---
- cgx_2.9/src/cgx.c | 2 +-
- cgx_2.9/src/dataMesh.c | 2 +-
+ cgx_2.10/src/cgx.c | 2 +-
+ cgx_2.10/src/dataMesh.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
-diff --git a/cgx_2.9/src/cgx.c b/cgx_2.9/src/cgx.c
-index f64a638..5a5b301 100644
---- a/cgx_2.9/src/cgx.c
-+++ b/cgx_2.9/src/cgx.c
-@@ -2289,7 +2289,7 @@ void ConfigureAndShowWindow_Vector( void )
+diff --git a/cgx_2.10/src/cgx.c b/cgx_2.10/src/cgx.c
+index d9684ae..dbccaa8 100644
+--- a/cgx_2.10/src/cgx.c
++++ b/cgx_2.10/src/cgx.c
+@@ -2305,7 +2305,7 @@ void ConfigureAndShowWindow_Vector( void )
for(n=0; n<dsSequence.nds; n++)
{
i=dsSequence.ds[n];
@@ -20,11 +20,11 @@ index f64a638..5a5b301 100644
else
{
if(v_dim==3) sprintf(lcase[lcase_animList].compName[n], "v(%s,%s,%s)", lcase[i].compName[entity_v[0]], lcase[i].compName[entity_v[1]], lcase[i].compName[entity_v[2]]);
-diff --git a/cgx_2.9/src/dataMesh.c b/cgx_2.9/src/dataMesh.c
-index d4c9171..58cb39d 100644
---- a/cgx_2.9/src/dataMesh.c
-+++ b/cgx_2.9/src/dataMesh.c
-@@ -2061,7 +2061,7 @@ void calcSequence( DsSequence dsSequence, double anim_faktor, int halfperiode, i
+diff --git a/cgx_2.10/src/dataMesh.c b/cgx_2.10/src/dataMesh.c
+index b342b12..8bb103a 100644
+--- a/cgx_2.10/src/dataMesh.c
++++ b/cgx_2.10/src/dataMesh.c
+@@ -2089,7 +2089,7 @@ void calcSequence( DsSequence dsSequence, double anim_faktor, int halfperiode, i
{
lcv=dsSequence.ds[s];
printf (" disp-list:%d ds:%d time:%lf text:%s\n", l+1, lcv+1, lcase[lcv].value, lcase[lcv].dataset_text );
diff --git a/debian/patches/0005-Removed-spelling-errors-in-binary.patch b/debian/patches/0005-Removed-spelling-errors-in-binary.patch
index 17ea822..f97c3a0 100644
--- a/debian/patches/0005-Removed-spelling-errors-in-binary.patch
+++ b/debian/patches/0005-Removed-spelling-errors-in-binary.patch
@@ -3,19 +3,19 @@ Date: Thu, 21 Jan 2016 13:45:05 +0100
Subject: Removed spelling errors in binary
---
- cgx_2.9/src/fuss.c | 2 +-
- cgx_2.9/src/meshSurf.c | 2 +-
- cgx_2.9/src/pickFunktions.c | 2 +-
- cgx_2.9/src/plotFunktions.c | 2 +-
- cgx_2.9/src/readFoam.c | 2 +-
- cgx_2.9/src/readfrd.c | 6 +++---
- cgx_2.9/src/setFunktions.c | 2 +-
+ cgx_2.10/src/fuss.c | 2 +-
+ cgx_2.10/src/meshSurf.c | 2 +-
+ cgx_2.10/src/pickFunktions.c | 2 +-
+ cgx_2.10/src/plotFunktions.c | 2 +-
+ cgx_2.10/src/readFoam.c | 2 +-
+ cgx_2.10/src/readfrd.c | 6 +++---
+ cgx_2.10/src/setFunktions.c | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
-diff --git a/cgx_2.9/src/fuss.c b/cgx_2.9/src/fuss.c
+diff --git a/cgx_2.10/src/fuss.c b/cgx_2.10/src/fuss.c
index b1fc4c5..28fd03f 100644
---- a/cgx_2.9/src/fuss.c
-+++ b/cgx_2.9/src/fuss.c
+--- a/cgx_2.10/src/fuss.c
++++ b/cgx_2.10/src/fuss.c
@@ -290,7 +290,7 @@ int fuss (Points **point_f, Lines **line_f, Sets **set_f, int anzSchaufel, doubl
point[line[i].p2].name = "SK2";
break;
@@ -25,11 +25,11 @@ index b1fc4c5..28fd03f 100644
}
if(i == (set[setNr].anz_l-1)){
point[pNum].name = "Min";
-diff --git a/cgx_2.9/src/meshSurf.c b/cgx_2.9/src/meshSurf.c
-index a12ca35..c0d575c 100644
---- a/cgx_2.9/src/meshSurf.c
-+++ b/cgx_2.9/src/meshSurf.c
-@@ -598,7 +598,7 @@ int mesh_tr3u(int nr )
+diff --git a/cgx_2.10/src/meshSurf.c b/cgx_2.10/src/meshSurf.c
+index 9280956..09948d2 100644
+--- a/cgx_2.10/src/meshSurf.c
++++ b/cgx_2.10/src/meshSurf.c
+@@ -597,7 +597,7 @@ int mesh_tr3u(int nr )
//replace later:
/* memory for the boundary node-seach algorithm */
@@ -38,11 +38,11 @@ index a12ca35..c0d575c 100644
/* stelle daten fuer near3d bereit */
if ( (rsort = (Rsort *)realloc((Rsort *)rsort, (anz_n+1) * sizeof(Rsort))) == NULL )
-diff --git a/cgx_2.9/src/pickFunktions.c b/cgx_2.9/src/pickFunktions.c
-index e0d2288..0c708e6 100644
---- a/cgx_2.9/src/pickFunktions.c
-+++ b/cgx_2.9/src/pickFunktions.c
-@@ -2792,7 +2792,7 @@ void goPicking( int x, int y, char *type )
+diff --git a/cgx_2.10/src/pickFunktions.c b/cgx_2.10/src/pickFunktions.c
+index 6110ae1..b295a73 100644
+--- a/cgx_2.10/src/pickFunktions.c
++++ b/cgx_2.10/src/pickFunktions.c
+@@ -2798,7 +2798,7 @@ void goPicking( int x, int y, char *type )
hits = glRenderMode (GL_RENDER);
if (hits<0)
{
@@ -51,11 +51,11 @@ index e0d2288..0c708e6 100644
}
else
{
-diff --git a/cgx_2.9/src/plotFunktions.c b/cgx_2.9/src/plotFunktions.c
-index a414179..a0d954e 100644
---- a/cgx_2.9/src/plotFunktions.c
-+++ b/cgx_2.9/src/plotFunktions.c
-@@ -134,7 +134,7 @@ extern SpecialSet specialset[1];
+diff --git a/cgx_2.10/src/plotFunktions.c b/cgx_2.10/src/plotFunktions.c
+index f0617d2..d8f2317 100644
+--- a/cgx_2.10/src/plotFunktions.c
++++ b/cgx_2.10/src/plotFunktions.c
+@@ -133,7 +133,7 @@ extern SpecialSet specialset[1];
int current_nurbs;
static void NurbsErrorCallback(GLenum which)
{
@@ -64,10 +64,10 @@ index a414179..a0d954e 100644
if(current_nurbs>-1)
{
printf(" %s in nurbs:%s see set:%s\n", gluErrorString(which), nurbs[current_nurbs].name,specialset->bnur);
-diff --git a/cgx_2.9/src/readFoam.c b/cgx_2.9/src/readFoam.c
+diff --git a/cgx_2.10/src/readFoam.c b/cgx_2.10/src/readFoam.c
index ce3b19a..4876467 100644
---- a/cgx_2.9/src/readFoam.c
-+++ b/cgx_2.9/src/readFoam.c
+--- a/cgx_2.10/src/readFoam.c
++++ b/cgx_2.10/src/readFoam.c
@@ -661,7 +661,7 @@ int readFoam(char *datin, Summen *apre, Sets **sptr, Nodes **nptr, Elements **ep
/* scan over all project directories and search for results */
sum_dir=0;
@@ -77,10 +77,10 @@ index ce3b19a..4876467 100644
if (dirp != NULL) while ((dp = readdir(dirp)) != NULL)
{
-diff --git a/cgx_2.9/src/readfrd.c b/cgx_2.9/src/readfrd.c
+diff --git a/cgx_2.10/src/readfrd.c b/cgx_2.10/src/readfrd.c
index 3458880..0ebd245 100644
---- a/cgx_2.9/src/readfrd.c
-+++ b/cgx_2.9/src/readfrd.c
+--- a/cgx_2.10/src/readfrd.c
++++ b/cgx_2.10/src/readfrd.c
@@ -741,7 +741,7 @@ int readfrd( char *datin, Summen *anz, Nodes **nptr, Elements **eptr, Datasets *
if( lcase[anz->l].irtype > 2 )
@@ -108,11 +108,11 @@ index 3458880..0ebd245 100644
return(-1);
}
-diff --git a/cgx_2.9/src/setFunktions.c b/cgx_2.9/src/setFunktions.c
-index e89e994..ba7fe81 100644
---- a/cgx_2.9/src/setFunktions.c
-+++ b/cgx_2.9/src/setFunktions.c
-@@ -7263,7 +7263,7 @@ void pre_split( char *record)
+diff --git a/cgx_2.10/src/setFunktions.c b/cgx_2.10/src/setFunktions.c
+index 1104776..37be049 100644
+--- a/cgx_2.10/src/setFunktions.c
++++ b/cgx_2.10/src/setFunktions.c
+@@ -7179,7 +7179,7 @@ void pre_split( char *record)
}
else if(m>0)
{
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/calculix-cgx.git
More information about the debian-science-commits
mailing list