r44108 - in /packages/mmg3d/trunk/debian: ./ patches/ source/
trophime-guest at users.alioth.debian.org
trophime-guest at users.alioth.debian.org
Thu Dec 8 16:31:28 UTC 2011
Author: trophime-guest
Date: Thu Dec 8 16:31:28 2011
New Revision: 44108
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44108
Log:
[svn-inject] Applying Debian modifications (4.0-1) to trunk
Added:
packages/mmg3d/trunk/debian/ (with props)
packages/mmg3d/trunk/debian/README.Debian
packages/mmg3d/trunk/debian/README.source
packages/mmg3d/trunk/debian/changelog
packages/mmg3d/trunk/debian/compat
packages/mmg3d/trunk/debian/control
packages/mmg3d/trunk/debian/copyright
packages/mmg3d/trunk/debian/docs
packages/mmg3d/trunk/debian/mmg3d.postinst
packages/mmg3d/trunk/debian/mmg3d.postrm
packages/mmg3d/trunk/debian/patches/
packages/mmg3d/trunk/debian/patches/debian-changes-3.1-1
packages/mmg3d/trunk/debian/patches/install.patch
packages/mmg3d/trunk/debian/patches/makefile.patch
packages/mmg3d/trunk/debian/patches/series
packages/mmg3d/trunk/debian/rules (with props)
packages/mmg3d/trunk/debian/source/
packages/mmg3d/trunk/debian/source/format
Propchange: packages/mmg3d/trunk/debian/
------------------------------------------------------------------------------
mergeWithUpstream = 1
Added: packages/mmg3d/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/debian-science/packages/mmg3d/trunk/debian/README.Debian?rev=44108&op=file
==============================================================================
--- packages/mmg3d/trunk/debian/README.Debian (added)
+++ packages/mmg3d/trunk/debian/README.Debian Thu Dec 8 16:31:28 2011
@@ -1,0 +1,6 @@
+mmg3d for Debian
+----------------
+
+initial build for wheezy
+
+ -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr> Mon, 21 Nov 2011 15:48:32 +0100
Added: packages/mmg3d/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/debian-science/packages/mmg3d/trunk/debian/README.source?rev=44108&op=file
==============================================================================
--- packages/mmg3d/trunk/debian/README.source (added)
+++ packages/mmg3d/trunk/debian/README.source Thu Dec 8 16:31:28 2011
@@ -1,0 +1,8 @@
+mmg3d for Debian
+----------------
+
+executables have been removed from orig tarball
+
+
+
+
Added: packages/mmg3d/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/mmg3d/trunk/debian/changelog?rev=44108&op=file
==============================================================================
--- packages/mmg3d/trunk/debian/changelog (added)
+++ packages/mmg3d/trunk/debian/changelog Thu Dec 8 16:31:28 2011
@@ -1,0 +1,6 @@
+mmg3d (4.0-1) unstable; urgency=low
+
+ * New upstream release
+ * Initial release (Closes: #nnnn)
+
+ -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr> Mon, 21 Nov 2011 15:48:32 +0100
Added: packages/mmg3d/trunk/debian/compat
URL: http://svn.debian.org/wsvn/debian-science/packages/mmg3d/trunk/debian/compat?rev=44108&op=file
==============================================================================
--- packages/mmg3d/trunk/debian/compat (added)
+++ packages/mmg3d/trunk/debian/compat Thu Dec 8 16:31:28 2011
@@ -1,0 +1,1 @@
+7
Added: packages/mmg3d/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/mmg3d/trunk/debian/control?rev=44108&op=file
==============================================================================
--- packages/mmg3d/trunk/debian/control (added)
+++ packages/mmg3d/trunk/debian/control Thu Dec 8 16:31:28 2011
@@ -1,0 +1,19 @@
+Source: mmg3d
+Section: non-free/math
+Priority: extra
+Maintainer: Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake,
+ libscotch-dev
+# hardening-includes,hardening-wrapper
+Standards-Version: 3.9.2
+Homepage: http://www.math.u-bordeaux1.fr/~dobj/logiciels/mmg3d.php
+#Vcs-Git: git://git.debian.org/collab-maint/mmg3d.git
+#Vcs-Browser: http://git.debian.org/?p=collab-maint/mmg3d.git;a=summary
+
+Package: mmg3d
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Moving Mesh Generation
+ Produces quasi-uniform meshes with respect to a metric tensor field.
+ Uses local mesh modifications and Delaunay kernel to adapt the initial
+ mesh. mmg3d allows one to deal with rigid body motion and moving meshes.
Added: packages/mmg3d/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-science/packages/mmg3d/trunk/debian/copyright?rev=44108&op=file
==============================================================================
--- packages/mmg3d/trunk/debian/copyright (added)
+++ packages/mmg3d/trunk/debian/copyright Thu Dec 8 16:31:28 2011
@@ -1,0 +1,26 @@
+This work was packaged for Debian by:
+
+ Christophe Trophime <christophe.trophime at lncmi.cnrs.fr> on Mon, 21 Nov 2011 15:48:32 +0100
+
+It was downloaded from:
+
+ http://www.math.u-bordeaux1.fr/~dobj/logiciels/mmg3d.php
+
+Upstream Authors:
+
+ C. Dobrzynski <cecile.dobrzynski at math.u-bordeaux1.fr>
+ P. Frey <frey at ann.jussieu.fr>
+
+Copyright:
+
+ Copyright (C) 2010 C. Dobrzynski <cecile.dobrzynski at math.u-bordeaux1.fr>
+ Copyright (C) 2010 P. Frey <frey at ann.jussieu.fr>
+
+License:
+
+ see "/usr/share/common-licenses/GPL-3"
+
+The Debian packaging is:
+
+ Copyright (C) 2010 Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>
+
Added: packages/mmg3d/trunk/debian/docs
URL: http://svn.debian.org/wsvn/debian-science/packages/mmg3d/trunk/debian/docs?rev=44108&op=file
==============================================================================
(empty)
Added: packages/mmg3d/trunk/debian/mmg3d.postinst
URL: http://svn.debian.org/wsvn/debian-science/packages/mmg3d/trunk/debian/mmg3d.postinst?rev=44108&op=file
==============================================================================
--- packages/mmg3d/trunk/debian/mmg3d.postinst (added)
+++ packages/mmg3d/trunk/debian/mmg3d.postinst Thu Dec 8 16:31:28 2011
@@ -1,0 +1,17 @@
+#! /bin/sh
+# postinst script for mmg3d
+#
+# see: dh_installdeb(1)
+
+set -e
+
+if [ "$1" = "configure" ] ; then
+ ldconfig
+fi
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
Added: packages/mmg3d/trunk/debian/mmg3d.postrm
URL: http://svn.debian.org/wsvn/debian-science/packages/mmg3d/trunk/debian/mmg3d.postrm?rev=44108&op=file
==============================================================================
--- packages/mmg3d/trunk/debian/mmg3d.postrm (added)
+++ packages/mmg3d/trunk/debian/mmg3d.postrm Thu Dec 8 16:31:28 2011
@@ -1,0 +1,17 @@
+#! /bin/sh
+# postinst script for mmg3d
+#
+# see: dh_installdeb(1)
+
+set -e
+
+if [ "$1" = "remove" ] ; then
+ ldconfig
+fi
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
Added: packages/mmg3d/trunk/debian/patches/debian-changes-3.1-1
URL: http://svn.debian.org/wsvn/debian-science/packages/mmg3d/trunk/debian/patches/debian-changes-3.1-1?rev=44108&op=file
==============================================================================
--- packages/mmg3d/trunk/debian/patches/debian-changes-3.1-1 (added)
+++ packages/mmg3d/trunk/debian/patches/debian-changes-3.1-1 Thu Dec 8 16:31:28 2011
@@ -1,0 +1,31 @@
+Description: Upstream changes introduced in version 3.1-1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ mmg3d (3.1-1) unstable; urgency=low
+ .
+ * Install also defines.h
+ * Initial release (Closes: #nnnn)
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Christophe Trophime <christophe.trophime at grenoble.cnrs.fr>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- mmg3d-3.1.orig/sources/compil.date
++++ mmg3d-3.1/sources/compil.date
+@@ -1 +1 @@
+-#define COMPIL " Jeu 18 mar 2010 13:56:11 CET "
++#define COMPIL " Fri Apr 1 09:25:46 CEST 2011 "
Added: packages/mmg3d/trunk/debian/patches/install.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/mmg3d/trunk/debian/patches/install.patch?rev=44108&op=file
==============================================================================
--- packages/mmg3d/trunk/debian/patches/install.patch (added)
+++ packages/mmg3d/trunk/debian/patches/install.patch Thu Dec 8 16:31:28 2011
@@ -1,0 +1,76 @@
+Index: mmg3d-4.0/build/CMakeLists.txt
+===================================================================
+--- mmg3d-4.0.orig/build/CMakeLists.txt 2011-11-21 17:57:16.000000000 +0100
++++ mmg3d-4.0/build/CMakeLists.txt 2011-11-22 11:09:49.000000000 +0100
+@@ -57,43 +57,43 @@
+
+ add_executable(mmg3d4.0 ${source_files})
+
+-option (COMPIL_STATIC_LIBRARY
+- "Use tutorial provided math implementation" OFF)
+-if (COMPIL_STATIC_LIBRARY)
+- add_library(mmg3dlib4.0 STATIC ${source_files})
+- target_link_libraries(mmg3dlib4.0 ${M_LIB} ${LIBS_SCOTCH} ${LIBS_SCOTCHERR})
+-endif (COMPIL_STATIC_LIBRARY)
+ option (COMPIL_SHARED_LIBRARY
+ "Use tutorial provided math implementation" OFF)
++
+ if (COMPIL_SHARED_LIBRARY)
+- add_library(mmg3dlib4.0 SHARED ${source_files})
+- target_link_libraries(mmg3dlib4.0 ${M_LIB} ${LIBS_SCOTCH} ${LIBS_SCOTCHERR})
++ SET(MMG3_LIBRARY_TYPE SHARED)
++else (COMPIL_SHARED_LIBRARY)
++ SET(MMG3_LIBRARY_TYPE STATIC)
+ endif (COMPIL_SHARED_LIBRARY)
+
++add_library(mmg3dlib4.0 ${MMG3_LIBRARY_TYPE} ${source_files})
++target_link_libraries(mmg3dlib4.0 ${M_LIB} ${LIBS_SCOTCH} ${LIBS_SCOTCHERR})
++
++set_target_properties(mmg3dlib4.0
++ PROPERTIES
++ VERSION 4.0
++ SOVERSION 4.0)
++
++
+ find_library(M_LIB m)
+ target_link_libraries(mmg3d4.0 ${M_LIB} ${LIBS_SCOTCH} ${LIBS_SCOTCHERR})
+
+ #add testlib
+-if (COMPIL_STATIC_LIBRARY)
+- #file sources
+- file(
+- GLOB_RECURSE
+- source_testlib
+- libexamples/*
+- )
+- add_executable(testlib ${source_testlib})
+- include_directories(sources/)
+- target_link_libraries(testlib mmg3dlib4.0)
+-endif (COMPIL_STATIC_LIBRARY)
++file(
++ GLOB_RECURSE
++ source_testlib
++ libexamples/*
++)
++add_executable(testlib ${source_testlib})
++include_directories(sources/)
++target_link_libraries(testlib mmg3dlib4.0)
+
++# add the install targets
++install (FILES "sources/libmmg3d.h"
++ DESTINATION include)
++INSTALL_TARGETS(/bin mmg3d4.0)
+ if (COMPIL_SHARED_LIBRARY)
+- #file sources
+- file(
+- GLOB_RECURSE
+- source_testlib
+- libexamples/*
+- )
+- add_executable(testlib ${source_testlib})
+- include_directories(sources/)
+- target_link_libraries(testlib mmg3dlib4.0)
++ INSTALL_TARGETS(/lib RUNTIME_DIRECTORY /bin mmg3dlib4.0)
++else (COMPIL_SHARED_LIBRARY)
++ INSTALL_TARGETS(/lib mmg3dlib4.0)
+ endif (COMPIL_SHARED_LIBRARY)
Added: packages/mmg3d/trunk/debian/patches/makefile.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/mmg3d/trunk/debian/patches/makefile.patch?rev=44108&op=file
==============================================================================
--- packages/mmg3d/trunk/debian/patches/makefile.patch (added)
+++ packages/mmg3d/trunk/debian/patches/makefile.patch Thu Dec 8 16:31:28 2011
@@ -1,0 +1,122 @@
+Index: mmg3d-3.1/makefile
+===================================================================
+--- mmg3d-3.1.orig/makefile 2011-04-01 09:20:06.000000000 +0200
++++ mmg3d-3.1/makefile 2011-04-01 09:20:10.000000000 +0200
+@@ -1,59 +1,65 @@
+ # Set compiler's options depending on the architecture
+ ifeq ($(ARCHI),hppa)
+ CC = c89
+- CFLAGS = -c +O3 +Olibcalls +Ofastaccess
++ MY_CFLAGS = -c +O3 +Olibcalls +Ofastaccess
+ LDFLAGS= -s
+ endif
+ ifeq ($(ARCHI),hppa64)
+ CC = c89
+- CFLAGS = -c +O3 +Olibcalls +Ofastaccess
++ MY_CFLAGS = -c +O3 +Olibcalls +Ofastaccess
+ LDFLAGS= +FPVZOUiD
+ OPT64 = +DD64
+ endif
+ ifeq ($(ARCHI),i86)
+ CC = gcc
+- CFLAGS = -O3 -c -Wuninitialized -Wunused -Winline -Wshadow \
++ MY_CFLAGS = -O3 -fPIC -c -Wuninitialized -Wunused -Winline -Wshadow \
+ -fexpensive-optimizations -funroll-loops
+ LDFLAGS= -static-libgcc
+ endif
++ifeq ($(ARCHI),amd64)
++ CC = gcc
++ MY_CFLAGS = -O3 -fPIC -c -Wuninitialized -Wunused -Winline -Wshadow \
++ -fexpensive-optimizations -funroll-loops
++ LDFLAGS=
++endif
+ ifeq ($(ARCHI),ppc)
+ # CC = /opt/ibmcmp/vac/6.0/bin/c89
+-# CFLAGS = -c -qthreaded -O5 -Q=20 -qtune=auto -qarch=auto -qunroll=auto -qaltivec
++# MY_CFLAGS = -c -qthreaded -O5 -Q=20 -qtune=auto -qarch=auto -qunroll=auto -qaltivec
+ # LDFLAGS=
+ CC = @gcc
+- CFLAGS = -O3 -Wall -c \
++ MY_CFLAGS = -O3 -Wall -c \
+ -mtune=G4 -mcpu=G4 \
+ -Wuninitialized -Wunused -Winline -Wshadow
+ ##-fexpensive-optimizations -funroll-loops
+-# CFLAGS = -g -c
++# MY_CFLAGS = -g -c
+ LDFLAGS= -s -mcpu=G4 -mtune=G4
+ endif
+ ifeq ($(ARCHI),i386)
+ CC = gcc
+- CFLAGS = -c -g -O3\
++ MY_CFLAGS = -c -g -O3\
+ -Wuninitialized -Wunused -Winline -Wshadow -arch ppc -arch i386 -mmacosx-version-min=10.4
+-# CFLAGS = c -fast -isysroot /Developer/SDKs/MacOSX10.5u.sdk -arch ppc64 -mcpu=G4
++# MY_CFLAGS = c -fast -isysroot /Developer/SDKs/MacOSX10.5u.sdk -arch ppc64 -mcpu=G4
+ # LDFLAGS= -s -isysroot /Developer/SDKs/MacOSX10.5u.sdk -arch ppc64 -mcpu=G4 -static-libgcc
+ LDFLAGS= -static-libgcc -arch ppc -arch i386 -mmacosx-version-min=10.4
+ endif
+ ifeq ($(ARCHI),sparc)
+ CC = acc
+- CFLAGS = -O4 -c -libmil -cg92
++ MY_CFLAGS = -O4 -c -libmil -cg92
+ LDFLAGS= -libmil -cg92
+ endif
+ ifeq ($(ARCHI), ia64)
+ CC = c89
+- CFLAGS = +Ofast +Odata_prefetch +Ofltacc +DSitanium -s
++ MY_CFLAGS = +Ofast +Odata_prefetch +Ofltacc +DSitanium -s
+ LDFLAGS= -s -N +Oprocelim
+ endif
+ ifeq ($(ARCHI), mips)
+ CC = c89
+- CFLAGS = -O3
++ MY_CFLAGS = -O3
+ LDFLAGS= -s
+ endif
+
+ # working dirs
+-EXEDIR = $(HOME)/bin/$(ARCHI)
++EXEDIR = $(DESTDIR)/usr/bin
+ SRCDIR = sources
+ OBJDIR = objects/$(ARCHI)
+ ARCDIR = archives
+@@ -70,24 +76,34 @@
+
+ .SILENT:
+
++all: target
++
++
+ $(OBJDIR)/%.o: $(SRCDIR)/%.c
+- $(CC) $(OPT64) $(INCDIR) $(CFLAGS) $< -o $@
++ echo "$(CC) $(OPT64) $(INCDIR) $(MY_CFLAGS) $< -o $@"
++ $(CC) $(OPT64) $(INCDIR) $(MY_CFLAGS) $< -o $@
+
+-$(EXEDIR)/$(prog):$(DIRDIR) $(objs)
++$(prog):$(DIRDIR) $(objs)
+ echo "#define COMPIL " '"' `date` '"' > $(SRCDIR)/compil.date
+- $(CC) $(CFLAGS) -c $(INCDIR) $(SRCDIR)/mmg3d.c -o $(OBJDIR)/mmg3d.o
++ $(CC) $(MY_CFLAGS) -c $(INCDIR) $(SRCDIR)/mmg3d.c -o $(OBJDIR)/mmg3d.o
+ echo "$(CC) $(LDFLAGS) $(OPT64) $(LDLDIR) $(objs) -o $@ -lm "
+ $(CC) $(LDFLAGS) $(OPT64) $(LDLDIR) $(objs) -o $@ -lm
+
+ $(objs):$(header)
+
+ $(DIRDIR):
+- @[ -d $@ ] || mkdir $@
++ @[ -d $@ ] || mkdir -p $@
+
+ clean:
+ -rm $(objs) $(EXEDIR)/$(prog)
++ -rm $(OBJDIR) $(ARCDIR)
++ -rm $(prog)
+
+ tar:$(DIRDIR)
+ tar czf $(ARCDIR)/$(prog).`date +"%Y.%m.%d"`.tgz sources makefile
+
+-target: $(EXEDIR)/$(prog)
++target: $(prog)
++
++install: $(prog)
++ mkdir -p $(DESTDIR)/usr/bin
++ install $(prog) $(DESTDIR)/usr/bin
Added: packages/mmg3d/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/mmg3d/trunk/debian/patches/series?rev=44108&op=file
==============================================================================
--- packages/mmg3d/trunk/debian/patches/series (added)
+++ packages/mmg3d/trunk/debian/patches/series Thu Dec 8 16:31:28 2011
@@ -1,0 +1,1 @@
+install.patch
Added: packages/mmg3d/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/mmg3d/trunk/debian/rules?rev=44108&op=file
==============================================================================
--- packages/mmg3d/trunk/debian/rules (added)
+++ packages/mmg3d/trunk/debian/rules Thu Dec 8 16:31:28 2011
@@ -1,0 +1,30 @@
+#!/usr/bin/make -f
+
+DEB_SRCDIR = build
+SOVERSION = 4.0
+VERSION = 4
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+
+#include /usr/share/hardening-includes/hardening.make
+
+#CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+#CXFLAGS=$(shell dpkg-buildflags --get CXFLAGS)
+#LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+#CFLAGS+=$(HARDENING_CFLAGS)
+#CXXFLAGS+=$(HARDENING_CFLAGS)
+#LDFLAGS+=$(HARDENING_LDFLAGS)
+
+# no check for this software
+DEB_MAKE_CHECK_TARGET :=
+
+DEB_CMAKE_EXTRA_FLAGS= -DCOMPIL_SHARED_LIBRARY="ON" \
+ -DINCLUDE_SCOTCH:PATH="/usr/include/scotch"
+
+install/mmg3d::
+ rm -f $(CURDIR)/debian/mmg3d/usr/lib/libmmg3dlib4.0.so
+ cd $(CURDIR)/debian/mmg3d/usr/lib && ln -s libmmg3dlib4.0.so.$(SOVERSION) libmmg3dlib4.0.so.$(VERSION)
+ cd $(CURDIR)/debian/mmg3d/usr/lib && ln -s libmmg3dlib4.0.so.$(VERSION) libmmg3dlib4.0.so
+
Propchange: packages/mmg3d/trunk/debian/rules
------------------------------------------------------------------------------
svn:executable = *
Added: packages/mmg3d/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/debian-science/packages/mmg3d/trunk/debian/source/format?rev=44108&op=file
==============================================================================
--- packages/mmg3d/trunk/debian/source/format (added)
+++ packages/mmg3d/trunk/debian/source/format Thu Dec 8 16:31:28 2011
@@ -1,0 +1,1 @@
+3.0 (quilt)
More information about the debian-science-commits
mailing list