Merge lp:~blueyed/bzr-builddeb/minor-fix into lp:~bzr-builddeb-hackers/bzr-builddeb/trunk-old

[Daniel Hahler]

[lp:~blueyed/bzr-builddeb/minor-fix]

235. By James Westby on 2008-07-08

Add support for importing native packages.

Native packages can be imported. A native package version is indicated
by "deb-native = True" being set as a revision property.

236. By James Westby on 2008-07-11

Only access the branch of other DistributionBranch, not the tree.

This allows them to be remote, or have no tree.

To do this we make them have .branch as primary object, not .tree,
and then never access .tree from another DistributionBranch.

.tree is then optional, and required if you actually want to do
any importing to the DistributionBranch.

There may be a better way to do the errors and enforce this, perhaps
through subclassing.

237. By James Westby on 2008-07-11

Don't override the tip of a branch when importing.

When a sync happens the changelog doesn't show the history
of Ubuntu changes, but we want to keep the history, so don't
overwrite the last_revision in this case.

238. By James Westby on 2008-07-11

Don't use strict changelog parsing.

239. By James Westby on 2008-07-11

Fix up tests to work with new version of changelog.py

240. By James Westby on 2008-07-11

Fix starting an upstream branch from another.

This problem was caused by making .upstream_tree optional.

241. By James Westby on 2008-07-14

Add an XFAIL test for importing parallel branches.

242. By James Westby on 2008-07-14

Don't try and commit with no parents if it's not the initial commit.

If a sync was done from Debian then history was dropped from the changelog,
this means that it can't determine any parents and so asks for none, it
should just use the current tip as a parent. (LP: #248440)

243. By James Westby on 2008-07-24

Initial support for transitioning from native to non-native and back.

244. By James Westby on 2008-07-30

Handle more transitions between native and non-native.

245. By James Westby on 2008-07-30

Remove debugging print statement.

246. By James Westby on 2008-07-30

Fix bad merge that caused a test to fail.

247. By James Westby on 2008-08-26

Use standard locations for the directories.

We still use ../build-area for the building so as not to clobber
anything, but it uses .. for the tarballs and result directories.

This makes the workflow much more standard and less surprising.

248. By James Westby on 2008-08-26

Fallback to ../tarballs when looking for .orig.tar.gz.

Using .. as the default now may cause some people's setups to break,
and so this compatibility code should keep them working.

249. By James Westby on 2008-08-26

Make moving a source result work.

The result moving code assumed that the resulting changes file
would be $arch.changes, but in -S mode it is source.changes.

This will fail if the user sets a source builder as the main or
quick builders.

250. By James Westby on 2008-08-27

Don't try and look for .changes file with the epoch in the name.

251. By James Westby on 2008-08-27

Add a mark-uploaded command that sets the relevant tag.

252. By James Westby on 2008-08-27

Merge trunk features.

253. By James Westby on 2008-08-27

Squash remaining references to ../tarballs.

254. By James Westby on 2008-08-27

Switch to DistributionBranch for merge-upstream.

255. By James Westby on 2008-08-27

Port import-dsc to DistributionBranch.

The internal tests still need porting, but there is a lot
duplicated with the DistributionBranch tests.

256. By James Westby on 2008-08-27

Make merge-upstream in an empty branch work.

It simply ends up doing "bzr import", "bzr tag".

257. By James Westby on 2008-08-27

Update the docs for the new behaviour of import-dsc and merge-upstream

258. By James Westby on 2008-08-27

Also record the native status in the working tree when using DistributionBranch.

259. By James Westby on 2008-08-27

Switch back to options for import-dsc and merge-upstream.

260. By James Westby on 2008-08-27

Copyright updates

261. By James Westby on 2008-08-27

Update debian/changelog and add debian/NEWS warning about the breaks.

262. By James Westby on 2008-08-27

Fix test failure fallout.

263. By James Westby on 2008-08-27

Version bump.

264. By James Westby on 2008-08-27

Correct the changelog header for experimental.

265. By James Westby on 2008-08-28

Post-release version bump.

266. By James Westby on 2008-08-28

* Fix retrieval of the upstream source from a watch file of the archive.
  - It would download to the specified tarball directory, but then
    report it as stored in the compatibility directory.

267. By James Westby on 2008-08-28

Start the 2.1 branch.

[James Westby (james-w)]

Hi Daniel,

Sorry it took me so long to get to this. I have just merged it to trunk, but
I took a different approach for doing the repacking. If you could test it that
would be great.

Thanks,

James

review: Approve

[Daniel Hahler (blueyed)]

Could not find it in trunk (http://bazaar.launchpad.net/~bzr-builddeb-hackers/bzr-builddeb/trunk/annotate/267?file_id=repack_tarball.py-20070623103032-17pnzojnvch8hgd8-1)..

[James Westby (james-w)]

On Fri, 2008-08-29 at 16:32 +0000, Daniel Hahler wrote:
> Could not find it in trunk (http://bazaar.launchpad.net/~bzr-builddeb-hackers/bzr-builddeb/trunk/annotate/267?file_id=repack_tarball.py-20070623103032-17pnzojnvch8hgd8-1)..

Hi,

It's not mirrored yet. The branch actually lives at

  http://bzr.debian.org/pkg-bazaar/bzr-builddeb/trunk

It says it will mirror it next in one hour.

Thanks,

James

[lp:~blueyed/bzr-builddeb/minor-fix]

268. By James Westby on 2008-08-29

Add support for repacking zip files. Thanks Daniel Hahler.

I'm not convinced that I have the conversion exactly right, but
zip files seem pretty horrible.

269. By James Westby on 2008-08-29

Merge the changes to 2.0.