[Pkg-bazaar-commits] r36 ./bzr/unstable: Commit for 0.90-1.

[Adeodato Simó]

------------------------------------------------------------
revno: 36
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Wed 2007-08-29 13:18:53 +0200
message:
  Commit for 0.90-1.
removed:
  bzr.dirs
  patches/dont_build_developers_doc.diff
modified:
  bzr.doc-base
  bzr.install
  changelog
  patches/series
  rules
-------------- next part --------------
=== removed file 'bzr.dirs'
--- a/bzr.dirs	2006-12-27 00:25:00 +0000
+++ b/bzr.dirs	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-usr/share/doc/bzr/html
-usr/share/doc/bzr/txt

=== removed file 'patches/dont_build_developers_doc.diff'
--- a/patches/dont_build_developers_doc.diff	2007-08-15 09:58:05 +0000
+++ b/patches/dont_build_developers_doc.diff	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
---- Makefile.orig
-+++ Makefile
-@@ -113,7 +113,7 @@
- man1/bzr.1: $(MAN_DEPENDENCIES)
- 	python generate_docs.py -o $@ man
- 
--ALL_DOCS = $(htm_files) $(MAN_PAGES) $(dev_htm_files) doc/developers/performance.png
-+ALL_DOCS = $(htm_files) $(MAN_PAGES)
- docs: $(ALL_DOCS)
- 
- copy-docs: docs

=== modified file 'bzr.doc-base'
--- a/bzr.doc-base	2007-08-15 09:58:05 +0000
+++ b/bzr.doc-base	2007-08-29 11:18:53 +0000
@@ -1,12 +1,10 @@
 Document: bzr
 Title: Bazaar documentation
-Author: Martin Pool
 Abstract: Documentation for Bazaar in text and HTML form.
 Section: Apps/Programming
 
-Format: text
-Files: /usr/share/doc/bzr/txt/*.txt
+Format: Text
+Files: /usr/share/doc/bzr/txt/index.txt
 
 Format: HTML
-Index: /usr/share/doc/bzr/html/tutorial.html
-Files: /usr/share/doc/bzr/html/*.html
+Index: /usr/share/doc/bzr/html/index.html

=== modified file 'bzr.install'
--- a/bzr.install	2007-08-15 09:58:05 +0000
+++ b/bzr.install	2007-08-29 11:18:53 +0000
@@ -1,6 +1,4 @@
 debian/overrides/bzr		usr/share/lintian/overrides/
 contrib/bash/*			etc/bash_completion.d/
-doc/*.txt			usr/share/doc/bzr/txt
-doc/README.1st			usr/share/doc/bzr/txt
-doc/*.html			usr/share/doc/bzr/html
 doc/default.css			usr/share/doc/bzr/html
+doc/en/quick-reference/quick-start-summary.svg	usr/share/doc/bzr/html/en/quick-reference

=== modified file 'changelog'
--- a/changelog	2007-08-15 09:58:05 +0000
+++ b/changelog	2007-08-29 11:18:53 +0000
@@ -1,3 +1,18 @@
+bzr (0.90-1) unstable; urgency=low
+
+  * Final 0.90 upstream release:
+    + the doc/ directory has been re-organized in subdirectories, thus
+      separating between *.txt and *.html cannot be easily done from
+      bzr.install anymore. Do it from debian/rules instead.
+    + update bzr.doc-base for this new layout as well.
+
+  * Ship documents under doc/developers, following upstream wishes.
+
+  * Use "/usr/bin/python" in the she-bang line instead of "/usr/bin/env
+    python". Rationale in LP: #134046 is right.
+
+ -- Adeodato Simó <dato at net.com.org.es>  Wed, 29 Aug 2007 12:29:26 +0200
+
 bzr (0.90~rc1-1) unstable; urgency=low
 
   * New upstream release candidate:

=== modified file 'patches/series'
--- a/patches/series	2007-08-15 09:58:05 +0000
+++ b/patches/series	2007-08-29 11:18:53 +0000
@@ -1,1 +0,0 @@
-dont_build_developers_doc.diff -p0

=== modified file 'rules'
--- a/rules	2007-08-15 09:58:05 +0000
+++ b/rules	2007-08-29 11:18:53 +0000
@@ -7,7 +7,8 @@
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_PYTHON_INSTALL_ARGS_ALL += --install-data=/usr/share
-DEB_PYTHON_BUILD_ARGS += --executable "/usr/bin/env python"
+DEB_PYTHON_BUILD_ARGS += --executable "/usr/bin/python"
+DEB_COMPRESS_EXCLUDE += .svg
 
 clean::
 	-rm -rf build test*.tmp doc/bzr_man.txt
@@ -27,3 +28,12 @@
 debian/stamp-doc:
 	make docs
 	touch $@
+
+install/bzr::
+# Install the documentation; since html and txt and intermixed
+# under doc/, this is handier than trying to do it from bzr.install. 
+	for ext in txt html; do \
+	    ( cd doc && find -name "*.$$ext" -print0 ) | \
+	    	xargs -r0 -i'{}' -n1 install -D -m 644 'doc/{}' \
+	    	"debian/bzr/usr/share/doc/bzr/$$ext/{}"; \
+	done