diff -Nru bzr-grep-0.4.0+bzr147/debian/bzr-builder.manifest bzr-grep-0.4.0+bzr147~ppa180~quantal1/debian/bzr-builder.manifest --- bzr-grep-0.4.0+bzr147/debian/bzr-builder.manifest 1970-01-01 00:00:00.000000000 +0000 +++ bzr-grep-0.4.0+bzr147~ppa180~quantal1/debian/bzr-builder.manifest 2013-08-21 22:41:23.000000000 +0000 @@ -0,0 +1,3 @@ +# bzr-builder format 0.3 deb-version {debupstream-base}bzr147~ppa180 +lp:bzr-grep revid:jelmer@canonical.com-20111220153920-ua3amlyncnmu69tx +merge packaging lp:~debian-bazaar/bzr-grep/unstable revid:a.starr.b@gmail.com-20130521022446-ayvie3umih2w7oil diff -Nru bzr-grep-0.4.0+bzr147/debian/changelog bzr-grep-0.4.0+bzr147~ppa180~quantal1/debian/changelog --- bzr-grep-0.4.0+bzr147/debian/changelog 2012-09-27 03:00:27.000000000 +0000 +++ bzr-grep-0.4.0+bzr147~ppa180~quantal1/debian/changelog 2013-08-21 22:41:23.000000000 +0000 @@ -1,10 +1,24 @@ -bzr-grep (0.4.0+bzr147-1ubuntu1) quantal; urgency=low +bzr-grep (0.4.0+bzr147~ppa180~quantal1) quantal; urgency=low - * bzr2.6compat.patch: Update to use 'graph.iter_lefthand_ancestry' - instead of 'repo.iter_reverse_revision_history' making compatible - with bzr 2.6 (LP: #1033849). + * Auto build. - -- Andrew Starr-Bochicchio Wed, 26 Sep 2012 22:59:33 -0400 + -- Launchpad Package Builder Wed, 21 Aug 2013 22:41:23 +0000 + +bzr-grep (0.4.0+bzr147-2) UNRELEASED; urgency=low + + [ Jelmer Vernooij ] + * Update header for copyright file format. + * Add test run of testsuite for autopkgtest. + * Remove myself from uploaders. + + [ Andrew Starr-Bochicchio ] + * Add XS-Testsuite field to debian/control. + * Use my @debian.org email address. + * Bump standards version to 3.9.4 (no changes). + * Fix debian/watch file. + * Drop depricated DM-Upload-Allowed field. + + -- Jelmer Vernooij Tue, 10 Apr 2012 12:30:52 +0200 bzr-grep (0.4.0+bzr147-1) unstable; urgency=low diff -Nru bzr-grep-0.4.0+bzr147/debian/control bzr-grep-0.4.0+bzr147~ppa180~quantal1/debian/control --- bzr-grep-0.4.0+bzr147/debian/control 2012-09-27 03:00:46.000000000 +0000 +++ bzr-grep-0.4.0+bzr147~ppa180~quantal1/debian/control 2013-08-21 22:41:23.000000000 +0000 @@ -1,20 +1,18 @@ Source: bzr-grep Section: vcs Priority: extra -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Bazaar Maintainers -Uploaders: Andrew Starr-Bochicchio , - Jelmer Vernooij +Maintainer: Debian Bazaar Maintainers +Uploaders: Andrew Starr-Bochicchio Build-Depends: debhelper (>= 7.0.50~), python (>= 2.6.6-3) Build-Depends-Indep: python-bzrlib.tests | bzr (<< 2.4.0~beta1-2), bzr (>= 1.13), python-testtools -Standards-Version: 3.9.2 +Standards-Version: 3.9.4 Homepage: https://launchpad.net/bzr-grep -DM-Upload-Allowed: yes Vcs-Bzr: http://bzr.debian.org/pkg-bazaar/bzr-grep/unstable Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-bazaar/bzr-grep/unstable/files X-Python-Version: >= 2.4 +XS-Testsuite: autopkgtest Package: bzr-grep Architecture: all diff -Nru bzr-grep-0.4.0+bzr147/debian/copyright bzr-grep-0.4.0+bzr147~ppa180~quantal1/debian/copyright --- bzr-grep-0.4.0+bzr147/debian/copyright 2012-09-27 02:38:34.000000000 +0000 +++ bzr-grep-0.4.0+bzr147~ppa180~quantal1/debian/copyright 2013-08-21 22:41:23.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://dep.debian.net/deps/dep5/ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: bzr-grep Upstream-Contact: Parth Malwankar Source: https://launchpad.net/bzr-grep diff -Nru bzr-grep-0.4.0+bzr147/debian/patches/bzr2.6compat.patch bzr-grep-0.4.0+bzr147~ppa180~quantal1/debian/patches/bzr2.6compat.patch --- bzr-grep-0.4.0+bzr147/debian/patches/bzr2.6compat.patch 2012-09-27 03:11:10.000000000 +0000 +++ bzr-grep-0.4.0+bzr147~ppa180~quantal1/debian/patches/bzr2.6compat.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -Description: Update to use 'graph.iter_lefthand_ancestry' instead of - 'repo.iter_reverse_revision_history' making compatible with bzr 2.6 -Origin: commit, revision id: a.starr.b@gmail.com-20120927025317-j05donh8ffy2auzk -Author: Andrew Starr-Bochicchio - - -=== modified file 'grep.py' ---- old/grep.py 2011-12-20 16:41:55 +0000 -+++ new/grep.py 2012-09-27 02:53:17 +0000 -@@ -67,7 +67,10 @@ - def _linear_view_revisions(branch, start_rev_id, end_rev_id): - # requires that start is older than end - repo = branch.repository -- for revision_id in repo.iter_reverse_revision_history(end_rev_id): -+ graph = repo.get_graph() -+ rev_sequence = graph.iter_lefthand_ancestry(end_rev_id, -+ (_mod_revision.NULL_REVISION,)) -+ for revision_id in rev_sequence: - revno = branch.revision_id_to_dotted_revno(revision_id) - revno_str = '.'.join(str(n) for n in revno) - if revision_id == start_rev_id: - diff -Nru bzr-grep-0.4.0+bzr147/debian/patches/series bzr-grep-0.4.0+bzr147~ppa180~quantal1/debian/patches/series --- bzr-grep-0.4.0+bzr147/debian/patches/series 2012-09-27 03:10:09.000000000 +0000 +++ bzr-grep-0.4.0+bzr147~ppa180~quantal1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -bzr2.6compat.patch diff -Nru bzr-grep-0.4.0+bzr147/debian/source/format bzr-grep-0.4.0+bzr147~ppa180~quantal1/debian/source/format --- bzr-grep-0.4.0+bzr147/debian/source/format 2013-08-21 22:44:14.116467324 +0000 +++ bzr-grep-0.4.0+bzr147~ppa180~quantal1/debian/source/format 2013-08-21 22:44:14.226486530 +0000 @@ -1 +1 @@ -3.0 (quilt) +3.0 (native) diff -Nru bzr-grep-0.4.0+bzr147/debian/tests/control bzr-grep-0.4.0+bzr147~ppa180~quantal1/debian/tests/control --- bzr-grep-0.4.0+bzr147/debian/tests/control 1970-01-01 00:00:00.000000000 +0000 +++ bzr-grep-0.4.0+bzr147~ppa180~quantal1/debian/tests/control 2013-08-21 22:41:23.000000000 +0000 @@ -0,0 +1,3 @@ +Tests: testsuite +Depends: bzr, python-bzrlib.tests +Features: no-build-needed diff -Nru bzr-grep-0.4.0+bzr147/debian/tests/testsuite bzr-grep-0.4.0+bzr147~ppa180~quantal1/debian/tests/testsuite --- bzr-grep-0.4.0+bzr147/debian/tests/testsuite 1970-01-01 00:00:00.000000000 +0000 +++ bzr-grep-0.4.0+bzr147~ppa180~quantal1/debian/tests/testsuite 2013-08-21 22:41:23.000000000 +0000 @@ -0,0 +1,4 @@ +#!/bin/sh +# Note that since the installed version of the package has to be tested, +# there is no mucking about with BZR_PLUGINS_AT. +bzr selftest -s bp.grep -v --parallel=fork diff -Nru bzr-grep-0.4.0+bzr147/debian/watch bzr-grep-0.4.0+bzr147~ppa180~quantal1/debian/watch --- bzr-grep-0.4.0+bzr147/debian/watch 2012-09-27 02:38:34.000000000 +0000 +++ bzr-grep-0.4.0+bzr147~ppa180~quantal1/debian/watch 2013-08-21 22:41:23.000000000 +0000 @@ -1,2 +1,2 @@ version=3 -https://launchpad.net/bzr-grep/+download http://launchpad.net/bzr-grep/.*/bzr-grep-(.*)\.tar\.gz +http://launchpad.net/bzr-grep/+download https://launchpad.net/bzr-grep/.*/bzr-grep-(.*)\.tar\.gz