[DebianGIS-dev] r1631 - in packages/gmt/trunk: debian debian/patches upstream
frankie at alioth.debian.org
frankie at alioth.debian.org
Fri Jun 13 08:42:19 UTC 2008
Author: frankie
Date: 2008-06-13 08:42:18 +0000 (Fri, 13 Jun 2008)
New Revision: 1631
Added:
packages/gmt/trunk/debian/README.source
packages/gmt/trunk/debian/libgmt-dev.install
packages/gmt/trunk/debian/libgmt4.install
packages/gmt/trunk/upstream/GMT4.3.1_pdf.tar.bz2
packages/gmt/trunk/upstream/GMT4.3.1_scripts.tar.bz2
packages/gmt/trunk/upstream/GMT4.3.1_share.tar.bz2
packages/gmt/trunk/upstream/GMT4.3.1_src.tar.bz2
packages/gmt/trunk/upstream/GMT4.3.1_suppl.tar.bz2
packages/gmt/trunk/upstream/GMT4.3.1_tut.tar.bz2
packages/gmt/trunk/upstream/GMT4.3.1_web.tar.bz2
Removed:
packages/gmt/trunk/debian/patches/disable_unsupported.diff
packages/gmt/trunk/upstream/GMT4.2.1_pdf.tar.bz2
packages/gmt/trunk/upstream/GMT4.2.1_scripts.tar.bz2
packages/gmt/trunk/upstream/GMT4.2.1_share.tar.bz2
packages/gmt/trunk/upstream/GMT4.2.1_src.tar.bz2
packages/gmt/trunk/upstream/GMT4.2.1_suppl.tar.bz2
packages/gmt/trunk/upstream/GMT4.2.1_tut.tar.bz2
packages/gmt/trunk/upstream/GMT4.2.1_web.tar.bz2
Modified:
packages/gmt/trunk/debian/changelog
packages/gmt/trunk/debian/control
packages/gmt/trunk/debian/gmt-doc-pdf.install
packages/gmt/trunk/debian/gmt.install
packages/gmt/trunk/debian/patches/series
packages/gmt/trunk/debian/rules
Log:
New upstream release
Added: packages/gmt/trunk/debian/README.source
===================================================================
--- packages/gmt/trunk/debian/README.source (rev 0)
+++ packages/gmt/trunk/debian/README.source 2008-06-13 08:42:18 UTC (rev 1631)
@@ -0,0 +1,16 @@
+Debian GMT (Generic Mapping Tools) upstream tarball creation
+------------------------------------------------------------
+
+Currently you need to get all required archives by running
+
+ debian/rules download-upstream
+
+which should download the upstream packages for you. After that, building a
+local package works as expected. To build an official package, first
+create an orig.tar.gz file from just the upstream folder using
+
+ debian/rules create-orig-tar
+
+After that you need to commit upstream stuff in svn in order to use
+svn-buildpackage successfully.
+
Modified: packages/gmt/trunk/debian/changelog
===================================================================
--- packages/gmt/trunk/debian/changelog 2008-06-13 08:28:14 UTC (rev 1630)
+++ packages/gmt/trunk/debian/changelog 2008-06-13 08:42:18 UTC (rev 1631)
@@ -1,3 +1,21 @@
+gmt (4.3.1-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ (closes: #480931)
+ * Fixed download URL.
+ * Added a README.source file to document how creating the upstream tarball.
+ * Patch disable_unsupported.diff dropped and moved to use appropriate configure flag.
+ * Added three new PDF documents in different formats.
+ * Policy bumped to 3.8.0.
+ * Now GMT is providing correct versioning and SONAMEs for shared libs, so
+ moving to supporting development libraries by splitting libgmt4 and libgmt-dev
+ binary packages. A long due wishlist finally managed, yeah!
+ (closes: #210611)
+ * Removed manpages duplicates.
+ * Fixed clean target to remove GMT symlink.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org> Fri, 13 Jun 2008 10:08:30 +0200
+
gmt (4.2.1-1) unstable; urgency=low
* New upstream release. There is no more a _man file, all manpages are in _src.
Modified: packages/gmt/trunk/debian/control
===================================================================
--- packages/gmt/trunk/debian/control 2008-06-13 08:28:14 UTC (rev 1630)
+++ packages/gmt/trunk/debian/control 2008-06-13 08:42:18 UTC (rev 1631)
@@ -5,7 +5,7 @@
Uploaders: Torsten Landschoff <torsten at debian.org>, Francesco P. Lovergine <frankie at debian.org>
Build-Depends: netcdfg-dev, tcsh | csh | c-shell, debhelper (>= 5.0), bzip2, quilt, libxmu-headers, libxaw7-dev
Build-Depends-Indep: debhelper (>= 5.0), bzip2, quilt
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
Homepage: http://gmt.soest.hawaii.edu/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/gmt/trunk
Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/gmt/trunk
@@ -29,6 +29,31 @@
and comes with support data such as coastlines, rivers, and political
boundaries.
+Package: libgmt4
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: gmt
+Description: Generic Mapping Tools Library
+ GMT libraries allow manipulating geographic and Cartesian data sets
+ (including filtering, trend fitting, gridding, projecting, etc.) and
+ producing Encapsulated PostScript File (EPS) illustrations ranging from
+ simple x-y plots via contour maps to artificially illuminated surfaces
+ and 3-D perspective views.
+
+Package: libgmt-dev
+Architecture: any
+Depends: ${shlibs:Depends}, libgmt4 (=${binary:Version})
+Suggests: gmt
+Description: Generic Mapping Tools Library
+ These set of libraries allow manipulating geographic and Cartesian data sets
+ (including filtering, trend fitting, gridding, projecting, etc.) and
+ producing Encapsulated PostScript File (EPS) illustrations ranging from
+ simple x-y plots via contour maps to artificially illuminated surfaces
+ and 3-D perspective views.
+ .
+ This package contains the files used for development of programs that
+ use the GMT libraries (headers, static objects).
+
Package: gmt-doc-pdf
Architecture: all
Section: doc
Modified: packages/gmt/trunk/debian/gmt-doc-pdf.install
===================================================================
--- packages/gmt/trunk/debian/gmt-doc-pdf.install 2008-06-13 08:28:14 UTC (rev 1630)
+++ packages/gmt/trunk/debian/gmt-doc-pdf.install 2008-06-13 08:42:18 UTC (rev 1631)
@@ -1,4 +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
Modified: packages/gmt/trunk/debian/gmt.install
===================================================================
--- packages/gmt/trunk/debian/gmt.install 2008-06-13 08:28:14 UTC (rev 1630)
+++ packages/gmt/trunk/debian/gmt.install 2008-06-13 08:42:18 UTC (rev 1631)
@@ -1,6 +1,5 @@
usr/bin
usr/lib/gmt/bin
-usr/lib/gmt/lib
usr/include
usr/share/gmt
usr/share/man
Added: packages/gmt/trunk/debian/libgmt-dev.install
===================================================================
--- packages/gmt/trunk/debian/libgmt-dev.install (rev 0)
+++ packages/gmt/trunk/debian/libgmt-dev.install 2008-06-13 08:42:18 UTC (rev 1631)
@@ -0,0 +1,3 @@
+usr/lib/gmt/lib/*.a usr/lib
+usr/lib/gmt/lib/lib*.so usr/lib
+usr/include/gmt usr/include
Added: packages/gmt/trunk/debian/libgmt4.install
===================================================================
--- packages/gmt/trunk/debian/libgmt4.install (rev 0)
+++ packages/gmt/trunk/debian/libgmt4.install 2008-06-13 08:42:18 UTC (rev 1631)
@@ -0,0 +1 @@
+usr/lib/gmt/lib/lib*.so.4 usr/lib
Deleted: packages/gmt/trunk/debian/patches/disable_unsupported.diff
===================================================================
--- packages/gmt/trunk/debian/patches/disable_unsupported.diff 2008-06-13 08:28:14 UTC (rev 1630)
+++ packages/gmt/trunk/debian/patches/disable_unsupported.diff 2008-06-13 08:42:18 UTC (rev 1631)
@@ -1,13 +0,0 @@
-Index: GMT4.2.1/GMT/Makefile
-===================================================================
---- GMT4.2.1/GMT.orig/Makefile 2007-04-02 22:38:49.000000000 +0200
-+++ GMT4.2.1/GMT/Makefile 2007-04-16 23:02:28.632988058 +0200
-@@ -65,7 +65,7 @@
- # !! STOP EDITING HERE, THE REST IS FIXED !!
- #-------------------------------------------------------------------------------
-
--SUPPL = dbase gshhs imgsrc meca mex mgd77 mgg misc segyprogs spotter x2sys x_system xgrid
-+SUPPL = dbase gshhs imgsrc meca mgd77 mgg misc segyprogs spotter x2sys x_system xgrid
- SUPPL_M = dbase imgsrc meca mgd77 mgg misc segyprogs spotter x2sys x_system
-
- all: gmt suppl
Modified: packages/gmt/trunk/debian/patches/series
===================================================================
--- packages/gmt/trunk/debian/patches/series 2008-06-13 08:28:14 UTC (rev 1630)
+++ packages/gmt/trunk/debian/patches/series 2008-06-13 08:42:18 UTC (rev 1631)
@@ -1 +0,0 @@
-disable_unsupported.diff
Modified: packages/gmt/trunk/debian/rules
===================================================================
--- packages/gmt/trunk/debian/rules 2008-06-13 08:28:14 UTC (rev 1630)
+++ packages/gmt/trunk/debian/rules 2008-06-13 08:42:18 UTC (rev 1631)
@@ -1,6 +1,6 @@
#! /usr/bin/make -f
-RELEASE := 4.2.1
+RELEASE := 4.3.1
PARTS := pdf src share scripts suppl tut web
ARCHIVES := $(PARTS:%=upstream/GMT$(RELEASE)_%.tar.bz2)
@@ -23,7 +23,7 @@
upstream/%:
dh_testdir
mkdir -p upstream
- wget -O upstream/$*.partial ftp://ibis.grdl.noaa.gov/pub/gmt/4/$*
+ wget -O upstream/$*.partial ftp://ibis.grdl.noaa.gov/pub/gmt/$*
mv upstream/$*.partial upstream/$*
stamps/unpack-stamp:
@@ -43,8 +43,7 @@
unpatch:
dh_testdir
QUILT_PATCH_OPTS="-p1" QUILT_PATCHES=debian/patches quilt pop -a || true
- rm -rf stamps/patch-stamp GMT
- rm -rf .pc
+ rm -rf stamps/patch-stamp GMT .pc
PATHCONFIG := --prefix=/usr/lib/gmt
DESTDIR := $(CURDIR)/debian/tmp
@@ -53,8 +52,8 @@
stamps/build-stamp: stamps/patch-stamp
dh_testdir
cd GMT$(RELEASE) && ./configure \
- --enable-shared $(PATHCONFIG) --enable-netcdf=/usr
- make -C GMT$(RELEASE) CC_OPT="-fPIC -g -O2 -ansi -pedantic" LDFLAGS="-g" all suppl
+ --enable-shared $(PATHCONFIG) --disable-mex --enable-netcdf=/usr
+ $(MAKE) -C GMT$(RELEASE) CC_OPT="-fPIC -g -O2 -ansi -pedantic" LDFLAGS="-g" all suppl
touch $@
stamps/install-stamp: stamps/build-stamp
@@ -67,13 +66,12 @@
# that tree.
mkdir -p $(DESTDIR)/usr/lib/gmt/www $(DESTDIR)/usr/share/gmt \
$(DESTDIR)/usr/share/man $(DESTDIR)/usr/include/gmt \
- $(DESTDIR)/usr/share/doc $(DESTDIR)/etc/gmt $(DESTDIR)/usr/bin \
- $(DESTDIR)/usr/share/man/man1
+ $(DESTDIR)/usr/share/doc $(DESTDIR)/etc/gmt $(DESTDIR)/usr/bin
ln -fs ../../share/man $(DESTDIR)/usr/lib/gmt/man
ln -fs ../../include/gmt $(DESTDIR)/usr/lib/gmt/include
ln -fs ../../share/gmt $(DESTDIR)/usr/lib/gmt/share
- make -C GMT$(RELEASE) $(PATHVARS) install-all
+ $(MAKE) -C GMT$(RELEASE) $(PATHVARS) install-all
# Okay, we still have to move the documentation (the trick above does
# not work because the Makefile would try to overwrite the link with
@@ -100,8 +98,12 @@
rm -f $(DESTDIR)/usr/lib/gmt/bin/GMT
# Move the manpages directory into the right place...
- for manpage in $(DESTDIR)/usr/lib/gmt/share/man/man1/*.1; do \
- gzip -c $${manpage} >$(DESTDIR)/usr/share/man/man1/`basename $${manpage}`gmt.gz; \
+ for section in 1 3 5; do \
+ mkdir -p $(DESTDIR)/usr/share/man/man$${section}; \
+ for manpage in $(DESTDIR)/usr/lib/gmt/share/man/man$${section}/*.$${section}; do \
+ gzip -c $${manpage} >$(DESTDIR)/usr/share/man/man$${section}/`basename $${manpage}`gmt.gz; \
+ rm -f $${manpage}; \
+ done; \
done
touch $@
@@ -121,6 +123,7 @@
dh_compress -a -X.pdf
dh_fixperms -a
dh_installdeb -a
+ dh_makeshlibs -a
dh_shlibdeps -a -l$(DESTDIR)/usr/lib/gmt/lib
dh_gencontrol -a
dh_md5sums -a
@@ -141,7 +144,6 @@
dh_compress -i -X.pdf
dh_fixperms -i
dh_installdeb -i
- dh_shlibdeps -i
dh_gencontrol -i
dh_md5sums -i
dh_builddeb -i
@@ -149,5 +151,5 @@
clean:
dh_testdir
dh_testroot
- rm -Rf stamps GMT$(RELEASE)
+ rm -Rf stamps GMT$(RELEASE) GMT .pc
dh_clean
Deleted: packages/gmt/trunk/upstream/GMT4.2.1_pdf.tar.bz2
===================================================================
(Binary files differ)
Deleted: packages/gmt/trunk/upstream/GMT4.2.1_scripts.tar.bz2
===================================================================
(Binary files differ)
Deleted: packages/gmt/trunk/upstream/GMT4.2.1_share.tar.bz2
===================================================================
(Binary files differ)
Deleted: packages/gmt/trunk/upstream/GMT4.2.1_src.tar.bz2
===================================================================
(Binary files differ)
Deleted: packages/gmt/trunk/upstream/GMT4.2.1_suppl.tar.bz2
===================================================================
(Binary files differ)
Deleted: packages/gmt/trunk/upstream/GMT4.2.1_tut.tar.bz2
===================================================================
(Binary files differ)
Deleted: packages/gmt/trunk/upstream/GMT4.2.1_web.tar.bz2
===================================================================
(Binary files differ)
Added: packages/gmt/trunk/upstream/GMT4.3.1_pdf.tar.bz2
===================================================================
(Binary files differ)
Property changes on: packages/gmt/trunk/upstream/GMT4.3.1_pdf.tar.bz2
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: packages/gmt/trunk/upstream/GMT4.3.1_scripts.tar.bz2
===================================================================
(Binary files differ)
Property changes on: packages/gmt/trunk/upstream/GMT4.3.1_scripts.tar.bz2
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: packages/gmt/trunk/upstream/GMT4.3.1_share.tar.bz2
===================================================================
(Binary files differ)
Property changes on: packages/gmt/trunk/upstream/GMT4.3.1_share.tar.bz2
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: packages/gmt/trunk/upstream/GMT4.3.1_src.tar.bz2
===================================================================
(Binary files differ)
Property changes on: packages/gmt/trunk/upstream/GMT4.3.1_src.tar.bz2
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: packages/gmt/trunk/upstream/GMT4.3.1_suppl.tar.bz2
===================================================================
(Binary files differ)
Property changes on: packages/gmt/trunk/upstream/GMT4.3.1_suppl.tar.bz2
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: packages/gmt/trunk/upstream/GMT4.3.1_tut.tar.bz2
===================================================================
(Binary files differ)
Property changes on: packages/gmt/trunk/upstream/GMT4.3.1_tut.tar.bz2
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: packages/gmt/trunk/upstream/GMT4.3.1_web.tar.bz2
===================================================================
(Binary files differ)
Property changes on: packages/gmt/trunk/upstream/GMT4.3.1_web.tar.bz2
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
More information about the Pkg-grass-devel
mailing list