[Pkg-scicomp-devel] freefem3d/freefem3d/trunk

Christophe Prud'homme prudhomm at debian.org
Wed Jul 11 03:11:31 UTC 2007


SVN commit 1656 by prudhomm:

[svn-inject] Applying Debian modifications to trunk

 M  +2 -0      freefem3d/freefem3d/trunk/Makefile.am  
 M  +1 -1      freefem3d/freefem3d/trunk/Makefile.dist  
 AM            freefem3d/freefem3d/trunk/debian (directory)  
 A             freefem3d/freefem3d/trunk/debian/README.debian  
 A             freefem3d/freefem3d/trunk/debian/changelog  
 A             freefem3d/freefem3d/trunk/debian/compat  
 A             freefem3d/freefem3d/trunk/debian/control  
 A             freefem3d/freefem3d/trunk/debian/copyright  
 A             freefem3d/freefem3d/trunk/debian/ff3d.1  
 A             freefem3d/freefem3d/trunk/debian/freefem3d.doc-base  
 A             freefem3d/freefem3d/trunk/debian/freefem3d.docs  
 A             freefem3d/freefem3d/trunk/debian/freefem3d.examples  
 A             freefem3d/freefem3d/trunk/debian/freefem3d.install  
 AM            freefem3d/freefem3d/trunk/debian/rules  
 M  +2 -2      freefem3d/freefem3d/trunk/doc/freefem3dDoc.ps  
 M  +1 -1      freefem3d/freefem3d/trunk/graphics/moc_MainWindow.cpp  
 M  +1 -1      freefem3d/freefem3d/trunk/graphics/moc_SyntaxHighLighter.cpp  
 M  +2 -2      freefem3d/freefem3d/trunk/m4/qt.m4  
 M  +1 -1      freefem3d/freefem3d/trunk/solver/ConnectivityBuilder.cpp  


--- freefem3d/freefem3d/trunk/Makefile.am #1655:1656
@@ -82,3 +82,5 @@
 	doc					\
 	tests
 
+aclocal.m4: m4/compile.m4  m4/gui.m4  m4/libtool.m4  m4/pthread.m4  m4/qt.m4  m4/vtk.m4
+	make -f Makefile.dist
--- freefem3d/freefem3d/trunk/Makefile.dist #1655:1656
@@ -13,7 +13,7 @@
 SUFFIXES	= .cpp .hpp .c .h .f .F .o .moc
 
 all:
-	aclocal
+	aclocal -I m4
 	autoheader
 	automake 
 	autoconf
** freefem3d/freefem3d/trunk/debian #property changes
Name: mergeWithUpstream
   + 1
** freefem3d/freefem3d/trunk/debian/rules #property changes
Name: svn:executable
   + *
--- freefem3d/freefem3d/trunk/doc/freefem3dDoc.ps #1655:1656
@@ -1,7 +1,7 @@
 %!PS-Adobe-2.0
 %%Creator: dvips(k) 5.96.1 Copyright 2007 Radical Eye Software
 %%Title: freefem3dDoc.dvi
-%%CreationDate: Wed Jun 27 01:30:57 2007
+%%CreationDate: Wed Jun 27 01:23:00 2007
 %%Pages: 60
 %%PageOrder: Ascend
 %%BoundingBox: 0 0 595 842
@@ -14,7 +14,7 @@
 %DVIPSWebPage: (www.radicaleye.com)
 %DVIPSCommandLine: dvips freefem3dDoc.dvi -o freefem3dDoc.ps
 %DVIPSParameters: dpi=600
-%DVIPSSource:  TeX output 2007.06.27:0130
+%DVIPSSource:  TeX output 2007.06.27:0123
 %%BeginProcSet: tex.pro 0 0
 %!
 /TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S
--- freefem3d/freefem3d/trunk/graphics/moc_MainWindow.cpp #1655:1656
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** Meta object code from reading C++ file 'MainWindow.hpp'
 **
-** Created: Thu May 24 22:12:42 2007
+** Created: Sat Jun 23 17:21:18 2007
 **      by: The Qt Meta Object Compiler version 59 (Qt 4.2.3)
 **
 ** WARNING! All changes made in this file will be lost!
--- freefem3d/freefem3d/trunk/graphics/moc_SyntaxHighLighter.cpp #1655:1656
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** Meta object code from reading C++ file 'SyntaxHighLighter.hpp'
 **
-** Created: Thu May 24 22:12:42 2007
+** Created: Sat Jun 23 17:21:18 2007
 **      by: The Qt Meta Object Compiler version 59 (Qt 4.2.3)
 **
 ** WARNING! All changes made in this file will be lost!
--- freefem3d/freefem3d/trunk/m4/qt.m4 #1655:1656
@@ -62,14 +62,14 @@
   AC_MSG_RESULT([$QT_VER ($QT_MAJOR)])
 
   # Check that moc is in path
-  AC_CHECK_PROG(MOC, moc, moc)
+  AC_CHECK_PROGS(MOC, [moc moc-qt3], moc)
   if test x"$MOC" = x ; then
         FOUND_QT=false
         AC_MSG_WARN([*** moc must be in path])
   fi
 
   # uic is the Qt user interface compiler
-  AC_CHECK_PROG(UIC, uic, uic)
+  AC_CHECK_PROGS(UIC, [uic uic-qt3], uic)
   if test x"$UIC" = x ; then
           FOUND_QT=false
           AC_MSG_WARN([*** uic must be in path])
--- freefem3d/freefem3d/trunk/solver/ConnectivityBuilder.cpp #1655:1656
@@ -13,7 +13,7 @@
 
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software Foundation,
-//  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
+//  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 //  $Id: ConnectivityBuilder.cpp,v 1.7 2005/04/20 22:09:41 delpinux Exp $
 



More information about the Pkg-scicomp-devel mailing list