[SCM] Gmsh packaging. Gmsh is an automatic 3D finite element mesh generator. branch, gmsh-tetgen, updated. debian/2.6.0.dfsg-2-20-gd3d918e

Wed Jun 27 18:23:20 UTC 2012

The following commit has been merged in the gmsh-tetgen branch:
commit 9c763787cc45a9d4ce68917ed9de1e3aaebfc066
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Sun Jun 24 17:41:32 2012 +0200

    Fix tetgen version of gmsh.

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 808af89..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,15 +0,0 @@
-# -*- mode: readme-debian -*- 
-
-
-Removing Metis support
-----------------------
-
-The sources of Gmsh contain Metis, a non-free library, as a module
-that can be disabled. To keep Gmsh clean, its sources are modified and
-Metis has been removed from contrib/Metis.
-The steps are documented in debian/rules in the get-orig-source rule.
-
-Also a quilt patch (see debian/patches) is available to fix a
-compilation issue when using --disable-metis
-
- -- Christophe Prud'homme <prudhomm at debian.org>, Sat,  1 Nov 2008 08:34:47 +0100
diff --git a/debian/changelog b/debian/changelog
index e130313..918396b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,11 @@
-<<<<<<< HEAD
+gmsh-tetgen (2.6.0-2) non-free; urgency=low
+
+  * [5b8e374] Add dfsg-prefix to the upstream number.
+  * [3892439] Update patch, change the name of shared library.
+  * [d9902a5] Add alauzet patch, refresh other patches.
+
+ -- Anton Gladky <gladky.anton at gmail.com>  Wed, 20 Jun 2012 18:59:00 +0200
+
 gmsh-tetgen (2.5.1~beta2~svn12143~dfsg-1) non-free; urgency=low
 
   * Imported Upstream version 2.5.1~beta2~svn12143~dfsg
@@ -13,14 +20,6 @@ gmsh-tetgen (2.5.1~beta2~svn12143~dfsg-1) non-free; urgency=low
   * Remove fix_FTBFS_linking.patch. Applied by upstream.
 
  -- Anton Gladky <gladky.anton at gmail.com>  Thu, 24 May 2012 21:15:53 +0200
-=======
-gmsh (2.6.0.dfsg-2) unstable; urgency=low
-
-  * [5b8e374] Add dfsg-prefix to the upstream number.
-  * [3892439] Update patch, change the name of shared library.
-  * [d9902a5] Add alauzet patch, refresh other patches.
-
- -- Anton Gladky <gladky.anton at gmail.com>  Wed, 20 Jun 2012 18:59:00 +0200
 
 gmsh (2.6.0-1) unstable; urgency=low
 
@@ -56,7 +55,6 @@ gmsh (2.5.1~beta2~svn12143~dfsg-1) unstable; urgency=low
   * [ba6f120] Fix FTBFS against gcc-4.7 (bamg-library).
 
  -- Anton Gladky <gladky.anton at gmail.com>  Thu, 24 May 2012 22:06:11 +0200
->>>>>>> master
 
 gmsh (2.5.1~beta2~svn11845~dfsg-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index c07805c..248bd0f 100644
--- a/debian/control
+++ b/debian/control
@@ -46,7 +46,7 @@ Description: Three-dimensional finite element mesh generator
  See Gmsh's reference manual for a more thorough overview of Gmsh's
  capabilities.
 
-Package: libgmsh2
+Package: libgmsh2-tetgen
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, mpi-default-bin,
  python (>= 2.7), python (<<2.8)
@@ -65,7 +65,7 @@ Description: Three-dimensional finite element mesh generator. Shared library
  See Gmsh's reference manual for a more thorough overview of Gmsh's
  capabilities.
 
-Package: libgmsh-dev
+Package: libgmsh-tetgen-dev
 Architecture: all
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, mpi-default-bin,
@@ -85,7 +85,7 @@ Description: Three-dimensional finite element mesh generator. Development files
  See Gmsh's reference manual for a more thorough overview of Gmsh's
  capabilities.
 
-Package: gmsh-doc
+Package: gmsh-tetgen-doc
 Section: doc
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, mpi-default-bin,
diff --git a/debian/gmsh-doc.lintian-overrides b/debian/gmsh-doc.lintian-overrides
deleted file mode 100644
index ba6d965..0000000
--- a/debian/gmsh-doc.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-gmsh-doc: extra-license-file usr/share/doc/gmsh-doc/converters/stl_to_cartesian/LICENCE.txt
-#It is not a license file, just a link on topic of forum, where it was published
diff --git a/debian/gmsh-doc.doc-base b/debian/gmsh-tetgen-doc.doc-base
similarity index 52%
rename from debian/gmsh-doc.doc-base
rename to debian/gmsh-tetgen-doc.doc-base
index 773c2d7..b323617 100644
--- a/debian/gmsh-doc.doc-base
+++ b/debian/gmsh-tetgen-doc.doc-base
@@ -1,12 +1,12 @@
-Document: gmsh
+Document: gmsh-tetgen
 Title: Gmsh Reference Manual
 Author: Christophe Geuzaine and Jean-François Remacle
 Abstract: This is the reference manual for gmsh.
 Section: Science/Mathematics
 
 Format: pdf
-Files: /usr/share/doc/gmsh-doc/gmsh.pdf.gz
+Files: /usr/share/doc/gmsh-tetgen-doc/gmsh.pdf.gz
 
 Format: HTML
-Index: /usr/share/doc/gmsh-doc/gmsh.html
-Files: /usr/share/doc/gmsh-doc/gmsh.html
+Index: /usr/share/doc/gmsh-tetgen-doc/gmsh.html
+Files: /usr/share/doc/gmsh-tetgen-doc/gmsh.html
diff --git a/debian/gmsh-doc.docs b/debian/gmsh-tetgen-doc.docs
similarity index 100%
rename from debian/gmsh-doc.docs
rename to debian/gmsh-tetgen-doc.docs
diff --git a/debian/gmsh-tetgen-doc.lintian-overrides b/debian/gmsh-tetgen-doc.lintian-overrides
new file mode 100644
index 0000000..386af35
--- /dev/null
+++ b/debian/gmsh-tetgen-doc.lintian-overrides
@@ -0,0 +1,2 @@
+gmsh-tetgen-doc: extra-license-file usr/share/doc/gmsh-tetgen-doc/converters/stl_to_cartesian/LICENCE.txt
+#It is not a license file, just a link on topic of forum, where it was published
diff --git a/debian/gmsh-tetgen.doc-base b/debian/gmsh-tetgen.doc-base
deleted file mode 100644
index 1eb62cd..0000000
--- a/debian/gmsh-tetgen.doc-base
+++ /dev/null
@@ -1,12 +0,0 @@
-Document: gmsh-tetgen
-Title: Gmsh Reference Manual (Tetgen version)
-Author: Christophe Geuzaine and Jean-François Remacle
-Abstract: This is the reference manual for gmsh-tetgen.
-Section: Science/Mathematics
-
-Format: pdf
-Files: /usr/share/doc/gmsh-tetgen/gmsh.pdf.gz
-
-Format: HTML
-Index: /usr/share/doc/gmsh-tetgen/gmsh.html
-Files: /usr/share/doc/gmsh-tetgen/gmsh.html
diff --git a/debian/gmsh-tetgen.docs b/debian/gmsh-tetgen.docs
deleted file mode 100644
index 685c212..0000000
--- a/debian/gmsh-tetgen.docs
+++ /dev/null
@@ -1,3 +0,0 @@
-utils/converters
-utils/solvers
-utils/api_demos
diff --git a/debian/gmsh-tetgen.install b/debian/gmsh-tetgen.install
index d3056f2..1dd6ec5 100644
--- a/debian/gmsh-tetgen.install
+++ b/debian/gmsh-tetgen.install
@@ -1,18 +1,3 @@
 debian/*.xpm /usr/share/pixmaps
-debian/gmsh-tetgen.desktop /usr/share/applications
-#The following files are for compiling api_demos
-Common/Gmsh.h /usr/include/gmshy-tetgen
-Geo/Chain.h /usr/include/gmsh-tetgen
-Graphics/Camera.h /usr/include/gmsh-tetgen
-Graphics/Trackball.h /usr/include/gmsh-tetgen
-Solver/functionSpace.h /usr/include/gmsh-tetgen
-Solver/STensor43.h /usr/include/gmsh-tetgen
-Solver/STensor33.h /usr/include/gmsh-tetgen
-Common/OS.h /usr/include/gmsh-tetgen
-Common/Options.h /usr/include/gmsh-tetgen
-Post/ColorTable.h /usr/include/gmsh-tetgen
-Post/PViewOptions.h /usr/include/gmsh-tetgen
-Common/OpenFile.h /usr/include/gmsh-tetgen
-Common/StringUtils.h /usr/include/gmsh-tetgen
-Mesh/Field.h  /usr/include/gmsh-tetgen
-Post/PViewData.h /usr/include/gmsh-tetgen
+debian/*.desktop /usr/share/applications
+usr/bin
diff --git a/debian/gmsh-tetgen.links b/debian/gmsh-tetgen.links
deleted file mode 100644
index edafaaf..0000000
--- a/debian/gmsh-tetgen.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/libgmsh-tetgen.so /usr/lib/libgmsh-tetgen.so.2.5.1
diff --git a/debian/gmsh.manpages b/debian/gmsh-tetgen.manpages
similarity index 100%
rename from debian/gmsh.manpages
rename to debian/gmsh-tetgen.manpages
diff --git a/debian/gmsh-tetgen.menu b/debian/gmsh-tetgen.menu
index 44d2fe5..f5e0e20 100644
--- a/debian/gmsh-tetgen.menu
+++ b/debian/gmsh-tetgen.menu
@@ -1,8 +1,8 @@
-?package(gmsh):               \
+?package(gmsh-tetgen):               \
   needs="X11"                 \
   section="Applications/Science/Engineering" \
   title="Gmsh"                \
   command="/usr/bin/gmsh"     \
-  icon="/usr/share/pixmaps/gmsh_32x32.xpm" \
-  icon16x16="/usr/share/pixmaps/gmsh_16x16.xpm" \
-  icon32x32="/usr/share/pixmaps/gmsh_32x32.xpm"
+  icon="/usr/share/pixmaps/gmsh-tetgen_32x32.xpm" \
+  icon16x16="/usr/share/pixmaps/gmsh-tetgen_16x16.xpm" \
+  icon32x32="/usr/share/pixmaps/gmsh-tetgen_32x32.xpm"
diff --git a/debian/gmsh.pyinstall b/debian/gmsh-tetgen.pyinstall
similarity index 100%
rename from debian/gmsh.pyinstall
rename to debian/gmsh-tetgen.pyinstall
diff --git a/debian/libgmsh-dev.install b/debian/libgmsh-tetgen-dev.install
similarity index 100%
rename from debian/libgmsh-dev.install
rename to debian/libgmsh-tetgen-dev.install
diff --git a/debian/libgmsh2.install b/debian/libgmsh2-tetgen.install
similarity index 100%
rename from debian/libgmsh2.install
rename to debian/libgmsh2-tetgen.install
diff --git a/debian/patches/series b/debian/patches/series
index 3042807..a0ca214 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,9 +7,5 @@ api_demos.patch
 fix_FTBFS_linking.patch
 cgns.patch
 pedantic.patch
-<<<<<<< HEAD
 metis.patch
-tetgen-1.4.3.patch
-=======
 alauzet.patch
->>>>>>> master
diff --git a/debian/patches/tetgen-1.4.3.patch b/debian/patches/tetgen-1.4.3.patch
deleted file mode 100644
index 4bfd489..0000000
--- a/debian/patches/tetgen-1.4.3.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: gmsh-2.5.1~beta2~svn11503~dfsg/CMakeLists.txt
-===================================================================
---- gmsh-2.5.1~beta2~svn11503~dfsg.orig/CMakeLists.txt	2012-03-01 09:15:22.000000000 +0100
-+++ gmsh-2.5.1~beta2~svn11503~dfsg/CMakeLists.txt	2012-03-01 09:16:35.000000000 +0100
-@@ -600,6 +600,9 @@
-       list(APPEND EXTERNAL_LIBRARIES ${TETGEN_LIB})
-       list(APPEND EXTERNAL_INCLUDES ${TETGEN_INC})
-       set_config_option(HAVE_TETGEN "Tetgen")
-+      #
-+      # how to check version ?? to eventally add -DTETLIBRARY flag
-+      add_definitions(-DTETLIBRARY)
-     endif(TETGEN_LIB AND TETGEN_INC)
-   endif(ENABLE_TETGEN_NEW AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/TetgenNew/tetgen.h)
-   if(HAVE_TETGEN)
diff --git a/debian/rules b/debian/rules
index e680d05..16dde27 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,22 +10,14 @@ disable_mpi_archs = armel armhf kfreebsd-amd64 kfreebsd-i386 mips mipsel
 export LD_LIBRARY_PATH :=  $(CURDIR)/debian/tmp/usr/lib:$(LD_LIBRARY_PATH); 
 
 extra_flags += \
-<<<<<<< HEAD
 -DCMAKE_CXX_FLAGS="-DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX -fopenmp -lmpi -fPIC \
                   -Wall $(shell dpkg-buildflags --get CXXFLAGS)" \
-=======
->>>>>>> master
 -DCMAKE_C_FLAGS="-fPIC -Wall $(shell dpkg-buildflags --get CFLAGS)" \
 -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python2.7 \
 -DPYTHON_LIBRARY:FILEPATH=/usr/lib/libpython2.7.so \
-<<<<<<< HEAD
 -DENABLE_METIS:BOOL=ON \
 -DENABLE_TAUCS:BOOL=ON \
 -DENABLE_MPI:BOOL=ON \
-=======
--DENABLE_METIS:BOOL=OFF \
--DENABLE_TAUCS:BOOL=OFF \
->>>>>>> master
 -DENABLE_OSMESA:BOOL=OFF \
 -DENABLE_CGNS:BOOL=OFF \
 -DCMAKE_INCLUDE_PATH:STRING="/usr/include/mpi" \

-- 
Gmsh packaging. Gmsh is an automatic 3D finite element mesh generator. 

