--- bzr-0.16.orig/debian/overrides/bzr +++ bzr-0.16/debian/overrides/bzr @@ -0,0 +1,3 @@ +bzr: script-not-executable ./usr/share/pycentral/bzr/site-packages/bzrlib/weave.py +bzr: script-not-executable ./usr/share/pycentral/bzr/site-packages/bzrlib/tests/test_weave.py +bzr: script-not-executable ./usr/share/pycentral/bzr/site-packages/bzrlib/patiencediff.py --- bzr-0.16.orig/debian/copyright +++ bzr-0.16/debian/copyright @@ -0,0 +1,47 @@ +Debianized by Norbert Tretkowski 2005-04-16 +New co-maintainer Jeff Bailey 2005-09-05 +New co-maintainer Rob Weir 2005-09-15 +New co-maintainer Andres Salomon 2006-01-24 +New co-maintainer Lars Wirzenius 2006-04-13 +New co-maintainer Adeodato Simó 2006-07-24 +New co-maintainer Wouter van Heyst 2007-01-17 + +Maintained by the pkg-bazaar team on alioth since May 2007 + +It was downloaded from: + + + +And the project homepage is: + + + +Upstream authors (among others): + + | Martin Pool + | Robert Collins + | Aaron Bentley + | John Arbash Meinel + +Copyright and license terms: + + - The sources of Bazaar are: + + | Copyright (C) 2004, 2005, 2006, 2007 by Canonical 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 + | along with this program; 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 GNU General Public License is available + in /usr/share/common-licenses/GPL. --- bzr-0.16.orig/debian/bzr.manpages +++ bzr-0.16/debian/bzr.manpages @@ -0,0 +1 @@ +bzr.1 --- bzr-0.16.orig/debian/TODO +++ bzr-0.16/debian/TODO @@ -0,0 +1,5 @@ +- preserve executable bits of those .py files that are runnable + (weave.py, patiencediff.py, bundle/common.py) + +- ask upstream to remove she-bang line from .py files that are not + runnable (bundle/commands.py, tests/test_weave.py) --- bzr-0.16.orig/debian/bzr.dirs +++ bzr-0.16/debian/bzr.dirs @@ -0,0 +1,2 @@ +usr/share/doc/bzr/html +usr/share/doc/bzr/txt --- bzr-0.16.orig/debian/bzr.doc-base +++ bzr-0.16/debian/bzr.doc-base @@ -0,0 +1,12 @@ +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/tutorial.htm +Files: /usr/share/doc/bzr/html/*.htm --- bzr-0.16.orig/debian/watch +++ bzr-0.16/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://bazaar-vcs.org/releases/src/bzr-(.*)\.tar\.gz --- bzr-0.16.orig/debian/NEWS +++ bzr-0.16/debian/NEWS @@ -0,0 +1,30 @@ +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 ` to get it back. + + -- Wouter van Heyst 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. + + -- 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.16.orig/debian/pycompat +++ bzr-0.16/debian/pycompat @@ -0,0 +1 @@ +2 --- bzr-0.16.orig/debian/control +++ bzr-0.16/debian/control @@ -0,0 +1,26 @@ +Source: bzr +Section: devel +Priority: optional +Maintainer: Debian Bazaar Maintainers +Uploaders: Rob Weir , Jeff Bailey , Andres Salomon , Adeodato Simó , Wouter van Heyst , Reinhard Tartler +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 +Standards-Version: 3.7.2 +XS-Python-Version: >= 2.4 + +Package: bzr +Architecture: all +Depends: ${python:Depends} +Recommends: python-paramiko, python-pycurl, python-celementtree (>= 1.0.5-7) +Suggests: libxml2-utils +Conflicts: bzr-doc +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. --- bzr-0.16.orig/debian/rules +++ bzr-0.16/debian/rules @@ -0,0 +1,32 @@ +#!/usr/bin/make -f + +DEB_PYTHON_SYSTEM = pycentral + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/python-distutils.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk + +DEB_PYTHON_INSTALL_ARGS_ALL += --install-data=/usr/share + +clean:: + -rm -rf build test*.tmp doc/*.htm doc/bzr_man.txt + find . -name "*.pyc" -print0 | xargs -0 rm -f + rm -f 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 +endif + +build/bzr:: debian/stamp-doc + +debian/stamp-doc: + make docs + 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 --- bzr-0.16.orig/debian/changelog +++ bzr-0.16/debian/changelog @@ -0,0 +1,431 @@ +bzr (0.16-1ubuntu1) gutsy; urgency=low + + * Make python-celementtree a recommends (again). + + -- Matthias Klose Wed, 06 Jun 2007 10:48:57 +0200 + +bzr (0.16-1) unstable; urgency=low + + * new upstream version + * add a note about this package being maintained by pkg-bazaar + * add myself to uploaders + * generate docs via make docs, upstream has the html links right now + * merge ubuntu changes: + - add lintian overrides + - install doc/README.1st and doc/default.css + - debian/control: The upstream name is 'Bazaar', not bazaar-ng anymore + + -- Reinhard Tartler Tue, 8 May 2007 18:23:31 +0200 + +bzr (0.16~rc1-1) unstable; urgency=low + + * New upstream release candidate. + * Change the maintainer address to the pkg-bazaar-maint alioth list. + * Add a NEWS entry on the `bzr rm` behaviour change. + + -- Wouter van Heyst Fri, 27 Apr 2007 23:09:46 +0200 + +bzr (0.15-1) unstable; urgency=low + + * New upstream release + * Extend copyright to 2007 + + -- Wouter van Heyst Fri, 6 Apr 2007 22:41:36 +0200 + +bzr (0.14-1) experimental; urgency=low + + * New upstream release + + More gracefully deals with readonly branches (Closes: #374673) + * Acknowledge NMUs. (Closes: #395203, #389518, #397535, #397852) + * Bump debhelper compat to 5. + * Comply with python policy mandated dependencies of debhelper and + pycentral. + * Flip DEB_BUILD_OPTIONS logic on the testsuite until someone figures out + why it intermittently hangs under fakeroot. + + -- Wouter van Heyst Wed, 24 Jan 2007 00:05:48 +0100 + +bzr (0.14~rc1-1) experimental; urgency=low + + * New upstream release candidate. + * Add myself as a co-maintainer. + + -- Wouter van Heyst Wed, 17 Jan 2007 00:53:33 +0100 + +bzr (0.13-0.1) experimental; urgency=low + + * Non-maintainer upload. + + [ Wouter van Heyst ] + * New upstream release (Closes: #397852) + + Supersedes listdir patch (Closes: #397535) + * The rst documentation generates *.htm files, not *.html (Closes: #389518) + + -- Wouter van Heyst Wed, 27 Dec 2006 02:18:08 +0100 + +bzr (0.11-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * In test_osutils.py, sort what we get from os.listdir() before checking it; + the OS can give back directory entries in whatever order it likes, and + this shouldn't break the tests. Fixes intermittent test failures and + FTBFS. (Closes: #395203) + + -- Steinar H. Gunderson Wed, 8 Nov 2006 01:28:55 +0100 + +bzr (0.11-1) unstable; urgency=low + + * New upstream release (closes: #389606). + + -- Andres Salomon Sat, 7 Oct 2006 04:50:50 +0000 + +bzr (0.10-1) unstable; urgency=low + + * New upstream release. + + -- Andres Salomon Mon, 11 Sep 2006 07:43:50 +0000 + +bzr (0.10~rc2-1) unstable; urgency=low + + * Second release candidate for the upcoming 0.10 version, fixes Launchpad + #58057, `bzr selftest` only works from build tree. + + * Update download URL in debian/copyright. + + * Fix typo in previous changelog entry. + + -- Adeodato Simó Tue, 29 Aug 2006 03:49:33 +0200 + +bzr (0.10~rc1-1) unstable; urgency=low + + * First release candidate of the upcoming 0.10 version. Dropped patches, + present upstream now (series file now empty): + + + bazaar.conf_is_file_not_dir.diff + + bzr.dev.r1929_handle_TZ=UTC.diff + + * Changes in control fields: + + + add python-paramiko to Build-Depends, since now the test suite requires + its presence. + + change Build-Dependency on, er, python-all-dev, to python (>= 2.4). + + bump version on python-central Build-Dependency-Indep to 0.5, and move + it to Build-Depends; both suggested by lintian. + + * Dropped Lars Wirzenius from the Uploaders field, at his request. Thanks + for the time you spent on the package, Lars! + + -- Adeodato Simó Mon, 28 Aug 2006 08:00:11 +0200 + +bzr (0.9-2) unstable; urgency=low + + * Instead of setting TZ in debian/rules, appply patch from bzr.dev r1929 to + handle TZ=UTC correctly. Thanks for the suggestion, Martin Pitt. + + -- Adeodato Simó Wed, 16 Aug 2006 18:54:07 +0200 + +bzr (0.9-1) unstable; urgency=low + + * Bazaar 0.9 released and uploaded. + + * Fix download URL in debian/copyright (thanks, Etienne Goyer), add 2004 to + the copyright statement, mention all co-maintainers and reformat the file + a bit. + + * Create a stamp-doc after creating the HTML docs, so that it doesn't get + invoked twice (once in build, and another time in binary). + + * Run test suite with TZ explicitly set to non-UTC from debian/rules, to + workaround Launchpad #56290. + + -- Adeodato Simó Mon, 14 Aug 2006 19:52:23 +0200 + +bzr (0.9~rc1-1) unstable; urgency=low + + * First 0.9 release candidate packaged (closes: #381920). Bugs reported in + Debian's BTS fixed with this upload: + + + more informative error message when paramiko is not installed and an + operation over SFTP is attempted. (Closes: #370099) + + progress bar and other output respect terminal width. (Closes: #374674) + + does not raise UnicodeEncodeError when launching an editor to enter + commit message, and infotext is non-ASCII. (Closes: #375405) + + * Patches updates: + + + move debian/001-bazaar.conf.patch to debian/patches, and use quilt to + apply it (added build-dependency on it). + + remove 003-unboundlocalerror.patch and 004-unboundlocalerror2.patch, + included upstream. + + drop 002-execute_path.patch, which is not needed anymore as per + https://lists.ubuntu.com/archives/bazaar-ng/2006q2/012247.html. Add a + note to debian/TODO about preserving executable bits. + + * Move python-all-dev from Build-Depends-Indep to Build-Depends, well + spotted by lintian. + + * Do not run `bzr selftest` if 'nocheck' is present in DEB_BUILD_OPTIONS. + + * Add python-medusa to Build-Depends-Indep to make the FTP tests runnable. + + -- Adeodato Simó Wed, 9 Aug 2006 09:30:17 +0200 + +bzr (0.8.2-5) unstable; urgency=high + + * Add python-pycurl to Recommends. (Addresses: #353213) + + -- Adeodato Simó Thu, 3 Aug 2006 02:05:29 +0200 + +bzr (0.8.2-4) unstable; urgency=low + + * Update debian/control to refer to python-* instead of python2.4-* for + docutils, paramiko, and celementtree. (Closes: #376559, #363561) + + * Promote paramiko from Suggests to Recommends. (Closes: #376837) + + * Update to new Python policy using pycentral. + + * Pass --no-plugins to `bzr selftest` in debian/rules. + + * Update Standards-Version to 3.7.2 (no changes needed). + + * Add myself as an uploader. + + -- Adeodato Simó Mon, 24 Jul 2006 13:49:24 +0200 + +bzr (0.8.2-3) unstable; urgency=low + + * Keep unit tests around for now, since bzr's sftp transport depend upon it + (closes: #368760). + + -- Andres Salomon Tue, 30 May 2006 16:35:29 +0000 + +bzr (0.8.2-2) unstable; urgency=low + + * Set the tutorial as the Index page for doc-base (closes: #368120). + * Add comments to the top of all patches in debian/ that describe upstream + submission status. + * Don't throw UnboundLocalError when attempting to write to a read-only + repository; thanks to Martin F. Krafft and Bob Tanner (closes: #352707). + * Don't throw UnboundLocalError on bzr ignore; thanks to + Martin F. Krafft and Bob Tanner (closes: #352791). + + -- Andres Salomon Sat, 20 May 2006 03:34:32 +0000 + +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.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.16.orig/debian/bzr.install +++ bzr-0.16/debian/bzr.install @@ -0,0 +1,6 @@ +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 --- bzr-0.16.orig/debian/compat +++ bzr-0.16/debian/compat @@ -0,0 +1 @@ +5