This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository ossim.
commit ae4e34bbe467501768ad16c3f307aa3999dc55eb Author: Bas Couwenberg <[email protected]> Date: Wed Dec 16 14:28:57 2015 +0100 Use ossim subdirectory as source directory. --- debian/changelog | 1 + debian/rules | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index d54d891..941d373 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ ossim (1.8.20.2+ds-1) UNRELEASED; urgency=medium * New upstream release. * Update copyright file using copyright-format 1.0. * Update watch file to set repacksuffix and use HTTP. + * Use ossim subdirectory as source directory. -- Bas Couwenberg <[email protected]> Wed, 16 Dec 2015 14:21:12 +0100 diff --git a/debian/rules b/debian/rules index d32c1c6..5f76a8a 100755 --- a/debian/rules +++ b/debian/rules @@ -17,7 +17,7 @@ endif %: dh $@ --buildsystem cmake \ - --sourcedirectory=$(CURDIR) \ + --sourcedirectory=$(CURDIR)/ossim \ --builddirectory=$(CURDIR)/debian/build # Add here any variable or target overrides you need. @@ -47,7 +47,7 @@ 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) + dh_auto_configure -- $(CMAKE_OPTS) $(CURDIR)/ossim override_dh_auto_build: $(MAKE) -C debian/build @@ -56,8 +56,8 @@ overridd_dh_auto_install: #$(MAKE) -C $(CURDIR)/debian/build install DESTDIR=$(CURDIR)/debian/tmp dh_auto_install install -d $(CURDIR)/debian/tmp/usr/share/ossim/templates/ - install -D $(CURDIR)/etc/templates/*.kwl $(CURDIR)/debian/tmp/usr/share/ossim/templates - install -T $(CURDIR)/etc/templates/ossim_preferences_template $(CURDIR)/debian/tmp/usr/share/ossim/templates/ossim_preferences + 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 -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 _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
