--- bzr-0.8.2.orig/bzrlib/uncommit.py +++ bzr-0.8.2/bzrlib/uncommit.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python """\ Remove the last revision from the history of the current branch. """ --- bzr-0.8.2.orig/bzrlib/weave.py +++ bzr-0.8.2/bzrlib/weave.py @@ -1,5 +1,3 @@ -#! /usr/bin/python - # Copyright (C) 2005 Canonical Ltd # This program is free software; you can redistribute it and/or modify --- bzr-0.8.2.orig/tools/doc_generate/autodoc_man.py +++ bzr-0.8.2/tools/doc_generate/autodoc_man.py @@ -176,7 +176,7 @@ E-Mail address of the user. Overriddes default user config. .SH "FILES" .TP -.I "~/.bazaar/bazaar.conf/" +.I "~/.bazaar/bazaar.conf" Contains the default user config. Only one section, [DEFAULT] is allowed. A typical default config file may be similiar to: .br --- bzr-0.8.2.orig/tools/doc_generate/autodoc_rstx.py +++ bzr-0.8.2/tools/doc_generate/autodoc_rstx.py @@ -189,7 +189,7 @@ Files ===== -**On Linux**: ``~/.bazaar/bazaar.conf/`` +**On Linux**: ``~/.bazaar/bazaar.conf`` **On Windows**: ``C:\\Documents and Settings\\username\\Application Data\\bazaar\\2.0\\bazaar.conf`` --- bzr-0.8.2.orig/debian/NEWS +++ bzr-0.8.2/debian/NEWS @@ -0,0 +1,19 @@ +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. + + -- Andres Salomon 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. + + -- Rob Weir Tue, 11 Oct 2005 11:45:21 +1000 + --- bzr-0.8.2.orig/debian/compat +++ bzr-0.8.2/debian/compat @@ -0,0 +1 @@ +5 --- bzr-0.8.2.orig/debian/bzr.doc-base +++ bzr-0.8.2/debian/bzr.doc-base @@ -0,0 +1,13 @@ +Document: bzr +Title: Bazaar-NG documentation +Author: Martin Pool +Abstract: Documentation for Bazaar-NG, in text and HTML form. +Section: Apps/Programming + +Format: text +Files: /usr/share/doc/bzr/txt/*.txt + +Format: HTML +Index: /usr/share/doc/bzr/html/index.html +Files: /usr/share/doc/bzr/html/*.html + --- bzr-0.8.2.orig/debian/changelog +++ bzr-0.8.2/debian/changelog @@ -0,0 +1,291 @@ +bzr (0.8.2-1ubuntu1) dapper; urgency=low + + * Synchronize with Debian changes + + -- Jeff Bailey Sun, 21 May 2006 15:35:07 -0400 + +bzr (0.8.2-1) unstable; urgency=low + + * New upstream release (closes: #366083). + * No longer call bzr_man.py; upstream's install now automatically builds + and installs the manpage. + * Upstream cleaned up their docs, and reduced the number of them quite + significantly (~30k vs. 300k). There's not much point in bzr-doc anymore, + so drop it and merge docs into the main package. Conflict w/ the + old bzr-doc package, too. + * Include bzr.simple in /etc/bash_completion.d. + * Add an entry to NEWS describing changes to how a user's email address + is set, and point users at the (now correct) manpage (closes: #353540). + * Don't install unit tests; this saves a few megs of code, and end users + don't really need to be running this anyways (it's certainly not + documented in end-user stuff). + * Throw 002-execute_path.patch into debian/, as this is needed to shut + lintian up (as originally done by Lars). + * Misc additional lintian/linda changes/suggestions. + * Don't create empty doc/text directory; create doc/txt instead + (closes: #357254). + + -- Andres Salomon Fri, 19 May 2006 02:08:17 -0400 + +bzr (0.8-0ubuntu1) dapper; urgency=low + + * Final 0.8 release. + + -- Jeff Bailey Tue, 9 May 2006 13:13:38 -0400 + +bzr (0.8~200605051825-0ubuntu1) dapper; urgency=low + + * New snapshot, request by Robert Collins. + + * Generate the doc from doc/tutorial.txt. + + -- Jeff Bailey Fri, 5 May 2006 12:28:09 -0400 + +bzr (0.8~200604291148-0ubuntu2) dapper; urgency=low + + * Actually include the HTML file. + (Malone: #432392, 42231, 41242, 41114) + + -- Jeff Bailey Tue, 2 May 2006 07:54:45 -0400 + +bzr (0.8~200604291148-0ubuntu1) dapper; urgency=low + + * New snapshot, requested by Robert Collins. + + * Change recommends from python-pycurl to python2.4-pycurl + (Malone: #38581) + + * Install tutorial.txt into the package. Need to find more + documentation to include. This helps, but doesn't solve 41114. + + -- Jeff Bailey Sat, 29 Apr 2006 11:50:03 -0400 + +bzr (0.8~200604201740-0ubuntu1) dapper; urgency=low + + * New snapshot + + With this release, knits are no longer experimental. + + -- Jeff Bailey Thu, 20 Apr 2006 17:44:58 -0400 + +bzr (0.8~200604071016-0ubuntu1) dapper; urgency=low + + * New snapshot, fixes (Malone #38504) + + -- Jeff Bailey Fri, 7 Apr 2006 10:20:01 -0400 + +bzr (0.8~200604060901-0ubuntu1) dapper; urgency=low + + * New snapshot, by request of Robert Collins. + + -- Jeff Bailey Thu, 6 Apr 2006 09:30:17 -0400 + +bzr (0.8~200603230747-0ubuntu1) dapper; urgency=low + + * New snapshot, fixes merge problems. (Malone: #35886) + + -- Jeff Bailey Thu, 23 Mar 2006 08:03:21 -0500 + +bzr (0.8~200603200831-0ubuntu1) dapper; urgency=low + + * Snapshot uploaded to Dapper at Martin Pool's request. + + * Disable testsuite for upload. Fakeroot and the testsuite don't + play along. + + -- Jeff Bailey Mon, 20 Mar 2006 08:31:00 -0500 + +bzr (0.7-3) unstable; urgency=low + + * Adding myself to Uploaders with the agreement of Andreas and Jeff. + Unfortunately, it seems that Rob is inaccessible right now. + * bzrlib/uncommit.py, bzrlib/tests/test_weave.py: Removed #! line. + This silences lintian, and the lines also didn't do anything + useful since the files didn't have a main program so executing + them was a no-op, basically. + * doc/Makefile: Call rst2html, not rest2html. + * debian/bzr-doc.linda-overrides: Added an override to silence linda + about html-only-changelogs. This is actually a bug in linda, which + will be filed, but until it's fixed, we still need to be quiet. + * debian/control: Added python2.4-paramiko to Suggests for bzr. + Closes: #352921. + + -- Lars Wirzenius Thu, 13 Apr 2006 21:26:57 +0300 + +bzr (0.7-2) unstable; urgency=low + + * Update copyright file (closes: #345128). + * Be sure to really clean up after build, working around a CDBS bug; + thanks Bob Tanner (closes: #336550). + + -- Andres Salomon Wed, 25 Jan 2006 14:30:06 +0000 + +bzr (0.7-1) unstable; urgency=low + + * New upstream release. + * Add myself to uploaders. + * bzr-man.py -> bzr_man.py, and be sure to clean *all* .pyc files (by + searching in root, not just in bzrlib/ subdir). + + -- Andres Salomon Tue, 24 Jan 2006 21:28:02 +0000 + +bzr (0.6-2) unstable; urgency=low + + * Update NEWS.Debian file to have the correct backup dir name. + + -- Rob Weir Mon, 31 Oct 2005 00:43:25 +1100 + +bzr (0.6-1) unstable; urgency=low + + * New upstream release. + * Remove {build-,}deps on python, use python2.4 specifically + (Closes: #334838). Thanks, Bob Tanner. + * Also explicitly build-dep on python2.4-docutils to try to avoid bringing + in python 2.3 at all. Sadly, python2.4-docutils Depends on + python-docutils, which brings in python2.3-docutils and python2.3 anyway. + + -- Rob Weir Fri, 28 Oct 2005 22:03:24 +1000 + +bzr (0.1.1-1) unstable; urgency=low + + * New upstream release. + + -- Rob Weir Wed, 12 Oct 2005 21:30:27 +1000 + +bzr (0.1-1) unstable; urgency=low + + * New upstream version (Closes: #329950). + + It now installs testsweet.py, so "bzr selftest" works (Closes: #331330). + + This release uses a new weave-based tree format, and requires a "bzr + upgrade" to continue working on old trees. + + Incorporates patch so the man page can be built. + * Add NEWS.Debian file detailing the above format change. + * Run "./bzr selftest" as part of the package build, and bail if it fails. + * Add new some new lintian overrides for non-executable-but-hash-banged + .py files + * debian/control fiddling: + + Remove Recommends of urlgrabber, bzr doesn't use it anymore. + + Convert Recommends of python2.4-celementtree to Depends. + + Build-depend on python2.4-celementtree so it's used by the tests. + + Remove Depends on regular elementtree. + * Update debian/copyright with the FSF's new address. + * Thanks to Jeff Bailey again. + + -- Rob Weir Tue, 11 Oct 2005 10:48:45 +1000 + +bzr (0.0.7-2) unstable; urgency=low + + * Add build-dep on python2.4 and python2.4-dev (Closes: #327160). Thanks, + Matt Kraai! + * Update lintian override for the fact we're using python2.4. + * Add doc-base support. + * Clean up generated html documentation on 'clean'. + * Thanks again to Jeff Bailey. + + -- Rob Weir Thu, 15 Sep 2005 17:20:04 +1000 + +bzr (0.0.7-1) unstable; urgency=low + + * Add myself to Uploaders, update packagin based on Debian Snapshot + and Ubuntu packaging. + + -- Jeff Bailey Mon, 5 Sep 2005 14:56:49 -0400 + +bzr (0.0.5-2.1) unstable; urgency=low + + * Dont' depend on URL Grabber + + -- Jeff Bailey Thu, 30 Jun 2005 08:31:21 -0400 + +bzr (0.0.5-2) unstable; urgency=low + + * New maintainer. + * Add build-dep on python2.3 (closes: #315152). + + * Upload sponsored by Norbert Tretkowski . + + -- Rob Weir Tue, 21 Jun 2005 16:59:00 +1000 + +bzr (0.0.5-1) unstable; urgency=low + + * New upstream release. + * First upload to unstable. + + -- Norbert Tretkowski Wed, 15 Jun 2005 11:44:22 +0200 + +bzr (0.0.4+20050610-1) experimental; urgency=low + + * Updated to latest tree. + * Used dh_python instead hardcoded postinst/prerm files, thanks to Jeff + Bailey for debugging (see #312661 for details). + * Removed patch added in 0.0.4+20050602-1, it was integrated upstream. + * Added recommendation on python2.3-urlgrabber. + + -- Norbert Tretkowski Sat, 11 Jun 2005 15:54:20 +0200 + +bzr (0.0.4+20050606-1) experimental; urgency=low + + * Updated to latest tree. + * Added bash completion file. + + -- Norbert Tretkowski Mon, 6 Jun 2005 12:52:55 +0200 + +bzr (0.0.4+20050602-2) experimental; urgency=low + + * Don't ship *.pyc and *.pyo files, instead compile them when installing + the package. + + -- Norbert Tretkowski Thu, 2 Jun 2005 11:41:48 +0200 + +bzr (0.0.4+20050602-1) experimental; urgency=low + + * Updated to latest tree. + * Added patch from Hans Ulrich Niedermann to create a manpage. + + -- Norbert Tretkowski Thu, 2 Jun 2005 01:18:54 +0200 + +bzr (0.0.4+20050530-1) experimental; urgency=low + + * Updated to latest tree. + + -- Norbert Tretkowski Mon, 30 May 2005 20:56:41 +0200 + +bzr (0.0.4+20050526-1) experimental; urgency=low + + * Updated to latest tree. + + -- Norbert Tretkowski Thu, 26 May 2005 22:17:58 +0200 + +bzr (0.0.4+20050522-1) experimental; urgency=low + + * Updated to latest tree. + * Added TODO file. + * Added lintian override for bzrlib/remotebranch.py. + + -- Norbert Tretkowski Sun, 22 May 2005 11:51:35 +0200 + +bzr (0.0.4-2) experimental; urgency=low + + * Mention 'bazaar-ng' in short and long descriptions. + + -- Norbert Tretkowski Tue, 26 Apr 2005 20:45:11 +0200 + +bzr (0.0.4-1) experimental; urgency=low + + * New upstream release. + * Added lintian override for bzrlib/revfile.py. + + -- Norbert Tretkowski Mon, 25 Apr 2005 08:00:17 +0200 + +bzr (0.0.3-2) experimental; urgency=low + + * Added copyright of debian/ subdir to copyright file. + * Changed section of bzr-doc from devel to doc. + + -- Norbert Tretkowski Mon, 18 Apr 2005 08:26:11 +0200 + +bzr (0.0.3-1) experimental; urgency=low + + * Initial release. (closes: #303724) + + -- Norbert Tretkowski Sat, 16 Apr 2005 16:48:35 +0200 --- bzr-0.8.2.orig/debian/001-bazaar.conf.patch +++ bzr-0.8.2/debian/001-bazaar.conf.patch @@ -0,0 +1,26 @@ +=== modified file 'tools/doc_generate/autodoc_man.py' +--- tools/doc_generate/autodoc_man.py ++++ tools/doc_generate/autodoc_man.py +@@ -176,7 +176,7 @@ + E-Mail address of the user. Overriddes default user config. + .SH "FILES" + .TP +-.I "~/.bazaar/bazaar.conf/" ++.I "~/.bazaar/bazaar.conf" + Contains the default user config. Only one section, [DEFAULT] is allowed. A + typical default config file may be similiar to: + .br + +=== modified file 'tools/doc_generate/autodoc_rstx.py' +--- tools/doc_generate/autodoc_rstx.py ++++ tools/doc_generate/autodoc_rstx.py +@@ -189,7 +189,7 @@ + Files + ===== + +-**On Linux**: ``~/.bazaar/bazaar.conf/`` ++**On Linux**: ``~/.bazaar/bazaar.conf`` + + **On Windows**: ``C:\\Documents and Settings\\username\\Application Data\\bazaar\\2.0\\bazaar.conf`` + + --- bzr-0.8.2.orig/debian/rules +++ bzr-0.8.2/debian/rules @@ -0,0 +1,21 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/python-distutils.mk + +DEB_PYTHON_COMPILE_VERSION := 2.4 +DEB_PYTHON_INSTALL_ARGS_ALL += --install-data=/usr/share + +clean:: + -rm -rf build test*.tmp doc/*.html + find . -name "*.pyc" -print0 | xargs -0 rm -f + rm -f bzr.1 + +#common-post-build-indep:: +# ./bzr selftest + +build/bzr:: + for f in doc/*.txt; do h=$$(echo $$f | sed 's/txt$$/html/'); rst2html $$f > $$h; done + +install/bzr:: + rm -rf $(DEB_DESTDIR)/usr/lib/python$(DEB_PYTHON_COMPILE_VERSION)/site-packages/bzrlib/tests --- bzr-0.8.2.orig/debian/bzr.install +++ bzr-0.8.2/debian/bzr.install @@ -0,0 +1,3 @@ +contrib/bash/* etc/bash_completion.d/ +doc/*.txt usr/share/doc/bzr/txt +doc/*.html usr/share/doc/bzr/html --- bzr-0.8.2.orig/debian/bzr.manpages +++ bzr-0.8.2/debian/bzr.manpages @@ -0,0 +1 @@ +bzr.1 --- bzr-0.8.2.orig/debian/control +++ bzr-0.8.2/debian/control @@ -0,0 +1,23 @@ +Source: bzr +Section: devel +Priority: optional +Maintainer: Rob Weir +Uploaders: Jeff Bailey , Andres Salomon , Lars Wirzenius +Build-Depends: debhelper (>= 4.1.67), cdbs +Build-Depends-Indep: python2.4-docutils, python2.4, python2.4-dev, python2.4-celementtree +Standards-Version: 3.6.2 + +Package: bzr +Architecture: all +Depends: python2.4-celementtree, python2.4 +Suggests: libxml2-utils, python2.4-paramiko +Conflicts: bzr-doc +Description: bazaar-ng, 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. --- bzr-0.8.2.orig/debian/copyright +++ bzr-0.8.2/debian/copyright @@ -0,0 +1,30 @@ +This package was originally debianized by Norbert Tretkowski + on Sat, 16 Apr 2005 16:48:35 +0200. + +It is currently maintained by Rob Weir , +Jeff Bailey , and +Andres Salomon . + +It was downloaded from http://bazaar.canonical.com/. + +Upstream Authors: Martin Pool + +Copyright 2005-2006 Canonical Development Ltd. + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License with +the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL; +if not, write to the Free Software Foundation, Inc., 51 Franklin St, +Fifth Floor, Boston, MA 02110-1301, USA. + +On Debian systems, the full text of the GPL can be found in +/usr/share/common-licenses/GPL --- bzr-0.8.2.orig/debian/bzr.dirs +++ bzr-0.8.2/debian/bzr.dirs @@ -0,0 +1,2 @@ +usr/share/doc/bzr/html +usr/share/doc/bzr/txt --- bzr-0.8.2.orig/debian/002-execute_path.patch +++ bzr-0.8.2/debian/002-execute_path.patch @@ -0,0 +1,19 @@ +=== modified file 'bzrlib/uncommit.py' +--- bzrlib/uncommit.py ++++ bzrlib/uncommit.py +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + """\ + Remove the last revision from the history of the current branch. + """ + +=== modified file 'bzrlib/weave.py' +--- bzrlib/weave.py ++++ bzrlib/weave.py +@@ -1,5 +1,3 @@ +-#! /usr/bin/python +- + # Copyright (C) 2005 Canonical Ltd + + # This program is free software; you can redistribute it and/or modify +