[Pkg-bazaar-commits] r35 ./bzr/unstable: Commit for bzr_0.90~rc1-1.

Wed Aug 15 09:58:05 UTC 2007

------------------------------------------------------------
revno: 35
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Wed 2007-08-15 11:58:05 +0200
message:
  Commit for bzr_0.90~rc1-1.
removed:
  patches/no_python2.4_shebangs.diff
modified:
  bzr.doc-base
  bzr.install
  changelog
  control
  patches/dont_build_developers_doc.diff
  patches/series
  rules
-------------- next part --------------
=== removed file 'patches/no_python2.4_shebangs.diff'

--- a/patches/no_python2.4_shebangs.diff	2007-07-17 15:15:19 +0000
+++ b/patches/no_python2.4_shebangs.diff	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
---- bzrlib/tests/test_weave.py.orig
-+++ bzrlib/tests/test_weave.py
-@@ -1,5 +1,3 @@
--#! /usr/bin/python2.4
--
- # Copyright (C) 2005 Canonical Ltd
- #
- # This program is free software; you can redistribute it and/or modify
---- tools/capture_tree.py.orig
-+++ tools/capture_tree.py
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python2.4
-+#! /usr/bin/env python
- 
- # Copyright (C) 2005 Canonical Ltd
- 
---- tools/rst2prettyhtml.py.orig
-+++ tools/rst2prettyhtml.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python2.4
-+#!/usr/bin/env python
- 
- import errno
- import os
---- tools/trace-revisions.orig
-+++ tools/trace-revisions
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python2.4
-+#! /usr/bin/env python
- 
- import sys
- 

=== modified file 'bzr.doc-base'
--- a/bzr.doc-base	2007-06-12 16:11:26 +0000
+++ b/bzr.doc-base	2007-08-15 09:58:05 +0000
@@ -8,5 +8,5 @@
 Files: /usr/share/doc/bzr/txt/*.txt
 
 Format: HTML
-Index: /usr/share/doc/bzr/html/tutorial.htm
-Files: /usr/share/doc/bzr/html/*.htm
+Index: /usr/share/doc/bzr/html/tutorial.html
+Files: /usr/share/doc/bzr/html/*.html

=== modified file 'bzr.install'
--- a/bzr.install	2007-05-09 09:36:11 +0000
+++ b/bzr.install	2007-08-15 09:58:05 +0000
@@ -2,5 +2,5 @@
 contrib/bash/*			etc/bash_completion.d/
 doc/*.txt			usr/share/doc/bzr/txt
 doc/README.1st			usr/share/doc/bzr/txt
-doc/*.htm			usr/share/doc/bzr/html
+doc/*.html			usr/share/doc/bzr/html
 doc/default.css			usr/share/doc/bzr/html

=== modified file 'changelog'
--- a/changelog	2007-07-17 15:15:19 +0000
+++ b/changelog	2007-08-15 09:58:05 +0000
@@ -1,3 +1,25 @@
+bzr (0.90~rc1-1) unstable; urgency=low
+
+  * New upstream release candidate:
+    + drop no_python2.4_shebangs.diff, applied upstream.
+    + adjust dont_build_developers_doc.diff.
+    + HTML docs are now .html instead of .htm; adjust bzr.doc-base,
+      bzr.install and rules accordingly.
+
+  * The package now includes Pyrex extensions, so:
+    + move Build-Depends-Indep to Build-Depends.
+    + add python-all-dev to Build-Depends.
+    + make the package arch:any.
+    + add ${shlibs:Depends} to Depends.
+
+  * Swap the order of the 'python (>> 2.5) | python-celementtree'
+    build-dependency to make sbuild in the buildds happy. (Closes: #436396)
+
+  * Pass --executable "/usr/bin/env python" to setup.py, to avoid spurious
+    dependencies on python2.X.
+
+ -- Adeodato Simó <dato at net.com.org.es>  Wed, 15 Aug 2007 11:54:51 +0200
+
 bzr (0.18-1) unstable; urgency=low
 
   * New upstream version.

=== modified file 'control'
--- a/control	2007-07-17 15:15:19 +0000
+++ b/control	2007-08-15 09:58:05 +0000
@@ -3,15 +3,14 @@
 Priority: optional
 Maintainer: Debian Bazaar Maintainers <pkg-bazaar-maint at lists.alioth.debian.org>
 Uploaders: Rob Weir <rweir at ertius.org>, Jeff Bailey <jbailey at raspberryginger.com>, Andres Salomon <dilinger at debian.org>, Adeodato Simó <dato at net.com.org.es>, Wouter van Heyst <larstiq at larstiq.dyndns.org>, Reinhard Tartler <siretart at tauware.de>
-Build-Depends: debhelper, cdbs, quilt, python, python-central
-Build-Depends-Indep: python-docutils, python (>> 2.5) | python-celementtree, python-paramiko
+Build-Depends: debhelper, cdbs, quilt, python, python-all-dev, python-central, python-docutils, python-celementtree | python (>> 2.5), python-paramiko
 Standards-Version: 3.7.2
 XS-Python-Version: >= 2.4
 XS-VCS-Bzr: http://bzr.debian.org/pkg-bazaar/bzr/unstable
 
 Package: bzr
-Architecture: all
-Depends: ${python:Depends}, python (>> 2.5) | python-celementtree
+Architecture: any
+Depends: ${shlibs:Depends}, ${python:Depends}, python (>> 2.5) | python-celementtree
 Recommends: python-paramiko, python-pycurl
 Suggests: libxml2-utils
 Conflicts: bzr-doc

=== modified file 'patches/dont_build_developers_doc.diff'
--- a/patches/dont_build_developers_doc.diff	2007-07-17 15:15:19 +0000
+++ b/patches/dont_build_developers_doc.diff	2007-08-15 09:58:05 +0000
@@ -4,7 +4,7 @@
  man1/bzr.1: $(MAN_DEPENDENCIES)
  	python generate_docs.py -o $@ man
  
--ALL_DOCS = $(htm_files) $(MAN_PAGES) doc/developers/HACKING.htm $(dev_htm_files) doc/developers/performance.png
+-ALL_DOCS = $(htm_files) $(MAN_PAGES) $(dev_htm_files) doc/developers/performance.png
 +ALL_DOCS = $(htm_files) $(MAN_PAGES)
  docs: $(ALL_DOCS)
  

=== modified file 'patches/series'
--- a/patches/series	2007-07-17 15:15:19 +0000
+++ b/patches/series	2007-08-15 09:58:05 +0000
@@ -1,2 +1,1 @@
 dont_build_developers_doc.diff -p0
-no_python2.4_shebangs.diff -p0

=== modified file 'rules'
--- a/rules	2007-07-17 15:15:19 +0000
+++ b/rules	2007-08-15 09:58:05 +0000
@@ -7,10 +7,11 @@
 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"
 
 clean::
 	-rm -rf build test*.tmp doc/bzr_man.txt
-	find doc -name "*.htm" -print0 | xargs -r0 rm -f
+	find doc -name "*.html" -print0 | xargs -r0 rm -f
 	find . -name "*.pyc" -print0 | xargs -r0 rm -f
 	rm -f bzr.1 man1/bzr.1
 	rm -f debian/stamp-doc

