[DebianGIS-dev] r1620 - in packages/gmt/trunk/debian: . patches

[frankie at alioth.debian.org]

Author: frankie
Date: 2008-06-12 12:25:19 +0000 (Thu, 12 Jun 2008)
New Revision: 1620

Removed:
   packages/gmt/trunk/debian/patches/link_gcc.diff
Modified:
   packages/gmt/trunk/debian/changelog
   packages/gmt/trunk/debian/gmt-doc-pdf.install
   packages/gmt/trunk/debian/patches/disable_unsupported.diff
   packages/gmt/trunk/debian/rules
Log:
Releasing 4.2.1, long due


Modified: packages/gmt/trunk/debian/changelog
===================================================================
--- packages/gmt/trunk/debian/changelog	2008-06-11 07:54:50 UTC (rev 1619)
+++ packages/gmt/trunk/debian/changelog	2008-06-12 12:25:19 UTC (rev 1620)
@@ -1,8 +1,8 @@
-gmt (4.2.1-1) UNRELEASED; urgency=low
+gmt (4.2.1-1) unstable; urgency=low
 
-  * NOT RELEASED YET
   * New upstream release. There is no more a _man file, all manpages are in _src.
     debian/rules changed as consequence.
+    This partially fixes #181557 but project.1 is still a bit weird.
   * Revised man page installation in debian/rules, due to changes in the building system.
   * In debian/rules: added LDFLAGS="-g" at build-time, in order to create unstripped binaries.
     (closes: #437047)
@@ -10,8 +10,15 @@
     calling dh_shlibdeps
   * Policy bumped to 3.7.3, without changes.
   * Added Vcs-* fields to debian/control.
+  * Now installs some additional pdfs in gmt-doc-pdf.
+  * GMT wrapper changed to modify PATH before calling a GMT command.
+    Patch applied on fly in debian/rules.
+    (closes: #416869)
+  * Fixed patches and debian/rules to use quilt in top dir and support next generation 
+    source package.
+    (closes: #485163)
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 10 Dec 2007 16:32:18 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 12 Jun 2008 14:21:53 +0200
 
 gmt (4.2.0-1) unstable; urgency=low
 

Modified: packages/gmt/trunk/debian/gmt-doc-pdf.install
===================================================================
--- packages/gmt/trunk/debian/gmt-doc-pdf.install	2008-06-11 07:54:50 UTC (rev 1619)
+++ packages/gmt/trunk/debian/gmt-doc-pdf.install	2008-06-12 12:25:19 UTC (rev 1620)
@@ -1 +1,5 @@
+usr/share/doc/gmt/pdf/GMT_Manpages.pdf
+usr/share/doc/gmt/pdf/GMT_Tutorial.pdf
 usr/share/doc/gmt/pdf/GMT_Docs.pdf
+usr/share/doc/gmt/pdf/GMT_Manpages_suppl.pdf
+

Modified: packages/gmt/trunk/debian/patches/disable_unsupported.diff
===================================================================
--- packages/gmt/trunk/debian/patches/disable_unsupported.diff	2008-06-11 07:54:50 UTC (rev 1619)
+++ packages/gmt/trunk/debian/patches/disable_unsupported.diff	2008-06-12 12:25:19 UTC (rev 1620)
@@ -1,7 +1,7 @@
-Index: GMT4.2.0/Makefile
+Index: GMT4.2.1/GMT/Makefile
 ===================================================================
---- GMT4.2.0.orig/Makefile	2007-04-02 22:38:49.000000000 +0200
-+++ GMT4.2.0/Makefile	2007-04-16 23:02:28.632988058 +0200
+--- 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 !!
  #-------------------------------------------------------------------------------

Deleted: packages/gmt/trunk/debian/patches/link_gcc.diff
===================================================================
--- packages/gmt/trunk/debian/patches/link_gcc.diff	2008-06-11 07:54:50 UTC (rev 1619)
+++ packages/gmt/trunk/debian/patches/link_gcc.diff	2008-06-12 12:25:19 UTC (rev 1620)
@@ -1,12 +0,0 @@
-Index: GMT4.2.0/configure
-===================================================================
---- GMT4.2.0.orig/configure	2007-04-03 05:32:45.000000000 +0200
-+++ GMT4.2.0/configure	2007-04-16 23:02:18.509532455 +0200
-@@ -4673,6 +4673,7 @@
- 			LDFLAGS=$OPTS'-Wl,-R,$(libdir):'$NETCDFHOME/lib
- 		fi
- 	elif test "$os" = "Linux" ; then	# Need optimization when doing shared
-+		LD=gcc
- 		LD_OPT="-shared"
- 		OPTGO="-O2 "
- 		LDFLAGS=$OPTS'-Wl,-rpath,$(libdir):'$NETCDFHOME/lib

Modified: packages/gmt/trunk/debian/rules
===================================================================
--- packages/gmt/trunk/debian/rules	2008-06-11 07:54:50 UTC (rev 1619)
+++ packages/gmt/trunk/debian/rules	2008-06-12 12:25:19 UTC (rev 1620)
@@ -15,8 +15,8 @@
 create-orig-tar:	$(ARCHIVES)
 	dh_testdir
 	mkdir -p gmt-$(RELEASE).orig
-	ln $(ARCHIVES) gmt-$(RELEASE).orig
-	tar -cf - gmt-$(RELEASE).orig|gzip -9 > gmt-$(RELEASE).orig.tar.gz
+	ln -f $(ARCHIVES) gmt-$(RELEASE).orig
+	tar cf - gmt-$(RELEASE).orig|gzip -9 > gmt-$(RELEASE).orig.tar.gz
 	mv gmt-$(RELEASE).orig.tar.gz ..
 	rm -R gmt-$(RELEASE).orig
 
@@ -29,20 +29,21 @@
 stamps/unpack-stamp: 
 	dh_testdir
 	for i in $(ARCHIVES); do \
-		tar -xjf $$i || exit 1; \
+		tar xjf $$i || exit 1; \
 	done
 	mkdir -p stamps
 	touch $@
 
 stamps/patch-stamp:	stamps/unpack-stamp
 	dh_testdir
-	ln -sf ../debian/patches GMT$(RELEASE)/
-	cd GMT$(RELEASE) && quilt push -a --color=auto || [ $$? = 2 ]
+	ln -sf GMT$(RELEASE) GMT
+	QUILT_PATCH_OPTS="-p1" QUILT_PATCHES=debian/patches quilt push -a --color=auto || [ $$? = 2 ]
 	touch $@
 
 unpatch:
 	dh_testdir
-	cd GMT$(RELEASE) && quilt pop -a
+	QUILT_PATCH_OPTS="-p1" QUILT_PATCHES=debian/patches quilt pop -a || true
+	rm -f stamps/patch-stamp GMT
 
 PATHCONFIG	:= --prefix=/usr/lib/gmt
 DESTDIR		:= $(CURDIR)/debian/tmp
@@ -93,8 +94,8 @@
 	ln -fs /etc/gmt/coastline.conf $(DESTDIR)/usr/share/gmt/
 
 	# GMT wrapper does not help in /usr/lib/gmt/bin (not in path by default)
-	# So: Move it to /usr/bin
-	mv $(DESTDIR)/usr/lib/gmt/bin/GMT $(DESTDIR)/usr/bin/
+	# So: Move it to /usr/bin and patch it a bit locally to alter the PATH var
+	sed -e 's/^exec /PATH=\$PATH:\${exec_prefix}\/bin exec /' /usr/bin/GMT >$(DESTDIR)/usr/bin/GMT
 
 	# Move the manpages directory into the right place...
 	for manpage in $(DESTDIR)/usr/lib/gmt/share/man/man1/*.1; do \