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

frankie at alioth.debian.org frankie at alioth.debian.org
Mon Dec 10 13:42:42 UTC 2007 

Author: frankie
Date: 2007-12-10 13:42:41 +0000 (Mon, 10 Dec 2007)
New Revision: 1289

Removed:
   packages/gmt/trunk/upstream/GMT4.2.0_man.tar.bz2
   packages/gmt/trunk/upstream/GMT4.2.0_pdf.tar.bz2
   packages/gmt/trunk/upstream/GMT4.2.0_scripts.tar.bz2
   packages/gmt/trunk/upstream/GMT4.2.0_share.tar.bz2
   packages/gmt/trunk/upstream/GMT4.2.0_src.tar.bz2
   packages/gmt/trunk/upstream/GMT4.2.0_suppl.tar.bz2
   packages/gmt/trunk/upstream/GMT4.2.0_tut.tar.bz2
   packages/gmt/trunk/upstream/GMT4.2.0_web.tar.bz2
Modified:
   packages/gmt/trunk/debian/changelog
   packages/gmt/trunk/debian/patches/series
   packages/gmt/trunk/debian/rules
Log:
Starting 4.2.1 development.


Modified: packages/gmt/trunk/debian/changelog
===================================================================
--- packages/gmt/trunk/debian/changelog	2007-12-05 09:45:06 UTC (rev 1288)
+++ packages/gmt/trunk/debian/changelog	2007-12-10 13:42:41 UTC (rev 1289)
@@ -1,3 +1,12 @@
+gmt (4.2.1-1) UNRELEASED; 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.
+  * Revised man page installation in debian/rules, due to changes in the building system.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 17 Oct 2007 16:04:13 +0200
+
 gmt (4.2.0-1) unstable; urgency=low
 
   [ Torsten Landschoff ]

Modified: packages/gmt/trunk/debian/patches/series
===================================================================
--- packages/gmt/trunk/debian/patches/series	2007-12-05 09:45:06 UTC (rev 1288)
+++ packages/gmt/trunk/debian/patches/series	2007-12-10 13:42:41 UTC (rev 1289)
@@ -1,2 +1 @@
-link_gcc.diff
 disable_unsupported.diff

Modified: packages/gmt/trunk/debian/rules
===================================================================
--- packages/gmt/trunk/debian/rules	2007-12-05 09:45:06 UTC (rev 1288)
+++ packages/gmt/trunk/debian/rules	2007-12-10 13:42:41 UTC (rev 1289)
@@ -1,7 +1,7 @@
 #! /usr/bin/make -f
 
-RELEASE		:= 4.2.0
-PARTS		:= man pdf src share scripts suppl tut web
+RELEASE		:= 4.2.1
+PARTS		:= pdf src share scripts suppl tut web
 ARCHIVES	:= $(PARTS:%=upstream/GMT$(RELEASE)_%.tar.bz2)
 
 unpack:		stamps/unpack-stamp
@@ -51,7 +51,7 @@
 stamps/build-stamp: stamps/patch-stamp
 	dh_testdir
 	cd GMT$(RELEASE) && ./configure \
-		--enable-mansect=1gmt --enable-shared $(PATHCONFIG) --enable-netcdf=/usr
+		--enable-shared $(PATHCONFIG) --enable-netcdf=/usr
 	make -C GMT$(RELEASE) CC_OPT="-fPIC -O2 -ansi -pedantic" all suppl
 	touch $@
 
@@ -65,10 +65,11 @@
 	# that tree.
 	mkdir -p $(DESTDIR)/usr/lib/gmt/www $(DESTDIR)/usr/share/gmt 	\
 		$(DESTDIR)/usr/share/man $(DESTDIR)/usr/include/gmt \
-		$(DESTDIR)/usr/share/doc $(DESTDIR)/etc/gmt $(DESTDIR)/usr/bin
-	ln -s ../../share/man $(DESTDIR)/usr/lib/gmt/man
-	ln -s ../../include/gmt $(DESTDIR)/usr/lib/gmt/include
-	ln -s ../../share/gmt $(DESTDIR)/usr/lib/gmt/share
+		$(DESTDIR)/usr/share/doc $(DESTDIR)/etc/gmt $(DESTDIR)/usr/bin \
+		$(DESTDIR)/usr/share/man/man1
+	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
 
@@ -77,26 +78,28 @@
 	# 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 -s ../../../share/doc/gmt $(DESTDIR)/usr/lib/gmt/www/gmt
+	ln -fs ../../../share/doc/gmt $(DESTDIR)/usr/lib/gmt/www/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 -s . $(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/gmt.conf $(DESTDIR)/etc/gmt/
-	ln -s /etc/gmt/gmt.conf $(DESTDIR)/usr/share/gmt/
+	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 -s /etc/gmt/coastline.conf $(DESTDIR)/usr/share/gmt/
+	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/
 
-	# Move the manpages directory to the right place...
-	mv $(DESTDIR)/usr/share/man/man1gmt $(DESTDIR)/usr/share/man/man1
+	# Move the manpages directory into the right place...
+	for manpage in $(DESTDIR)/usr/lib/gmt/share/man/man1/*.1; do \
+		gzip -c $${manpage} >$(DESTDIR)/usr/share/man/man1/`basename $${manpage}`gmt.gz; \
+	done
 
 	touch $@
 
@@ -105,7 +108,7 @@
 	dh_testroot -a
 	dh_install --list-missing --sourcedir=$(DESTDIR)
 	dh_installchangelogs -a
-	dh_installchangelogs -pgmt GMT$(RELEASE)/CHANGES
+	dh_installchangelogs -pgmt GMT$(RELEASE)/ChangeLog
 	dh_installdocs -a
 	dh_installexamples -a
 	dh_installmenu -a

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

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

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

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

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

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

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

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

More information about the Pkg-grass-devel mailing list