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

Proposed by Stephen M. Webb
Status: Rejected
Rejected by: Francis Ginther
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 Disapprove
PS Jenkins bot continuous-integration Approve
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.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
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

branched Desktop Unity7 projects for Saucy release

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'stacks/saucy/unity.cfg'
--- stacks/saucy/unity.cfg 2013-10-02 12:02:12 +0000
+++ stacks/saucy/unity.cfg 2013-10-10 16:17:31 +0000
@@ -45,7 +45,7 @@
45# - media # Uncomment once unity-scope-mediascanner is ready to land45# - media # Uncomment once unity-scope-mediascanner is ready to land
46 projects:46 projects:
47 compiz:47 compiz:
48 target_branch: lp:compiz/0.9.1048 target_branch: lp:compiz/saucy
49 build_timeout: 24049 build_timeout: 240
50 archive_artifacts: '**/results/**'50 archive_artifacts: '**/results/**'
51 publish_coverage: '**/results/coverage.xml'51 publish_coverage: '**/results/coverage.xml'
@@ -63,6 +63,7 @@
63 libunity:63 libunity:
64 libunity-misc:64 libunity-misc:
65 nux:65 nux:
66 target_branch: lp:nux/saucy
66 hooks: H05set_package_version D00mbs_archive B09googletests B09copy_results H10enable_coverage B10gcovr_run D10install_lcov67 hooks: H05set_package_version D00mbs_archive B09googletests B09copy_results H10enable_coverage B10gcovr_run D10install_lcov
67 archive_artifacts: '**/results/**'68 archive_artifacts: '**/results/**'
68 publish_coverage: '**/results/coverage.xml'69 publish_coverage: '**/results/coverage.xml'
@@ -71,6 +72,7 @@
71 saucy-armhf:72 saucy-armhf:
72 hooks: H05set_package_version D00mbs_archive B09googletests B09copy_results73 hooks: H05set_package_version D00mbs_archive B09googletests B09copy_results
73 unity:74 unity:
75 target_branch: lp:unity/7.1
74 build_timeout: 24076 build_timeout: 240
75 hooks: H05set_package_version D00mbs_archive D10install_google_test H10enable_coverage B10gcovr_run B09googletests B09copy_results77 hooks: H05set_package_version D00mbs_archive D10install_google_test H10enable_coverage B10gcovr_run B09googletests B09copy_results
76 archive_artifacts: '**/results/**'78 archive_artifacts: '**/results/**'
@@ -80,6 +82,7 @@
80 saucy-armhf:82 saucy-armhf:
81 hooks: H05set_package_version D00mbs_archive D10install_google_test B09googletests B09copy_results83 hooks: H05set_package_version D00mbs_archive D10install_google_test B09googletests B09copy_results
82 unity-asset-pool:84 unity-asset-pool:
85 target_branch: lp:unity-asset-pool/saucy
83 unity-lens-applications:86 unity-lens-applications:
84 hooks: H05set_package_version D00mbs_archive B09copy_results H10enable_coverage B10gcovr_run D10install_lcov87 hooks: H05set_package_version D00mbs_archive B09copy_results H10enable_coverage B10gcovr_run D10install_lcov
85 configurations:88 configurations:

Subscribers

People subscribed via source and target branches

to all changes: