The following commit has been merged in the master branch: commit 9a17d710bc6c7ec49319343238f522166d000c3c Merge: 50c584e1e9c129adf2d2f267b83a8f249e7b01cc a836271e1e445e42e3d580d936d24181482fb198 Author: YunQiang Su <wzss...@gmail.com> Date: Mon Jul 29 19:48:54 2013 +0800
Merge tag 'upstream/1.4.6' Upstream version 1.4.6 Conflicts: debian/changelog debian/control debian/copyright debian/patches/series debian/savi-bin debian/savi.install diff --combined debian/changelog index 74c0b46,0000000..308a6b4 mode 100644,000000..100644 --- a/debian/changelog +++ b/debian/changelog @@@ -1,35 -1,0 +1,44 @@@ ++savi (1.4.6-1) unstable; urgency=low ++ ++ * New upstream release 1.4.6. ++ * Bump policy version to 3.9.4: no changes needed. ++ * Drop DMUA section in debian/control ++ * Bump DH compat to 9. ++ ++ -- YunQiang Su <wzss...@gmail.com> Mon, 29 Jul 2013 19:53:28 +0800 ++ +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 <wzss...@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 <wzss...@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 + - remove debian/patches/{data, maps, oogl}_to_share.diff + [debian/savi.install, debian/savi-bin] + 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 <wzss...@gmail.com> Tue, 12 Jul 2011 08:10:37 +0800 + +savi (1.4.5-1) unstable; urgency=low + + * Initial release (Closes: #436511) + + -- YunQiang Su <wzss...@gmail.com> Fri, 22 Apr 2011 19:10:37 +0800 diff --combined debian/compat index 7f8f011,0000000..ec63514 mode 100644,000000..100644 --- a/debian/compat +++ b/debian/compat @@@ -1,1 -1,0 +1,1 @@@ - 7 ++9 diff --combined debian/control index 50880bb,0000000..1cc4a2c mode 100644,000000..100644 --- a/debian/control +++ b/debian/control @@@ -1,23 -1,0 +1,22 @@@ +Source: savi +Section: science +Priority: optional +Maintainer: YunQiang Su <wzss...@gmail.com> - DM-Upload-Allowed: yes +Uploaders: DebianGis Team <pkg-grass-devel@lists.alioth.debian.org> - Build-Depends: debhelper (>= 7.0.50~), autotools-dev, tcl-dev, tk-dev - Standards-Version: 3.9.2 ++Build-Depends: debhelper (>= 9), autotools-dev, tcl-dev, tk-dev ++Standards-Version: 3.9.4 +Homepage: http://savi.sourceforge.net/ +Vcs-Git: git://git.debian.org/pkg-grass/savi.git +Vcs-Browser: http://git.debian.org/?p=pkg-grass/savi.git + +Package: savi +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Suggests: geomview +Description: satellite constellation visualisation + SaVi allows you to simulate satellite orbits and coverage, + in two and three dimensions. SaVi is particularly useful for + simulating satellite constellations such as Iridium and Globalstar. + . + SaVi can use Geomview, an optional but useful package, + for 3D rendering. diff --combined debian/patches/enable_zlib.diff index b537613,0000000..8f006b7 mode 100644,000000..100644 --- a/debian/patches/enable_zlib.diff +++ b/debian/patches/enable_zlib.diff @@@ -1,48 -1,0 +1,54 @@@ +Enable -lz and change to generic tcl/tk from fixed 8.5 + - Index: savi-1.4.4/src/Makefile_defs_ubuntu ++Index: savi/src/Makefile_defs_ubuntu +=================================================================== - --- savi-1.4.4.orig/src/Makefile_defs_ubuntu 2011-04-22 20:38:40.729947634 +0800 - +++ savi-1.4.4/src/Makefile_defs_ubuntu 2011-04-22 20:38:46.000000000 +0800 ++--- savi.orig/src/Makefile_defs_ubuntu 2013-07-29 21:32:43.483067324 +0800 +++++ savi/src/Makefile_defs_ubuntu 2013-07-29 21:32:43.475067323 +0800 +@@ -45,7 +45,7 @@ + # match. # + # # + ######################################################## +-TCL_INCLUDES = -I/usr/include/tcl8.5 -I/usr/include/tk8.5 ++TCL_INCLUDES = -I/usr/include/tcl -I/usr/include/tk + + ######################################################## + # # +@@ -56,9 +56,9 @@ + # Debian requires a dot here: -ltcl8.4 -ltk8.4 + # as does Red Hat Enterprise. + +-TCL_LIBS = -ltcl8.5 -ltk8.5 ++#TCL_LIBS = -ltcl8.5 -ltk8.5 + +-# TCL_LIBS = -ltcl -ltk ++TCL_LIBS = -ltcl -ltk + # is a generic alternative to try. + + +@@ -70,6 +70,6 @@ + ######################################################## + OTHER_LIBS = -ldl + +-# OTHER_LIBS = -lz ++OTHER_LIBS = -lz + # if zlib compression of textures to Geomview is desired. + # OTHER_LIBS = -static - Index: savi-1.4.4/src/Makefile ++Index: savi/src/Makefile +=================================================================== - --- savi-1.4.4.orig/src/Makefile 2011-04-22 20:48:31.150813600 +0800 - +++ savi-1.4.4/src/Makefile 2011-04-22 20:48:51.330843197 +0800 - @@ -26,7 +26,7 @@ ++--- savi.orig/src/Makefile 2013-07-29 21:32:43.483067324 +0800 +++++ savi/src/Makefile 2013-07-29 21:32:56.423067685 +0800 ++@@ -26,12 +26,12 @@ + # zlib enables transparent gzip compression of dynamic texture scratchfiles. + # OTHER_LIBS = -lz should be inserted at end of definitions file. + +- GCC_FLAGS = -O2 -DNO_ZLIB ++ GCC_FLAGS = -O2 + + LIBS = $(TCL_LIBS) $(OTHER_LIBS) -lm + ++ ++- DEBUGFLAGS = -Wall -Wextra -Wconversion -pedantic -ansi +++ DEBUGFLAGS = -Wall -Wextra -Wconversion -pedantic ++ ++ # These do not find anything to warn about: ++ # DEBUGFLAGS = -Wshadow -Wpointer-arith -Wcast-qual \ diff --combined debian/patches/series index 8439f70,0000000..9aa50f0 mode 100644,000000..100644 --- a/debian/patches/series +++ b/debian/patches/series @@@ -1,3 -1,0 +1,2 @@@ +enable_zlib.diff +share_lib_div.diff - no_build_with_ansi_option.diff diff --combined debian/patches/share_lib_div.diff index 00a28ce,0000000..932f90b mode 100644,000000..100644 --- a/debian/patches/share_lib_div.diff +++ b/debian/patches/share_lib_div.diff @@@ -1,38 -1,0 +1,13 @@@ - Index: savi-1.4.5/savi ++Index: savi/savi +=================================================================== - --- 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 @@ ++--- savi.orig/savi 2013-07-29 20:15:48.758938605 +0800 +++++ savi/savi 2013-07-29 20:17:20.142941154 +0800 ++@@ -40,7 +40,7 @@ + # - # Default executable relative location and name ++ # Default executable absolute location and name + # - -SAVIBIN=bin/SaVi - +SAVIBIN=../../lib/savi/bin/SaVi ++-SAVIBIN="${SAVI}/bin/SaVi" +++SAVIBIN="../../lib/savi/bin/SaVi" + - - # - @@ -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} - -fi - \ No newline at end of file - +fi ++ # Set locations of tcl and tk library code needed at runtime diff --combined debian/rules index a65fbfe,0000000..7052621 mode 100755,000000..100755 --- a/debian/rules +++ b/debian/rules @@@ -1,17 -1,0 +1,21 @@@ +#!/usr/bin/make -f + +%: + dh $@ + +override_dh_auto_configure: + +override_dh_auto_build: + make ARCH=ubuntu + +override_dh_auto_install: + +override_dh_install: + dh_install + cp debian/savi-bin debian/savi/usr/bin/savi + cp debian/geomview-savi debian/savi/usr/lib/geomview/.geomview-savi + find debian/savi/usr/ -name "Makefile*" -exec rm {} \; ++ ++override_dh_fixperms: ++ dh_fixperms ++ find debian/savi/usr/share/savi/oogl/ -type f | xargs chmod -x -- satellite constellation visualisation _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel