[calculix-cgx] 06/07: Add patch for clean script and make everything lintian clean
Wolfgang Fütterer
wlfuetter-guest at moszumanska.debian.org
Mon Apr 27 10:50:08 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-cgx.
commit 2d4747ae394bd9ce6867afd84e392bba75ba8dcc
Author: Wolfgang Fuetterer <debian at wlf-online.de>
Date: Thu Apr 2 09:47:59 2015 +0200
Add patch for clean script and make everything lintian clean
---
debian/cgx.1 | 50 ++++++++-----
debian/control | 26 ++++---
debian/docs | 1 -
...d-Patch-to-build-with-freeglut-and-libsnl.patch | 84 ----------------------
...eglut-Using-standard-header-from-freeglut.patch | 21 ------
debian/patches/0004-Shebang-for-script.patch | 17 +++++
debian/patches/series | 1 +
debian/rules | 5 ++
8 files changed, 73 insertions(+), 132 deletions(-)
diff --git a/debian/cgx.1 b/debian/cgx.1
index cd94201..a3ff68d 100644
--- a/debian/cgx.1
+++ b/debian/cgx.1
@@ -1,63 +1,77 @@
-.TH ccx 1 "CalculiX GraphiX GRAPHICAL INTERFACE" "DEBIAN"
+.TH cgx 1 "CalculiX GraphiX GRAPHICAL INTERFACE" "DEBIAN"
.SH NAME
-ccx \- CalculiX GraphiX
+cgx \- CalculiX GraphiX
.SH SYNOPSIS
.B cgx
-.RI [ options ] [parameter] filename [ccxfile] ...
+.RB [options]
+.RB [parameter]
+.I filename
+.RB [ccxfile] ...
.br
-.B bar
-.RI [ options ] [parameter] filename [ccxfile] ...
.SH DESCRIPTION
This manual page documents briefly the
-.B ccx
-and
-.B bar
-commands. The complete documentation and test files
-are located in the calculix-ccx-doc package in the
-/usr/share/doc/calculix-ccx-doc/ directory.
+.B cgx
+command. The complete documentation and test files
+are located in the calculix-cgx-doc package in the
+/usr/share/doc/calculix-cgx-doc/ directory.
.PP
.SH PARAMETERS
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of options is included below.
.TP
-.B \-a
+.B \-a
auto-mode, geometry file derived from a cad-file must be provided
-.B \-b
+.TP
+.B \-b
build-mode, geometry (command) file must be provided
+.TP
.B \-bg
background, suppress creation of graphic output
-otherwhise as -b, geometry (command) file must be provided
+otherwhise as
+.B \-b
+a geometry (command) file must be provided
+.TP
.B \-c
read an solver input file (ccx)
+.TP
.B \-duns2d
read duns result files (2D)
+.TP
.B \-duns3d
read duns result files (3D)
+.TP
.B \-foam
read openFoam result files
-.B \-isaac2d [-pref<val> -tref<val> -R<val>]
+.TP
+.B \-isaac2d [\-pref<val> \-tref<val> \-R<val>]
read isaac result files (2D)
+.TP
.B \-isaac3d [-pref<val> -tref<val> -R<val>]
read isaac result files (3D)
+.TP
.B \-f06
read Nastran f06 file
+.TP
.B \-ng
read Netgen native format
+.TP
.B \-step
read a step file (only points and lines)
+.TP
.B \-stepsplit
read step and write its single parts to the filesystem
+.TP
.B \-stl
read stl triangles
+.TP
.B \-v
(default) read a result file in frd-format and optional a solver
input file (ccx) which provides the sets and loads used in the
calculation.
.TP
.SH SPECIAL PURPOSE OPTIONS
+.TP
.B \-mksets
make node-sets from *DLOAD-values (setname:''_<value>'')
+.TP
.B \-read
forces the program to read the complete result-file
at startup
diff --git a/debian/control b/debian/control
index 29250af..79ef291 100644
--- a/debian/control
+++ b/debian/control
@@ -11,21 +11,31 @@ Homepage: http://www.calculix.de
Package: calculix-cgx
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Calculix GraphiX is a 3-dimensional pre- and post-processor for finite elements
- CalculiX Finite Element Models can be build, calculated and
- post-processed. The pre- and post-processor is an
+Description: Calculix cgx is a 3-dimensional pre- and post-processor for fem
+ CalculiX GraphiX (cgx) is a 3-dimensional pre- and post-processor for
+ finite elemnts. CalculiX CrunchiX Finite Element Models can be build,
+ calculated and post-processed. The pre- and post-processor is an
interactive 3D-tool using the openGL API.
.
- For postprocessing duns (2D, 3D), OpenFOAM, isaac (2D, 3D) and
- the Calculix CrunchiX result files can be read and displayed.
+ In addition to the Calculix CrunchiX results files (frd) results from
+ OpenFoam, Duns (2D and 3D), Isaac (2D and 3D) and Nastran (f06) can
+ be read. For preprocessing Netgen nativ format, STEP and STL can be
+ imported.
+
Package: calculix-cgx-examples
Architecture: all
Depends: ${misc:Depends}
Section: doc
-Description: A 3-dimensional pre- and post-processor for finite elements (example files)
- CalculiX Finite Element Models can be build, calculated and
- post-processed. The pre- and post-processor is an
+Description: Example files for Calculix GraphiX
+ CalculiX GraphiX (cgx) is a 3-dimensional pre- and post-processor for
+ finite elemnts. CalculiX CrunchiX Finite Element Models can be build,
+ calculated and post-processed. The pre- and post-processor is an
interactive 3D-tool using the openGL API.
.
+ In addition to the Calculix CrunchiX results files (frd) results from
+ OpenFoam, Duns (2D and 3D), Isaac (2D and 3D) and Nastran (f06) can
+ be read. For preprocessing Netgen nativ format, STEP and STL can be
+ imported.
+ .
This package contains the examples.
\ No newline at end of file
diff --git a/debian/docs b/debian/docs
index bda4248..e845566 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,2 +1 @@
-CHANGES
README
diff --git a/debian/patches/0001-Debian-Build-Patch-to-build-with-freeglut-and-libsnl.patch b/debian/patches/0001-Debian-Build-Patch-to-build-with-freeglut-and-libsnl.patch
deleted file mode 100644
index 8218acf..0000000
--- a/debian/patches/0001-Debian-Build-Patch-to-build-with-freeglut-and-libsnl.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From: Wolfgang Fuetterer <debian at wlf-online.de>
-Date: Thu, 26 Mar 2015 08:38:03 +0100
-Subject: Debian Build Patch to build with freeglut and libsnl from debian
- repository
-
----
- 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
-@@ -1,20 +1,12 @@
--CFLAGS = -O3 -Wall \
-+CFLAGS += -O3 -Wall \
- -I./ \
- -I/usr/include \
- -I/usr/include/GL \
-- -I../../libSNL/src \
-- -I../../glut-3.5/src \
-- -I/usr/X11/include
-
--LFLAGS = \
-- -L/usr/lib64 -lGL -lGLU \
-- -L/usr/X11R6/lib64 -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE \
-- -lm -lpthread -lrt
--
--
--# on 32bit systems change lib64 to lib
--# -lpthread is needed if mesaGL is using threading, otherwhise it is not needed
--# -L/usr/X11/lib64 -lpthread -lX11 -lXext -lXi -lXmu -lXt -lSM -lICE \
-+LFLAGS += \
-+ -L/usr/lib64 -lGL -lGLU -lglut -lSNL\
-+ -L/usr/X11R6/lib -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE \
-+ -lm -lpthread
-
- include Makefile.inc
-
-@@ -22,44 +14,8 @@ ULIB = \
- userFunction.c
-
- SUTIL = \
-- ../../glut-3.5/src/layerutil.c \
-- ../../glut-3.5/src/glut_dials.c \
-- ../../glut-3.5/src/glut_ext.c \
-- ../../glut-3.5/src/glut_mesa.c \
-- ../../glut-3.5/src/glut_menu.c \
-- ../../glut-3.5/src/glut_modifier.c \
-- ../../glut-3.5/src/glut_space.c \
-- ../../glut-3.5/src/glut_shapes.c \
-- ../../glut-3.5/src/glut_tablet.c \
-- ../../glut-3.5/src/glut_warp.c \
-- ../../glut-3.5/src/glut_8x13.c \
-- ../../glut-3.5/src/glut_9x15.c \
-- ../../glut-3.5/src/glut_hel10.c \
-- ../../glut-3.5/src/glut_hel18.c \
-- ../../glut-3.5/src/glut_hel12.c \
-- ../../glut-3.5/src/glut_tr10.c \
-- ../../glut-3.5/src/glut_tr24.c \
-- ../../glut-3.5/src/glut_bitmap.c \
-- ../../glut-3.5/src/glut_cursor.c \
-- ../../glut-3.5/src/glut_event.c \
-- ../../glut-3.5/src/glut_get.c \
-- ../../glut-3.5/src/glut_overlay.c \
-- ../../glut-3.5/src/glut_input.c \
-- ../../glut-3.5/src/glut_stroke.c \
-- ../../glut-3.5/src/glut_teapot.c \
-- ../../glut-3.5/src/glut_winmisc.c \
-- ../../glut-3.5/src/glut_fullscrn.c \
-- ../../glut-3.5/src/glut_cindex.c \
-- ../../glut-3.5/src/glut_roman.c \
-- ../../glut-3.5/src/glut_mroman.c \
-- ../../glut-3.5/src/glut_swidth.c \
-- ../../glut-3.5/src/glut_bwidth.c \
-- ../../glut-3.5/src/glut_win.c \
-- ../../glut-3.5/src/glut_init.c \
-- ../../glut-3.5/src/glut_util.c \
- uselibSNL.cpp \
- generateTet.cpp \
-- ../../libSNL/src/*.cpp
-
- OLIB = $(SLIB:.c=.o)
- OULIB = $(ULIB:.c=.o)
diff --git a/debian/patches/0002-Using-freeglut-Using-standard-header-from-freeglut.patch b/debian/patches/0002-Using-freeglut-Using-standard-header-from-freeglut.patch
deleted file mode 100644
index e3d3757..0000000
--- a/debian/patches/0002-Using-freeglut-Using-standard-header-from-freeglut.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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
-
----
- 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
-@@ -34,7 +34,7 @@ void printf_fflush(const char *fmt,...);
- }
- #endif
- #else
-- #include <GL/glut_cgx.h>
-+ #include <GL/freeglut_std.h>
- #endif
-
- #define PI 3.14159265358979323846264338327950288
diff --git a/debian/patches/0004-Shebang-for-script.patch b/debian/patches/0004-Shebang-for-script.patch
new file mode 100644
index 0000000..f9fd4d0
--- /dev/null
+++ b/debian/patches/0004-Shebang-for-script.patch
@@ -0,0 +1,17 @@
+From: Wolfgang Fuetterer <debian at wlf-online.de>
+Date: Wed, 1 Apr 2015 16:29:01 +0200
+Subject: Shebang for script Added shebang to satisfy lintian
+
+---
+ examples/clean | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/examples/clean b/examples/clean
+index 76c4692..c5cc660 100755
+--- a/examples/clean
++++ b/examples/clean
+@@ -1,2 +1,4 @@
++#!/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
+
diff --git a/debian/patches/series b/debian/patches/series
index bd94109..3840edf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
0001-Debian-Build.patch
0002-Using-freeglut.patch
0003-No-format-arg-in-sprintf.patch
+0004-Shebang-for-script.patch
diff --git a/debian/rules b/debian/rules
index 6e2303a..0349e32 100644
--- a/debian/rules
+++ b/debian/rules
@@ -4,5 +4,10 @@ DH_VERBOSE = 1
DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/default.mk
+UPSTREAM_CFLAGS="-I\."
+
%:
dh $@ -Dsrc
+
+override_dh_auto_build:
+ dh_auto_build -- CFLAGS+="-Wl,-z,relro $(UPSTREAM_CFLAGS)"
--
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