[ossim] 11/14: Update rules for restructured upstream source tree.

Bas Couwenberg sebastic at debian.org
Thu Aug 24 17:18:18 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 a91b12a33d897e62cdccfb0839978148bfc686b9
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Aug 24 16:15:08 2017 +0200

    Update rules for restructured upstream source tree.
---
 debian/changelog | 1 +
 debian/rules     | 8 +++-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d1b8bd7..683dcf2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ ossim (2.0.0-1) UNRELEASED; urgency=medium
   * Bump Standards-Version to 4.0.0, changes: Priority.
   * Add autopkgtest to test installability.
   * Use pkg-info.mk variables instead of dpkg-parsechangelog output.
+  * Update rules for restructured upstream source tree.
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 25 Jul 2017 12:20:49 +0200
 
diff --git a/debian/rules b/debian/rules
index e673fe4..56c9d5c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,6 @@ endif
 
 %:
 	dh $@ --buildsystem cmake \
-	      --sourcedirectory=$(CURDIR)/ossim \
 	      --builddirectory=$(CURDIR)/debian/build \
 	      --parallel
 
@@ -30,7 +29,6 @@ endif
 CMAKE_OPTS = \
        -DCMAKE_BUILD_TYPE=Release \
        -DCMAKE_INSTALL_PREFIX=/usr \
-       -DCMAKE_MODULE_PATH=$(CURDIR)/ossim/CMakeModules \
        -DBUILD_OSSIM_FRAMEWORKS=OFF \
        -DBUILD_OSSIM_FREETYPE_SUPPORT=ON \
        -DBUILD_OSSIM_ID_SUPPORT=ON \
@@ -49,13 +47,13 @@ override_dh_auto_clean:
 override_dh_auto_configure:
 	[ -d debian/build ] || mkdir debian/build
 	[ ! -e CMakeCache.txt ] || rm CMakeCache.txt
-	dh_auto_configure -- $(CMAKE_OPTS) $(CURDIR)/ossim
+	dh_auto_configure -- $(CMAKE_OPTS)
 
 overridd_dh_auto_install:
 	dh_auto_install
 	install -d $(CURDIR)/debian/tmp/usr/share/ossim/templates/
-	install -D $(CURDIR)/ossim/etc/templates/*.kwl $(CURDIR)/debian/tmp/usr/share/ossim/templates
-	install -T $(CURDIR)/ossim/etc/templates/ossim_preferences_template $(CURDIR)/debian/tmp/usr/share/ossim/templates/ossim_preferences
+	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

-- 
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