[Pkg-bazaar-commits] ./bzr/etch-backports r34: merge changes from unstable
Reinhard Tartler
siretart at tauware.de
Tue May 20 13:50:56 UTC 2008
------------------------------------------------------------
revno: 34
committer: Reinhard Tartler <siretart at tauware.de>
branch nick: etch-backports
timestamp: Tue 2008-05-20 15:50:56 +0200
message:
merge changes from unstable
modified:
NEWS
TODO
bzr.install
changelog
control
copyright
rules
------------------------------------------------------------
revno: 27.1.19
committer: Arnaud Fontaine <arnau at milkypond.org>
branch nick: bzr
timestamp: Fri 2007-11-23 00:46:19 +0000
message:
* Rename XS-Vcs-Bzr to Vcs-Bzr field (dpkg supports it now).
* Add Homepage field.
* Update GPL path to GPL-2 as GPL-3 is now the default.
modified:
changelog
control
copyright
------------------------------------------------------------
revno: 27.1.20
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Fri 2007-11-30 15:42:42 +0100
message:
Fix NEWS.Debian format.
modified:
NEWS
------------------------------------------------------------
revno: 27.1.21
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Fri 2007-11-30 16:59:44 +0100
message:
Prepare 1.0~rc-1; provide a NEWS.Debian entry.
modified:
NEWS
changelog
------------------------------------------------------------
revno: 27.1.22
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Sat 2007-12-01 11:27:36 +0100
message:
Install images that come with the documentation.
modified:
changelog
rules
------------------------------------------------------------
revno: 27.1.23
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Sat 2007-12-01 11:55:19 +0100
message:
Clean up the clean target, making two builds in a row work.
modified:
changelog
rules
------------------------------------------------------------
revno: 27.1.24
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Sat 2007-12-01 12:37:33 +0100
message:
Maybe remove python-pycurl from Recommends?
modified:
TODO
------------------------------------------------------------
revno: 27.1.25
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Sat 2007-12-01 13:18:22 +0100
message:
Revamp description, and add plugins to Suggests/Recommends.
modified:
changelog
control
------------------------------------------------------------
revno: 27.1.26
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Sat 2007-12-01 13:43:43 +0100
message:
Typos and feedback from James.
modified:
control
------------------------------------------------------------
revno: 27.1.27
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Sat 2007-12-01 13:49:18 +0100
message:
Typo from vila.
modified:
control
------------------------------------------------------------
revno: 27.1.28
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Sat 2007-12-01 13:50:44 +0100
message:
Better wording, from vila an James.
modified:
control
------------------------------------------------------------
revno: 27.1.29
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Mon 2007-12-03 17:39:58 +0100
message:
More improvements.
modified:
changelog
control
------------------------------------------------------------
revno: 27.1.30
committer: James Westby <jw+debian at jameswestby.net>
branch nick: unstable
timestamp: Mon 2007-12-03 18:04:18 +0000
message:
* debian/rules:
+ use '$(MAKE)' instead of 'make' to at least allow a parallel build.
modified:
changelog
rules
------------------------------------------------------------
revno: 27.1.31
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Sun 2007-12-09 19:55:51 +0100
message:
Properly capitalize Vcs-Bzr.
modified:
changelog
control
------------------------------------------------------------
revno: 27.1.32
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Sun 2007-12-09 21:05:55 +0100
message:
Add graphviz to Build-Depends in order to build performance.png.
modified:
changelog
control
------------------------------------------------------------
revno: 27.1.33
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Sun 2007-12-09 21:12:15 +0100
message:
Install pdf and png copies of the quick-start-summary.
modified:
bzr.install
------------------------------------------------------------
revno: 27.1.34
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Sun 2007-12-09 21:29:52 +0100
message:
Do not compress .pdf files.
modified:
rules
------------------------------------------------------------
revno: 27.1.35
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Sun 2007-12-09 21:31:59 +0100
message:
Uploading 1.0~rc2.
modified:
changelog
------------------------------------------------------------
revno: 27.1.36
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Sun 2007-12-09 23:39:05 +0100
message:
Apply patch to fix wrong version numbers in bzr and bzrlib.
added:
patches/fix_version_strings.diff
modified:
changelog
patches/series
------------------------------------------------------------
revno: 27.1.37
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Thu 2007-12-13 11:03:06 +0100
message:
Recommend upgrade before reconciling in NEWS.Debian; see changelog.
modified:
NEWS
changelog
------------------------------------------------------------
revno: 27.1.38
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Fri 2007-12-14 13:18:22 +0100
message:
Prepare for 1.0-1 upload.
modified:
changelog
------------------------------------------------------------
revno: 27.1.39
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Fri 2007-12-14 13:21:31 +0100
message:
Drop now unneeded patch fix_version_strings.diff.
removed:
patches/fix_version_strings.diff
modified:
changelog
patches/series
------------------------------------------------------------
revno: 27.1.40
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Sat 2008-01-05 20:34:47 +0100
message:
Packaging 1.1~rc1-1.
modified:
changelog
control
------------------------------------------------------------
revno: 27.1.41
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Thu 2008-02-14 13:36:13 +0100
message:
Packaging 1.2~rc1-1.
modified:
changelog
------------------------------------------------------------
revno: 27.1.42
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Mon 2008-03-17 13:53:31 +0100
message:
Packaging 1.3~rc1-1.
modified:
changelog
------------------------------------------------------------
revno: 27.1.43
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Fri 2008-03-21 17:58:00 +0100
message:
Packaging 1.3-1.
modified:
changelog
------------------------------------------------------------
revno: 27.1.44
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Sat 2008-05-03 02:58:56 +0200
message:
Package 1.3.1. (Uploaded a couple weeks ago.)
modified:
changelog
------------------------------------------------------------
revno: 27.1.45
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: unstable
timestamp: Fri 2008-05-02 17:46:36 +0200
message:
Packaging 1.4-1.
modified:
changelog
control
copyright
------------------------------------------------------------
revno: 27.1.46
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Sat 2008-05-03 19:32:55 +0200
message:
Add a Dm-Upload-Allowed: yes header.
modified:
changelog
control
------------------------------------------------------------
revno: 27.1.47
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr
timestamp: Mon 2008-05-12 00:18:33 +0200
message:
package 1.5rc1.
modified:
changelog
------------------------------------------------------------
revno: 27.1.48
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr
timestamp: Tue 2008-05-20 15:30:24 +0200
message:
Package 1.5.
modified:
changelog
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS 2007-04-27 23:49:19 +0000
+++ b/NEWS 2007-12-13 10:03:06 +0000
@@ -1,30 +1,46 @@
+bzr (1.0~rc1-1) unstable; urgency=low
+
+ This version of Bazaar changes the default format used for newly created
+ branches and repositories. This format is understood by Bazaar 0.92 and
+ later; previous versions won't be able to read this format. To create new
+ branches while maintaining compatibility with previous Bazaar versions,
+ pass --dirstate or --dirstate-tags (>= 0.15) to `bzr init`.
+
+ To upgrade existing branches or repositories to this new format, run `bzr
+ upgrade`, and then `bzr reconcile`. You need to run these two commands in
+ each standalone branch (those that are not inside a shared repository), but
+ only once in the toplevel directory for shared repositories.
+
+ Additionally, you can run `bzr upgrade` in branches inside a shared
+ repository to upgrade them to a format that support tags, introduced in
+ version 0.15.
+
+ -- Adeodato Simó <dato at net.com.org.es> Fri, 30 Nov 2007 16:56:57 +0100
+
bzr (0.16~rc1-1) unstable; urgency=low
- * This release changes the behaviour of `bzr remove/rm` to remove the working
- file if it could be recovered again. If you prefer keeping the file
- instead, issue the --keep option to rm and/or consider using an alias that
- always sets it (see /usr/share/doc/bzr/txt/using_aliases.txt)
- If it so happens that a file gets unexpectedly deleted, use
- `bzr revert <file>` to get it back.
+ This release changes the behaviour of `bzr remove/rm` to remove the working
+ file if it could be recovered again. If you prefer keeping the file instead,
+ issue the --keep option to rm and/or consider using an alias that always
+ sets it (see /usr/share/doc/bzr/txt/using_aliases.txt) If it so happens that
+ a file gets unexpectedly deleted, use `bzr revert <file>` to get it back.
-- Wouter van Heyst <larstiq at larstiq.dyndns.org> Fri, 27 Apr 2007 23:11:12 +0000
bzr (0.8-1) unstable; urgency=low
- * Versions of bzr prior to 0.7 had users setting their email address in
- ~/.bzr.conf/email. This has changed; email addresses are
- now set either via environment variables ($BZREMAIL or $EMAIL) or
- through the config file ~/.bazaar/bazaar.conf. See the bzr(1) man
- page for more details.
+ Versions of bzr prior to 0.7 had users setting their email address in
+ ~/.bzr.conf/email. This has changed; email addresses are now set either via
+ environment variables ($BZREMAIL or $EMAIL) or through the config file
+ ~/.bazaar/bazaar.conf. See the bzr(1) man page for more details.
-- Andres Salomon <dilinger at debian.org> Mon, 15 May 2006 00:38:43 -0400
bzr (0.1-1) unstable; urgency=low
- * This release updates the bzr tree-format, and old trees will not be
- usable until they are upgraded with "bzr upgrade". This should
- proceed smoothly, but the old .bzr dir is backed up to .bzr.backup
- should anything go wrong.
+ This release updates the bzr tree-format, and old trees will not be usable
+ until they are upgraded with "bzr upgrade". This should proceed smoothly,
+ but the old .bzr dir is backed up to .bzr.backup should anything go wrong.
-- Rob Weir <rweir at ertius.org> Tue, 11 Oct 2005 11:45:21 +1000
=== modified file 'TODO'
--- a/TODO 2006-12-27 00:25:00 +0000
+++ b/TODO 2007-12-01 11:37:33 +0000
@@ -1,3 +1,6 @@
+- check with upstream whether python-pycurl should still be in
+ Recommends
+
- preserve executable bits of those .py files that are runnable
(weave.py, patiencediff.py, bundle/common.py)
=== modified file 'bzr.install'
--- a/bzr.install 2007-08-29 11:18:53 +0000
+++ b/bzr.install 2007-12-09 20:12:15 +0000
@@ -1,4 +1,6 @@
debian/overrides/bzr usr/share/lintian/overrides/
contrib/bash/* etc/bash_completion.d/
doc/default.css usr/share/doc/bzr/html
+doc/en/quick-reference/quick-start-summary.pdf usr/share/doc/bzr/html/en/quick-reference
+doc/en/quick-reference/quick-start-summary.png usr/share/doc/bzr/html/en/quick-reference
doc/en/quick-reference/quick-start-summary.svg usr/share/doc/bzr/html/en/quick-reference
=== modified file 'changelog'
--- a/changelog 2007-11-13 07:12:35 +0000
+++ b/changelog 2008-05-20 13:50:56 +0000
@@ -1,15 +1,133 @@
-bzr (0.92-1~bpo40+1) etch-backports; urgency=low
+bzr (1.5-1~bpo40+1) etch-backports; urgency=low
* upload to etch-backports
- * update VCS-Bzr header to point to our pkg-bazaar repository on alioth.
-
- -- Reinhard Tartler <siretart at tauware.de> Tue, 13 Nov 2007 08:06:30 +0100
-
-bzr (0.91-2~bpo40+1) etch-backports; urgency=low
-
- * Rebuild for etch.
-
- -- Adeodato Simó <dato at net.com.org.es> Tue, 23 Oct 2007 22:03:02 +0200
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 20 May 2008 15:49:56 +0200
+
+bzr (1.5-1) unstable; urgency=low
+
+ * Final 1.5 release.
+
+ -- Jelmer Vernooij <jelmer at samba.org> Sat, 17 May 2008 14:42:51 +0200
+
+bzr (1.5~rc1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Jelmer Vernooij <jelmer at samba.org> Mon, 12 May 2008 00:14:54 +0200
+
+bzr (1.4-1) unstable; urgency=low
+
+ [ Jelmer Vernooij ]
+ * New upstream release.
+ * Add myself as a co-maintainer.
+
+ [ Adeodato Simó ]
+ * Add a Dm-Upload-Allowed: yes header.
+
+ -- Adeodato Simó <dato at net.com.org.es> Sat, 03 May 2008 19:30:43 +0200
+
+bzr (1.3.1-1) unstable; urgency=low
+
+ * New upstream bugfix release.
+
+ -- Adeodato Simó <dato at net.com.org.es> Wed, 16 Apr 2008 19:13:43 +0200
+
+bzr (1.3-1) unstable; urgency=low
+
+ * Final 1.3 release.
+
+ -- Adeodato Simó <dato at net.com.org.es> Fri, 21 Mar 2008 17:56:59 +0100
+
+bzr (1.3~rc1-1) unstable; urgency=low
+
+ * First release candidate of the upcoming 1.3 release.
+
+ -- Adeodato Simó <dato at net.com.org.es> Mon, 17 Mar 2008 13:45:21 +0100
+
+bzr (1.2~rc1-1) unstable; urgency=low
+
+ * First release candidate of the upcoming 1.2 release.
+
+ (NB: 1.1 final was never packaged because there were no code changes
+ between 1.1~rc1 and 1.1 itself.)
+
+ -- Adeodato Simó <dato at net.com.org.es> Thu, 14 Feb 2008 13:32:37 +0100
+
+bzr (1.1~rc1-1) unstable; urgency=low
+
+ * First release candidate of the upcoming 1.1 release.
+
+ * Bump Standard-Versions to 3.7.3 (no changes required).
+
+ -- Adeodato Simó <dato at net.com.org.es> Sat, 05 Jan 2008 20:28:38 +0100
+
+bzr (1.0-1) unstable; urgency=low
+
+ * Final 1.0 release.
+ + Wrong download links in User Guide fixed. (Closes: #455592)
+ + Drop now unneeded patch fix_version_strings.diff.
+
+ * After some chat with upstream, recommend `bzr upgrade` and then `bzr
+ reconcile` in NEWS.Debian, instead of reconcile before upgrade, since
+ reconciling in the old format (knits) can be remarkably slower than in
+ the new format (packs). (NB: this should only be done with 1.0~rc2 and
+ later, due to LP #165290.)
+
+ -- Adeodato Simó <dato at net.com.org.es> Fri, 14 Dec 2007 13:12:06 +0100
+
+bzr (1.0~rc2-2) unstable; urgency=low
+
+ * Apply patch to fix wrong version numbers in bzr and bzrlib.
+ (See https://bugs.launchpad.net/bzr/+bug/175171.)
+
+ -- Adeodato Simó <dato at net.com.org.es> Sun, 09 Dec 2007 23:20:52 +0100
+
+bzr (1.0~rc2-1) unstable; urgency=low
+
+ [ Adeodato Simó ]
+ * New 1.0 release candidate.
+
+ * debian/control:
+ + revamp the description.
+ + add bzrtools to Recommends.
+ + add bzr-gtk and bzr-svn to Suggests.
+ + remove libxml2-utils from Suggests.
+ + drop conflicts on obsolete bzr-doc.
+ + demote python-pycurl to Suggests, mention in the description
+ what's useful for.
+ + properly capitalize Vcs-Bzr.
+
+ * Add graphviz to Build-Depends in order to build performance.png.
+
+ [ James Westby ]
+ * debian/rules:
+ + use '$(MAKE)' instead of 'make' to at least allow a parallel build.
+
+ -- Adeodato Simó <dato at net.com.org.es> Sun, 09 Dec 2007 21:31:49 +0100
+
+bzr (1.0~rc1-2) unstable; urgency=low
+
+ * Install images that come with the documentation.
+
+ * Remove unnecessary stuff from the clean target in debian/rules, and
+ invoke $(MAKE) clean-docs from there so that building twice in a row
+ works.
+
+ -- Adeodato Simó <dato at net.com.org.es> Sat, 01 Dec 2007 11:42:50 +0100
+
+bzr (1.0~rc1-1) unstable; urgency=low
+
+ [ Adeodato Simó ]
+ * First release candidate of the upcoming 1.0 release; see NEWS.Debian for
+ more information.
+
+ [ Arnaud Fontaine ]
+ * Rename XS-Vcs-Bzr to Vcs-Bzr field (dpkg supports it now).
+ * Add Homepage field.
+ * Update GPL path to GPL-2 as GPL-3 is now the default.
+
+ -- Adeodato Simó <dato at net.com.org.es> Fri, 30 Nov 2007 15:43:46 +0100
bzr (0.92-1) unstable; urgency=low
@@ -27,6 +145,19 @@
-- Adeodato Simó <dato at net.com.org.es> Fri, 02 Nov 2007 22:29:16 +0100
+bzr (0.92-1~bpo40+1) etch-backports; urgency=low
+
+ * upload to etch-backports
+ * update VCS-Bzr header to point to our pkg-bazaar repository on alioth.
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 13 Nov 2007 08:06:30 +0100
+
+bzr (0.91-2~bpo40+1) etch-backports; urgency=low
+
+ * Rebuild for etch.
+
+ -- Adeodato Simó <dato at net.com.org.es> Tue, 23 Oct 2007 22:03:02 +0200
+
bzr (0.91-2) unstable; urgency=low
* remove python-celementree and python-paramiko from build-depends.
=== modified file 'control'
--- a/control 2007-11-13 07:07:21 +0000
+++ b/control 2008-05-20 13:50:56 +0000
@@ -2,25 +2,38 @@
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>, 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
+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>, Jelmer Vernooij <jelmer at samba.org>
+Build-Depends: debhelper, cdbs, quilt, python, python-all-dev, python-central, python-docutils, graphviz
+Standards-Version: 3.7.3
XS-Python-Version: >= 2.4
VCS-Bzr: http://bzr.debian.org/pkg-bazaar/bzr/etch-backports
Package: bzr
Architecture: any
Depends: ${shlibs:Depends}, ${python:Depends}, python (>> 2.5) | python-celementtree
-Recommends: python-paramiko, python-pycurl
-Suggests: xdg-utils, libxml2-utils
-Conflicts: bzr-doc
+Recommends: bzrtools, python-paramiko
+Suggests: bzr-gtk, bzr-svn, python-pycurl, xdg-utils
XB-Python-Version: ${python:Versions}
-Description: Bazaar, the next-generation distributed version control system
- Open source distributed version control system that is powerful, friendly,
- and scalable.
- .
- It manages trees of files and subdirectories. In particular, it records
- revisions of trees, representing their state at a particular point in time,
- and information about those revisions and their relationships. Recording and
- retrieving tree revisions is useful in several ways if you are writing
- software or documents or doing similar creative work.
+Description: easy to use distributed version control system
+ Bazaar is a distributed version control system designed to be easy to
+ use and intuitive, able to adapt to many workflows, reliable, and
+ easily extendable.
+ .
+ Publishing of branches can be done over plain HTTP, that is, no special
+ software is needed on the server to host Bazaar branches. Branches can
+ be pushed to the server via sftp (which most SSH instalations come
+ with), FTP, or over a custom and faster protocol if bzr is installed in
+ the remote end.
+ .
+ Merging in Bazaar is easy, as the implementation is able to avoid many
+ spurious conflicts, deals well with repeated merges between branches,
+ and is able to handle modifications to renamed files correctly.
+ .
+ Bazaar is written in Python, and has a flexible plugin interface which
+ can be used to extend its functionality. Many plugins exist, providing
+ useful commands (bzrtools), graphical interfaces (bzr-gtk), or native
+ interaction with Subversion branches (bzr-svn).
+ .
+ Install python-paramiko if you are going to push branches to remote
+ hosts with sftp, and python-pycurl if you'd like for SSL certificates
+ always to be verified.
=== modified file 'copyright'
--- a/copyright 2007-05-08 16:36:53 +0000
+++ b/copyright 2008-05-02 15:46:36 +0000
@@ -4,7 +4,8 @@
New co-maintainer Andres Salomon <dilinger at debian.org> 2006-01-24
New co-maintainer Lars Wirzenius <liw at iki.fi> 2006-04-13
New co-maintainer Adeodato Simó <dato at net.com.org.es> 2006-07-24
-New co-maintainer Wouter van Heyst <larstiq at larstiq.dyndns.org> 2007-01-17
+New co-maintainer Wouter van Heyst <larstiq at larstiq.dyndns.org> 2007-01-17
+New co-maintainer Jelmer Vernooij <jelmer at samba.org> 2008-05-02
Maintained by the pkg-bazaar team on alioth since May 2007
@@ -44,4 +45,4 @@
| Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
On Debian systems, the full text of the GNU General Public License is available
- in /usr/share/common-licenses/GPL.
+ in /usr/share/common-licenses/GPL-2.
=== modified file 'rules'
--- a/rules 2007-08-29 11:18:53 +0000
+++ b/rules 2007-12-09 20:29:52 +0000
@@ -8,15 +8,11 @@
DEB_PYTHON_INSTALL_ARGS_ALL += --install-data=/usr/share
DEB_PYTHON_BUILD_ARGS += --executable "/usr/bin/python"
-DEB_COMPRESS_EXCLUDE += .svg
+DEB_COMPRESS_EXCLUDE += .svg .pdf
clean::
- -rm -rf build test*.tmp doc/bzr_man.txt
- 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
+ $(MAKE) clean-docs
+ rm -f bzr.1 debian/stamp-doc
ifneq (,$(findstring test,$(DEB_BUILD_OPTIONS)))
common-post-build-indep::
@@ -26,7 +22,7 @@
build/bzr:: debian/stamp-doc
debian/stamp-doc:
- make docs
+ $(MAKE) docs
touch $@
install/bzr::
@@ -37,3 +33,7 @@
xargs -r0 -i'{}' -n1 install -D -m 644 'doc/{}' \
"debian/bzr/usr/share/doc/bzr/$$ext/{}"; \
done
+# Install images as well
+ ( cd doc && find -name "*.png" -print0 ) | \
+ xargs -r0 -i'{}' -n1 install -D -m 644 'doc/{}' \
+ "debian/bzr/usr/share/doc/bzr/html/{}"
More information about the Pkg-bazaar-commits
mailing list