[calculix-cgx] 01/08: New upstream version
Wolfgang Fütterer
debian at wlf-online.de
Fri Jan 22 09:44:44 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 caf1680d1bb84340c81290e1d44a5efef0ca5924
Author: Wolfgang Fütterer <debian at wlf-online.de>
Date: Wed Jan 20 15:14:33 2016 +0100
New upstream version
---
debian/calculix-cgx-examples.docs | 2 +-
debian/calculix-cgx.install | 2 +-
debian/changelog | 4 +--
debian/copyright | 12 ++++----
debian/docs | 2 +-
...n-Build.patch => 0001-Debian-Build-Patch.patch} | 15 +++++-----
debian/patches/0002-Using-freeglut.patch | 16 +++++-----
debian/patches/0003-No-format-arg-in-sprintf.patch | 31 -------------------
...-script.patch => 0003-Shebang-for-script.patch} | 12 ++++----
debian/patches/0004-No-format-arg-in-sprintf.patch | 35 ++++++++++++++++++++++
debian/patches/series | 6 ++--
debian/rules | 9 +++++-
12 files changed, 77 insertions(+), 69 deletions(-)
diff --git a/debian/calculix-cgx-examples.docs b/debian/calculix-cgx-examples.docs
index 56bef8c..659296d 100644
--- a/debian/calculix-cgx-examples.docs
+++ b/debian/calculix-cgx-examples.docs
@@ -1 +1 @@
-examples/
\ No newline at end of file
+cgx_2.9/examples/
\ No newline at end of file
diff --git a/debian/calculix-cgx.install b/debian/calculix-cgx.install
index 7f93bb7..764cce1 100644
--- a/debian/calculix-cgx.install
+++ b/debian/calculix-cgx.install
@@ -1,2 +1,2 @@
-./src/cgx /usr/bin
+./cgx_2.9/src/cgx /usr/bin
debian/cgx.1 /usr/share/man/man1
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index 617bf63..399351f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-calculix-cgx (2.8.dfsg-1) unstable; urgency=medium
+calculix-cgx (2.9.dfsg-1) unstable; urgency=medium
* Initial release (Closes: #783479)
- -- Wolfgang Fuetterer <debian at wlf-online.de> Tue, 28 Apr 2015 09:57:03 +0200
+ -- Wolfgang Fütterer <debian at wlf-online.de> Thu, 21 Jan 2016 13:27:17 +0100
diff --git a/debian/copyright b/debian/copyright
index d02a3aa..a697237 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,20 +4,19 @@ Source: http://www.calculix.de
Files: *
Copyright: 2015 Klaus Wittig <klaus.wittig at calculix.de>
-License: GPL-2+
+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
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ the Free Software Foundation(version 2).
.
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
.
On Debian systems, the complete text of the GNU General
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
@@ -40,4 +39,3 @@ 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".
-
diff --git a/debian/docs b/debian/docs
index e845566..b521f00 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1 +1 @@
-README
+cgx_2.9/README
\ No newline at end of file
diff --git a/debian/patches/0001-Debian-Build.patch b/debian/patches/0001-Debian-Build-Patch.patch
similarity index 87%
rename from debian/patches/0001-Debian-Build.patch
rename to debian/patches/0001-Debian-Build-Patch.patch
index 8218acf..c697605 100644
--- a/debian/patches/0001-Debian-Build.patch
+++ b/debian/patches/0001-Debian-Build-Patch.patch
@@ -1,16 +1,15 @@
-From: Wolfgang Fuetterer <debian at wlf-online.de>
-Date: Thu, 26 Mar 2015 08:38:03 +0100
+From: =?utf-8?q?Wolfgang_F=C3=BCtterer?= <debian at wlf-online.de>
+Date: Wed, 20 Jan 2016 14:46:21 +0100
Subject: Debian Build Patch to build with freeglut and libsnl from debian
- repository
---
- src/Makefile | 54 +++++-------------------------------------------------
+ cgx_2.9/src/Makefile | 54 +++++-----------------------------------------------
1 file changed, 5 insertions(+), 49 deletions(-)
-diff --git a/src/Makefile b/src/Makefile
-index 78055f5..26c3a27 100644
---- a/src/Makefile
-+++ b/src/Makefile
+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
@@ -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 e3d3757..574d42b 100644
--- a/debian/patches/0002-Using-freeglut.patch
+++ b/debian/patches/0002-Using-freeglut.patch
@@ -1,15 +1,15 @@
-From: Wolfgang Fuetterer <debian at wlf-online.de>
-Date: Thu, 26 Mar 2015 08:38:45 +0100
-Subject: Using freeglut Using standard header from freeglut
+From: =?utf-8?q?Wolfgang_F=C3=BCtterer?= <debian at wlf-online.de>
+Date: Wed, 20 Jan 2016 14:48:41 +0100
+Subject: Using freeglut. Include standard header from freeglut
---
- src/extUtil.h | 2 +-
+ cgx_2.9/src/extUtil.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/src/extUtil.h b/src/extUtil.h
-index 0f5165c..342c618 100644
---- a/src/extUtil.h
-+++ b/src/extUtil.h
+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
@@ -34,7 +34,7 @@ void printf_fflush(const char *fmt,...);
}
#endif
diff --git a/debian/patches/0003-No-format-arg-in-sprintf.patch b/debian/patches/0003-No-format-arg-in-sprintf.patch
deleted file mode 100644
index d907ae3..0000000
--- a/debian/patches/0003-No-format-arg-in-sprintf.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Wolfgang Fuetterer <debian at wlf-online.de>
-Date: Thu, 26 Mar 2015 10:31:54 +0100
-Subject: No format arg in sprintf Adding format arguments to some sprintf
- statements
-
----
- src/cgx.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/cgx.c b/src/cgx.c
-index dd9568b..06f8364 100644
---- a/src/cgx.c
-+++ b/src/cgx.c
-@@ -2036,7 +2036,7 @@ void ConfigureAndShowWindow_Sequence( void )
- for(n=0; n<dsSequence.nds; n++)
- {
- i=dsSequence.ds[n];
-- sprintf(lcase[lcase_animList].compName[n], lcase[i].compName[cur_entity]);
-+ sprintf(lcase[lcase_animList].compName[n], "%s", lcase[i].compName[cur_entity]);
-
- if (lcase[i].irtype == 3)
- {
-@@ -2263,7 +2263,7 @@ void ConfigureAndShowWindow_Vector( void )
- for(n=0; n<dsSequence.nds; n++)
- {
- i=dsSequence.ds[n];
-- if(v_dim==4) sprintf(lcase[lcase_animList].compName[n], lcase[i].compName[cur_entity]);
-+ if(v_dim==4) sprintf(lcase[lcase_animList].compName[n], "%s", lcase[i].compName[cur_entity]);
- 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/debian/patches/0004-Shebang-for-script.patch b/debian/patches/0003-Shebang-for-script.patch
similarity index 63%
rename from debian/patches/0004-Shebang-for-script.patch
rename to debian/patches/0003-Shebang-for-script.patch
index f9fd4d0..11126d3 100644
--- a/debian/patches/0004-Shebang-for-script.patch
+++ b/debian/patches/0003-Shebang-for-script.patch
@@ -1,15 +1,15 @@
-From: Wolfgang Fuetterer <debian at wlf-online.de>
-Date: Wed, 1 Apr 2015 16:29:01 +0200
+From: =?utf-8?q?Wolfgang_F=C3=BCtterer?= <debian at wlf-online.de>
+Date: Wed, 20 Jan 2016 14:53:53 +0100
Subject: Shebang for script Added shebang to satisfy lintian
---
- examples/clean | 2 ++
+ cgx_2.9/examples/clean | 2 ++
1 file changed, 2 insertions(+)
-diff --git a/examples/clean b/examples/clean
+diff --git a/cgx_2.9/examples/clean b/cgx_2.9/examples/clean
index 76c4692..c5cc660 100755
---- a/examples/clean
-+++ b/examples/clean
+--- a/cgx_2.9/examples/clean
++++ b/cgx_2.9/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
new file mode 100644
index 0000000..b304f54
--- /dev/null
+++ b/debian/patches/0004-No-format-arg-in-sprintf.patch
@@ -0,0 +1,35 @@
+From: =?utf-8?q?Wolfgang_F=C3=BCtterer?= <debian at wlf-online.de>
+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 +-
+ 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 )
+ for(n=0; n<dsSequence.nds; n++)
+ {
+ i=dsSequence.ds[n];
+- if(v_dim==4) sprintf(lcase[lcase_animList].compName[n], lcase[i].compName[cur_entity]);
++ if(v_dim==4) sprintf(lcase[lcase_animList].compName[n], "%s", lcase[i].compName[cur_entity]);
+ 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
+ {
+ 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 );
+- sprintf(lcase[lcase_animList].compName[s], lcase[lcv].compName[cur_entity]);
++ sprintf(lcase[lcase_animList].compName[s], "%s", lcase[lcv].compName[cur_entity]);
+
+ /* if the selected lc is not a disp lc, search a related disp lc */
+ foundDisp=0;
diff --git a/debian/patches/series b/debian/patches/series
index 3840edf..7bd4181 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-0001-Debian-Build.patch
+0001-Debian-Build-Patch.patch
0002-Using-freeglut.patch
-0003-No-format-arg-in-sprintf.patch
-0004-Shebang-for-script.patch
+0003-Shebang-for-script.patch
+0004-No-format-arg-in-sprintf.patch
diff --git a/debian/rules b/debian/rules
index 0349e32..891387b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,8 @@
#!/usr/bin/make -f
+CGX_VERSION=2.9
+CGX_SRC=cgx_${CGX_VERSION}/src
+# See debhelper(7) (uncomment to enable)
+# output every command that modifies files on the build system.
DH_VERBOSE = 1
DPKG_EXPORT_BUILDFLAGS = 1
@@ -7,7 +11,10 @@ include /usr/share/dpkg/default.mk
UPSTREAM_CFLAGS="-I\."
%:
- dh $@ -Dsrc
+ dh $@ -D${CGX_SRC}
override_dh_auto_build:
dh_auto_build -- CFLAGS+="-Wl,-z,relro $(UPSTREAM_CFLAGS)"
+
+override_dh_installchangelogs:
+ dh_installchangelogs -k cgx_2.9/CHANGES
\ No newline at end of file
--
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