[Pkg-bazaar-commits] ./bzrtools/etch-backports r26: merge from unstable branch
Reinhard Tartler
siretart at tauware.de
Mon May 19 15:24:46 UTC 2008
------------------------------------------------------------
revno: 26
committer: Reinhard Tartler <siretart at tauware.de>
branch nick: etch-backports
timestamp: Mon 2008-05-19 17:24:46 +0200
message:
merge from unstable branch
modified:
.bzrignore
changelog
control
copyright
install
rules
------------------------------------------------------------
revno: 24.1.1
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Mon 2007-07-02 22:53:48 +0200
message:
Suggests overhaul.
modified:
changelog
control
------------------------------------------------------------
revno: 24.1.2
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Tue 2007-07-03 17:24:42 +0200
message:
Fix VCS-Bzr URL to point to the unstable branch.
modified:
control
------------------------------------------------------------
revno: 24.1.3
committer: Arnaud Fontaine <arnau at milkypond.org>
branch nick: bzrtools
timestamp: Wed 2007-07-11 13:48:55 +0200
message:
New upstream release
modified:
changelog
control
install
------------------------------------------------------------
revno: 24.1.4
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Tue 2007-07-17 18:15:18 +0200
message:
Add stamp-* to .bzrignore.
modified:
.bzrignore
------------------------------------------------------------
revno: 24.1.5
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Tue 2007-07-17 18:15:38 +0200
message:
Changes for 0.18.0-1.
added:
patches/
patches/no_python2.4_shebangs.diff
patches/series
modified:
changelog
control
rules
------------------------------------------------------------
revno: 24.1.6
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Sun 2007-07-29 14:33:39 +0200
message:
Fix double UTF-8.
modified:
changelog
------------------------------------------------------------
revno: 24.1.7
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Sun 2007-07-29 14:35:25 +0200
message:
Fix download URL in debian/copyright. (Closes: #435108)
modified:
changelog
copyright
------------------------------------------------------------
revno: 24.1.8
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Tue 2007-08-14 22:18:38 +0200
message:
Several bugs fixed in the upcoming 0.90.0 release.
modified:
changelog
------------------------------------------------------------
revno: 24.1.9
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Wed 2007-08-15 12:09:38 +0200
message:
Commit for 0.90.0-1.
removed:
patches/no_python2.4_shebangs.diff
patches/series
modified:
changelog
control
------------------------------------------------------------
revno: 24.1.10
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Fri 2007-09-14 10:30:51 +0200
message:
Package 0.91.0.
modified:
changelog
control
------------------------------------------------------------
revno: 24.1.11
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Sun 2007-09-16 16:40:11 +0200
message:
Remove empty directory patches.
removed:
patches/
------------------------------------------------------------
revno: 24.1.12
committer: Reinhard Tartler <siretart at tauware.de>
branch nick: unstable
timestamp: Fri 2007-11-02 07:40:55 -0400
message:
* New upstream release.
modified:
changelog
------------------------------------------------------------
revno: 24.1.13
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Fri 2007-11-02 22:30:58 +0100
message:
Making the upload.
modified:
changelog
------------------------------------------------------------
revno: 24.1.14
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Fri 2007-11-02 22:51:42 +0100
message:
Er, update required version of bzr.
modified:
control
------------------------------------------------------------
revno: 24.1.15
committer: Arnaud Fontaine <arnau at milkypond.org>
branch nick: bzrtools
timestamp: Thu 2007-11-22 23:54:48 +0000
message:
New upstream release (0.91.1)
modified:
changelog
control
copyright
------------------------------------------------------------
revno: 24.1.16
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Mon 2007-12-03 14:18:54 +0100
message:
Preparing 1.0.0-1.
modified:
changelog
------------------------------------------------------------
revno: 24.1.17
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Mon 2007-12-03 14:19:39 +0100
message:
No signs of a conversion to UTF-8 in rev. 39.
modified:
changelog
------------------------------------------------------------
revno: 24.1.18
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Mon 2007-12-03 14:21:10 +0100
message:
Bump required bzr version.
modified:
control
------------------------------------------------------------
revno: 24.1.19
committer: Arnaud Fontaine <arnau at milkypond.org>
branch nick: bzrtools
timestamp: Fri 2007-12-07 17:40:57 +0000
message:
New email address
modified:
changelog
control
------------------------------------------------------------
revno: 24.1.20
committer: Arnaud Fontaine <arnau at milkypond.org>
branch nick: bzrtools
timestamp: Fri 2007-12-07 17:42:46 +0000
message:
New email address: update copyright
modified:
copyright
------------------------------------------------------------
revno: 24.1.21
committer: Arnaud Fontaine <arnau at debian.org>
branch nick: bzrtools
timestamp: Fri 2007-12-07 20:20:03 +0000
message:
Update Standards-Version to 3.7.3. No changes needed
modified:
changelog
control
------------------------------------------------------------
revno: 24.1.22
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Sat 2008-01-12 11:28:52 +0100
message:
Uploading 1.1.0-1.
modified:
changelog
control
------------------------------------------------------------
revno: 24.1.23
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Thu 2008-02-14 13:47:34 +0100
message:
Packaging 1.2.0-1.
modified:
changelog
control
------------------------------------------------------------
revno: 24.1.24
committer: Reinhard Tartler <siretart at tauware.de>
branch nick: unstable
timestamp: Wed 2008-03-19 09:29:05 +0100
message:
* New upstream release.
modified:
changelog
------------------------------------------------------------
revno: 24.1.25
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Wed 2008-03-19 13:53:17 +0100
message:
Fix dependencies to be installable against bzr 1.3.
modified:
changelog
control
------------------------------------------------------------
revno: 24.1.26
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: debian
timestamp: Sun 2008-05-04 14:09:06 +0200
message:
New upstream release.
modified:
changelog
------------------------------------------------------------
revno: 24.1.27
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: debian
timestamp: Sun 2008-05-04 14:15:43 +0200
message:
Fix dependencies.
modified:
control
------------------------------------------------------------
revno: 24.1.28
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Mon 2008-05-05 17:50:49 +0200
message:
Add a Dm-Upload-Allowed: yes header.
modified:
changelog
control
------------------------------------------------------------
revno: 24.1.29
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: unstable
timestamp: Wed 2008-05-14 16:39:30 +0200
message:
Merge.
modified:
changelog
control
------------------------------------------------------------
revno: 24.2.1
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: debian
timestamp: Mon 2008-05-12 20:25:12 +0200
message:
Add myself as uploader.
modified:
control
------------------------------------------------------------
revno: 24.2.2
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: debian
timestamp: Mon 2008-05-12 20:25:53 +0200
message:
Package 1.5.0.
modified:
changelog
control
-------------- next part --------------
=== modified file '.bzrignore'
--- a/.bzrignore 2007-06-15 15:52:05 +0000
+++ b/.bzrignore 2007-07-17 16:15:18 +0000
@@ -3,4 +3,5 @@
bzrtools
*.debhelper
*.substvars
+stamp-*
files
=== modified file 'changelog'
--- a/changelog 2007-06-30 15:30:43 +0000
+++ b/changelog 2008-05-19 15:24:46 +0000
@@ -1,9 +1,122 @@
-bzrtools (0.17.1-1~bpo.1) etch-backports; urgency=low
-
- * Move graphviz to Recommends (Closes: #423011) (will be included in 0.17.1-2)
- * upload to etch-backports
-
- -- Reinhard Tartler <siretart at tauware.de> Sat, 16 Jun 2007 15:05:05 +0100
+bzrtools (1.5.0-1) etch-backports; urgency=low
+
+ * upload to etch-backports.
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 19 May 2008 17:24:01 +0200
+
+bzrtools (1.5.0-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Jelmer Vernooij <jelmer at samba.org> Mon, 12 May 2008 20:25:35 +0200
+
+bzrtools (1.4.0-1) unstable; urgency=low
+
+ [ Jelmer Vernooij ]
+ * New upstream release.
+
+ [ Adeodato Simó ]
+ * Add a Dm-Upload-Allowed: yes header.
+
+ -- Jelmer Vernooij <jelmer at samba.org> Sun, 04 May 2008 14:06:26 +0200
+
+bzrtools (1.3.0-2) unstable; urgency=low
+
+ * Fix dependencies to be installable against bzr 1.3.
+
+ -- Adeodato Simó <dato at net.com.org.es> Wed, 19 Mar 2008 13:51:20 +0100
+
+bzrtools (1.3.0-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 19 Mar 2008 09:28:40 +0100
+
+bzrtools (1.2.0-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Adeodato Simó <dato at net.com.org.es> Thu, 14 Feb 2008 13:44:56 +0100
+
+bzrtools (1.1.0-1) unstable; urgency=low
+
+ [ Adeodato Simó ]
+ * New upstream release.
+
+ [ Arnaud Fontaine ]
+ * New email address.
+ * debian/control:
+ + Update Standards-Version to 3.7.3. No changes needed.
+
+ -- Adeodato Simó <dato at net.com.org.es> Sat, 12 Jan 2008 11:24:45 +0100
+
+bzrtools (1.0.0-1) unstable; urgency=low
+
+ [ Adeodato Simó ]
+ * New upstream release.
+
+ [ Arnaud Fontaine ]
+ * debian/control:
+ + Move Homepage field to the source package (dpkg supports it now).
+ + Rename XS-Vcs-Bzr field to Vcs-Bzr (dpkg supports it now).
+ * debian/copyright:
+ + Update GPL path to GPL-2 as GPL-3 is now the default.
+
+ -- Adeodato Simó <dato at net.com.org.es> Mon, 03 Dec 2007 14:13:34 +0100
+
+bzrtools (0.92.0-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Adeodato Simó <dato at net.com.org.es> Fri, 02 Nov 2007 22:30:38 +0100
+
+bzrtools (0.91.0-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Adeodato Simó <dato at net.com.org.es> Fri, 14 Sep 2007 10:12:12 +0200
+
+bzrtools (0.90.0-1) unstable; urgency=low
+
+ * New upstream release:
+ + `bzr branches` works against HTTP locations. (Closes: #435110)
+ + `bzr multi-pull` reuses existing connections. (Closes: #435240)
+ + `bzr branches` dies gracefully on connect error. (Closes: #435112)
+
+ * Drop no_python2.4_shebangs.diff, applied upstream.
+
+ * Fix download URL in debian/copyright. (Closes: #435108)
+
+ -- Adeodato Simó <dato at net.com.org.es> Wed, 15 Aug 2007 12:03:21 +0200
+
+bzrtools (0.18.0-1) unstable; urgency=low
+
+ [ Arnaud Fontaine ]
+ * New upstream release.
+
+ [ Reinhard Tartler ]
+ * Move graphviz to Recommends (Closes: #423011)
+
+ [ Adeodato Simó ]
+
+ * Drop (meaningless) versioning constraints on suggested packages, and
+ rework them a bit:
+ + promote rsync to Recommends.
+ + promote patch to Depends.
+ + drop unneeded python-paramiko.
+
+ * Move rsync from Build-Depends to Build-Depends-Indep.
+
+ * Drop version constraints in Build-Depends that are satisfied in etch.
+
+ * Run the test suite if DEB_BUILD_OPTIONS contains 'test'.
+
+ * Add patch to loose python2.4-specific shebang lines, and thus a spurious
+ dependency on python2.4 (submitted upstream).
+
+ * Add *.Shelf and CREDITS to DEB_INSTALL_DOCS_ALL.
+
+ -- Arnaud Fontaine <arnaud at andesi.org> Tue, 17 Jul 2007 16:07:22 +0000
bzrtools (0.17.1-1) unstable; urgency=low
@@ -86,11 +199,11 @@
+ drop version requirements in Suggests.
+ promote rsync and patch to Recommends.
- -- Adeodato Simó <dato at net.com.org.es> Wed, 13 Sep 2006 20:10:51 +0200
+ -- Adeodato Simó <dato at net.com.org.es> Wed, 13 Sep 2006 20:10:51 +0200
bzrtools (0.9.0-1) unstable; urgency=low
- [ Mohammed AdnÚne Trojette ]
+ [ Mohammed Adnène Trojette ]
* New upstream release and resync with Ubuntu.
* debian/control:
- Add rsync and python-medusa to Build-Depends (necessary for tests).
@@ -109,7 +222,7 @@
* Relax bzr dependency setting to bzr >= 0.9.
* debian/rules: Add targets to fit new Python policy needs.
- * Thanks Mohammed AdnÚne Trojette and Adeodato Simó.
+ * Thanks Mohammed Adnène Trojette and Adeodato Simó.
-- Gustavo Franco <stratus at debian.org> Wed, 23 Aug 2006 11:46:01 -0300
@@ -120,7 +233,7 @@
in bzr 0.9 (now in the archive), and made bzr print a couple warnings in
every operation.
- -- Adeodato Simó <dato at net.com.org.es> Wed, 9 Aug 2006 18:24:30 +0200
+ -- Adeodato Simó <dato at net.com.org.es> Wed, 9 Aug 2006 18:24:30 +0200
bzrtools (0.8.1-1) unstable; urgency=low
=== modified file 'control'
--- a/control 2007-06-16 14:05:21 +0000
+++ b/control 2008-05-14 14:39:30 +0000
@@ -2,18 +2,20 @@
Section: devel
Priority: optional
Maintainer: Debian Bazaar Maintainers <pkg-bazaar-maint at lists.alioth.debian.org>
-Uploaders: Gustavo Franco <stratus at debian.org>, Arnaud Fontaine <arnaud at andesi.org>, Reinhard Tartler <siretart at tauware.de>, Adeodato Simó <dato at net.com.org.es>
-Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), python (>= 2.4), python-central (>= 0.5.6), rsync
-Build-Depends-Indep: bzr (>= 0.17~rc1)
-XS-Vcs-Bzr: http://bzr.debian.org/pkg-bazaar/bzrtools/
-Standards-Version: 3.7.2
+Uploaders: Gustavo Franco <stratus at debian.org>, Arnaud Fontaine <arnau at debian.org>, Reinhard Tartler <siretart at tauware.de>, Adeodato Simó <dato at net.com.org.es>, Jelmer Vernooij <jelmer at samba.org>
+Build-Depends: cdbs, debhelper, quilt, python, python-central
+Build-Depends-Indep: bzr (>= 1.5~), rsync
+Vcs-Bzr: http://bzr.debian.org/pkg-bazaar/bzrtools/unstable
+Homepage: http://bazaar-vcs.org/BzrTools
+Standards-Version: 3.7.3
XS-Python-Version: >= 2.4
+Dm-Upload-Allowed: yes
Package: bzrtools
Architecture: all
-Depends: ${python:Depends}, bzr (>= 0.17~rc1), bzr (<< 0.18~)
-Recommends: graphviz
-Suggests: rsync (>= 2.6.6-1), librsvg2-bin (>= 2.9.5-6), patch (>= 2.5.9-2), python-paramiko, pybaz
+Depends: ${python:Depends}, bzr (>= 1.5~), bzr (<< 1.6~), patch
+Recommends: rsync, graphviz
+Suggests: pybaz, librsvg2-bin
XB-Python-Version: ${python:Versions}
Description: Collection of tools for bzr
This package contains a collection of plugins for bzr - a distributed
@@ -34,5 +36,3 @@
providing autocompletion.
* patch: Apply a specified patch to your tree, that can be a file
or URL.
- .
- Homepage: http://bazaar-vcs.org/BzrTools
=== modified file 'copyright'
--- a/copyright 2007-06-13 10:54:51 +0000
+++ b/copyright 2007-12-07 17:42:46 +0000
@@ -1,7 +1,13 @@
-This package was debianized by Jeff Bailey <jbailey at ubuntu.com> on
-Wed, 8 Jun 2005 21:21:37 +0000.
-
-It was downloaded from http://panoramicfeedback.com/opensource/bzrtools/
+This package was debianized by Jeff Bailey <jbailey at ubuntu.com> on
+Wed, 8 Jun 2005 21:21:37 +0000. It is now maintained by the pkg-bazaar
+team on alioth since May 2007 and co-maintained by:
+
+Gustavo Franco <stratus at debian.org>
+Arnaud Fontaine <arnau at debian.org>
+Reinhard Tartler <siretart at tauware.de>
+Adeodato Simó <dato at net.com.org.es>
+
+It was downloaded from http://bazaar-vcs.org/BzrTools.
Copyright Holder:
@@ -24,5 +30,5 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA
-On Debian systems, the complete text of the GNU General Public
-License can be found in /usr/share/common-licenses/GPL file.
+On Debian systems, the complete text of the GNU General Public License
+can be found in /usr/share/common-licenses/GPL-2 file.
=== modified file 'install'
--- a/install 2007-06-13 10:54:51 +0000
+++ b/install 2007-07-11 11:48:55 +0000
@@ -1,2 +1,2 @@
-#tests/*.py /usr/lib/python2.4/site-packages/bzrlib/plugins/bzrtools/tests
+#tests/*.py usr/lib/python2.4/site-packages/bzrlib/plugins/bzrtools/tests
debian/overrides/bzrtools usr/share/lintian/overrides/
=== modified file 'rules'
--- a/rules 2007-06-13 10:54:51 +0000
+++ b/rules 2007-07-17 16:15:38 +0000
@@ -5,6 +5,14 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/python-distutils.mk
-
-#common-post-build-indep::
-# PYTHONPATH=. BZR_PLUGIN_PATH=build/lib/bzrlib/plugins/ bzr selftest bzrtools -v
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+
+DEB_INSTALL_DOCS_ALL += CREDITS NEWS.Shelf README.Shelf TODO.Shelf
+
+DEB_QUILT_PATCHDIR_LINK := quilt_patches # patches exists in the tarball
+
+ifneq (,$(findstring test,$(DEB_BUILD_OPTIONS)))
+common-post-build-indep::
+ env BZR_PLUGIN_PATH=$(CURDIR)/build/lib/bzrlib/plugins \
+ /usr/bin/bzr selftest bzrtools
+endif
More information about the Pkg-bazaar-commits
mailing list