This is an automated email from the git hooks/post-receive script.
ross-guest pushed a commit to branch master
in repository gmt.
commit b48afa577c82bb1b14ce80b9d9f8dc2fdabfcb23
Author: Ross Gammon <rossgam...@mail.dk>
Date: Thu Mar 26 19:19:15 2015 +0100
Temporary state - switching computer
---
debian/control | 2 +
debian/gmt-doc-pdf.install | 12 ++---
debian/gmt-doc.install | 2 +-
debian/gmt-examples.examples | 2 +-
debian/gmt-tutorial-pdf.install | 2 +-
debian/gmt.install | 8 +--
debian/libgmt-dev.install | 6 +--
debian/libgmt4.install | 1 -
debian/libgmt5.install | 4 ++
debian/octave-gmt.install | 4 +-
debian/rules | 111 +++++++++++++++++++++-------------------
11 files changed, 81 insertions(+), 73 deletions(-)
diff --git a/debian/control b/debian/control
index e9cbfd2..f78479c 100644
--- a/debian/control
+++ b/debian/control
@@ -44,6 +44,8 @@ Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
Suggests: gmt
+Conflicts: libgmt4
+Replaces: libgmt4
Description: Generic Mapping Tools Library
GMT libraries allow manipulating geographic and Cartesian data sets
(including filtering, trend fitting, gridding, projecting, etc.) and
diff --git a/debian/gmt-doc-pdf.install b/debian/gmt-doc-pdf.install
index d380923..adabc8f 100644
--- a/debian/gmt-doc-pdf.install
+++ b/debian/gmt-doc-pdf.install
@@ -1,6 +1,6 @@
-usr/share/doc/gmt/pdf/GMT_Docs.pdf
-usr/share/doc/gmt/pdf/GMT_Manpages.pdf
-usr/share/doc/gmt/pdf/GMT_Manpages_suppl.pdf
-usr/share/doc/gmt/pdf/GMT_RGBchart_a4.pdf
-usr/share/doc/gmt/pdf/GMT_RGBchart_letter.pdf
-usr/share/doc/gmt/pdf/GMT_RGBchart_tabloid.pdf
+#usr/share/doc/gmt/pdf/GMT_Docs.pdf
+#usr/share/doc/gmt/pdf/GMT_Manpages.pdf
+#usr/share/doc/gmt/pdf/GMT_Manpages_suppl.pdf
+#usr/share/doc/gmt/pdf/GMT_RGBchart_a4.pdf
+#usr/share/doc/gmt/pdf/GMT_RGBchart_letter.pdf
+#usr/share/doc/gmt/pdf/GMT_RGBchart_tabloid.pdf
diff --git a/debian/gmt-doc.install b/debian/gmt-doc.install
index f59840d..7b9efd1 100644
--- a/debian/gmt-doc.install
+++ b/debian/gmt-doc.install
@@ -1 +1 @@
-usr/share/doc/gmt/html
+#usr/share/doc/gmt/html
diff --git a/debian/gmt-examples.examples b/debian/gmt-examples.examples
index 5f810ac..4f6d87a 100644
--- a/debian/gmt-examples.examples
+++ b/debian/gmt-examples.examples
@@ -1 +1 @@
-debian/tmp/usr/share/doc/gmt/examples/*
+usr/share/doc/examples/*
diff --git a/debian/gmt-tutorial-pdf.install b/debian/gmt-tutorial-pdf.install
index fe056d9..fb3c34e 100644
--- a/debian/gmt-tutorial-pdf.install
+++ b/debian/gmt-tutorial-pdf.install
@@ -1 +1 @@
-usr/share/doc/gmt/pdf/GMT_Tutorial.pdf
+#usr/share/doc/gmt/pdf/GMT_Tutorial.pdf
diff --git a/debian/gmt.install b/debian/gmt.install
index e5c457c..e153037 100644
--- a/debian/gmt.install
+++ b/debian/gmt.install
@@ -1,5 +1,5 @@
usr/bin
-usr/lib/gmt/bin
-usr/share/gmt
-usr/share/man
-etc
+#usr/lib/gmt/bin
+#usr/share/gmt
+#usr/share/man
+#etc
diff --git a/debian/libgmt-dev.install b/debian/libgmt-dev.install
index 52aac81..c8136b0 100644
--- a/debian/libgmt-dev.install
+++ b/debian/libgmt-dev.install
@@ -1,3 +1,3 @@
-usr/lib/gmt/lib/*.a usr/lib
-usr/lib/gmt/lib/lib*.so usr/lib
-usr/include/gmt usr/include
+#usr/lib/gmt/lib/*.a usr/lib
+#usr/lib/gmt/lib/lib*.so usr/lib
+#usr/include/gmt usr/include
diff --git a/debian/libgmt4.install b/debian/libgmt4.install
deleted file mode 100644
index 7f6f265..0000000
--- a/debian/libgmt4.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/gmt/lib/lib*.so.4 usr/lib
diff --git a/debian/libgmt5.install b/debian/libgmt5.install
new file mode 100644
index 0000000..5ff0ac0
--- /dev/null
+++ b/debian/libgmt5.install
@@ -0,0 +1,4 @@
+usr/lib/*/libgmt.so.5
+usr/lib/*/libgmt.so.5.*
+usr/lib/*/libpsl.so.5
+usr/lib/*/libpsl.so.5.*
diff --git a/debian/octave-gmt.install b/debian/octave-gmt.install
index e978cee..573b0f6 100644
--- a/debian/octave-gmt.install
+++ b/debian/octave-gmt.install
@@ -1,2 +1,2 @@
-usr/share/octave/*
-usr/lib/*/octave/*
+#usr/share/octave/*
+#usr/lib/*/octave/*
diff --git a/debian/rules b/debian/rules
index 719d45f..0a27032 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,65 +1,65 @@
#! /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
-ifneq (,$(findstring verbose,$(DEB_BUILD_OPTIONS)))
- DH_VERBOSE=1
- export DH_VERBOSE
-endif
+#ifneq (,$(findstring verbose,$(DEB_BUILD_OPTIONS)))
+DH_VERBOSE=1
+export DH_VERBOSE
+#endif
-BUILDDIR = $(CURDIR)/debian/build
-DESTDIR = $(CURDIR)/debian/tmp
+#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
+#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_build:
- 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_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 \
- debian/tmp/usr/share/dbase \
- debian/tmp/usr/share/mgd77 \
- debian/tmp/usr/share/mgg \
- debian/tmp/usr/share/pattern \
- debian/tmp/usr/share/pslib \
- debian/tmp/usr/share/time \
- 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 {} \;
+#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 \
+# debian/tmp/usr/share/dbase \
+# debian/tmp/usr/share/mgd77 \
+# debian/tmp/usr/share/mgg \
+# debian/tmp/usr/share/pattern \
+# debian/tmp/usr/share/pslib \
+# debian/tmp/usr/share/time \
+# 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 {} \;
# $(MAKE) -C build/src/mex DESTDIR=$(DESTDIR) install
# -find $(DESTDIR)/usr/lib/octave -name "*.mex" -exec rename
's/\.mex/.oct/' {} \;
@@ -98,6 +98,9 @@ override_dh_auto_install:
# rm -rf $(DESTDIR)/usr/share/gmt/man
-override_dh_auto_clean:
- rm -rf $(BUILDDIR) $(DESTDIR)
- dh_auto_clean
+#override_dh_auto_clean:
+# rm -rf $(BUILDDIR) $(DESTDIR)
+# dh_auto_clean
+
+override_dh_install:
+ dh_install --list-missing
--
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
