[Pkg-bazaar-commits] r29 /bzr/pkg-bazaar/bzr/etch-backports: Backports of bzr 0.17 to etch

[Frederic Brin]

------------------------------------------------------------
revno: 29
committer: Frederic Brin <frederic.brin at assonetworx.com>
branch nick: etch-backport
timestamp: Sat 2007-06-30 13:31:03 +0000
message:
  Backports of bzr 0.17 to etch
  =============================
  
  * Merge everything from unstable branch (Current testing release)
  * Update changelog
renamed:
  .bzr-builddeb/local.conf => .bzr-builddeb/default.conf
modified:
  bzr.doc-base
  changelog
  control
  rules
  watch
    ------------------------------------------------------------
    revno: 27.1.3
    merged: jw+debian at jameswestby.net-20070618221420-dad371yej3wb9dcn
    committer: James Westby <jw+debian at jameswestby.net>
    branch nick: unstable
    timestamp: Mon 2007-06-18 23:14:20 +0100
    message:
      Use default.conf instead of local.conf
      
        * local.conf should just be for local changes, and not be committed to the
          branch. It will be deprecated in builddeb 0.17 in favour of
          .bzr/branch/branch.conf anyway.
    ------------------------------------------------------------
    revno: 27.1.2
    merged: siretart at tauware.de-20070618102821-tqmn3xcikqsb1gz2
    committer: Reinhard Tartler <siretart at tauware.de>
    branch nick: unstable
    timestamp: Mon 2007-06-18 11:28:21 +0100
    message:
      * Final release of 0.17
    ------------------------------------------------------------
    revno: 27.1.1
    merged: dato at net.com.org.es-20070612161126-rsdteujhy3r3u329
    committer: Adeodato Simó <dato at net.com.org.es>
    branch nick: unstable
    timestamp: Tue 2007-06-12 16:11:26 +0000
    message:
      * First release candidate for 0.17 packaged.
      * Delete man1/bzr.1 in clean, and delete all *.htm files under doc/ as well,
        not only the ones in the top-level dir.
      * Change Bazaar-NG to Bazaar in debian/bzr.doc-base.
      * Fix watch file to properly compare rc versions.
      * Add XS-VCS-Bzr header.
-------------- next part --------------
=== renamed file '.bzr-builddeb/local.conf' => '.bzr-builddeb/default.conf'
=== modified file 'bzr.doc-base'
--- a/bzr.doc-base	2006-12-28 01:38:38 +0000
+++ b/bzr.doc-base	2007-06-12 16:11:26 +0000
@@ -1,7 +1,7 @@
 Document: bzr
-Title: Bazaar-NG documentation
+Title: Bazaar documentation
 Author: Martin Pool
-Abstract: Documentation for Bazaar-NG, in text and HTML form.
+Abstract: Documentation for Bazaar in text and HTML form.
 Section: Apps/Programming
 
 Format: text

=== modified file 'changelog'
--- a/changelog	2007-06-09 12:39:35 +0000
+++ b/changelog	2007-06-30 13:31:03 +0000
@@ -1,3 +1,30 @@
+bzr (0.17-1~bpo.1) etch-backports; urgency=low
+
+  * Backport of bzr from testing to etch
+
+ -- Assonetworx R&D <devel at assonetworx.com>  Thu,  30 Jun 2007 15:11:49 +0000
+
+bzr (0.17-1) unstable; urgency=low
+
+  * Final release of 0.17
+
+ -- Reinhard Tartler <siretart at tauware.de>  Mon, 18 Jun 2007 11:23:17 +0100
+
+bzr (0.17~rc1-1) unstable; urgency=low
+
+  * First release candidate for 0.17 packaged.
+
+  * Delete man1/bzr.1 in clean, and delete all *.htm files under doc/ as well,
+    not only the ones in the top-level dir.
+
+  * Change Bazaar-NG to Bazaar in debian/bzr.doc-base.
+
+  * Fix watch file to properly compare rc versions.
+
+  * Add XS-VCS-Bzr header.
+
+ -- Adeodato Sim?? <dato at net.com.org.es>  Tue, 12 Jun 2007 16:08:46 +0100
+
 bzr (0.16-1~bpo.1) etch-backports; urgency=low
 
   * Backport of bzr from testing to etch

=== modified file 'control'
--- a/control	2007-05-09 09:40:22 +0000
+++ b/control	2007-06-12 16:11:26 +0000
@@ -7,6 +7,7 @@
 Build-Depends-Indep: python-docutils (>= 0.4-2), python-celementtree (>= 1.0.5-7), python-medusa, 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

=== modified file 'rules'
--- a/rules	2007-05-09 09:36:11 +0000
+++ b/rules	2007-06-12 16:11:26 +0000
@@ -9,9 +9,10 @@
 DEB_PYTHON_INSTALL_ARGS_ALL += --install-data=/usr/share
 
 clean::
-	-rm -rf build test*.tmp doc/*.htm doc/bzr_man.txt
+	-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
-	rm -f bzr.1
+	rm -f bzr.1 man1/bzr.1
 	rm -f debian/stamp-doc
 	rm -f .bzr.log
 

=== modified file 'watch'
--- a/watch	2007-05-08 14:22:00 +0000
+++ b/watch	2007-06-12 16:11:26 +0000
@@ -1,2 +1,3 @@
 version=3
+opts="uversionmangle=s/rc/~rc/" \
 http://bazaar-vcs.org/releases/src/bzr-(.*)\.tar\.gz