[DebianGIS-dev] r2031 - in packages/gmt/trunk: debian upstream

frankie at alioth.debian.org frankie at alioth.debian.org
Mon Mar 16 23:20:55 UTC 2009 

Author: frankie
Date: 2009-03-16 23:20:55 +0000 (Mon, 16 Mar 2009)
New Revision: 2031

Added:
   packages/gmt/trunk/upstream/GMT4.4.0_doc.tar.bz2
   packages/gmt/trunk/upstream/GMT4.4.0_share.tar.bz2
   packages/gmt/trunk/upstream/GMT4.4.0_src.tar.bz2
   packages/gmt/trunk/upstream/GMT4.4.0_suppl.tar.bz2
Removed:
   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
Modified:
   packages/gmt/trunk/debian/changelog
   packages/gmt/trunk/debian/compat
   packages/gmt/trunk/debian/control
   packages/gmt/trunk/debian/gmt-doc.install
   packages/gmt/trunk/debian/gmt-examples.examples
   packages/gmt/trunk/debian/rules
Log:
New upstream release.


Modified: packages/gmt/trunk/debian/changelog
===================================================================
--- packages/gmt/trunk/debian/changelog	2009-03-16 21:04:32 UTC (rev 2030)
+++ packages/gmt/trunk/debian/changelog	2009-03-16 23:20:55 UTC (rev 2031)
@@ -1,3 +1,13 @@
+gmt (4.4.0-1) unstable; urgency=low
+
+  * NOT RELEASED.
+  * New upstream release.
+  * Moved to debhelper level 7.
+  * Added a dh_prep call at building start.
+  * Revised debian/rules to work with new upstream locations.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 17 Mar 2009 00:17:41 +0100
+
 gmt (4.3.1-3) unstable; urgency=medium
 
   * Removed headers from gmt binary package.

Modified: packages/gmt/trunk/debian/compat
===================================================================
--- packages/gmt/trunk/debian/compat	2009-03-16 21:04:32 UTC (rev 2030)
+++ packages/gmt/trunk/debian/compat	2009-03-16 23:20:55 UTC (rev 2031)
@@ -1 +1 @@
-5
+7

Modified: packages/gmt/trunk/debian/control
===================================================================
--- packages/gmt/trunk/debian/control	2009-03-16 21:04:32 UTC (rev 2030)
+++ packages/gmt/trunk/debian/control	2009-03-16 23:20:55 UTC (rev 2031)
@@ -3,8 +3,8 @@
 Priority: extra
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Torsten Landschoff <torsten at debian.org>, Francesco P. Lovergine <frankie at debian.org>
-Build-Depends: libnetcdf-dev, debhelper (>= 5.0), bzip2, quilt, libxmu-headers, libxaw7-dev
-Build-Depends-Indep: debhelper (>= 5.0), bzip2, quilt
+Build-Depends: libnetcdf-dev, debhelper (>= 7.0), bzip2, quilt, libxmu-headers, libxaw7-dev
+Build-Depends-Indep: debhelper (>= 7.0), bzip2, quilt
 Standards-Version: 3.8.0
 Homepage: http://gmt.soest.hawaii.edu/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/gmt/trunk

Modified: packages/gmt/trunk/debian/gmt-doc.install
===================================================================
--- packages/gmt/trunk/debian/gmt-doc.install	2009-03-16 21:04:32 UTC (rev 2030)
+++ packages/gmt/trunk/debian/gmt-doc.install	2009-03-16 23:20:55 UTC (rev 2031)
@@ -1,3 +1 @@
-usr/share/doc/gmt/*.html
-usr/share/doc/gmt/*.gif
 usr/share/doc/gmt/html

Modified: packages/gmt/trunk/debian/gmt-examples.examples
===================================================================
--- packages/gmt/trunk/debian/gmt-examples.examples	2009-03-16 21:04:32 UTC (rev 2030)
+++ packages/gmt/trunk/debian/gmt-examples.examples	2009-03-16 23:20:55 UTC (rev 2031)
@@ -1 +1 @@
-GMT/examples/*
+debian/tmp/usr/share/doc/gmt/examples/*

Modified: packages/gmt/trunk/debian/rules
===================================================================
--- packages/gmt/trunk/debian/rules	2009-03-16 21:04:32 UTC (rev 2030)
+++ packages/gmt/trunk/debian/rules	2009-03-16 23:20:55 UTC (rev 2031)
@@ -1,7 +1,7 @@
 #! /usr/bin/make -f
 
-RELEASE		:= 4.3.1
-PARTS		:= pdf src share scripts suppl tut web
+RELEASE		:= 4.4.0
+PARTS		:= doc share src suppl 
 ARCHIVES	:= $(PARTS:%=upstream/GMT$(RELEASE)_%.tar.bz2)
 
 CFLAGS := -fPIC -ansi -pedantic
@@ -66,6 +66,7 @@
 
 stamps/build-stamp: stamps/patch-stamp
 	dh_testdir
+	dh_prep
 	cd GMT$(RELEASE) && ./configure \
 		--enable-shared $(PATHCONFIG) --disable-mex --enable-netcdf=/usr
 	$(MAKE) -C GMT$(RELEASE) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" all suppl 
@@ -74,45 +75,45 @@
 stamps/install-stamp: stamps/build-stamp
 	dh_testdir
 	dh_testroot
-
+	
 	# Very tricky: GMT does not conform to FHS. As it proved to be very
 	# time consuming to bend this beast I'll create a fake GMT tree
 	# which links to the Debian accepted locations and install into
 	# that tree.
-	mkdir -p $(DESTDIR)/usr/lib/gmt/www $(DESTDIR)/usr/share/gmt 	\
+	mkdir -p  $(DESTDIR)/usr/lib/gmt $(DESTDIR)/usr/share/gmt \
 		$(DESTDIR)/usr/share/man $(DESTDIR)/usr/include/gmt \
 		$(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
-
+	
 	# Okay, we still have to move the documentation (the trick above does
 	# not work because the Makefile would try to overwrite the link with
 	# a directory). So move the docs and link them to where GMT will look
 	# for them. 
-	mv $(DESTDIR)/usr/lib/gmt/www/gmt $(DESTDIR)/usr/share/doc/
-	ln -fs ../../../share/doc/gmt $(DESTDIR)/usr/lib/gmt/www/gmt
-
+	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
-
+#	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/
 	for file in $(DESTDIR)/etc/gmt/*.conf; do \
 		ln -fs /etc/gmt/`basename $$file` $(DESTDIR)/usr/share/gmt/`basename $$file`; \
 	done
-
+	
 	# 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
 	sed -e 's/^exec /PATH=\$$PATH:\$${exec_prefix}\/bin exec /' $(DESTDIR)/usr/lib/gmt/bin/GMT >$(DESTDIR)/usr/bin/GMT
 	rm -f $(DESTDIR)/usr/lib/gmt/bin/GMT
-
+	
 	# Move the manpages directory into the right place...
 	for section in 1 3 5; do \
 		mkdir -p $(DESTDIR)/usr/share/man/man$${section}; \
@@ -123,7 +124,7 @@
 		done; \
 	done
 	rm -rf $(DESTDIR)/usr/share/gmt/man
-
+	
 	touch $@
 
 binary-arch: stamps/install-stamp

Deleted: packages/gmt/trunk/upstream/GMT4.3.1_pdf.tar.bz2
===================================================================
(Binary files differ)

Deleted: packages/gmt/trunk/upstream/GMT4.3.1_scripts.tar.bz2
===================================================================
(Binary files differ)

Deleted: packages/gmt/trunk/upstream/GMT4.3.1_share.tar.bz2
===================================================================
(Binary files differ)

Deleted: packages/gmt/trunk/upstream/GMT4.3.1_src.tar.bz2
===================================================================
(Binary files differ)

Deleted: packages/gmt/trunk/upstream/GMT4.3.1_suppl.tar.bz2
===================================================================
(Binary files differ)

Deleted: packages/gmt/trunk/upstream/GMT4.3.1_tut.tar.bz2
===================================================================
(Binary files differ)

Deleted: packages/gmt/trunk/upstream/GMT4.3.1_web.tar.bz2
===================================================================
(Binary files differ)

Added: packages/gmt/trunk/upstream/GMT4.4.0_doc.tar.bz2
===================================================================
(Binary files differ)


Property changes on: packages/gmt/trunk/upstream/GMT4.4.0_doc.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: packages/gmt/trunk/upstream/GMT4.4.0_share.tar.bz2
===================================================================
(Binary files differ)


Property changes on: packages/gmt/trunk/upstream/GMT4.4.0_share.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: packages/gmt/trunk/upstream/GMT4.4.0_src.tar.bz2
===================================================================
(Binary files differ)


Property changes on: packages/gmt/trunk/upstream/GMT4.4.0_src.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: packages/gmt/trunk/upstream/GMT4.4.0_suppl.tar.bz2
===================================================================
(Binary files differ)


Property changes on: packages/gmt/trunk/upstream/GMT4.4.0_suppl.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

More information about the Pkg-grass-devel mailing list