This is an automated email from the git hooks/post-receive script. wzssyqa-guest pushed a commit to branch master in repository savi.
commit 0f7b2ead8afcc8936bf38d198b2c1ac6e9571161 Author: YunQiang Su <[email protected]> Date: Fri Feb 19 16:58:10 2016 +0800 Release 1.4.9-1 --- debian/changelog | 8 ++++++++ debian/control | 4 ++-- debian/copyright | 4 +--- debian/patches/enable_zlib.diff | 37 +++++++++++++++++-------------------- debian/patches/share_lib_div.diff | 26 +++++++++++++++++++++----- 5 files changed, 49 insertions(+), 30 deletions(-) diff --git a/debian/changelog b/debian/changelog index 308a6b4..a50abeb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +savi (1.4.9-1) unstable; urgency=medium + + * New upstream release 1.4.9. + * Bump standard version to 3.9.6. + * Built with -g and $(LDFLAGS): for dbgsym package. + + -- YunQiang Su <[email protected]> Fri, 19 Feb 2016 15:42:35 +0800 + savi (1.4.6-1) unstable; urgency=low * New upstream release 1.4.6. diff --git a/debian/control b/debian/control index 1cc4a2c..79da76b 100644 --- a/debian/control +++ b/debian/control @@ -1,10 +1,10 @@ Source: savi Section: science Priority: optional -Maintainer: YunQiang Su <[email protected]> +Maintainer: YunQiang Su <[email protected]> Uploaders: DebianGis Team <[email protected]> Build-Depends: debhelper (>= 9), autotools-dev, tcl-dev, tk-dev -Standards-Version: 3.9.4 +Standards-Version: 3.9.6 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 diff --git a/debian/copyright b/debian/copyright index 31ca027..2c53c47 100644 --- a/debian/copyright +++ b/debian/copyright @@ -40,7 +40,7 @@ Copyright: . University of Minnesota . . email: [email protected] -License: +License: BSD-4-clause This software is copyrighted as noted above. It is free software and may be obtained by emailing [email protected] or contacting the authors. It may be freely copied, modified, and redistributed under @@ -73,8 +73,6 @@ License: Figures 1, 2, and 5-300 were generated with SaVi, software written at the Geometry Center, University of Minnesota. - - Files: debian/* Copyright: 2011 YunQiang Su <[email protected]> License: GPL-2+ diff --git a/debian/patches/enable_zlib.diff b/debian/patches/enable_zlib.diff index 8f006b7..6d0fdff 100644 --- a/debian/patches/enable_zlib.diff +++ b/debian/patches/enable_zlib.diff @@ -1,31 +1,29 @@ -Enable -lz and change to generic tcl/tk from fixed 8.5 +Enable -lz and change to generic tcl/tk from fixed 8.6 -Index: savi/src/Makefile_defs_ubuntu -=================================================================== ---- 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 @@ +--- a/src/Makefile_defs_ubuntu ++++ b/src/Makefile_defs_ubuntu +@@ -46,7 +46,7 @@ # match. # # # ######################################################## --TCL_INCLUDES = -I/usr/include/tcl8.5 -I/usr/include/tk8.5 +-TCL_INCLUDES = -I/usr/include/tcl8.6 -I/usr/include/tk8.6 +TCL_INCLUDES = -I/usr/include/tcl -I/usr/include/tk - ######################################################## - # # -@@ -56,9 +56,9 @@ - # Debian requires a dot here: -ltcl8.4 -ltk8.4 + # TCL_INCLUDES = -I/usr/include/tcl -I/usr/include/tk + # is a generic alternative to try. +@@ -60,9 +60,9 @@ + # Debian variants, including Ubuntu, require 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 = -ltcl8.6 -ltk8.6 ++#TCL_LIBS = -ltcl8.6 -ltk8.6 -# TCL_LIBS = -ltcl -ltk +TCL_LIBS = -ltcl -ltk # is a generic alternative to try. -@@ -70,6 +70,6 @@ +@@ -74,6 +74,6 @@ ######################################################## OTHER_LIBS = -ldl @@ -33,18 +31,17 @@ Index: savi/src/Makefile_defs_ubuntu +OTHER_LIBS = -lz # if zlib compression of textures to Geomview is desired. # OTHER_LIBS = -static -Index: savi/src/Makefile -=================================================================== ---- savi.orig/src/Makefile 2013-07-29 21:32:43.483067324 +0800 -+++ savi/src/Makefile 2013-07-29 21:32:56.423067685 +0800 +--- a/src/Makefile ++++ b/src/Makefile @@ -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 ++ GCC_FLAGS = -O2 -g - LIBS = $(TCL_LIBS) $(OTHER_LIBS) -lm +- LIBS = $(TCL_LIBS) $(OTHER_LIBS) -lm ++ LIBS = $(TCL_LIBS) $(OTHER_LIBS) -lm $(LDFLAGS) - DEBUGFLAGS = -Wall -Wextra -Wconversion -pedantic -ansi diff --git a/debian/patches/share_lib_div.diff b/debian/patches/share_lib_div.diff index 932f90b..b24c70b 100644 --- a/debian/patches/share_lib_div.diff +++ b/debian/patches/share_lib_div.diff @@ -1,13 +1,29 @@ -Index: savi/savi -=================================================================== ---- savi.orig/savi 2013-07-29 20:15:48.758938605 +0800 -+++ savi/savi 2013-07-29 20:17:20.142941154 +0800 +--- a/savi ++++ b/savi @@ -40,7 +40,7 @@ # # Default executable absolute location and name # -SAVIBIN="${SAVI}/bin/SaVi" -+SAVIBIN="../../lib/savi/bin/SaVi" ++SAVIBIN="/usr/lib/savi/bin/SaVi" # # Set locations of tcl and tk library code needed at runtime +@@ -274,11 +274,6 @@ + fi + + # +-# Find what directory this script was invoked from +-# +-OLDCWD=`pwd`; export OLDCWD +- +-# + # If savi tree has been split, with files (data/ oogl/ tcl/ maps/ and textfiles) + # placed elsewhere, then uncomment and edit the following line to reset SAVI to + # that other tree location. +@@ -305,4 +300,4 @@ + echo "(setenv SAVI \"$SAVI\")" + fi + +-exec "$OLDCWD/${SAVIBIN}" $* ${params} ++exec "${SAVIBIN}" $* ${params} -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/savi.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
