Merge lp:~canonical-platform-qa/auto-upgrade-testing/packaging into lp:auto-upgrade-testing

Proposed by Max Brustkern
Status: Merged
Merged at revision: 102
Proposed branch: lp:~canonical-platform-qa/auto-upgrade-testing/packaging
Merge into: lp:auto-upgrade-testing
Diff against target: 77 lines (+11/-11)
5 files modified
debian/changelog (+2/-2)
debian/control (+3/-3)
debian/copyright (+2/-2)
setup.py (+3/-3)
upgrade_testing/data/changelog (+1/-1)
To merge this branch: bzr merge lp:~canonical-platform-qa/auto-upgrade-testing/packaging
Reviewer Review Type Date Requested Status
Paride Legovini Approve
platform-qa-bot continuous-integration Needs Fixing
prod-platform-qa continuous-integration Pending
Review via email: mp+298331@code.launchpad.net

Commit message

Fix packaging so it installs under the correct name

Description of the change

I'd like to get a package building for this. Also, once the package building works well and runs the autopkgtests, we can add autolanding.

To post a comment you must log in.
Revision history for this message
platform-qa-bot (platform-qa-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Max Brustkern (nuclearbob) wrote :

I forgot we already had autolanding enabled. Good for us.

Revision history for this message
platform-qa-bot (platform-qa-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
platform-qa-bot (platform-qa-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
platform-qa-bot (platform-qa-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
platform-qa-bot (platform-qa-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
platform-qa-bot (platform-qa-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
platform-qa-bot (platform-qa-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
platform-qa-bot (platform-qa-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Paride Legovini (paride) wrote :

The packaging will still be outdated, but these changes are still good to be merged.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2016-02-02 02:30:07 +0000
3+++ debian/changelog 2016-06-24 17:40:48 +0000
4@@ -1,5 +1,5 @@
5 auto-upgrade-testing (0.1-1) trusty; urgency=medium
6
7- * Initial release.
8+ * Initial release. (LP: #1546699)
9
10- -- Max Brustkern <max@canonical.com> Tue, 27 Oct 2015 13:57:34 -0400
11+ -- Max Brustkern <max@canonical.com> Fri, 24 Jun 2016 13:32:34 -0400
12
13=== modified file 'debian/control'
14--- debian/control 2016-03-16 02:40:14 +0000
15+++ debian/control 2016-06-24 17:40:48 +0000
16@@ -9,9 +9,9 @@
17 python3-lxc,
18 python3-setuptools,
19 python3-yaml,
20-Standards-Version: 3.9.3
21-Homepage: https://launchpad.net/autopkgtest-upgrade-testing
22-Vcs-Bzr: https://code.launchpad.net/~auto-upgrade-testing-dev/autopkgtest-upgrade-testing/trunk
23+Standards-Version: 3.9.7
24+Homepage: https://launchpad.net/auto-upgrade-testing
25+Vcs-Bzr: https://code.launchpad.net/~canonical-platform-qa/auto-upgrade-testing/autopkgtest
26 X-Python3-Version: >= 3.3
27
28 Package: auto-upgrade-testing
29
30=== modified file 'debian/copyright'
31--- debian/copyright 2015-11-03 03:12:25 +0000
32+++ debian/copyright 2016-06-24 17:40:48 +0000
33@@ -1,6 +1,6 @@
34 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
35-Upstream-Name: autopkgtest-upgrade-testing
36-Source: http://launchpad.net/autopkgtest-upgrade-testing
37+Upstream-Name: auto-upgrade-testing
38+Source: http://launchpad.net/auto-upgrade-testing
39
40 Files: *
41 Copyright: 2015 Canonical
42
43=== modified file 'debian/tests/upgrade' (properties changed: -x to +x)
44=== modified file 'setup.py'
45--- setup.py 2015-11-05 03:12:00 +0000
46+++ setup.py 2016-06-24 17:40:48 +0000
47@@ -28,10 +28,10 @@
48
49
50 setup(
51- name='autopkgtest-upgrade-testing',
52+ name='upgrade-testing',
53 version=VERSION,
54 description='Test framework for testing system upgrades.',
55- url='https://launchpad.net/autopkgtest-upgrade-testing',
56+ url='https://launchpad.net/auto-upgrade-testing',
57 license='GPLv3',
58 packages=find_packages(),
59 package_data={
60@@ -39,7 +39,7 @@
61 },
62 entry_points={
63 'console_scripts': [
64- 'autopkgtest-upgrade-testing = upgrade_testing.command_line:main'
65+ 'auto-upgrade-testing = upgrade_testing.command_line:main'
66 ]
67 },
68 )
69
70=== modified file 'upgrade_testing/data/changelog'
71--- upgrade_testing/data/changelog 2015-11-05 02:13:18 +0000
72+++ upgrade_testing/data/changelog 2016-06-24 17:40:48 +0000
73@@ -1,4 +1,4 @@
74-autopkgtest-upgrade-testing (0.1-1) UNRELEASED; urgency=medium
75+auto-upgrade-testing (0.1-1) UNRELEASED; urgency=medium
76
77 * Initial release.
78

Subscribers

People subscribed via source and target branches