~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to Makefile

Committer: Leonard Richardson
Date: 2011-03-23 16:28:51 UTC
mfrom: (12651 devel)
mto: This revision was merged to the branch mainline in revision 12658.
Revision ID: leonard.richardson@canonical.com-20110323162851-01ufg6po3a2uyspm

Merge from trunk and resolve mysterious conflicts.

files added:
cronscripts/distroseriesdifference_job.py

lib/canonical/launchpad/icing/sprite.css.in

lib/lp/app/browser/tests/test_inlinemulticheckboxwidget.py

lib/lp/app/javascript/multicheckbox.js

lib/lp/app/javascript/tests/test_multicheckboxwidget.html

lib/lp/app/javascript/tests/test_multicheckboxwidget.js

lib/lp/app/templates/inline-multicheckbox-widget.pt

lib/lp/code/windmill/tests/test_recipe_inline_distroseries_edit.py

files removed:
lib/lp/soyuz/interfaces/distroseriesdifferencejob.py

files renamed:
lib/canonical/launchpad/icing/style-3-0.css.in => lib/canonical/launchpad/icing/style-3-0.css

files modified:
Makefile

buildout-templates/bin/combine-css.in

buildout-templates/bin/sprite-util.in

configs/development/launchpad-lazr.conf

database/schema/security.cfg

lib/canonical/config/schema-lazr.conf

lib/canonical/launchpad/components/decoratedresultset.py

lib/lp/app/browser/lazrjs.py

lib/lp/app/doc/lazr-js-widgets.txt

lib/lp/app/templates/base-layout-macros.pt

lib/lp/bugs/browser/bug.py

lib/lp/bugs/browser/bugalsoaffects.py

lib/lp/bugs/browser/bugtask.py

lib/lp/bugs/browser/tests/test_bugtask.py

lib/lp/bugs/javascript/bugtask_index_portlets.js

lib/lp/bugs/mail/bugnotificationbuilder.py

lib/lp/bugs/mail/tests/test_bugnotificationbuilder.py

lib/lp/bugs/model/bug.py

lib/lp/bugs/model/bugtask.py

lib/lp/bugs/scripts/bugnotification.py

lib/lp/bugs/scripts/tests/test_bugnotification.py

lib/lp/bugs/tests/test_bugchanges.py

lib/lp/bugs/tests/test_bugvisibility.py

lib/lp/code/browser/sourcepackagerecipe.py

lib/lp/code/browser/tests/test_sourcepackagerecipe.py

lib/lp/code/configure.zcml

lib/lp/code/interfaces/branch.py

lib/lp/code/interfaces/sourcepackagerecipe.py

lib/lp/code/javascript/requestbuild_overlay.js

lib/lp/code/model/branch.py

lib/lp/code/model/branchcollection.py

lib/lp/code/model/branchmergeproposal.py

lib/lp/code/model/sourcepackagerecipe.py

lib/lp/code/model/tests/test_branch.py

lib/lp/code/templates/sourcepackagerecipe-index.pt

lib/lp/code/templates/sourcepackagerecipe-new.pt

lib/lp/code/templates/sourcepackagerecipe-request-builds.pt

lib/lp/code/windmill/tests/test_recipe_request_build.py

lib/lp/registry/interfaces/person.py

lib/lp/registry/interfaces/product.py

lib/lp/registry/model/distroseries.py

lib/lp/registry/model/person.py

lib/lp/registry/model/product.py

lib/lp/services/database/bulk.py

lib/lp/services/features/__init__.py

lib/lp/services/scripts/base.py

lib/lp/services/scripts/tests/test_feature_controller.py

lib/lp/soyuz/configure.zcml

lib/lp/soyuz/doc/distroseriesqueue-translations.txt

lib/lp/soyuz/interfaces/distributionjob.py

lib/lp/soyuz/interfaces/queue.py

lib/lp/soyuz/model/archive.py

lib/lp/soyuz/model/distroseriesdifferencejob.py

lib/lp/soyuz/model/publishing.py

lib/lp/soyuz/model/queue.py

lib/lp/soyuz/model/sourcepackagerelease.py

lib/lp/soyuz/tests/test_distroseriesdifferencejob.py

lib/lp/soyuz/tests/test_sourcepackagerelease.py

lib/lp/testing/__init__.py

lib/lp/testing/tests/test_testing.py

versions.cfg

Show diffs side-by-side

added added

removed removed

Makefile

154

css_combine: sprite_css bin/combine-css

155

${SHHH} bin/combine-css

156

157

sprite_css: ${LP_BUILT_JS_ROOT}/style-3-0.css

157

sprite_css: ${LP_BUILT_JS_ROOT}/sprite.css

158

159

${LP_BUILT_JS_ROOT}/style-3-0.css: bin/sprite-util ${ICING}/style-3-0.css.in ${ICING}/icon-sprites.positioning

159

${LP_BUILT_JS_ROOT}/sprite.css: bin/sprite-util ${ICING}/sprite.css.in ${ICING}/icon-sprites.positioning

160

${SHHH} bin/sprite-util create-css

161

162

sprite_image:

Older »