[DebianGIS-dev] r1643 - packages/gmt/branches/4.2.1/debian

[frankie at alioth.debian.org]

Author: frankie
Date: 2008-06-14 17:46:26 +0000 (Sat, 14 Jun 2008)
New Revision: 1643

Modified:
   packages/gmt/branches/4.2.1/debian/README.Debian
   packages/gmt/branches/4.2.1/debian/changelog
   packages/gmt/branches/4.2.1/debian/gmt-examples.examples
   packages/gmt/branches/4.2.1/debian/rules
Log:
Fixed examples stuff


Modified: packages/gmt/branches/4.2.1/debian/README.Debian
===================================================================
--- packages/gmt/branches/4.2.1/debian/README.Debian	2008-06-14 08:33:38 UTC (rev 1642)
+++ packages/gmt/branches/4.2.1/debian/README.Debian	2008-06-14 17:46:26 UTC (rev 1643)
@@ -13,9 +13,15 @@
 /etc/gmt/coastline.conf and add the path to the files ending with .cfg 
 that you just extracted. Afterwards, GMT should be fully functional. 
 
-NOTE: By default, the gmt utilities are not included in $PATH, so you 
+NOTE: 
+
+By default, the gmt utilities are not included in $PATH, so you 
 either need to add /usr/lib/gmt/bin to your PATH or use the GMT wrapper, 
-see GMT(1gmt).
+see GMT(1gmt). Therefore, you also need to run do_examples.sh as 
 
+./do_examples.sh /usr/lib/gmt/bin /usr/lib/gmt/lib
+
+if you would use gmt-examples to recreate GMT examples.
+
  -- Torsten Landschoff <torsten at debian.org>  Fri, 26 May 2006 22:56:49 +0200
-
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Sat, 14 Jun 2008 11:48:20 +0200

Modified: packages/gmt/branches/4.2.1/debian/changelog
===================================================================
--- packages/gmt/branches/4.2.1/debian/changelog	2008-06-14 08:33:38 UTC (rev 1642)
+++ packages/gmt/branches/4.2.1/debian/changelog	2008-06-14 17:46:26 UTC (rev 1643)
@@ -1,10 +1,17 @@
 gmt (4.2.1-3) UNRELEASED; urgency=low
 
+  Changes merged from 4.3.1 in trunk:
   * Changed build-dep to libnetcdf-dev instead of netcdfg-dev now
-    obsolete (merged from trunk).
-  * Removed C-shell build-dep (merged from trunk).
+    obsolete 
+  * Removed C-shell build-dep.
+  * Cleaned debian/rules.
+  * Added missing symlinks to *.conf in the share directory.
+  * Fixed debian/gmt-examples.examples to install examples for true.
+  * Now avoids compression of examples/ stuff in debian/rules. 
+  * A note has been added to README.Debian to explain how to run examples 
+    scripts. (closes: #400991)
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Fri, 13 Jun 2008 22:32:14 +0200
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Sat, 14 Jun 2008 11:48:20 +0200
 
 gmt (4.2.1-2) unstable; urgency=low
 

Modified: packages/gmt/branches/4.2.1/debian/gmt-examples.examples
===================================================================
--- packages/gmt/branches/4.2.1/debian/gmt-examples.examples	2008-06-14 08:33:38 UTC (rev 1642)
+++ packages/gmt/branches/4.2.1/debian/gmt-examples.examples	2008-06-14 17:46:26 UTC (rev 1643)
@@ -1 +1,2 @@
-GMT4.2.0/examples/*
+GMT/examples/*
+GMT/examples/.gmtdefaults4.doc

Modified: packages/gmt/branches/4.2.1/debian/rules
===================================================================
--- packages/gmt/branches/4.2.1/debian/rules	2008-06-14 08:33:38 UTC (rev 1642)
+++ packages/gmt/branches/4.2.1/debian/rules	2008-06-14 17:46:26 UTC (rev 1643)
@@ -3,7 +3,21 @@
 RELEASE		:= 4.2.1
 PARTS		:= pdf src share scripts suppl tut web
 ARCHIVES	:= $(PARTS:%=upstream/GMT$(RELEASE)_%.tar.bz2)
+CC_OPT		:= -fPIC -ansi -pedantic
 
+# Some special build options
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+   CC_OPT  += -g -O0
+   LDFLAGS += -g
+else
+   CC_OPT  += -O2
+endif
+
+ifneq (,$(findstring verbose,$(DEB_BUILD_OPTIONS)))
+   DH_VERBOSE=1
+   export DH_VERBOSE
+endif
+
 unpack:		stamps/unpack-stamp
 patch:		stamps/patch-stamp
 build:		stamps/build-stamp
@@ -53,7 +67,7 @@
 	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 
+	make -C GMT$(RELEASE) CC_OPT="$(CC_OPT)" LDFLAGS="$(LDFLAGS)" all suppl
 	touch $@
 
 stamps/install-stamp: stamps/build-stamp
@@ -88,9 +102,8 @@
 
 	# Configuration files are still at the wrong place, let's fix this
 	mv $(DESTDIR)/usr/share/gmt/conf/*.conf $(DESTDIR)/etc/gmt/
-	ln -fs /etc/gmt/gmt.conf $(DESTDIR)/usr/share/gmt/
 	install -m644 debian/coastline.conf $(DESTDIR)/etc/gmt/
-	ln -fs /etc/gmt/coastline.conf $(DESTDIR)/usr/share/gmt/
+	ln -fs /etc/gmt/*.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 and patch it a bit locally to alter the PATH var
@@ -141,6 +154,8 @@
 	dh_strip -i
 	dh_link -i
 	dh_compress -i -X.pdf
+	# Uncompress examples stuff 
+	find  $(CURDIR)/debian/gmt-examples/usr/share/doc/gmt-examples/examples -name "*.gz" -exec gunzip {} \;
 	dh_fixperms -i
 	dh_installdeb -i
 	dh_shlibdeps -i