[SCM] savi branch, master, updated. 50c584e1e9c129adf2d2f267b83a8f249e7b01cc
YunQiang Su
wzssyqa at gmail.com
Sat Nov 5 20:11:29 UTC 2011
The following commit has been merged in the master branch:
commit 50c584e1e9c129adf2d2f267b83a8f249e7b01cc
Author: YunQiang Su <wzssyqa at gmail.com>
Date: Sun Nov 6 04:11:49 2011 +0800
fix ftbfs on kfreebsd; strings.h -> string.h remove -ansi
diff --git a/debian/changelog b/debian/changelog
index 59571e6..74c0b46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+savi (1.4.5-4) unstable; urgency=low
+
+ * [debian/patches/no_build_with_ansi_option.diff]
+ - No build with -ansi option
+ - replace strings.h to string.h (Closes: #647717)
+ * Fix format problem in debian/copyright.
+
+ -- YunQiang Su <wzssyqa at gmail.com> Sun, 06 Nov 2011 03:23:52 +0800
+
+savi (1.4.5-3) unstable; urgency=low
+
+ * [debian/patches/share_lib_div.diff]
+ - get "ubuntu" just from /etc/debian_version. (Closes: #633533)
+ no need "-f /vmlinuz -o -f /boot/vmlinuz",
+ which may not work when generic kernel is not installed or
+ on kFreeBSD or some els port.
+
+ -- YunQiang Su <wzssyqa at gmail.com> Tue, 12 Jul 2011 18:41:20 +0800
+
savi (1.4.5-2) unstable; urgency=low
* Install data files to /usr/share now
@@ -6,7 +25,6 @@ savi (1.4.5-2) unstable; urgency=low
install data files and scripts to /usr/share/savi
[debian/patches/share_lib_div.diff]
patch ./savi to find bin file SaVi in /usr/lib/savi/bin
-
-- YunQiang Su <wzssyqa at gmail.com> Tue, 12 Jul 2011 08:10:37 +0800
diff --git a/debian/copyright b/debian/copyright
index 0edfc4e..31ca027 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,74 +4,72 @@ Source: http://savi.sourceforge.net/
Files: *
Copyright:
- 1. ADDITIONAL COPYRIGHT FOR THE SAVI 1.2, 1.3 and 1.4 RELEASES
- ==============================================================
-
- Enhancements to and modifications of SaVi 1.0, expressed in the
- SaVi 1.2, 1.3 and 1.4 releases, are:
-
- Copyright (c) 2001, 2002, 2003, 2004, 2005,
- 2006, 2007, 2008, 2009, 2010, 2011 Lloyd Wood.
-
- Lloyd Wood maintains SaVi, and welcomes bug reports and fixes from
- users. Contact Lloyd at: lloydwood at users.sourceforge.net.
-
- SaVi continues to be provided "as is", and no warranty or guarantee of
- fitness for use is expressed or implied.
-
- Use of SaVi images should credit SaVi. A suggested reference is:
- L. Wood, P. Worfolk et al., SaVi - Satellite constellation
- Visualisation software, http://savi.sf.net/, 2011.
-
- 2. ORIGINAL COPYRIGHT FOR SAVI 1.0
- ==================================
-
- SaVi
-
- by Robert Thurman (thurman at geom.umn.edu) and
- Patrick Worfolk (worfolk at alum.mit.edu).
-
-
- Copyright (c) 1997
-
- The National Science and Technology Research Center for
- Computation and Visualization of Geometric Structures
- (The Geometry Center)
- University of Minnesota
-
- email: savi at geom.umn.edu
-
-
+ 1. ADDITIONAL COPYRIGHT FOR THE SAVI 1.2, 1.3 and 1.4 RELEASES
+ ==============================================================
+ .
+ Enhancements to and modifications of SaVi 1.0, expressed in the
+ SaVi 1.2, 1.3 and 1.4 releases, are:
+ .
+ Copyright (c) 2001, 2002, 2003, 2004, 2005,
+ 2006, 2007, 2008, 2009, 2010, 2011 Lloyd Wood.
+ .
+ Lloyd Wood maintains SaVi, and welcomes bug reports and fixes from
+ users. Contact Lloyd at: lloydwood at users.sourceforge.net.
+ .
+ SaVi continues to be provided "as is", and no warranty or guarantee of
+ fitness for use is expressed or implied.
+ .
+ Use of SaVi images should credit SaVi. A suggested reference is:
+ L. Wood, P. Worfolk et al., SaVi - Satellite constellation
+ Visualisation software, http://savi.sf.net/, 2011.
+ .
+ 2. ORIGINAL COPYRIGHT FOR SAVI 1.0
+ ==================================
+ .
+ SaVi
+ .
+ by Robert Thurman (thurman at geom.umn.edu) and
+ Patrick Worfolk (worfolk at alum.mit.edu).
+ .
+ .
+ . Copyright (c) 1997
+ .
+ The National Science and Technology Research Center for
+ Computation and Visualization of Geometric Structures
+ . (The Geometry Center)
+ . University of Minnesota
+ .
+ . email: savi at geom.umn.edu
License:
-This software is copyrighted as noted above. It is free software and
-may be obtained by emailing savi at geom.umn.edu or contacting the
-authors. It may be freely copied, modified, and redistributed under
-the following conditions:
-
-1. All copyright notices must remain intact in all files.
-
-2. A copy of this file (COPYRIGHT) must be distributed along with any
- copies which you redistribute; this includes copies which you have
- modified, or copies of programs or other software products which
- include this software or portions of it.
-
-3. When distributing modified versions of this software,
- you must provide notice clearly stating that it is modified software
- and that the original software may be obtained freely as noted
- above.
- When distributing other software products which include this
- software or portions of it, you must also provide notice that the
- original software may be obtained freely as noted above.
-
-4. There is no warranty or other guarantee of fitness for this
- software, it is provided solely "as is". Bug reports or fixes may
- be sent to the email address above; the authors may or may not act
- on them as they desire.
-
-If you use an image produced by this software in a publication or
-presentation, we request that you credit the Geometry Center with a
-notice such as the following:
-
+ This software is copyrighted as noted above. It is free software and
+ may be obtained by emailing savi at geom.umn.edu or contacting the
+ authors. It may be freely copied, modified, and redistributed under
+ the following conditions:
+ .
+ 1. All copyright notices must remain intact in all files.
+ .
+ 2. A copy of this file (COPYRIGHT) must be distributed along with any
+ copies which you redistribute; this includes copies which you have
+ modified, or copies of programs or other software products which
+ include this software or portions of it.
+ .
+ 3. When distributing modified versions of this software,
+ you must provide notice clearly stating that it is modified software
+ and that the original software may be obtained freely as noted
+ above.
+ When distributing other software products which include this
+ software or portions of it, you must also provide notice that the
+ original software may be obtained freely as noted above.
+ .
+ 4. There is no warranty or other guarantee of fitness for this
+ software, it is provided solely "as is". Bug reports or fixes may
+ be sent to the email address above; the authors may or may not act
+ on them as they desire.
+ .
+ If you use an image produced by this software in a publication or
+ presentation, we request that you credit the Geometry Center with a
+ notice such as the following:
+ .
Figures 1, 2, and 5-300 were generated with SaVi, software written
at the Geometry Center, University of Minnesota.
diff --git a/debian/patches/no_build_with_ansi_option.diff b/debian/patches/no_build_with_ansi_option.diff
new file mode 100644
index 0000000..0257927
--- /dev/null
+++ b/debian/patches/no_build_with_ansi_option.diff
@@ -0,0 +1,26 @@
+Index: savi-1.4.5/src/Makefile
+===================================================================
+--- savi-1.4.5.orig/src/Makefile 2011-07-12 08:54:19.000000000 +0800
++++ savi-1.4.5/src/Makefile 2011-11-06 02:48:47.553862822 +0800
+@@ -31,7 +31,7 @@
+ LIBS = $(TCL_LIBS) $(OTHER_LIBS) -lm
+
+
+- DEBUGFLAGS = -Wall -Wconversion -pedantic -ansi
++ DEBUGFLAGS = -Wall -Wconversion -pedantic
+
+ # These do not find anything to warn about:
+ # DEBUGFLAGS = -Wshadow -Wpointer-arith -Wcast-qual \
+Index: savi-1.4.5/src/Satellite.c
+===================================================================
+--- savi-1.4.5.orig/src/Satellite.c 2011-01-10 04:20:01.000000000 +0800
++++ savi-1.4.5/src/Satellite.c 2011-11-06 03:03:24.654212137 +0800
+@@ -25,7 +25,7 @@
+ * $Id: Satellite.c,v 1.14 2011/01/09 20:20:01 lloydwood Exp $
+ */
+
+-#include <strings.h>
++#include <string.h>
+
+ #include "constants.h"
+ #include "orbit_utils.h"
diff --git a/debian/patches/series b/debian/patches/series
index 9aa50f0..8439f70 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
enable_zlib.diff
share_lib_div.diff
+no_build_with_ansi_option.diff
diff --git a/debian/patches/share_lib_div.diff b/debian/patches/share_lib_div.diff
index 6a83d33..00a28ce 100644
--- a/debian/patches/share_lib_div.diff
+++ b/debian/patches/share_lib_div.diff
@@ -1,7 +1,7 @@
Index: savi-1.4.5/savi
===================================================================
---- savi-1.4.5.orig/savi 2011-07-12 08:07:17.862240899 +0800
-+++ savi-1.4.5/savi 2011-07-12 08:09:27.818885318 +0800
+--- savi-1.4.5.orig/savi 2011-07-12 08:12:19.895738607 +0800
++++ savi-1.4.5/savi 2011-07-12 18:35:57.002610486 +0800
@@ -68,7 +68,7 @@
#
# Default executable relative location and name
@@ -11,7 +11,25 @@ Index: savi-1.4.5/savi
#
-@@ -270,4 +270,4 @@
+@@ -80,12 +80,13 @@
+ #
+ # Check for known machine types
+ #
+-if [ -f /vmlinuz -o -f /boot/vmlinuz ]; then
+- ARCH=linux
+- if [ -f /etc/debian_version ]; then
++if [ -f /etc/debian_version ]; then
+ # Ubuntu is the most popular Debian variant.
++ # Debian is not only a Linux distribution.
++ # It has kFreeBSD and etc.
+ ARCH=ubuntu
+- fi
++elif [ -f /vmlinuz -o -f /boot/vmlinuz ]; then
++ ARCH=linux
+ elif [ -d /devices ]; then
+ ARCH=sun
+ elif [ -d /usr/bsd -a -d /usr/sbin ]; then
+@@ -270,4 +271,4 @@
echo "(setenv SAVI \"$SAVI\")"
fi
exec ${SAVIBIN} $* ${params}
--
satellite constellation visualisation
More information about the Pkg-grass-devel
mailing list