[ossim] 09/10: Fix dh_auto_install override.

Bas Couwenberg sebastic at debian.org
Sat Dec 9 13:32:26 UTC 2017


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

sebastic pushed a commit to branch experimental
in repository ossim.

commit 40f0ebce4c715317b680d581c1b6c1e076ffce60
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Dec 9 12:50:01 2017 +0100

    Fix dh_auto_install override.
---
 debian/changelog |  1 +
 debian/rules     | 10 ++--------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index af22b79..4240247 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,7 @@ ossim (2.2.0-1) UNRELEASED; urgency=medium
   * Strip trailing whitespace from changelog.
   * Drop libopenthreads-dev build dependency, no longer required.
   * Add libjsoncpp-dev to build dependencies.
+  * Fix dh_auto_install override.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 09 Dec 2017 12:05:48 +0100
 
diff --git a/debian/rules b/debian/rules
index 49569f7..953762c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,17 +50,11 @@ override_dh_auto_configure:
 	[ ! -e CMakeCache.txt ] || rm CMakeCache.txt
 	dh_auto_configure -- $(CMAKE_OPTS)
 
-overridd_dh_auto_install:
+override_dh_auto_install:
 	dh_auto_install
-	install -d $(CURDIR)/debian/tmp/usr/share/ossim/templates/
-	install -D $(CURDIR)/share/ossim/templates/templates/*.kwl $(CURDIR)/debian/tmp/usr/share/ossim/templates
-	install -T $(CURDIR)/share/ossim/templates/ossim_preferences_template $(CURDIR)/debian/tmp/usr/share/ossim/templates/ossim_preferences
-	install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/ossim
-	find $(CURDIR)/debian/tmp/usr/share/ossim/templates -type f -exec chmod a-x {} \;
 	rm -f $(CURDIR)/debian/tmp/usr/include/ossimConfig.h
 	rm -f $(CURDIR)/debian/tmp/usr/include/ossimVersion.h
-	rm -f $(CURDIR)/debian/tmp/usr/share/ossim/fonts/arial.ttf
-	rm -f $(CURDIR)/debian/tmp/usr/share/ossim/fonts/times.ttf
+	rm -rf $(CURDIR)/debian/tmp/usr/share/ossim/fonts
 
 override_dh_install:
 	dh_install --list-missing

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



More information about the Pkg-grass-devel mailing list