[Pkg-bazaar-commits] r30 ./bzr/etch-backports: merge unstable packaging branch
Reinhard Tartler
siretart at tauware.de
Tue Nov 13 07:05:25 UTC 2007
------------------------------------------------------------
revno: 30
committer: Reinhard Tartler <siretart at tauware.de>
branch nick: etch-backports
timestamp: Tue 2007-11-13 08:05:25 +0100
message:
merge unstable packaging branch
removed:
bzr.dirs
added:
patches/
patches/series
modified:
.bzrignore
bzr.doc-base
bzr.install
changelog
control
rules
------------------------------------------------------------
revno: 27.1.4
committer: Reinhard Tartler <siretart at tauware.de>
branch nick: unstable
timestamp: Tue 2007-07-10 21:23:15 +0200
message:
- new upstream version
- add ubuntu changelog entries, since we have merged a lot for the
0.16 release
modified:
changelog
------------------------------------------------------------
revno: 27.1.5
committer: Reinhard Tartler <siretart at tauware.de>
branch nick: unstable
timestamp: Thu 2007-07-12 11:10:02 +0200
message:
revert addition of ubuntu changelog entries
modified:
changelog
------------------------------------------------------------
revno: 27.1.6
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Tue 2007-07-17 17:07:23 +0200
message:
More stuff to .bzrignore.
modified:
.bzrignore
------------------------------------------------------------
revno: 27.1.7
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
------------------------------------------------------------
revno: 27.1.8
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
------------------------------------------------------------
revno: 27.1.9
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
------------------------------------------------------------
revno: 27.1.10
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Thu 2007-08-30 10:13:20 +0200
message:
Files line in bzr.doc-base, etch/feisty needs it.
modified:
bzr.doc-base
changelog
------------------------------------------------------------
revno: 27.1.11
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Sun 2007-09-02 10:44:25 +0200
message:
Suggest xdg-utils for /usr/bin/xdg-email, used if present in `bzr send`.
modified:
changelog
control
------------------------------------------------------------
revno: 27.1.12
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Fri 2007-09-14 10:15:45 +0200
message:
Package 0.91~rc2.
modified:
changelog
------------------------------------------------------------
revno: 27.1.13
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Wed 2007-09-26 22:17:42 +0200
message:
Package 0.91.
modified:
changelog
------------------------------------------------------------
revno: 27.1.14
committer: Reinhard Tartler <siretart at tauware.de>
branch nick: unstable
timestamp: Thu 2007-09-27 12:27:06 +0200
message:
* remove python-celementree and python-paramiko from build-depends.
rationale:
- python-celementree is purely an optimisation for python2.4,
and is already included in python2.5
- python-paramiko is not used during build at all. However, the
testsuite currently fails when paramiko is not installed
(see also #59150 in launchpad.net for details). Since we
currently don't run the testsuite by default on the buildds,
it is safe to remove that dependency, at least for now.
modified:
changelog
control
------------------------------------------------------------
revno: 27.1.15
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Tue 2007-10-09 19:05:23 +0200
message:
Dropped Andres Salomon from the Uploaders field, at his request.
modified:
changelog
control
------------------------------------------------------------
revno: 27.1.16
committer: Reinhard Tartler <siretart at tauware.de>
branch nick: unstable
timestamp: Tue 2007-10-30 16:38:22 -0400
message:
merged unreleased version to new upstream release upload
modified:
changelog
------------------------------------------------------------
revno: 27.1.17
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Fri 2007-11-02 22:30:32 +0100
message:
Making the upload.
modified:
changelog
------------------------------------------------------------
revno: 27.1.18
committer: Reinhard Tartler <siretart at tauware.de>
branch nick: unstable
timestamp: Tue 2007-11-13 07:56:17 +0100
message:
update to 0.92 release
modified:
changelog
-------------- 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
=== added directory 'patches'
=== added file 'patches/series'
=== modified file '.bzrignore'
--- a/.bzrignore 2007-05-09 09:38:07 +0000
+++ b/.bzrignore 2007-07-17 15:07:23 +0000
@@ -1,2 +1,7 @@
.bzr-builddeb/local.conf
debian
+./bzr
+./files
+./stamp-*
+./*.debhelper
+./*.substvars
=== modified file 'bzr.doc-base'
--- a/bzr.doc-base 2007-06-12 16:11:26 +0000
+++ b/bzr.doc-base 2007-08-30 08:13:20 +0000
@@ -1,12 +1,11 @@
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.htm
-Files: /usr/share/doc/bzr/html/*.htm
+Index: /usr/share/doc/bzr/html/index.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-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/*.htm 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-06-30 13:31:03 +0000
+++ b/changelog 2007-11-13 07:05:25 +0000
@@ -1,3 +1,115 @@
+bzr (0.92-1) unstable; urgency=low
+
+ * Final 0.92 release.
+ - Introduction Packs as experimental format, which is expected to become
+ the default format for the final release. (Closes: #396227)
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 13 Nov 2007 07:44:48 +0100
+
+bzr (0.92~rc1-1) unstable; urgency=low
+
+ * First release candidate for the upcoming 0.92 version.
+
+ * Dropped Andres Salomon from the Uploaders field, at his request.
+
+ -- Adeodato Simó <dato at net.com.org.es> Fri, 02 Nov 2007 22:29:16 +0100
+
+bzr (0.91-2) unstable; urgency=low
+
+ * remove python-celementree and python-paramiko from build-depends.
+ rationale:
+ - python-celementree is purely an optimisation for python2.4,
+ and is already included in python2.5
+ - python-paramiko is not used during build at all. However, the
+ testsuite currently fails when paramiko is not installed
+ (see also #59150 in launchpad.net for details). Since we
+ currently don't run the testsuite by default on the buildds,
+ it is safe to remove that dependency, at least for now.
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 27 Sep 2007 12:25:43 +0200
+
+bzr (0.91-1) unstable; urgency=low
+
+ * Final 0.91 release.
+
+ -- Adeodato Simó <dato at net.com.org.es> Wed, 26 Sep 2007 22:16:47 +0200
+
+bzr (0.91~rc2-1) unstable; urgency=low
+
+ * Second release candidate for the upcoming 0.91 release.
+
+ * Give a Files line in the HTML section of bzr.doc-base, since the doc-base
+ package in etch requires it.
+
+ * Suggest xdg-utils for /usr/bin/xdg-email, used if present in `bzr send`.
+
+ -- Adeodato Simó <dato at net.com.org.es> Fri, 14 Sep 2007 10:02:29 +0200
+
+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:
+ + 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.
+
+ * 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~bpo.1) etch-backports; urgency=low
* Backport of bzr from testing to etch
=== modified file 'control'
--- a/control 2007-06-12 16:11:26 +0000
+++ b/control 2007-10-09 17:05:23 +0000
@@ -2,18 +2,17 @@
Section: devel
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
+Uploaders: Rob Weir <rweir at ertius.org>, Jeff Bailey <jbailey at raspberryginger.com>, 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-all-dev, python-central, python-docutils
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)
+Architecture: any
+Depends: ${shlibs:Depends}, ${python:Depends}, python (>> 2.5) | python-celementtree
Recommends: python-paramiko, python-pycurl
-Suggests: libxml2-utils
+Suggests: xdg-utils, libxml2-utils
Conflicts: bzr-doc
XB-Python-Version: ${python:Versions}
Description: Bazaar, the next-generation distributed version control system
=== modified file 'rules'
--- a/rules 2007-06-12 16:11:26 +0000
+++ b/rules 2007-08-29 11:18:53 +0000
@@ -7,18 +7,20 @@
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/python"
+DEB_COMPRESS_EXCLUDE += .svg
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 "*.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
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
@@ -28,6 +30,10 @@
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
+# 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
More information about the Pkg-bazaar-commits
mailing list