[SCM] gmt branch, master, updated. upstream/4.5.5-13-g2b12d98
The following commit has been merged in the master branch:
commit 2b12d98e743f13b1bc080b4bbe5e8126c5aedc2b
Author: Francesco Paolo Lovergine
Date: Wed Mar 7 12:46:22 2012 +0100
Copyright file revised for new format 1.0
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 4d88689..000
--- a/debian/README.source
+++ /dev/null
@@ -1,16 +0,0 @@
-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.
-
diff --git a/debian/changelog b/debian/changelog
index 7b48b8c..223028b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,10 @@ gmt (4.5.7-1) unstable; urgency=low
of the distribution.
* Added a build-dep on autotools-dev and provided usual snippets to override
config.{sub,guess} files before configuring.
+ * Moved to copyright format version 1.0. Note that in 4.5.6 GMT team added
+compatibility with any later version for GPL-2.
- -- Francesco Paolo Lovergine Wed, 07 Mar 2012 09:56:12
+0100
+ -- Francesco Paolo Lovergine Wed, 07 Mar 2012 12:14:54
+0100
gmt (4.5.6-1) unstable; urgency=low
diff --git a/debian/copyright b/debian/copyright
index 7bdd037..738ec39 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,24 +1,21 @@
-
-This package was debianized by Torsten Landschoff on
-Wed, 29 Sep 1999 18:04:12 +0200
-
-The upstream source is available from
-
- http://gmt.soest.hawaii.edu/
-
-The main upstream authors are
-
- Paul Wessel
- and Walter Smith
-
-Copyright:
-
-Copyright (c) 1991-2008, P. Wessel & W. H. F. Smith
-
-This software is covered by the GNU Library General Public Licence
-(version 2).
-
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-2'. If
-you got the source archive you will find the license in the file COPYING
-in the top directory.
+ormat: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: GMT
+Upstream-Contact: Paul Wessel and Walter Smith
+Source: http://gmt.soest.hawaii.edu/
+
+File: *
+Copyright: 1991-2011 P.Wessel & W.H.F.Smith
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 or any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ On Debian GNU/Linux systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'. If
+ you got the source archive you will find the license in the file COPYING
+ in the top directory.
--
Generic Mapping Tools
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] gmt branch, master, updated. upstream/4.5.5-13-g2b12d98
The following commit has been merged in the master branch:
commit adc0addf31aa399971ccb5e8f45bdf21e4a83a3b
Author: Francesco Paolo Lovergine
Date: Wed Mar 7 10:53:48 2012 +0100
Packaging scripts revised for current upstream distribution.
diff --git a/debian/changelog b/debian/changelog
index 915ea3e..7b48b8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,11 @@ gmt (4.5.7-1) unstable; urgency=low
* New upstream version with a new compact distribution.
* Policy bumped to 3.9.3, no changes required.
+ * Now use in embedded mode quilt and all tar/unpack/patch target have been
dropped.
+ * Get-orig-source and all other special target dropped due to semplification
+of the distribution.
+ * Added a build-dep on autotools-dev and provided usual snippets to override
+config.{sub,guess} files before configuring.
-- Francesco Paolo Lovergine Wed, 07 Mar 2012 09:56:12
+0100
diff --git a/debian/control b/debian/control
index ddf3359..8daafd3 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,9 @@ Section: science
Priority: extra
Maintainer: Debian GIS Project
Uploaders: Torsten Landschoff , Francesco Paolo Lovergine
-Build-Depends: libnetcdf-dev, debhelper (>= 8), quilt, bzip2, libxmu-headers,
libxaw7-dev
+Build-Depends: libnetcdf-dev, debhelper (>= 8), bzip2, libxmu-headers,
libxaw7-dev, autotools-dev
Build-Depends-Indep: debhelper (>= 8), quilt, bzip2
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Homepage: http://gmt.soest.hawaii.edu/
Vcs-Browser: http://git.debian.org/?p=pkg-grass/gmt.git
Vcs-Git: git://git.debian.org/git/pkg-grass/gmt.git
diff --git a/debian/rules b/debian/rules
index 6f8bfb2..5423b01 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,5 @@
#! /usr/bin/make -f
-RELEASE:= 4.5.7
-PARTS := doc share src suppl
-ARCHIVES := $(PARTS:%=upstream/GMT$(RELEASE)_%.tar.bz2)
-
CFLAGS := -fPIC -ansi -pedantic
# Some special build options
@@ -19,60 +15,32 @@ ifneq (,$(findstring verbose,$(DEB_BUILD_OPTIONS)))
export DH_VERBOSE
endif
-unpack:stamps/unpack-stamp
-patch: stamps/patch-stamp
-build: stamps/build-stamp
-install: stamps/install-stamp
+build: build-stamp
+install: install-stamp
binary:binary-arch binary-indep
-download-upstream: $(ARCHIVES)
-
-create-orig-tar: $(ARCHIVES)
- dh_testdir
- mkdir -p gmt-$(RELEASE)/upstream
- ln -f $(ARCHIVES) gmt-$(RELEASE)/upstream
- tar cf - gmt-$(RELEASE)|gzip -9 > gmt_$(RELEASE).orig.tar.gz
- mv gmt_$(RELEASE).orig.tar.gz ..
- rm -R gmt-$(RELEASE)
-
-upstream/%:
- dh_testdir
- mkdir -p upstream
- wget -O upstream/$*.partial ftp://ibis.grdl.noaa.gov/pub/gmt/$*
- mv upstream/$*.partial upstream/$*
-
-stamps/unpack-stamp:
- dh_testdir
- for i in $(ARCHIVES); do \
- tar xjf $$i || exit 1; \
- done
- mkdir -p stamps
- touch $@
-
-stamps/patch-stamp:stamps/unpack-stamp
- dh_testdir
- ln -sf GMT$(RELEASE) GMT
- QUILT_PATCH_OPTS="-p1" QUILT_PATCHES=debian/patches quilt push -a
--color=auto || [ $$? = 2 ]
- touch $@
-
-unpatch:
- dh_testdir
- QUILT_PATCH_OPTS="-p1" QUILT_PATCHES=debian/patches quilt pop -a || true
- rm -rf stamps/patch-stamp GMT .pc
-
PATHCONFIG := --prefix=/usr/lib/gmt
DESTDIR:= $(CURDIR)/debian/tmp
PATHVARS := prefix=$(DESTDIR)/usr/lib/gmt
-stamps/build-stamp: stamps/patch-stamp
+build-stamp:
dh_testdir
dh_prep
- cd GMT$(RELEASE) && ./configure \
+
+ # Use current autotools helpers
+ -test -r /usr/share/misc/config.sub && \
+ mv config.sub config.sub.original && \
+ cp -f /usr/share/misc/config.sub config.sub
+ -test -r /usr/share/misc/config.guess && \
+ mv config.guess config.guess.original && \
+ cp -f /usr/share/misc/config.guess config.guess
+
+ $(CURDIR)/configure \
--enable-shared $(PATHCONFIG) --disable-mex --enable-netcdf=/usr
- $(MAKE) -C GMT$(RELEASE) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" all
suppl
+ $(MAKE) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" all suppl
touch $@
-stamps/install-stamp: stamps/build-stamp
+install-stamp: build-stamp
dh_testdir
dh_testroot
@@ -87,7 +55,7 @@ stamps/install-stamp: stamps/build-stamp
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) $(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
@@ -96,12 +64,6 @@ stamps/install-stamp: stamps/build-stamp
mv $(DESTDIR
[SCM] gmt branch, master, updated. upstream/4.5.5-13-g2b12d98
The following commit has been merged in the master branch: commit e57e2197942a56c2885d18f102d6ee710c20c9c5 Merge: 534ed2a094ce005e59dbe330ae2f1f84443336bf 6797941eb14b4f7fde758a1d8359828339a6a8a1 Author: Francesco Paolo Lovergine Date: Wed Mar 7 10:01:26 2012 +0100 Merge tag 'upstream/4.5.7' Upstream version 4.5.7 Conflicts: doc/pdf/GMT_Docs.pdf upstream/GMT4.5.5_doc.tar.bz2 upstream/GMT4.5.6_doc.tar.bz2 -- Generic Mapping Tools ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] gmt branch, master, updated. upstream/4.5.5-13-g2b12d98
The following commit has been merged in the master branch: commit 534ed2a094ce005e59dbe330ae2f1f84443336bf Author: Francesco Paolo Lovergine Date: Wed Mar 7 09:57:00 2012 +0100 Started new upstream version packaging. diff --git a/debian/changelog b/debian/changelog index 5bc7b86..915ea3e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gmt (4.5.7-1) unstable; urgency=low + + * New upstream version with a new compact distribution. + * Policy bumped to 3.9.3, no changes required. + + -- Francesco Paolo Lovergine Wed, 07 Mar 2012 09:56:12 +0100 + gmt (4.5.6-1) unstable; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 3d46cc3..ddf3359 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Debian GIS Project Uploaders: Torsten Landschoff , Francesco Paolo Lovergine Build-Depends: libnetcdf-dev, debhelper (>= 8), quilt, bzip2, libxmu-headers, libxaw7-dev Build-Depends-Indep: debhelper (>= 8), quilt, bzip2 -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Homepage: http://gmt.soest.hawaii.edu/ Vcs-Browser: http://git.debian.org/?p=pkg-grass/gmt.git Vcs-Git: git://git.debian.org/git/pkg-grass/gmt.git diff --git a/debian/rules b/debian/rules index 24ba679..6f8bfb2 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,6 @@ #! /usr/bin/make -f -RELEASE:= 4.5.6 +RELEASE:= 4.5.7 PARTS := doc share src suppl ARCHIVES := $(PARTS:%=upstream/GMT$(RELEASE)_%.tar.bz2) -- Generic Mapping Tools ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] gmt branch, master, updated. upstream/4.5.5-13-g2b12d98
The following commit has been merged in the master branch: commit 9c01db4bc061e1e3ad8be1a6e8c340a84fffa30e Author: Francesco Paolo Lovergine Date: Mon Mar 28 13:12:46 2011 +0200 Changed version. diff --git a/debian/changelog b/debian/changelog index d7b49a2..5bc7b86 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -gmt (4.5.5-2) unstable; urgency=low +gmt (4.5.6-1) unstable; urgency=low * New upstream release. -- Generic Mapping Tools ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] gmt branch, master, updated. upstream/4.5.5-13-g2b12d98
The following commit has been merged in the master branch: commit 2f2f45ea14d607463ae752f867c9911f63a5e8ab Author: Francesco Paolo Lovergine Date: Mon Mar 28 13:10:17 2011 +0200 Version 4.5.6 diff --git a/debian/changelog b/debian/changelog index 9bf798b..d7b49a2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +gmt (4.5.5-2) unstable; urgency=low + + * New upstream release. + + -- Francesco Paolo Lovergine Mon, 28 Mar 2011 12:50:08 +0200 + gmt (4.5.5-1) unstable; urgency=low * New upstream release. diff --git a/debian/rules b/debian/rules index 81d06e2..24ba679 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,6 @@ #! /usr/bin/make -f -RELEASE:= 4.5.5 +RELEASE:= 4.5.6 PARTS := doc share src suppl ARCHIVES := $(PARTS:%=upstream/GMT$(RELEASE)_%.tar.bz2) diff --git a/upstream/GMT4.5.5_share.tar.bz2 b/upstream/GMT4.5.5_share.tar.bz2 deleted file mode 100644 index d4374d3..000 Binary files a/upstream/GMT4.5.5_share.tar.bz2 and /dev/null differ diff --git a/upstream/GMT4.5.5_src.tar.bz2 b/upstream/GMT4.5.5_src.tar.bz2 deleted file mode 100644 index 720c4ec..000 Binary files a/upstream/GMT4.5.5_src.tar.bz2 and /dev/null differ diff --git a/upstream/GMT4.5.5_suppl.tar.bz2 b/upstream/GMT4.5.5_suppl.tar.bz2 deleted file mode 100644 index 7b215d1..000 Binary files a/upstream/GMT4.5.5_suppl.tar.bz2 and /dev/null differ diff --git a/upstream/GMT4.5.5_doc.tar.bz2 b/upstream/GMT4.5.6_doc.tar.bz2 similarity index 71% rename from upstream/GMT4.5.5_doc.tar.bz2 rename to upstream/GMT4.5.6_doc.tar.bz2 index 1f5553a..e88fdca 100644 Binary files a/upstream/GMT4.5.5_doc.tar.bz2 and b/upstream/GMT4.5.6_doc.tar.bz2 differ diff --git a/upstream/GMT4.5.6_share.tar.bz2 b/upstream/GMT4.5.6_share.tar.bz2 new file mode 100644 index 000..2c6d0a5 Binary files /dev/null and b/upstream/GMT4.5.6_share.tar.bz2 differ diff --git a/upstream/GMT4.5.6_src.tar.bz2 b/upstream/GMT4.5.6_src.tar.bz2 new file mode 100644 index 000..f9ccf4a Binary files /dev/null and b/upstream/GMT4.5.6_src.tar.bz2 differ diff --git a/upstream/GMT4.5.6_suppl.tar.bz2 b/upstream/GMT4.5.6_suppl.tar.bz2 new file mode 100644 index 000..d5eb410 Binary files /dev/null and b/upstream/GMT4.5.6_suppl.tar.bz2 differ -- Generic Mapping Tools ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
