Quickly

Merge lp:~didrocks/quickly/call-copyright-option into lp:quickly

  1. call-copyright-option
  2. Merge into trunk
Proposed by Didier Roche-Tolomelli
Status: Merged
Merged at revision: 554
Proposed branch: lp:~didrocks/quickly/call-copyright-option
Merge into: lp:quickly
Diff against target: 12 lines (+1/-1)
1 file modified
data/templates/ubuntu-application/internal/packaging.py (+1/-1)
To merge this branch: bzr merge lp:~didrocks/quickly/call-copyright-option
Reviewer Review Type Date Requested Status
Michael Terry (community) Approve
Review via email: mp+38435@code.launchpad.net

Description of the change

call --force-copyright from python-mkdebian to force debian/copyright to be
generated each time (LP: #656943)

if used with previous version of python-distutils-extra, the option will be
ignored and then, the copyright file won't be updated, as before.

To post a comment you must log in.
Revision history for this message
Michael Terry (mterry) wrote :

Looks right to me. We'll have to make sure to bump required version of distutils extra.

Revision history for this message
Michael Terry (mterry) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/templates/ubuntu-application/internal/packaging.py'
2--- data/templates/ubuntu-application/internal/packaging.py 2010-09-28 12:53:04 +0000
3+++ data/templates/ubuntu-application/internal/packaging.py 2010-10-14 16:59:39 +0000
4@@ -162,7 +162,7 @@
5
6 if not changelog:
7 changelog = []
8- command = ['python-mkdebian', '--force-control']
9+ command = ['python-mkdebian', '--force-control', '--force-copyright']
10 if no_changelog:
11 command.append("--no-changelog")
12 for message in changelog:

Subscribers

People subscribed via source and target branches