[grass] 06/16: Refresh patches.

Bas Couwenberg sebastic at debian.org
Fri Oct 28 14:16:29 UTC 2016


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

sebastic pushed a commit to branch experimental
in repository grass.

commit 95b7a09ef65ea0a852221851d97845ad6a909237
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Oct 28 12:59:54 2016 +0200

    Refresh patches.
---
 debian/changelog       | 1 +
 debian/patches/instdir | 4 ++--
 debian/patches/pager   | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 285ed49..bd8786f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ grass (7.2.0~rc1-1) UNRELEASED; urgency=medium
   * Drop unused overrides for hardening-no-pie.
   * Update watch file for 7.2.x releases.
   * Drop Conflicts/Provides/Replaces for old upstream GRASS 7.0 packages.
+  * Refresh patches.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 28 Oct 2016 12:44:55 +0200
 
diff --git a/debian/patches/instdir b/debian/patches/instdir
index 3e0ddb7..aec63b8 100644
--- a/debian/patches/instdir
+++ b/debian/patches/instdir
@@ -4,7 +4,7 @@ Forwarded: not-needed
 
 --- a/configure
 +++ b/configure
-@@ -1427,7 +1427,7 @@ fi
+@@ -1441,7 +1441,7 @@ fi
  if test -n "$MACOSX_APP" ; then
      INSTDIR='${prefix}'"/GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.app/Contents/MacOS"
  else
@@ -15,7 +15,7 @@ Forwarded: not-needed
  
 --- a/configure.in
 +++ b/configure.in
-@@ -214,7 +214,7 @@ AC_SUBST(MACOSX_SDK)
+@@ -216,7 +216,7 @@ AC_SUBST(MACOSX_SDK)
  if test -n "$MACOSX_APP" ; then
      INSTDIR='${prefix}'"/GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.app/Contents/MacOS"
  else
diff --git a/debian/patches/pager b/debian/patches/pager
index d72d250..755be41 100644
--- a/debian/patches/pager
+++ b/debian/patches/pager
@@ -10,7 +10,7 @@ Forwarded: not-needed
 
 --- a/lib/init/grass.py
 +++ b/lib/init/grass.py
-@@ -440,10 +440,12 @@ def find_exe(pgm):
+@@ -636,10 +636,12 @@ def find_exe(pgm):
  def set_defaults():
      # GRASS_PAGER
      if not os.getenv('GRASS_PAGER'):

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git



More information about the Pkg-grass-devel mailing list