[SCM] grass branch, master, updated. upstream/6.4.1-74-g70fe174

M. Hamish Bowman hamish_b at yahoo.com
Sat Feb 25 13:31:53 UTC 2012 

The following commit has been merged in the master branch:
commit 49b7884c0b2589432759c8e6ec29eb8ea8aceea2
Author: M. Hamish Bowman <hamish_b at yahoo.com>
Date:   Sun Feb 26 02:29:09 2012 +1300

    more programmers manual install updates

diff --git a/debian/TODO b/debian/TODO
index 40456c2..8dc69ef 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -11,6 +11,11 @@ FIXME:
 
 E: grass-core: package-installs-python-bytecode usr/lib/grass64/etc/.../*.pyc
 ( -> removed in rules, but still need to generate anew in postinst )
+  see /usr/share/debhelper/autoscripts/postinst-python
+      /var/lib/dpkg/info/python-numpy.*
+      update-python-modules(8)
+      dh_python2
+
 
 
 Lintian:
diff --git a/debian/changelog b/debian/changelog
index 3ecffb2..e20b246 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ grass (6.4.2-1) unstable; urgency=low
   * Reorganize binary packages, new: grass-core, grass-gui, grass-dev-doc.
   * Patch g.extension.sh to check for the needed grass-dev package.
   * Remove outdated cruft from debian/fixscripts.sh and debian/rules.
+  * Install the full Programmers' Manual.
   * Use system's copy of jquery.js in the Programmers' Manual.
   * libmysqlclient-dev replaces libmysqlclient15-dev.
     (closes: #650361)
diff --git a/debian/control b/debian/control
index 4caf41d..136e4cb 100644
--- a/debian/control
+++ b/debian/control
@@ -25,6 +25,8 @@ Build-depends:
   libreadline-dev | libreadline6-dev,
   libsqlite3-dev,
   libxmu-dev,
+#install optipng if compressing the PNG images in the programmers' manual
+#  optipng,
   python-dev (>= 2.5), python-support (>= 0.7.1),
   python-wxgtk2.8, libwxgtk2.8-dev,
   tcl-dev (>= 8.5), tk-dev (>= 8.5),
diff --git a/debian/grass-dev-doc.doc-base b/debian/grass-dev-doc.doc-base
index 1731e8f..4a04a41 100644
--- a/debian/grass-dev-doc.doc-base
+++ b/debian/grass-dev-doc.doc-base
@@ -9,5 +9,5 @@ Abstract: Geographic Resources Analysis Support System, commonly referred
 Section: Science/Geoscience
 
 Format: HTML
-Index: /usr/share/doc/grass-dev-doc/programming-manual/html/gis/html/index.html
-Files: /usr/share/doc/grass-dev-doc/programming-manual/html/db/html/*.html /usr/share/doc/grass-dev-doc/programming-manual/html/gis/html/*.html /usr/share/doc/grass-dev-doc/programming-manual/html/vector/html/*.html
+Index: /usr/share/doc/grass-dev-doc/programming-manual/html/index.html
+Files: /usr/share/doc/grass-dev-doc/programming-manual/html/*.html
diff --git a/debian/grass-dev-doc.install b/debian/grass-dev-doc.install
index db7a5e1..37cf348 100644
--- a/debian/grass-dev-doc.install
+++ b/debian/grass-dev-doc.install
@@ -1,13 +1 @@
-programming-manual/db usr/share/doc/grass-dev-doc/programming-manual/html
-programming-manual/g3d usr/share/doc/grass-dev-doc/programming-manual/html
-programming-manual/gis usr/share/doc/grass-dev-doc/programming-manual/html
-programming-manual/gmath usr/share/doc/grass-dev-doc/programming-manual/html
-programming-manual/gpde usr/share/doc/grass-dev-doc/programming-manual/html
-programming-manual/gui usr/share/doc/grass-dev-doc/programming-manual/html
-programming-manual/html usr/share/doc/grass-dev-doc/programming-manual/html
-programming-manual/ogsf usr/share/doc/grass-dev-doc/programming-manual/html
-programming-manual/proj usr/share/doc/grass-dev-doc/programming-manual/html
-programming-manual/python usr/share/doc/grass-dev-doc/programming-manual/html
-programming-manual/rfc usr/share/doc/grass-dev-doc/programming-manual/html
-programming-manual/segment usr/share/doc/grass-dev-doc/programming-manual/html
-programming-manual/vector usr/share/doc/grass-dev-doc/programming-manual/html
+programming-manual/html usr/share/doc/grass-dev-doc/programming-manual
diff --git a/debian/grass-dev-doc.links b/debian/grass-dev-doc.links
index 0752159..17e72df 100644
--- a/debian/grass-dev-doc.links
+++ b/debian/grass-dev-doc.links
@@ -1,14 +1 @@
-usr/share/javascript/jquery/jquery.js usr/share/doc/grass-dev-doc/programming-manual/html/db/html/jquery.js
-usr/share/javascript/jquery/jquery.js usr/share/doc/grass-dev-doc/programming-manual/html/g3d/html/jquery.js
-usr/share/javascript/jquery/jquery.js usr/share/doc/grass-dev-doc/programming-manual/html/gis/html/jquery.js
-usr/share/javascript/jquery/jquery.js usr/share/doc/grass-dev-doc/programming-manual/html/gmath/html/jquery.js
-usr/share/javascript/jquery/jquery.js usr/share/doc/grass-dev-doc/programming-manual/html/gpde/html/jquery.js
-usr/share/javascript/jquery/jquery.js usr/share/doc/grass-dev-doc/programming-manual/html/gui/wxpython/html/jquery.js
-usr/share/javascript/jquery/jquery.js usr/share/doc/grass-dev-doc/programming-manual/html/html/jquery.js
-usr/share/javascript/jquery/jquery.js usr/share/doc/grass-dev-doc/programming-manual/html/ogsf/html/jquery.js
-usr/share/javascript/jquery/jquery.js usr/share/doc/grass-dev-doc/programming-manual/html/proj/html/jquery.js
-usr/share/javascript/jquery/jquery.js usr/share/doc/grass-dev-doc/programming-manual/html/python/html/jquery.js
-usr/share/javascript/jquery/jquery.js usr/share/doc/grass-dev-doc/programming-manual/html/rfc/html/jquery.js
-usr/share/javascript/jquery/jquery.js usr/share/doc/grass-dev-doc/programming-manual/html/segment/html/jquery.js
-usr/share/javascript/jquery/jquery.js usr/share/doc/grass-dev-doc/programming-manual/html/vector/html/jquery.js
-usr/share/javascript/jquery/jquery.js usr/share/doc/grass-dev-doc/programming-manual/html/vector/dglib/html/jquery.js
+usr/share/javascript/jquery/jquery.js usr/share/doc/grass-dev-doc/programming-manual/html/jquery.js
diff --git a/debian/rules b/debian/rules
index 9c5ca2c..4ccc6bd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -95,7 +95,11 @@ build-indep: configure build-indep-stamp
 build-indep-stamp: 
 	dh_testdir
 	# generate the Programmers' manual (in HTML)
-	$(MAKE) htmldocs
+	$(MAKE) htmldocs-single
+	# save a lot of disk space by compressing PNG images (but takes a long time)
+	##for file in `find debian/tmp/programming-manual/ -iname \*.png` ; do \
+	##	optipng -o5 $$file ; \
+	##done
 	touch $@
 
 clean: templates true-clean 
@@ -224,38 +228,11 @@ install: build
 install-indep: build-indep
 	dh_testdir -i
 	dh_testroot -i
-	install -m 644  -d debian/tmp
-	for CHAPTER in \
-		db \
-		g3d \
-		gis \
-		gmath \
-		gpde \
-		ogsf \
-		proj \
-		python \
-		segment \
-		vector \
-		vector/dglib ; \
-	     do \
-		install -m 644 -d debian/tmp/programming-manual/$$CHAPTER/html/search ; \
-		install -m 644 lib/$$CHAPTER/html/* \
-			debian/tmp/programming-manual/$$CHAPTER/html ; \
-		rm -f debian/tmp/programming-manual/$$CHAPTER/html/jquery.js ; \
-		install -m 644 lib/$$CHAPTER/html/search/* \
-			debian/tmp/programming-manual/$$CHAPTER/html/search ; \
-	done
-	for CHAPTER in \
-		. \
-		rfc \
-		gui/wxpython ; \
-	     do \
-		install -m 644 -d debian/tmp/programming-manual/$$CHAPTER/html/search ; \
-		install -m 644 $$CHAPTER/html/* \
-			debian/tmp/programming-manual/$$CHAPTER/html ; \
-		rm -f debian/tmp/programming-manual/$$CHAPTER/html/jquery.js ; \
-		install -m 644 $$CHAPTER/html/search/* \
-			debian/tmp/programming-manual/$$CHAPTER/html/search ; \
+	install -m 644 -d debian/tmp
+	-install -m 644 -d debian/tmp/programming-manual/html/search
+	-install -m 644 ./html/* debian/tmp/programming-manual/html
+	-install -m 644 ./html/search/* debian/tmp/programming-manual/html/search
+	-rm -f debian/tmp/programming-manual/html/jquery.js
 	done
 
 # Build architecture-independent files here.

-- 
Geographic Resources Analysis Support System

More information about the Pkg-grass-devel mailing list