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

[frankie at alioth.debian.org]

Author: frankie
Date: 2009-02-16 15:05:25 +0000 (Mon, 16 Feb 2009)
New Revision: 1904

Modified:
   packages/grass/trunk/debian/grass-doc.dirs
   packages/grass/trunk/debian/grass-doc.install
   packages/grass/trunk/debian/rules
Log:
Fixating residual dirs


Modified: packages/grass/trunk/debian/grass-doc.dirs
===================================================================
--- packages/grass/trunk/debian/grass-doc.dirs	2009-02-16 14:00:13 UTC (rev 1903)
+++ packages/grass/trunk/debian/grass-doc.dirs	2009-02-16 15:05:25 UTC (rev 1904)
@@ -1,4 +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/doc/grass-doc
+usr/share/doc/grass-doc/programming-manual
+usr/share/doc/grass-doc/programming-manual/html
 usr/share/man

Modified: packages/grass/trunk/debian/grass-doc.install
===================================================================
--- packages/grass/trunk/debian/grass-doc.install	2009-02-16 14:00:13 UTC (rev 1903)
+++ packages/grass/trunk/debian/grass-doc.install	2009-02-16 15:05:25 UTC (rev 1904)
@@ -1,5 +1,5 @@
-usr/lib/grass64/docs/html usr/share/doc/grass-preview-doc
+usr/lib/grass64/docs/html usr/share/doc/grass-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
+programming-manual/db usr/share/doc/grass-doc/programming-manual/html
+programming-manual/gis usr/share/doc/grass-doc/programming-manual/html
+programming-manual/vector usr/share/doc/grass-doc/programming-manual/html

Modified: packages/grass/trunk/debian/rules
===================================================================
--- packages/grass/trunk/debian/rules	2009-02-16 14:00:13 UTC (rev 1903)
+++ packages/grass/trunk/debian/rules	2009-02-16 15:05:25 UTC (rev 1904)
@@ -29,7 +29,8 @@
 
 include /usr/share/dpatch/dpatch.make
 
-config-stamp: patch
+configure: patch config.status
+config.status: 
 	dh_testdir
 	# Add here commands to configure the package.
 	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
@@ -64,8 +65,8 @@
 
 # This target generates arch-dep stuff, unfortunately most doc requires working bins to 
 # be properly generated...
-build: build-stamp
-build-stamp:  config-stamp
+build: configure build-stamp
+build-stamp:  
 	dh_testdir
 
 	$(MAKE) 
@@ -74,15 +75,15 @@
 	touch $@
 
 # This target generates truly arch-indep stuff
-build-indep: build-indep-stamp
-build-indep-stamp: config-stamp
+build-indep: configure build-indep-stamp
+build-indep-stamp: 
 	dh_testdir
 
 	$(MAKE) htmldocs
 
 	touch $@
 
-clean: clean-patched unpatch
+clean: clean-patched unpatch 
 clean-patched:
 	dh_testdir
 	dh_testroot
@@ -203,4 +204,4 @@
 	dh_builddeb -a
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch
+.PHONY: build clean binary-indep binary-arch binary install patch unpatch configure clean-patched