[DebianGIS-dev] r1898 - packages/grass/trunk/debian

frankie at alioth.debian.org frankie at alioth.debian.org
Mon Feb 16 12:54:32 UTC 2009 

Author: frankie
Date: 2009-02-16 12:54:31 +0000 (Mon, 16 Feb 2009)
New Revision: 1898

Added:
   packages/grass/trunk/debian/grass-dev.dirs
   packages/grass/trunk/debian/grass-dev.install
   packages/grass/trunk/debian/grass-doc.dirs
   packages/grass/trunk/debian/grass-doc.install
   packages/grass/trunk/debian/grass-doc.links
   packages/grass/trunk/debian/grass.dirs
   packages/grass/trunk/debian/grass.install
Removed:
   packages/grass/trunk/debian/grass-preview-dev.dirs
   packages/grass/trunk/debian/grass-preview-dev.install
   packages/grass/trunk/debian/grass-preview-doc.dirs
   packages/grass/trunk/debian/grass-preview-doc.install
   packages/grass/trunk/debian/grass-preview-doc.links
   packages/grass/trunk/debian/grass-preview.dirs
   packages/grass/trunk/debian/grass-preview.install
   packages/grass/trunk/debian/grass-preview.postinst
   packages/grass/trunk/debian/grass-preview.postrm
Modified:
   packages/grass/trunk/debian/changelog
   packages/grass/trunk/debian/rules
Log:
First round of changes for incoming stable.


Modified: packages/grass/trunk/debian/changelog
===================================================================
--- packages/grass/trunk/debian/changelog	2009-02-16 12:21:01 UTC (rev 1897)
+++ packages/grass/trunk/debian/changelog	2009-02-16 12:54:31 UTC (rev 1898)
@@ -1,3 +1,42 @@
+grass-preview (6.4.0~rc3-1) unstable; urgency=low
+
+  * New upstream pre-release for next stable. 
+    From now on all grass-related directories are versionend to allow people installing
+    packaged unofficial/testing versions.
+  * Removing Tcl Lenny related code in debian/rules. 
+  * Some minor clean-ups in debian/rules.
+  * Obsolete NEWS file removed.
+  * Debhelper level moved to 7, now using dh_prep.
+  * Removed ld.so file installation. Grass programs must be called under Grass environment,
+    so it is pointless and can be dangerous when different versions are installed. This
+    is also true for Qgis and its Grass plugin. As consequence postinst and postrm files 
+    have been removed as obsolete.
+
+  * Merging relevant changes in the stable 6.2.3 tree with the 
+    experimental DebianGis series:
+
+  	From 6.2.3-3:
+  	o Added Vcs-* fields to debian/control.
+        o Fixated patch rule.
+
+        From 6.2.3-2:
+        o Added libfftw3-dev build-dep to reflect current library name.
+          (it closed: #458232)
+        o Upstream already fixed v.db.update as suggested.
+          (it closed: #434897)
+
+        From: 6.2.3-1:
+  	o Added the new Homepage field to debian/control.
+  	o Updated obsolete ${Source-Version} to ${binary:Version}.
+  	o Fixed lintian error: : debian-rules-ignores-make-clean-error
+  	o Moved to new Tcl/Tk policy, introducing default -dev packages build-dependencies as alternative
+    	  and still depending on versioned ones for backports. For backports the
+    	  Tcl/Tk includes path is found at build time in debian/rules.
+  	o Now using mysql_config to get MySQL includes path.
+  	o Added private library path at dh_shlibdeps call.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 16 Feb 2009 13:28:23 +0100
+
 grass-preview (6.4~20081031-1) experimental; urgency=low
 
   [ Hamish Bowman ]

Copied: packages/grass/trunk/debian/grass-dev.dirs (from rev 1897, packages/grass/trunk/debian/grass-preview-dev.dirs)
===================================================================
--- packages/grass/trunk/debian/grass-dev.dirs	                        (rev 0)
+++ packages/grass/trunk/debian/grass-dev.dirs	2009-02-16 12:54:31 UTC (rev 1898)
@@ -0,0 +1,3 @@
+usr/lib/grass64/include
+usr/lib/grass64/include/Make
+usr/share/pkgconfig


Property changes on: packages/grass/trunk/debian/grass-dev.dirs
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: packages/grass/trunk/debian/grass-dev.install (from rev 1897, packages/grass/trunk/debian/grass-preview-dev.install)
===================================================================
--- packages/grass/trunk/debian/grass-dev.install	                        (rev 0)
+++ packages/grass/trunk/debian/grass-dev.install	2009-02-16 12:54:31 UTC (rev 1898)
@@ -0,0 +1 @@
+usr/lib/grass64/include


Property changes on: packages/grass/trunk/debian/grass-dev.install
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: packages/grass/trunk/debian/grass-doc.dirs (from rev 1897, packages/grass/trunk/debian/grass-preview-doc.dirs)
===================================================================
--- packages/grass/trunk/debian/grass-doc.dirs	                        (rev 0)
+++ packages/grass/trunk/debian/grass-doc.dirs	2009-02-16 12:54:31 UTC (rev 1898)
@@ -0,0 +1,4 @@
+usr/share/doc/grass-preview-doc
+usr/share/doc/grass-preview-doc/programming-manual
+usr/share/doc/grass-preview-doc/programming-manual/html
+usr/share/man


Property changes on: packages/grass/trunk/debian/grass-doc.dirs
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: packages/grass/trunk/debian/grass-doc.install (from rev 1897, packages/grass/trunk/debian/grass-preview-doc.install)
===================================================================
--- packages/grass/trunk/debian/grass-doc.install	                        (rev 0)
+++ packages/grass/trunk/debian/grass-doc.install	2009-02-16 12:54:31 UTC (rev 1898)
@@ -0,0 +1,5 @@
+usr/lib/grass64/docs/html usr/share/doc/grass-preview-doc
+usr/lib/grass64/man/man1 usr/share/man
+programming-manual/db usr/share/doc/grass-preview-doc/programming-manual/html
+programming-manual/gis usr/share/doc/grass-preview-doc/programming-manual/html
+programming-manual/vector usr/share/doc/grass-preview-doc/programming-manual/html


Property changes on: packages/grass/trunk/debian/grass-doc.install
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: packages/grass/trunk/debian/grass-doc.links (from rev 1897, packages/grass/trunk/debian/grass-preview-doc.links)
===================================================================
--- packages/grass/trunk/debian/grass-doc.links	                        (rev 0)
+++ packages/grass/trunk/debian/grass-doc.links	2009-02-16 12:54:31 UTC (rev 1898)
@@ -0,0 +1 @@
+usr/share/doc/grass-doc/html usr/lib/grass/docs/html


Property changes on: packages/grass/trunk/debian/grass-doc.links
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: packages/grass/trunk/debian/grass-preview-dev.dirs
===================================================================
--- packages/grass/trunk/debian/grass-preview-dev.dirs	2009-02-16 12:21:01 UTC (rev 1897)
+++ packages/grass/trunk/debian/grass-preview-dev.dirs	2009-02-16 12:54:31 UTC (rev 1898)
@@ -1,3 +0,0 @@
-usr/lib/grass64/include
-usr/lib/grass64/include/Make
-usr/share/pkgconfig

Deleted: packages/grass/trunk/debian/grass-preview-dev.install
===================================================================
--- packages/grass/trunk/debian/grass-preview-dev.install	2009-02-16 12:21:01 UTC (rev 1897)
+++ packages/grass/trunk/debian/grass-preview-dev.install	2009-02-16 12:54:31 UTC (rev 1898)
@@ -1 +0,0 @@
-usr/lib/grass64/include

Deleted: packages/grass/trunk/debian/grass-preview-doc.dirs
===================================================================
--- packages/grass/trunk/debian/grass-preview-doc.dirs	2009-02-16 12:21:01 UTC (rev 1897)
+++ packages/grass/trunk/debian/grass-preview-doc.dirs	2009-02-16 12:54:31 UTC (rev 1898)
@@ -1,4 +0,0 @@
-usr/share/doc/grass-preview-doc
-usr/share/doc/grass-preview-doc/programming-manual
-usr/share/doc/grass-preview-doc/programming-manual/html
-usr/share/man

Deleted: packages/grass/trunk/debian/grass-preview-doc.install
===================================================================
--- packages/grass/trunk/debian/grass-preview-doc.install	2009-02-16 12:21:01 UTC (rev 1897)
+++ packages/grass/trunk/debian/grass-preview-doc.install	2009-02-16 12:54:31 UTC (rev 1898)
@@ -1,5 +0,0 @@
-usr/lib/grass64/docs/html usr/share/doc/grass-preview-doc
-usr/lib/grass64/man/man1 usr/share/man
-programming-manual/db usr/share/doc/grass-preview-doc/programming-manual/html
-programming-manual/gis usr/share/doc/grass-preview-doc/programming-manual/html
-programming-manual/vector usr/share/doc/grass-preview-doc/programming-manual/html

Deleted: packages/grass/trunk/debian/grass-preview-doc.links
===================================================================
--- packages/grass/trunk/debian/grass-preview-doc.links	2009-02-16 12:21:01 UTC (rev 1897)
+++ packages/grass/trunk/debian/grass-preview-doc.links	2009-02-16 12:54:31 UTC (rev 1898)
@@ -1 +0,0 @@
-usr/share/doc/grass-doc/html usr/lib/grass/docs/html

Deleted: packages/grass/trunk/debian/grass-preview.dirs
===================================================================
--- packages/grass/trunk/debian/grass-preview.dirs	2009-02-16 12:21:01 UTC (rev 1897)
+++ packages/grass/trunk/debian/grass-preview.dirs	2009-02-16 12:54:31 UTC (rev 1898)
@@ -1,6 +0,0 @@
-etc/ld.so.conf.d
-usr/lib/grass64
-/usr/bin
-/usr/lib/grass64
-/usr/share/doc/grass64
-/usr/share/man

Deleted: packages/grass/trunk/debian/grass-preview.install
===================================================================
--- packages/grass/trunk/debian/grass-preview.install	2009-02-16 12:21:01 UTC (rev 1897)
+++ packages/grass/trunk/debian/grass-preview.install	2009-02-16 12:54:31 UTC (rev 1898)
@@ -1,8 +0,0 @@
-usr/bin/grass64
-usr/lib/grass64/bin
-usr/lib/grass64/bwidget
-usr/lib/grass64/driver
-usr/lib/grass64/etc
-usr/lib/grass64/fonts
-usr/lib/grass64/scripts
-usr/lib/grass64/lib

Deleted: packages/grass/trunk/debian/grass-preview.postinst
===================================================================
--- packages/grass/trunk/debian/grass-preview.postinst	2009-02-16 12:21:01 UTC (rev 1897)
+++ packages/grass/trunk/debian/grass-preview.postinst	2009-02-16 12:54:31 UTC (rev 1898)
@@ -1,43 +0,0 @@
-#!/bin/sh
-# Make sure grass libraries are picked up by ldconfig
-# Lifted from xfree86 package's shell-lib.sh script
-
-set -e
-
-# Removes obsolete path in the main ld.so configuration file.
-# This should be removed post-lenny.
-dir="/usr/lib/grass64/lib"
-ldsoconf="/etc/ld.so.conf"
-# is the line present?
-if fgrep -qsx "$dir" "$ldsoconf"; then
-    # rewrite the file (very carefully)
-    set +e
-    fgrep -svx "$dir" "$ldsoconf" > "$ldsoconf.dpkg-tmp"
-    fgrep_status=$?
-    set -e
-    case $fgrep_status in
-      0|1) ;; # we don't actually care if any lines matched or not
-      *) echo "error reading \"$ldsoconf\"; fgrep exited with status" \
-        "$fgrep_status" && exit 1 ;;
-    esac
-    set +e
-    cmp -s "$ldsoconf.dpkg-tmp" "$ldsoconf"
-    cmp_status=$?
-    set -e
-    case $cmp_status in
-      0) rm "$ldsoconf.dpkg-tmp" ;; # files are identical
-      1) mv "$ldsoconf.dpkg-tmp" "$ldsoconf" ;; # files differ
-      *) echo "error comparing \"$ldsoconf.dpkg-tmp\" to \"$ldsoconf\"; cmp" \
-        "exited with status $cmp_status" && exit 2 ;;
-    esac
-fi
-
-if [ "$1" = "configure" ]; then
-  ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
-
-

Deleted: packages/grass/trunk/debian/grass-preview.postrm
===================================================================
--- packages/grass/trunk/debian/grass-preview.postrm	2009-02-16 12:21:01 UTC (rev 1897)
+++ packages/grass/trunk/debian/grass-preview.postrm	2009-02-16 12:54:31 UTC (rev 1898)
@@ -1,14 +0,0 @@
-#!/bin/sh
-# Make sure grass library dir is removed from ld.so.conf
-# Lifted from xfree86 package's shell-lib.sh script
-
-set -e
-
-if [ "$1" = "remove" ]; then
-  rm -f /etc/ld.so.conf.d/grass64.conf
-  ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0

Copied: packages/grass/trunk/debian/grass.dirs (from rev 1897, packages/grass/trunk/debian/grass-preview.dirs)
===================================================================
--- packages/grass/trunk/debian/grass.dirs	                        (rev 0)
+++ packages/grass/trunk/debian/grass.dirs	2009-02-16 12:54:31 UTC (rev 1898)
@@ -0,0 +1,6 @@
+etc/ld.so.conf.d
+usr/lib/grass64
+/usr/bin
+/usr/lib/grass64
+/usr/share/doc/grass64
+/usr/share/man


Property changes on: packages/grass/trunk/debian/grass.dirs
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: packages/grass/trunk/debian/grass.install (from rev 1897, packages/grass/trunk/debian/grass-preview.install)
===================================================================
--- packages/grass/trunk/debian/grass.install	                        (rev 0)
+++ packages/grass/trunk/debian/grass.install	2009-02-16 12:54:31 UTC (rev 1898)
@@ -0,0 +1,8 @@
+usr/bin/grass64
+usr/lib/grass64/bin
+usr/lib/grass64/bwidget
+usr/lib/grass64/driver
+usr/lib/grass64/etc
+usr/lib/grass64/fonts
+usr/lib/grass64/scripts
+usr/lib/grass64/lib


Property changes on: packages/grass/trunk/debian/grass.install
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: packages/grass/trunk/debian/rules
===================================================================
--- packages/grass/trunk/debian/rules	2009-02-16 12:21:01 UTC (rev 1897)
+++ packages/grass/trunk/debian/rules	2009-02-16 12:54:31 UTC (rev 1898)
@@ -10,7 +10,7 @@
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 BASE_NAME=grass64
-PKG_NAME=grass-preview
+PKG_NAME=grass
 
 CFLAGS=-Wall -g
 
@@ -25,15 +25,7 @@
 	STRIP = strip
 endif
 
-#
-# This is used to test about the use of default tcl-dev, just
-# useful for backports. To be removed after Lenny.
-#
-ifeq (0,$(shell test -d /usr/include/tcl; echo $$?))
-	TCLINC = /usr/include/tcl
-else
-	TCLINC = /usr/include/tcl8.4
-endif
+TCLINC = /usr/include/tcl
 
 include /usr/share/dpatch/dpatch.make
 
@@ -68,7 +60,7 @@
 		    --with-python=/usr/bin/python2.5-config \
 		    --with-cairo
 
-	touch config-stamp
+	touch $@
 
 # This target generates arch-dep stuff, unfortunately most doc requires working bins to 
 # be properly generated...
@@ -79,7 +71,7 @@
 	$(MAKE) 
 	chmod 755 debian/fixpaths.sh debian/fixscripts.sh
 
-	touch build-stamp
+	touch $@
 
 # This target generates truly arch-indep stuff
 build-indep: build-indep-stamp
@@ -88,7 +80,7 @@
 
 	$(MAKE) htmldocs
 
-	touch build-indep-stamp
+	touch $@
 
 clean: clean-patched unpatch
 clean-patched:
@@ -104,7 +96,7 @@
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	cp -f /usr/share/misc/config.guess config.guess
 endif
-	dh_clean build-stamp config-stamp build-indep-stamp
+	dh_clean 
 
 	rm -f lib/proj/nad2bin
 	rm -f tools/timer/main.o
@@ -132,11 +124,10 @@
 		rfc/latex \
 		swig/latex
 
-
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 
 	# install grass core into debian/tmp
@@ -165,9 +156,6 @@
 	# install pkg-config file
 	install -m 644 grass.pc debian/$(PKG_NAME)-dev/usr/share/pkgconfig/$(BASE_NAME).pc
 
-	# install ld.so file
-	install -m 644 debian/grass.conf debian/$(PKG_NAME)/etc/ld.so.conf.d/$(BASE_NAME).conf
-
 install-indep: build-indep
 	dh_testdir -i
 	dh_testroot -i
@@ -187,7 +175,6 @@
 	dh_installchangelogs -i CHANGES
 	dh_installdocs -i
 	dh_install --sourcedir=debian/tmp -i
-#	dh_link -i
 	dh_strip -i
 	dh_compress -i
 	dh_fixperms -i
@@ -205,7 +192,6 @@
 	dh_installexamples  -a
 	dh_install --sourcedir=debian/tmp -a
 	dh_installman -p$(PKG_NAME) debian/$(BASE_NAME).1 -a
-#	dh_link -a
 	dh_strip -a
 	dh_compress -a
 	dh_fixperms -a

More information about the Pkg-grass-devel mailing list