lp:~jelmer/bzr-builddeb/distributionbranch-upstream-cleanup
- Get this branch:
- bzr branch lp:~jelmer/bzr-builddeb/distributionbranch-upstream-cleanup
Branch merges
- James Westby: Approve
-
Diff: 664 lines (+106/-112)6 files modifiedcmds.py (+4/-4)
dh_make.py (+1/-1)
import_dsc.py (+80/-86)
merge_package.py (+2/-2)
tests/blackbox/test_merge_upstream.py (+1/-1)
tests/test_import_dsc.py (+18/-18)
Branch information
Recent revisions
- 568. By Jelmer Vernooij
-
Merge fix to cope with native packages with dashes in the version in AptSource.
- 566. By Max Bowsher
-
When attempting to import a package with multiple upstream tarballs, raise
MultipleUpstreamTarballsNotSup ported rather than AssertionError. - 565. By Jelmer Vernooij
-
Merge jr's hook for automatically setting the changelog and setting bug revision properties based on debian/changelog.
- 564. By Max Bowsher
-
Mend inconsistencies where different indent widths are used at different points
within a single Python source file. I've not attempted to produce consistency
across the project, just ensure each file is internally consistent. - 562. By Max Bowsher
-
Fix overly permissive determination of whether another branch in a
DistributionBranchSet can be pulled into the current one. This could result in
revisions being removed from an Ubuntu branch to make it identical to a Debian
branch, when importing a synced package version.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:bzr-builddeb