[calculix-cgx] 01/06: Adjust versions in patch files
Wolfgang Fütterer
debian at wlf-online.de
Tue May 17 20:51:08 UTC 2016
This is an automated email from the git hooks/post-receive script.
wlfuetter-guest pushed a commit to branch patch-queue/master
in repository calculix-cgx.
commit 45e9c31e15d155bdf2bab67a90f1d2538a7112bd
Author: Wolfgang Fütterer <debian at wlf-online.de>
Date: Wed Mar 16 10:37:29 2016 +0100
Adjust versions in patch files
---
debian/patches/0001-Debian-Build-Patch.patch | 4 ++--
debian/patches/0002-Using-freeglut.patch | 4 ++--
debian/patches/0003-Shebang-for-script.patch | 4 ++--
debian/patches/0004-No-format-arg-in-sprintf.patch | 8 +++----
.../0005-Removed-spelling-errors-in-binary.patch | 28 +++++++++++-----------
5 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/debian/patches/0001-Debian-Build-Patch.patch b/debian/patches/0001-Debian-Build-Patch.patch
index c697605..c68ef15 100644
--- a/debian/patches/0001-Debian-Build-Patch.patch
+++ b/debian/patches/0001-Debian-Build-Patch.patch
@@ -8,8 +8,8 @@ Subject: Debian Build Patch to build with freeglut and libsnl from debian
diff --git a/cgx_2.9/src/Makefile b/cgx_2.9/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..afe6317 100644
--- a/debian/patches/0002-Using-freeglut.patch
+++ b/debian/patches/0002-Using-freeglut.patch
@@ -8,8 +8,8 @@ Subject: Using freeglut. Include standard header from freeglut
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
+--- 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..1c5cc21 100644
--- a/debian/patches/0003-Shebang-for-script.patch
+++ b/debian/patches/0003-Shebang-for-script.patch
@@ -8,8 +8,8 @@ Subject: Shebang for script Added shebang to satisfy lintian
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
+--- a/cgx_2.10/examples/clean
++++ b/cgx_2.10/examples/clean
@@ -1,2 +1,4 @@
+#!/bin/sh
+
diff --git a/debian/patches/0004-No-format-arg-in-sprintf.patch b/debian/patches/0004-No-format-arg-in-sprintf.patch
index b304f54..5dc5af6 100644
--- a/debian/patches/0004-No-format-arg-in-sprintf.patch
+++ b/debian/patches/0004-No-format-arg-in-sprintf.patch
@@ -9,8 +9,8 @@ Subject: No format arg in sprintf Adding format arguments to some sprintf
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
+--- a/cgx_2.10/src/cgx.c
++++ b/cgx_2.10/src/cgx.c
@@ -2289,7 +2289,7 @@ void ConfigureAndShowWindow_Vector( void )
for(n=0; n<dsSequence.nds; n++)
{
@@ -22,8 +22,8 @@ index f64a638..5a5b301 100644
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
+--- a/cgx_2.10/src/dataMesh.c
++++ b/cgx_2.10/src/dataMesh.c
@@ -2061,7 +2061,7 @@ void calcSequence( DsSequence dsSequence, double anim_faktor, int halfperiode, i
{
lcv=dsSequence.ds[s];
diff --git a/debian/patches/0005-Removed-spelling-errors-in-binary.patch b/debian/patches/0005-Removed-spelling-errors-in-binary.patch
index 17ea822..2cfa277 100644
--- a/debian/patches/0005-Removed-spelling-errors-in-binary.patch
+++ b/debian/patches/0005-Removed-spelling-errors-in-binary.patch
@@ -14,8 +14,8 @@ Subject: Removed spelling errors in binary
diff --git a/cgx_2.9/src/fuss.c b/cgx_2.9/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;
@@ -27,8 +27,8 @@ index b1fc4c5..28fd03f 100644
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
+--- a/cgx_2.10/src/meshSurf.c
++++ b/cgx_2.10/src/meshSurf.c
@@ -598,7 +598,7 @@ int mesh_tr3u(int nr )
//replace later:
@@ -40,8 +40,8 @@ index a12ca35..c0d575c 100644
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
+--- a/cgx_2.10/src/pickFunktions.c
++++ b/cgx_2.10/src/pickFunktions.c
@@ -2792,7 +2792,7 @@ void goPicking( int x, int y, char *type )
hits = glRenderMode (GL_RENDER);
if (hits<0)
@@ -53,8 +53,8 @@ index e0d2288..0c708e6 100644
{
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
+--- a/cgx_2.10/src/plotFunktions.c
++++ b/cgx_2.10/src/plotFunktions.c
@@ -134,7 +134,7 @@ extern SpecialSet specialset[1];
int current_nurbs;
static void NurbsErrorCallback(GLenum which)
@@ -66,8 +66,8 @@ index a414179..a0d954e 100644
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
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;
@@ -79,8 +79,8 @@ index ce3b19a..4876467 100644
diff --git a/cgx_2.9/src/readfrd.c b/cgx_2.9/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 )
@@ -110,8 +110,8 @@ index 3458880..0ebd245 100644
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
+--- a/cgx_2.10/src/setFunktions.c
++++ b/cgx_2.10/src/setFunktions.c
@@ -7263,7 +7263,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