[grass] 01/02: Don't delete /usr/lib/grass70/etc/license.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository grass.

commit f2cfcf280bb0f624d5c685c9cefd3025cbfadfb1
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Mar 29 21:11:12 2016 +0200

    Don't delete /usr/lib/grass70/etc/license.
    
    Not an extra license file and required for `grass --version`.
---
 debian/changelog                    | 2 ++
 debian/grass-core.lintian-overrides | 1 +
 debian/rules                        | 3 ---
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a3c3f91..0ab92ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ grass (7.0.3-3) UNRELEASED; urgency=medium
   * Update dh_python2 override to call dh_numpy too.
   * Enable all hardening buildflags, except PIE (causes build failure).
   * Add patch to fix various spelling errors.
+  * Don't delete /usr/lib/grass70/etc/license, not an extra license file
+    and required for `grass --version`.
 
  -- Bas Couwenberg <sebastic at debian.org>  Mon, 28 Mar 2016 14:13:24 +0200
 
diff --git a/debian/grass-core.lintian-overrides b/debian/grass-core.lintian-overrides
index 74a4bf9..b706a6c 100644
--- a/debian/grass-core.lintian-overrides
+++ b/debian/grass-core.lintian-overrides
@@ -81,6 +81,7 @@ grass-core: hardening-no-fortify-functions usr/lib/grass*/lib/libgrass_segment.*
 
 # This license file is used by the program to show license, so needs to be
 # distributed.
+grass-core: extra-license-file usr/lib/grass*/etc/license
 grass-core: extra-license-file usr/share/doc/grass-core/COPYING
 
 # PIE breaks the build
diff --git a/debian/rules b/debian/rules
index a27ecf7..3da81ef 100755
--- a/debian/rules
+++ b/debian/rules
@@ -125,9 +125,6 @@ install-arch-stamp:
 	# fix links
 	debian/fixpaths.sh $(CURDIR)/debian/tmp debian/tmp
 
-	# delete extra license files
-	$(RM) debian/tmp/usr/lib/$(BASE_NAME)/etc/license
-
 	# delete python compiled bytecode files (maybe dh_python2 takes care of this for us?)
 	find debian/tmp/ -type f -name "*.pyc" -delete
 

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