Merge lp:~bregma/cupstream2distro-config/branch-unity7-for-saucy into lp:cupstream2distro-config

Proposed by Stephen M. Webb on 2013-10-10
Status: Rejected
Rejected by: Francis Ginther on 2013-12-02
Proposed branch: lp:~bregma/cupstream2distro-config/branch-unity7-for-saucy
Merge into: lp:cupstream2distro-config
Diff against target: 36 lines (+4/-1)
1 file modified
stacks/saucy/unity.cfg (+4/-1)
To merge this branch: bzr merge lp:~bregma/cupstream2distro-config/branch-unity7-for-saucy
Reviewer Review Type Date Requested Status
Francis Ginther 2013-10-10 Disapprove on 2013-12-02
PS Jenkins bot continuous-integration Approve on 2013-10-10
Review via email: mp+190409@code.launchpad.net

Commit message

branched Unity7 stack for Saucy

Description of the change

The base Unity7 projects have branched in preparation for Ubuntu 13.10 (Saucy Salamander) release. This change updates the cupstream2distro config for Saucy to match.

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Francis Ginther (fginther) wrote :

All of these changes have been incorporated into lp:cupstream2distro-config as of revision 931. No need to process this MP.

review: Disapprove

Unmerged revisions

847. By Stephen M. Webb on 2013-10-10

branched Desktop Unity7 projects for Saucy release

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'stacks/saucy/unity.cfg'
2--- stacks/saucy/unity.cfg 2013-10-02 12:02:12 +0000
3+++ stacks/saucy/unity.cfg 2013-10-10 16:17:31 +0000
4@@ -45,7 +45,7 @@
5 # - media # Uncomment once unity-scope-mediascanner is ready to land
6 projects:
7 compiz:
8- target_branch: lp:compiz/0.9.10
9+ target_branch: lp:compiz/saucy
10 build_timeout: 240
11 archive_artifacts: '**/results/**'
12 publish_coverage: '**/results/coverage.xml'
13@@ -63,6 +63,7 @@
14 libunity:
15 libunity-misc:
16 nux:
17+ target_branch: lp:nux/saucy
18 hooks: H05set_package_version D00mbs_archive B09googletests B09copy_results H10enable_coverage B10gcovr_run D10install_lcov
19 archive_artifacts: '**/results/**'
20 publish_coverage: '**/results/coverage.xml'
21@@ -71,6 +72,7 @@
22 saucy-armhf:
23 hooks: H05set_package_version D00mbs_archive B09googletests B09copy_results
24 unity:
25+ target_branch: lp:unity/7.1
26 build_timeout: 240
27 hooks: H05set_package_version D00mbs_archive D10install_google_test H10enable_coverage B10gcovr_run B09googletests B09copy_results
28 archive_artifacts: '**/results/**'
29@@ -80,6 +82,7 @@
30 saucy-armhf:
31 hooks: H05set_package_version D00mbs_archive D10install_google_test B09googletests B09copy_results
32 unity-asset-pool:
33+ target_branch: lp:unity-asset-pool/saucy
34 unity-lens-applications:
35 hooks: H05set_package_version D00mbs_archive B09copy_results H10enable_coverage B10gcovr_run D10install_lcov
36 configurations:

Subscribers

People subscribed via source and target branches

to all changes: