This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository gmt.
commit 1281d88cca4aef796eab5c9670ea906fd623888f
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Sun Jun 7 12:25:07 2015 +0200
Build documentation in build-indep target.
---
debian/changelog | 1 +
debian/control | 3 ++
debian/rules | 93 +++++++++++++++++++++++++++++---------------------------
3 files changed, 53 insertions(+), 44 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9654f8b..f1605fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,7 @@ gmt (5.1.2+dfsg1-1) UNRELEASED; urgency=medium
* Fix bash-completion installation.
* Strip RPATH from binary & libraries.
* Also exclude prebuilt documentation and manpages from repacked source.
+ * Build documentation in build-indep target.
-- Bas Couwenberg <sebas...@debian.org> Sun, 07 Jun 2015 12:06:29 +0200
diff --git a/debian/control b/debian/control
index cddee2c..4c44cae 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Priority: extra
Build-Depends: debhelper (>= 9),
chrpath,
cmake,
+ ghostscript,
libgdal-dev,
libnetcdf-dev,
libpcre3-dev,
@@ -14,6 +15,8 @@ Build-Depends: debhelper (>= 9),
libxmu-headers,
python-sphinx,
sfftw-dev,
+ texlive,
+ texlive-latex-extra,
zlib1g-dev
Standards-Version: 3.9.6
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/gmt.git
diff --git a/debian/rules b/debian/rules
index c166bd7..fac1ab3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,54 +1,57 @@
#! /usr/bin/make -f
# Some special build options
-#ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-# CFLAGS += -g -O0
-# LDFLAGS += -g
-#else
-# CFLAGS += -O2
-#endif
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -g -O0
+ LDFLAGS += -g
+else
+ CFLAGS += -O2
+endif
CFLAGS += $(CPPFLAGS)
-#ifneq (,$(findstring verbose,$(DEB_BUILD_OPTIONS)))
-DH_VERBOSE=1
-export DH_VERBOSE
-#endif
-
-#BUILDDIR = $(CURDIR)/debian/build
-#DESTDIR = $(CURDIR)/debian/tmp
-
-#CMAKE_OPTS = -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-# -DCMAKE_C_FLAGS="-fstrict-aliasing $(CFLAGS)" \
-# -DCMAKE_INSTALL_PREFIX=/usr \
-# -DDCW_ROOT=/usr/share/gmt/dcw \
-# -DGSHHG_ROOT=/usr/share/gmt/gshhg \
-# -DNETCDF_ROOT=/usr \
-# -DFFTW3_ROOT=/usr \
-# -DGDAL_ROOT=/usr \
-# -DPCRE_ROOT=/usr \
-# -DFLOCK=on \
-# -DGMT_INSTALL_MODULE_LINKS=off \
-# -DGMT_INSTALL_TRADITIONAL_FOLDERNAMES=off \
-# -DLICENSE_RESTRICTED=LGPL
+ifneq (,$(findstring verbose,$(DEB_BUILD_OPTIONS)))
+ DH_VERBOSE=1
+ export DH_VERBOSE
+endif
+
+BUILDDIR = $(CURDIR)/debian/build
+DESTDIR = $(CURDIR)/debian/tmp
+
+CMAKE_OPTS = -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_C_FLAGS="-fstrict-aliasing $(CFLAGS)" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DDCW_ROOT=/usr/share/gmt/dcw \
+ -DGSHHG_ROOT=/usr/share/gmt/gshhg \
+ -DNETCDF_ROOT=/usr \
+ -DFFTW3_ROOT=/usr \
+ -DGDAL_ROOT=/usr \
+ -DPCRE_ROOT=/usr \
+ -DFLOCK=on \
+ -DGMT_INSTALL_MODULE_LINKS=off \
+ -DGMT_INSTALL_TRADITIONAL_FOLDERNAMES=off \
+ -DLICENSE_RESTRICTED=LGPL
%:
dh $@ --buildsystem cmake \
-# --sourcedirectory=$(CURDIR) --builddirectory=$(BUILDDIR) \
-# --parallel
+ --sourcedirectory=$(CURDIR) --builddirectory=$(BUILDDIR) \
+ --parallel
+
+override_dh_auto_clean:
+ rm -rf $(BUILDDIR) $(DESTDIR)
+ dh_auto_clean
-#override_dh_auto_clean:
-# rm -rf $(BUILDDIR) $(DESTDIR)
-# dh_auto_clean
+override_dh_auto_build-arch:
+ mkdir $(BUILDDIR) || true
+ cd $(BUILDDIR) && cmake $(CMAKE_OPTS) ../..
+ $(MAKE) -C $(BUILDDIR) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
-#override_dh_auto_build:
-# mkdir $(BUILDDIR) || true
-# cd $(BUILDDIR) && cmake $(CMAKE_OPTS) ../..
-# $(MAKE) -C $(BUILDDIR) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
+override_dh_auto_build-indep:
+ $(MAKE) -C $(BUILDDIR) docs_man docs_html docs_pdf
-#override_dh_auto_install:
-# DESTDIR=$(DESTDIR) $(MAKE) -C $(BUILDDIR) install
-# # remove duplicated stuff
+override_dh_auto_install:
+ DESTDIR=$(DESTDIR) $(MAKE) -C $(BUILDDIR) install
+ # remove duplicated stuff
# rm -rf debian/tmp/usr/share/conf \
# debian/tmp/usr/share/cpt \
# debian/tmp/usr/share/custom \
@@ -61,11 +64,12 @@ export DH_VERBOSE
# debian/tmp/usr/share/tools \
# debian/tmp/usr/share/VERSION \
# debian/tmp/usr/share/x2sys
-# dh_auto_install
-# # Uncompress examples stuff
-# find $(CURDIR)/debian/gmt-examples/usr/share/doc/gmt-examples/examples
-name "*.gz" -exec gunzip {} \;
-# # Remove +x
-# find $(CURDIR)/debian/gmt-examples/usr/share/doc/gmt-examples/examples
-name "*.bat" -exec chmod -x {} \;
+ dh_auto_install
+
+ # Uncompress examples stuff
+ #find
$(CURDIR)/debian/gmt-examples/usr/share/doc/gmt-examples/examples -name "*.gz"
-exec gunzip {} \;
+ # Remove +x
+ #find
$(CURDIR)/debian/gmt-examples/usr/share/doc/gmt-examples/examples -name "*.bat"
-exec chmod -x {} \;
# Fix bash-completion installation
mkdir -p debian/tmp/usr/share/bash-completion/completions
@@ -121,3 +125,4 @@ override_dh_install:
override_dh_compress:
# Don't compress the pdf files needed for the gmt-doc-pdf package
dh_compress -X.pdf
+
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/gmt.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
