[Pkg-bazaar-commits] r34 ./bzr/unstable: Commit for 0.18-1.

Tue Jul 17 15:15:19 UTC 2007

------------------------------------------------------------
revno: 34
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Tue 2007-07-17 17:15:19 +0200
message:
  Commit for 0.18-1.
added:
  patches/
  patches/dont_build_developers_doc.diff
  patches/no_python2.4_shebangs.diff
  patches/series
modified:
  changelog
  control
  rules
-------------- next part --------------
=== added directory 'patches'
=== added file 'patches/dont_build_developers_doc.diff'

--- a/patches/dont_build_developers_doc.diff	1970-01-01 00:00:00 +0000
+++ b/patches/dont_build_developers_doc.diff	2007-07-17 15:15:19 +0000
@@ -0,0 +1,11 @@
+--- Makefile.orig
++++ Makefile
+@@ -113,7 +113,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)
+ docs: $(ALL_DOCS)
+ 
+ copy-docs: docs

=== added file 'patches/no_python2.4_shebangs.diff'
--- a/patches/no_python2.4_shebangs.diff	1970-01-01 00:00:00 +0000
+++ b/patches/no_python2.4_shebangs.diff	2007-07-17 15:15:19 +0000
@@ -0,0 +1,32 @@
+--- 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
+ 

=== added file 'patches/series'
--- a/patches/series	1970-01-01 00:00:00 +0000
+++ b/patches/series	2007-07-17 15:15:19 +0000
@@ -0,0 +1,2 @@
+dont_build_developers_doc.diff -p0
+no_python2.4_shebangs.diff -p0

=== modified file 'changelog'
--- a/changelog	2007-07-12 09:10:02 +0000
+++ b/changelog	2007-07-17 15:15:19 +0000
@@ -1,10 +1,30 @@
-bzr (0.18~rc1-1) unstable; urgency=low
-
-  * new upstream version
-  * add ubuntu changelog entries, since we have merged a lot for the
-    0.16 release
-
- -- Reinhard Tartler <siretart at tauware.de>  Tue, 10 Jul 2007 21:13:05 +0200
+bzr (0.18-1) unstable; urgency=low
+
+  * New upstream version.
+
+  * Drop version constraints in Build-Depends and Depends, all are satisfied
+    in etch.
+
+  * Add a patch to skip the generation of doc/developers/*.htm, since we don't
+    ship those in the package.
+
+  * debian/rules:
+    + pass -r to xargs.
+    + drop commented out install/bzr:: hunk.
+    + don't abort the test suite on the first error.
+
+  * Bits to help Ubuntu:
+
+    + prefix dependency and build-dependency on python-celementtree with a
+      "python (>> 2.5)" alternative, since Python 2.5 includes celementtree.
+
+    + apply patch from Ubuntu to drop python2.4-specific shebang lines, and
+      hence spurious dependency on python2.4 (submitted upstream).
+
+    + drop build-dependency on python-medusa, only needed to exercise the FTP
+      part of the test suite.
+
+ -- Adeodato Sim?? <dato at net.com.org.es>  Tue, 17 Jul 2007 16:48:37 +0200
 
 bzr (0.17-1) unstable; urgency=low
 

=== modified file 'control'
--- a/control	2007-06-12 16:11:26 +0000
+++ b/control	2007-07-17 15:15:19 +0000
@@ -3,15 +3,15 @@
 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 (>= 5.0.38), cdbs (>= 0.4.43), quilt, python (>= 2.4), python-central (>= 0.5.6)
-Build-Depends-Indep: python-docutils (>= 0.4-2), python-celementtree (>= 1.0.5-7), python-medusa, python-paramiko
+Build-Depends: debhelper, cdbs, quilt, python, python-central
+Build-Depends-Indep: python-docutils, python (>> 2.5) | python-celementtree, 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-celementtree (>= 1.0.5-7)
+Depends: ${python:Depends}, python (>> 2.5) | python-celementtree
 Recommends: python-paramiko, python-pycurl
 Suggests: libxml2-utils
 Conflicts: bzr-doc

=== modified file 'rules'
--- a/rules	2007-06-12 16:11:26 +0000
+++ b/rules	2007-07-17 15:15:19 +0000
@@ -10,15 +10,15 @@
 
 clean::
 	-rm -rf build test*.tmp doc/bzr_man.txt
-	find doc -name "*.htm" -print0 | xargs -0 rm -f
-	find . -name "*.pyc" -print0 | xargs -0 rm -f
+	find doc -name "*.htm" -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
 	rm -f .bzr.log
 
 ifneq (,$(findstring test,$(DEB_BUILD_OPTIONS)))
 common-post-build-indep::
-	./bzr selftest --no-plugins --one
+	./bzr selftest --no-plugins
 endif
 
 build/bzr:: debian/stamp-doc
@@ -26,8 +26,3 @@
 debian/stamp-doc:
 	make docs
 	touch $@
-
-install/bzr::
-	# we can't delete the tests/ subdirectory due to an upstream
-	# bug; #368760.
-	#rm -rf $(DEB_DESTDIR)/usr/lib/python$(DEB_PYTHON_COMPILE_VERSION)/site-packages/bzrlib/tests

