[savi] 11/16: Refresh patches & add DEP3 headers.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository savi.

commit e3d9fcb0571341d6bba30c253fc489d254f735e0
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Sep 30 17:43:00 2016 +0200

    Refresh patches & add DEP3 headers.
---
 debian/changelog                  |  1 +
 debian/patches/enable_zlib.diff   | 17 +++++++----------
 debian/patches/share_lib_div.diff | 23 ++++-------------------
 3 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5e2c0ca..ece1a95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ savi (1.5.0-1) UNRELEASED; urgency=medium
   * Add upstream metadata.
   * Add gbp.conf to use pristine-tar by default.
   * Update copyright file using copyright-format 1.0.
+  * Refresh patches & add DEP3 headers.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 30 Sep 2016 16:56:33 +0200
 
diff --git a/debian/patches/enable_zlib.diff b/debian/patches/enable_zlib.diff
index 6d0fdff..c9caf4d 100644
--- a/debian/patches/enable_zlib.diff
+++ b/debian/patches/enable_zlib.diff
@@ -1,8 +1,9 @@
-Enable -lz and change to generic tcl/tk from fixed 8.6
+Description: Enable -lz and change to generic tcl/tk from fixed 8.6.
+Author: YunQiang Su <syq at debian.org>
 
 --- a/src/Makefile_defs_ubuntu
 +++ b/src/Makefile_defs_ubuntu
-@@ -46,7 +46,7 @@
+@@ -46,7 +46,7 @@ CC = gcc
  # match.                                               #
  #                                                      #
  ########################################################
@@ -11,7 +12,7 @@ Enable -lz and change to generic tcl/tk from fixed 8.6
  
  # TCL_INCLUDES = -I/usr/include/tcl -I/usr/include/tk
  # is a generic alternative to try.
-@@ -60,9 +60,9 @@
+@@ -60,9 +60,9 @@ TCL_INCLUDES = -I/usr/include/tcl8.6 -I/
  # Debian variants, including Ubuntu, require a dot here: -ltcl8.4 -ltk8.4
  # as does Red Hat Enterprise.
  
@@ -23,7 +24,7 @@ Enable -lz and change to generic tcl/tk from fixed 8.6
  # is a generic alternative to try.
  
  
-@@ -74,6 +74,6 @@
+@@ -74,6 +74,6 @@ TCL_LIBS = -ltcl8.6 -ltk8.6
  ########################################################
  OTHER_LIBS = -ldl
  
@@ -33,7 +34,7 @@ Enable -lz and change to generic tcl/tk from fixed 8.6
  # OTHER_LIBS = -static
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -26,12 +26,12 @@
+@@ -25,9 +25,9 @@ include Makefile_defs_$(ARCH)
  # zlib enables transparent gzip compression of dynamic texture scratchfiles.
  # OTHER_LIBS = -lz should be inserted at end of definitions file.
  
@@ -44,8 +45,4 @@ Enable -lz and change to generic tcl/tk from fixed 8.6
 +        LIBS = $(TCL_LIBS) $(OTHER_LIBS) -lm $(LDFLAGS)
  
  
--    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 \
+ #   DEBUGFLAGS = -Wall -Wextra -Wconversion -pedantic -ansi
diff --git a/debian/patches/share_lib_div.diff b/debian/patches/share_lib_div.diff
index b24c70b..b650d3b 100644
--- a/debian/patches/share_lib_div.diff
+++ b/debian/patches/share_lib_div.diff
@@ -1,6 +1,9 @@
+Description: Modify executable location as used for Debian package.
+Author: YunQiang Su <syq at debian.org>
+
 --- a/savi
 +++ b/savi
-@@ -40,7 +40,7 @@
+@@ -41,7 +41,7 @@ export SAVI
  #
  # Default executable absolute location and name
  #
@@ -9,21 +12,3 @@
  
  #
  # 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