[SCM] FreeFem++ packaging branch, master, updated. debian/3.12-1-8-g41e37c6
Dimitrios Eftaxiopoulos
eftaxi12 at otenet.gr
Sun Feb 20 19:15:33 UTC 2011
The following commit has been merged in the master branch:
commit 41e37c6c1cd092542ae7ab71cd5d82b28676fb5f
Merge: 1e5b3212c94823bcbdc3693eaaa1a5f3dc74e3bc b7b84a3b4b9c00bd7affd3551c523f9b6ba8a107
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date: Sun Feb 20 20:59:50 2011 +0200
Edit debian/copyright file a bit
Conflicts:
debian/changelog
debian/copyright
src/medit/Makefile.am
src/medit/Makefile.in
diff --combined debian/changelog
index 335a2e4,6e2a05d..10a2472
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,10 +1,16 @@@
-freefem++ (3.12-1) experimental; urgency=low
+freefem++ (3.12-1) unstable; urgency=low
- * Initial release (Closes: #500755)
+ * Initial release (Closes: #500755).
+ * Create packages libfreefem++ and libfreefem++-dev.
+ * Complete the man pages.
+ -- Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr> Sun, 20 Feb 2011 16:21:00 +0200
+
+freefem++ (3.11-1) unreleased; urgency=low
+
+ * A successful build
+
- -- Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr> Fri, 24 Dec 2010 17:50:44 +0200
+ -- Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr> Sat, 22 Jan 2011 04:56:44 +0200
freefem++ (3.9-2-1.1) unstable; urgency=low
diff --combined debian/changelog~
index 335a2e4,6e2a05d..eccba8c
--- a/debian/changelog~
+++ b/debian/changelog~
@@@ -1,14 -1,10 +1,24 @@@
++<<<<<<< HEAD
+freefem++ (3.12-1) unstable; urgency=low
++=======
+ freefem++ (3.12-1) experimental; urgency=low
++>>>>>>> b7b84a3b4b9c00bd7affd3551c523f9b6ba8a107
- * Initial release (Closes: #500755)
+ * Initial release (Closes: #500755).
+ * Create packages libfreefem++ and libfreefem++-dev.
+ * Complete the man pages.
++<<<<<<< HEAD
+ -- Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr> Sun, 20 Feb 2011 16:21:00 +0200
+
+freefem++ (3.11-1) unreleased; urgency=low
+
+ * A successful build
+
+ -- Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr> Fri, 24 Dec 2010 17:50:44 +0200
++=======
+ -- Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr> Sat, 22 Jan 2011 04:56:44 +0200
++>>>>>>> b7b84a3b4b9c00bd7affd3551c523f9b6ba8a107
freefem++ (3.9-2-1.1) unstable; urgency=low
diff --combined debian/copyright~
index f8fa745,5a99330..fa60e99
--- a/debian/copyright~
+++ b/debian/copyright~
@@@ -27,10 -27,10 +27,17 @@@ License
GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999.
Excepted are the following files which have their own licences:
++<<<<<<< HEAD
src/Algo
++=======
++
++
++ src/Algo
++
++>>>>>>> b7b84a3b4b9c00bd7affd3551c523f9b6ba8a107
COOOL is a package of tools for writing optimization code and solving optimization problems. Our special interest is in solving inverse problems, but the library should be useful for many different kinds of problems.
taken from the COOOL software by the FreeFem++ authors
(http://coool.mines.edu/)
@@@ -38,6 -38,6 +45,23 @@@
Licence:
Copyright (C) 2003, Lydia Deng, Wences Gouveia
++<<<<<<< HEAD
++
++ The COOOL library is a free software. You can do anything you want
++ with it including make a fortune. However, neither the authors,
++ the Center for Wave Phenomena, nor anyone else you can think of
++ makes any guarantees about anything in this package or any aspect
++ of its functionality.
++
++ Since you've got the source code you can also modify the
++ library to suit your own purposes. We would appreciate it
++ if the headers that identify the authors are kept in the
++ source code.
++
++
++ src/fflib/mt19937ar.cpp
++
++=======
The COOOL library is a free software. You can do anything you want
with it including make a fortune. However, neither the authors,
@@@ -53,6 -53,6 +77,7 @@@
src/fflib/mt19937ar.cpp
++>>>>>>> b7b84a3b4b9c00bd7affd3551c523f9b6ba8a107
A C-program for MT19937, with initialization improved 2002/1/26.
Coded by Takuji Nishimura and Makoto Matsumoto
(mailto:m-mat at math.sci.hiroshima-u.ac.jp).
@@@ -99,3 -99,4 +124,7 @@@ The Debian packaging is
2006-2010 Christophe Prud'homme <prudhomm at debian.org>
and is licensed under the GPL version 3,
see "/usr/share/common-licenses/GPL-3".
++<<<<<<< HEAD
++=======
+
++>>>>>>> b7b84a3b4b9c00bd7affd3551c523f9b6ba8a107
diff --combined debian/patches/src-medit-Makefile.patch
index 822929a,78f4325..8e4a862
--- a/debian/patches/src-medit-Makefile.patch
+++ b/debian/patches/src-medit-Makefile.patch
@@@ -1,58 -1,48 +1,58 @@@
-Comment out pinking no opt part
+Fix medit not install patch
--- a/src/medit/Makefile.am
+++ b/src/medit/Makefile.am
- @@ -23,15 +23,15 @@
-@@ -23,13 +23,13 @@
++@@ -23,15 +23,14 @@
compil.date: $(ffmedit_SOURCES)
echo "#define COMPIL " '"' `date` '(with ff++ $(VERSION))''"' > compil.date
#.PHONY: compil.date
--all-local: pinking.no-opt
+-all-local: pinking.no-opt$(MEDITPROG)
-
--pinking.no-opt:picking.c
+-pinking.no-optffmedit$(EXEEXT):picking.c
- rm picking.$(OBJEXT)
-- $(MAKE) picking.o ffmedit CFLAGS="$(CNOFLAGS)"
+- $(MAKE) picking.o $(MEDITPROG) CFLAGS="$(CNOFLAGS)"
+- touch pinking.no-optffmedit$(EXEEXT)
+-pinking.no-opt:picking.c
- touch pinking.no-opt
-clean-local:
-- -rm pinking.no-opt
-+# all-local: pinking.no-opt
+- -rm pinking.no-opt pinking.no-optffmedit$(EXEEXT)
++-
++
++# all-local: pinking.no-opt$(MEDITPROG)
+#
-+# pinking.no-opt:picking.c
++# pinking.no-optffmedit$(EXEEXT):picking.c
+# rm picking.$(OBJEXT)
-+# $(MAKE) picking.o ffmedit CFLAGS="$(CNOFLAGS)"
++# $(MAKE) picking.o $(MEDITPROG) CFLAGS="$(CNOFLAGS)"
++# touch pinking.no-optffmedit$(EXEEXT)
++# pinking.no-opt:picking.c
+# touch pinking.no-opt
+# clean-local:
-+# -rm pinking.no-opt
-
-
++# -rm pinking.no-opt pinking.no-optffmedit$(EXEEXT)
-
-
--- a/src/medit/Makefile.in
+++ b/src/medit/Makefile.in
-@@ -658,14 +658,14 @@
- compil.date: $(ffmedit_SOURCES)
+@@ -659,17 +659,17 @@
echo "#define COMPIL " '"' `date` '(with ff++ $(VERSION))''"' > compil.date
#.PHONY: compil.date
--all-local: pinking.no-opt
+
+-all-local: pinking.no-opt$(MEDITPROG)
-
--pinking.no-opt:picking.c
+-pinking.no-optffmedit$(EXEEXT):picking.c
- rm picking.$(OBJEXT)
-- $(MAKE) picking.o ffmedit CFLAGS="$(CNOFLAGS)"
+- $(MAKE) picking.o $(MEDITPROG) CFLAGS="$(CNOFLAGS)"
+- touch pinking.no-optffmedit$(EXEEXT)
+-pinking.no-opt:picking.c
- touch pinking.no-opt
+-
-clean-local:
- -rm pinking.no-opt
-+# all-local: pinking.no-opt
++# all-local: pinking.no-opt$(MEDITPROG)
+#
-+# pinking.no-opt:picking.c
++# pinking.no-optffmedit$(EXEEXT):picking.c
+# rm picking.$(OBJEXT)
-+# $(MAKE) picking.o ffmedit CFLAGS="$(CNOFLAGS)"
++# $(MAKE) picking.o $(MEDITPROG) CFLAGS="$(CNOFLAGS)"
++# touch pinking.no-optffmedit$(EXEEXT)
++# pinking.no-opt:picking.c
+# touch pinking.no-opt
++#
+# clean-local:
+# -rm pinking.no-opt
diff --combined src/medit/Makefile.am
index 9bec8c3,8afa9df..61d91cc
--- a/src/medit/Makefile.am
+++ b/src/medit/Makefile.am
@@@ -23,15 -23,16 +23,14 @@@ BUILT_SOURCES=compil.dat
compil.date: $(ffmedit_SOURCES)
echo "#define COMPIL " '"' `date` '(with ff++ $(VERSION))''"' > compil.date
#.PHONY: compil.date
+
-all-local: pinking.no-opt$(MEDITPROG)
-
-pinking.no-optffmedit$(EXEEXT):picking.c
- rm picking.$(OBJEXT)
- $(MAKE) picking.o $(MEDITPROG) CFLAGS="$(CNOFLAGS)"
- touch pinking.no-optffmedit$(EXEEXT)
-pinking.no-opt:picking.c
- touch pinking.no-opt
-clean-local:
- -rm pinking.no-opt pinking.no-optffmedit$(EXEEXT)
-
-
+# all-local: pinking.no-opt$(MEDITPROG)
+#
+# pinking.no-optffmedit$(EXEEXT):picking.c
+# rm picking.$(OBJEXT)
+# $(MAKE) picking.o $(MEDITPROG) CFLAGS="$(CNOFLAGS)"
+# touch pinking.no-optffmedit$(EXEEXT)
+# pinking.no-opt:picking.c
+# touch pinking.no-opt
+# clean-local:
+# -rm pinking.no-opt pinking.no-optffmedit$(EXEEXT)
-
-
diff --combined src/medit/Makefile.am~
index 9bec8c3,8afa9df..805592e
--- a/src/medit/Makefile.am~
+++ b/src/medit/Makefile.am~
@@@ -23,15 -23,16 +23,29 @@@ BUILT_SOURCES=compil.dat
compil.date: $(ffmedit_SOURCES)
echo "#define COMPIL " '"' `date` '(with ff++ $(VERSION))''"' > compil.date
#.PHONY: compil.date
++<<<<<<< HEAD
+# all-local: pinking.no-opt$(MEDITPROG)
+#
+# pinking.no-optffmedit$(EXEEXT):picking.c
+# rm picking.$(OBJEXT)
+# $(MAKE) picking.o $(MEDITPROG) CFLAGS="$(CNOFLAGS)"
+# touch pinking.no-optffmedit$(EXEEXT)
+# pinking.no-opt:picking.c
+# touch pinking.no-opt
+# clean-local:
+# -rm pinking.no-opt pinking.no-optffmedit$(EXEEXT)
++=======
+
+ all-local: pinking.no-opt$(MEDITPROG)
+
+ pinking.no-optffmedit$(EXEEXT):picking.c
+ rm picking.$(OBJEXT)
+ $(MAKE) picking.o $(MEDITPROG) CFLAGS="$(CNOFLAGS)"
+ touch pinking.no-optffmedit$(EXEEXT)
+ pinking.no-opt:picking.c
+ touch pinking.no-opt
+ clean-local:
+ -rm pinking.no-opt pinking.no-optffmedit$(EXEEXT)
++>>>>>>> b7b84a3b4b9c00bd7affd3551c523f9b6ba8a107
diff --combined src/medit/Makefile.in~
index 5efd251,3c30371..036f4a1
--- a/src/medit/Makefile.in~
+++ b/src/medit/Makefile.in~
@@@ -659,17 -659,17 +659,31 @@@ compil.date: $(ffmedit_SOURCES
echo "#define COMPIL " '"' `date` '(with ff++ $(VERSION))''"' > compil.date
#.PHONY: compil.date
++<<<<<<< HEAD
+# all-local: pinking.no-opt$(MEDITPROG)
+#
+# pinking.no-optffmedit$(EXEEXT):picking.c
+# rm picking.$(OBJEXT)
+# $(MAKE) picking.o $(MEDITPROG) CFLAGS="$(CNOFLAGS)"
+# touch pinking.no-optffmedit$(EXEEXT)
+# pinking.no-opt:picking.c
+# touch pinking.no-opt
+#
+# clean-local:
+# -rm pinking.no-opt
++=======
+ all-local: pinking.no-opt$(MEDITPROG)
+
+ pinking.no-optffmedit$(EXEEXT):picking.c
+ rm picking.$(OBJEXT)
+ $(MAKE) picking.o $(MEDITPROG) CFLAGS="$(CNOFLAGS)"
+ touch pinking.no-optffmedit$(EXEEXT)
+ pinking.no-opt:picking.c
+ touch pinking.no-opt
+
+ clean-local:
+ -rm pinking.no-opt
++>>>>>>> b7b84a3b4b9c00bd7affd3551c523f9b6ba8a107
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
--
FreeFem++ packaging
More information about the debian-science-commits
mailing list