r38221 - in /packages/gmsh/trunk/debian: ./ patches/ source/
gladky-anton-guest at users.alioth.debian.org
gladky-anton-guest at users.alioth.debian.org
Sat Mar 19 21:45:28 UTC 2011
Author: gladky-anton-guest
Date: Sat Mar 19 21:45:23 2011
New Revision: 38221
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=38221
Log:
Fix #605962, #618541; DebSRC3.0
Added:
packages/gmsh/trunk/debian/patches/fix-default-browser-and-editor.patch
packages/gmsh/trunk/debian/patches/fix-spelling-errors.patch
packages/gmsh/trunk/debian/source/
packages/gmsh/trunk/debian/source/format
Removed:
packages/gmsh/trunk/debian/patches/00list
packages/gmsh/trunk/debian/patches/01_port_amd64_gcc40.dpatch
packages/gmsh/trunk/debian/patches/gcc44.patch
packages/gmsh/trunk/debian/patches/makefile.patch
packages/gmsh/trunk/debian/patches/melement.patch
packages/gmsh/trunk/debian/patches/metis.patch
packages/gmsh/trunk/debian/patches/stdlib.patch
Modified:
packages/gmsh/trunk/debian/changelog
packages/gmsh/trunk/debian/control
packages/gmsh/trunk/debian/copyright
packages/gmsh/trunk/debian/patches/scotchmetis.patch
packages/gmsh/trunk/debian/patches/series
Modified: packages/gmsh/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh/trunk/debian/changelog?rev=38221&op=diff
==============================================================================
--- packages/gmsh/trunk/debian/changelog (original)
+++ packages/gmsh/trunk/debian/changelog Sat Mar 19 21:45:23 2011
@@ -1,3 +1,16 @@
+gmsh (2.5.0.dfsg-3) unstable; urgency=low
+
+ * Switch to dpkg-source 3.0 (quilt) format
+ * debian/copyright has been changed to machine-readable DEP-5 format
+ * Old unused patches are removed
+ * Updated license information, now GPL-2+ instead of GPL-2:
+ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=617931#10
+ * Move mpi-default-bin from "Recommends" to "Depends". Closes: #605962
+ * sensible-editor and sensible-browser are used. Closes: #618541
+ * Fix spelling errors, fix-spelling-errors.patch
+
+ -- Anton Gladky <gladky.anton at gmail.com> Sat, 19 Mar 2011 09:52:13 +0100
+
gmsh (2.5.0.dfsg-2) unstable; urgency=low
[Christophe Trophime]
Modified: packages/gmsh/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh/trunk/debian/control?rev=38221&op=diff
==============================================================================
--- packages/gmsh/trunk/debian/control (original)
+++ packages/gmsh/trunk/debian/control Sat Mar 19 21:45:23 2011
@@ -2,7 +2,7 @@
Section: math
Priority: optional
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
-Uploaders: Christophe Prud'homme <prudhomm at debian.org>
+Uploaders: Christophe Prud'homme <prudhomm at debian.org>, Anton Gladky <gladky.anton at gmail.com>
Build-Depends: debhelper (>= 7), cdbs, quilt, cmake, gfortran, libgl1-mesa-dev|nvidia-glx-dev,
libglu1-mesa-dev, libfltk1.1-dev (>=1.1.7),
libpng12-dev, libjpeg62-dev, zlib1g-dev, texlive, texinfo,
@@ -19,9 +19,8 @@
Package: gmsh
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libcgns2 (>= 2.5.3)
-Recommends: mpi-default-bin
-Description: three-dimensional finite element mesh generator
+Depends: ${shlibs:Depends}, ${misc:Depends}, libcgns2 (>= 2.5.3), mpi-default-bin
+Description: Three-dimensional finite element mesh generator
Gmsh is an automatic 3D finite element mesh generator (primarily
Delaunay) with build-in CAD and post-processing facilities. Its
design goal is to provide a simple meshing tool for academic test
Modified: packages/gmsh/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh/trunk/debian/copyright?rev=38221&op=diff
==============================================================================
--- packages/gmsh/trunk/debian/copyright (original)
+++ packages/gmsh/trunk/debian/copyright Sat Mar 19 21:45:23 2011
@@ -1,35 +1,49 @@
-This package was debianized by Christophe Prud'homme <prudhomm at debian.org> on
-Tue, 9 Mar 2004 11:24:10 +0100.
+Format: http://dep.debian.net/deps/dep5/
+Source: http://www.geuz.org/gmsh/#Download
-It was downloaded from http://www.geuz.org/gmsh/#Download
+Files: *
+Copyright: 1997-2011 Christophe Geuzaine <geuzaine at acm.caltech.edu>
+ Jean-Francois Remacle <remacle at gce.ucl.ac.be>
+License: GPL-2+
+ This program 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 any later version.
+ .
+ This program 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 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
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
-Upstream Authors:
+Files: debian/*
+Copyright: 1997-2010 Christophe Prud'homme <prudhomm at mit.edu>
+ 2010 Christophe Trophime <christophe.trophime at grenoble.cnrs.fr>
+ 2011 Anton Gladky <gladky.anton at gmail.com>
+License: GPL-2+
+ The full text see above.
-Christophe Geuzaine <geuzaine at acm.caltech.edu>
-Jean-Francois Remacle <remacle at gce.ucl.ac.be>
-
-Copyright:
-
-/usr/share/common-licenses/GPL-2
-
-Gmsh is copyright (C) 1997-2004 by C. Geuzaine and J.-F. Remacle and
-is distributed under the terms of the GNU General Public License
-(GPL).
-
-----------------------------------------------------------------------
-Chaco version 2.2
-
-This software was developed by Bruce Hendrickson and Robert Leland
-at Sandia National Laboratories under US Department of Energy
-contract DE-AC04-76DP00789 and is copyrighted by Sandia Corporation.
-
-Gmsh - license info and modifications:
-
-Chaco is released under the GNU LGPL v2.1.
-See http://www.sandia.gov/~bahendr/chaco.html for more info.
-
-Chaco has been slightly modified for integration into the Gmsh program. Most
-changes are to 'main/interface.c'. Elsewhere, the 'printf' routine has been
-defined as Gmsh_printf to write through a Gmsh Msg::Info. All other
-modifications are tagged by 'Gmsh' and 'Gmsh - end'
-----------------------------------------------------------------------
+Files: contrib/Chaco/*
+Copyright: 1997-2010
+License: LGPL-2.1
+ This software was developed by Bruce Hendrickson and Robert Leland
+ at Sandia National Laboratories under US Department of Energy
+ contract DE-AC04-76DP00789 and is copyrighted by Sandia Corporation.
+ .
+ Chaco has been slightly modified for integration into the Gmsh program. Most
+ changes are to 'main/interface.c'. Elsewhere, the 'printf' routine has been
+ defined as Gmsh_printf to write through a Gmsh Msg::Info. All other
+ modifications are tagged by 'Gmsh' and 'Gmsh - end'
+ .
+ On Debian systems, the full text of the GNU LESSER GENERAL PUBLIC
+ LICENSE version 2.1 can be found in the file
+ `/usr/share/common-licenses/LGPL-2.1'.
Added: packages/gmsh/trunk/debian/patches/fix-default-browser-and-editor.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh/trunk/debian/patches/fix-default-browser-and-editor.patch?rev=38221&op=file
==============================================================================
--- packages/gmsh/trunk/debian/patches/fix-default-browser-and-editor.patch (added)
+++ packages/gmsh/trunk/debian/patches/fix-default-browser-and-editor.patch Sat Mar 19 21:45:23 2011
@@ -1,0 +1,26 @@
+Description: hard-coded browser and editor are replaced by
+ default installed in system.
+Author: Anton Gladky <gladky.anton at gmail.com>
+Bug-Debian: http://bugs.debian.org/618541
+Last-Update: 2011-03-19
+
+--- a/Common/DefaultOptions.h
++++ b/Common/DefaultOptions.h
+@@ -83,7 +83,7 @@
+ #elif defined(__APPLE__)
+ "open -t %s" ,
+ #else
+- "emacs '%s' &" ,
++ "sensible-editor '%s' &" ,
+ #endif
+ "System command to launch a text editor" },
+ { F|S, "TmpFileName" , opt_general_tmp_filename , ".gmsh-tmp" ,
+@@ -95,7 +95,7 @@
+ #elif defined(__APPLE__)
+ "open %s" ,
+ #else
+- "firefox %s &" ,
++ "sensible-browser %s &" ,
+ #endif
+ "System command to launch a web browser" },
+
Added: packages/gmsh/trunk/debian/patches/fix-spelling-errors.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh/trunk/debian/patches/fix-spelling-errors.patch?rev=38221&op=file
==============================================================================
--- packages/gmsh/trunk/debian/patches/fix-spelling-errors.patch (added)
+++ packages/gmsh/trunk/debian/patches/fix-spelling-errors.patch Sat Mar 19 21:45:23 2011
@@ -1,0 +1,173 @@
+Description: fix spelling errors in messages.
+Author: Anton Gladky <gladky.anton at gmail.com>
+Last-Update: 2011-03-19
+
+--- a/Common/DefaultOptions.h
++++ b/Common/DefaultOptions.h
+@@ -928,11 +928,11 @@
+ { F|O, "OCCConnectFaces" , opt_geometry_occ_connect_faces , 0. ,
+ "Cut and connect faces in STEP, IGES and BRep models" },
+ { F, "OffsetX" , opt_geometry_offset0 , 0. ,
+- "Model diplay offset along X-axis (in model coordinates)" },
++ "Model display offset along X-axis (in model coordinates)" },
+ { F, "OffsetY" , opt_geometry_offset1 , 0. ,
+- "Model diplay offset along Y-axis (in model coordinates)" },
++ "Model display offset along Y-axis (in model coordinates)" },
+ { F, "OffsetZ" , opt_geometry_offset2 , 0. ,
+- "Model diplay offset along Z-axis (in model coordinates)" },
++ "Model display offset along Z-axis (in model coordinates)" },
+ { F|O, "OldCircle" , opt_geometry_old_circle , 0. ,
+ "Use old circle description (compatibility option for old Gmsh geometries)" },
+ { F|O, "OldNewReg" , opt_geometry_old_newreg , 1. ,
+@@ -1013,7 +1013,7 @@
+ { F|O, "AnisoMax" , opt_mesh_aniso_max, 1.e33,
+ "Maximum anisotropy of the mesh" },
+ { F|O, "AllowSwapAngle" , opt_mesh_allow_swap_edge_angle , 10.0 ,
+- "Treshold angle (in degrees) between faces normals under which we allow "
++ "Threshold angle (in degrees) between faces normals under which we allow "
+ "an edge swap" },
+
+ { F|O, "BdfFieldFormat" , opt_mesh_bdf_field_format , 1. ,
+--- a/doc/texinfo/opt_geometry.texi
++++ b/doc/texinfo/opt_geometry.texi
+@@ -110,17 +110,17 @@
+ Saved in: @code{General.OptionsFileName}
+
+ @item Geometry.OffsetX
+-Model diplay offset along X-axis (in model coordinates)@*
++Model display offset along X-axis (in model coordinates)@*
+ Default value: @code{0}@*
+ Saved in: @code{-}
+
+ @item Geometry.OffsetY
+-Model diplay offset along Y-axis (in model coordinates)@*
++Model display offset along Y-axis (in model coordinates)@*
+ Default value: @code{0}@*
+ Saved in: @code{-}
+
+ @item Geometry.OffsetZ
+-Model diplay offset along Z-axis (in model coordinates)@*
++Model display offset along Z-axis (in model coordinates)@*
+ Default value: @code{0}@*
+ Saved in: @code{-}
+
+--- a/Common/CommandLine.cpp
++++ b/Common/CommandLine.cpp
+@@ -78,7 +78,7 @@
+ Msg::Direct(" -smoothRatio float Set smoothing ration between mesh sizes at nodes of a same edge (only used in bamg)");
+ Msg::Direct(" -clcurv Automatically compute element sizes from curvatures");
+ Msg::Direct(" -epslc1d Set the accuracy of the evaluation of the LCFIELD for 1D mesh");
+- Msg::Direct(" -swapangle Set the treshold angle (in degree) between two adjacent faces");
++ Msg::Direct(" -swapangle Set the threshold angle (in degree) between two adjacent faces");
+ Msg::Direct(" below which a swap is allowed");
+ Msg::Direct(" -rand float Set random perturbation factor");
+ Msg::Direct(" -bgm file Load background mesh from file");
+@@ -420,7 +420,7 @@
+ if(argv[i]) {
+ CTX::instance()->mesh.allowSwapEdgeAngle = atof(argv[i++]);
+ if(CTX::instance()->mesh.allowSwapEdgeAngle <= 0.0)
+- Msg::Fatal("Treshold angle for edge swap must be > 0");
++ Msg::Fatal("Threshold angle for edge swap must be > 0");
+ }
+ else
+ Msg::Fatal("Missing number");
+--- a/doc/texinfo/opt_mesh.texi
++++ b/doc/texinfo/opt_mesh.texi
+@@ -25,7 +25,7 @@
+ Saved in: @code{General.OptionsFileName}
+
+ @item Mesh.AllowSwapAngle
+-Treshold angle (in degrees) between faces normals under which we allow an edge swap@*
++Threshold angle (in degrees) between faces normals under which we allow an edge swap@*
+ Default value: @code{10}@*
+ Saved in: @code{General.OptionsFileName}
+
+--- a/contrib/bamg/bamglib/MeshRead.cpp
++++ b/contrib/bamg/bamglib/MeshRead.cpp
+@@ -360,7 +360,7 @@
+ }
+ }
+ else
+- { // unkown field
++ { // unknown field
+ field = ++showfield;
+ if(showfield==1) // just to show one time
+ if (verbosity>5)
+@@ -896,7 +896,7 @@
+ else if (ftq) Read_ftq(f_in);
+ else
+ {
+- cerr << " Unkown type mesh " << filename << endl;
++ cerr << " Unknown type mesh " << filename << endl;
+ MeshError(2);
+ }
+ ConsGeometry(cutoffradian);
+@@ -1200,7 +1200,7 @@
+ }
+ }
+ else
+- { // unkown field
++ { // unknown field
+ field = ++showfield;
+ if(showfield==1) // just to show one time
+ if (verbosity>3)
+--- a/contrib/bamg/bamglib/MeshWrite.cpp
++++ b/contrib/bamg/bamglib/MeshWrite.cpp
+@@ -74,7 +74,7 @@
+ case mshMesh : cout << " msh " ; break;
+ default:
+ cerr << endl
+- << " Unkown type mesh file " << (int) type << " for Writing " << filename <<endl;
++ << " Unknown type mesh file " << (int) type << " for Writing " << filename <<endl;
+ MeshError(1);
+ }
+ Int4 NbOfTria = nbt-2*NbOfQuad-NbOutT ;
+@@ -114,7 +114,7 @@
+ case ftqMesh : Write_ftq(f) ; break;
+ case mshMesh : Write_msh(f) ; break;
+ default:
+- cerr << " Unkown type mesh file " << (int) type << " for Writing " << filename <<endl;
++ cerr << " Unknown type mesh file " << (int) type << " for Writing " << filename <<endl;
+ MeshError(1);
+ }
+ else
+--- a/contrib/bamg/bamglib/Meshio.cpp
++++ b/contrib/bamg/bamglib/Meshio.cpp
+@@ -30,7 +30,7 @@
+ #include "Meshio.h"
+ namespace bamg {
+
+-const char *OFortranUnFormattedFile::unkown("unkown file name");
++const char *OFortranUnFormattedFile::unkown("unknown file name");
+ void (*MeshIstreamErrorHandler)(ios & ) =0;
+ ///////////////////////////////////////////////////////////
+ void WriteStr(ostream & out,char * str)
+@@ -335,7 +335,7 @@
+ else if (err==3)
+ cerr<< "-- Erreur write record info " ;
+ else
+- cerr << " unkown err " << err ;
++ cerr << " unknown err " << err ;
+
+ cerr << " Record number = " << nb_rec << endl
+ << " read position in file " << j << " < " << n
+@@ -358,7 +358,7 @@
+ else if (err==3)
+ cerr<< " Erreur read record info " ;
+ else
+- cerr << " unkown err " << err ;
++ cerr << " unknown err " << err ;
+
+ cerr << " Record number = " << nb_rec << endl
+ << " read position in file " << j << " < " << n
+--- a/contrib/mpeg_encode/bsearch.cpp
++++ b/contrib/mpeg_encode/bsearch.cpp
+@@ -153,7 +153,7 @@
+ } else if ( strcmp(alg, "EXHAUSTIVE") == 0 ) {
+ bsearchAlg = BSEARCH_EXHAUSTIVE;
+ } else {
+- throw "Illegal bsearch algoritm";
++ throw "Illegal bsearch algorithm";
+ }
+ }
+
Modified: packages/gmsh/trunk/debian/patches/scotchmetis.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh/trunk/debian/patches/scotchmetis.patch?rev=38221&op=diff
==============================================================================
--- packages/gmsh/trunk/debian/patches/scotchmetis.patch (original)
+++ packages/gmsh/trunk/debian/patches/scotchmetis.patch Sat Mar 19 21:45:23 2011
@@ -1,3 +1,6 @@
+Description: links the gmsh with packaged version of ScotchMetis.
+Author: Christophe Trophime <christophe.trophime at grenoble.cnrs.fr>
+
Index: gmsh-2.5.0.dfsg/CMakeLists.txt
===================================================================
--- gmsh-2.5.0.dfsg.orig/CMakeLists.txt 2010-10-22 10:20:27.000000000 +0200
Modified: packages/gmsh/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh/trunk/debian/patches/series?rev=38221&op=diff
==============================================================================
--- packages/gmsh/trunk/debian/patches/series (original)
+++ packages/gmsh/trunk/debian/patches/series Sat Mar 19 21:45:23 2011
@@ -1,1 +1,3 @@
scotchmetis.patch
+fix-default-browser-and-editor.patch
+fix-spelling-errors.patch
Added: packages/gmsh/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh/trunk/debian/source/format?rev=38221&op=file
==============================================================================
--- packages/gmsh/trunk/debian/source/format (added)
+++ packages/gmsh/trunk/debian/source/format Sat Mar 19 21:45:23 2011
@@ -1,0 +1,1 @@
+3.0 (quilt)
More information about the debian-science-commits
mailing list