[SCM] gmt branch, master, updated. upstream/4.5.5-13-g2b12d98

Francesco Paolo Lovergine frankie at debian.org
Wed Mar 7 11:51:02 UTC 2012


The following commit has been merged in the master branch:
commit adc0addf31aa399971ccb5e8f45bdf21e4a83a3b
Author: Francesco Paolo Lovergine <frankie at debian.org>
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 <frankie at debian.org>  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 <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Torsten Landschoff <torsten at debian.org>, Francesco Paolo Lovergine <frankie at debian.org>
-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)/usr/lib/gmt/share/doc/gmt $(DESTDIR)/usr/share/doc/
 	ln -fs ../../../share/doc/gmt $(DESTDIR)/usr/lib/gmt/share/doc/gmt
 	
-	# Move stuff from the doc directory up one level and replace the dir
-	# with a symlink to .
-#	mv $(DESTDIR)/usr/share/doc/gmt/doc/* $(DESTDIR)/usr/share/doc/gmt/
-#	rmdir $(DESTDIR)/usr/share/doc/gmt/doc
-#	ln -fs . $(DESTDIR)/usr/share/doc/gmt/doc
-	
 	# Configuration files are still at the wrong place, let's fix this
 	mv $(DESTDIR)/usr/share/gmt/conf/*.conf $(DESTDIR)/etc/gmt/
 	install -m644 debian/coastline.conf $(DESTDIR)/etc/gmt/
@@ -130,12 +92,12 @@ stamps/install-stamp: stamps/build-stamp
 	
 	touch $@
 
-binary-arch: stamps/install-stamp
+binary-arch: install-stamp
 	dh_testdir -a
 	dh_testroot -a
 	dh_install --list-missing --sourcedir=$(DESTDIR)
 	dh_installchangelogs -a
-	dh_installchangelogs -pgmt GMT$(RELEASE)/ChangeLog
+	dh_installchangelogs -pgmt ChangeLog
 	dh_installdocs -a
 	dh_installexamples -a
 	dh_installmenu -a
@@ -152,7 +114,7 @@ binary-arch: stamps/install-stamp
 	dh_builddeb -a
 	
 
-binary-indep: stamps/install-stamp
+binary-indep: install-stamp
 	dh_testdir -i
 	dh_testroot -i
 	dh_install --list-missing --sourcedir=$(DESTDIR)
@@ -177,5 +139,14 @@ binary-indep: stamps/install-stamp
 clean:
 	dh_testdir
 	dh_testroot
-	rm -Rf stamps GMT$(RELEASE) GMT .pc
+	rm -f install-stamp build-stamp
+	# Reset upstream autotools helpers
+	[ ! -f config.sub.original ] || mv -f config.sub.original config.sub 
+	[ ! -f config.guess.original ] || mv -f config.guess.original config.guess
+	[ ! -f Makefile ] || $(MAKE) distclean || true
+	# Remove a few files still around after upstream cleaning
+	rm -f src/mgg/libgmt_mgg.a \
+		  share/conf/gmt.conf \
+		  share/conf/gmtdefaults_SI \
+		  share/conf/gmtdefaults_US src/isogmt
 	dh_clean

-- 
Generic Mapping Tools



More information about the Pkg-grass-devel mailing list