Zorba

Merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba

  1. bug-fixing
  2. Merge into trunk
Proposed by Matthias Brantner
Status: Merged
Approved by: Matthias Brantner
Approved revision: no longer in the source branch.
Merged at revision: 10579
Proposed branch: lp:~matthias-brantner/zorba/bug-fixing
Merge into: lp:zorba
Diff against target: 12 lines (+1/-1)
1 file modified
CPackSourceConfig.cmake.in (+1/-1)
To merge this branch: bzr merge lp:~matthias-brantner/zorba/bug-fixing
Reviewer Review Type Date Requested Status
Cezar Andrei Approve
Matthias Brantner Approve
Review via email: mp+85047@code.launchpad.net

Commit message

exclude .bzr dir from source packages

Description of the change

exclude .bzr dir from source packages

To post a comment you must log in.
Revision history for this message
Matthias Brantner (matthias-brantner) :
review: Approve
Revision history for this message
Cezar Andrei (cezar-andrei) wrote :

looks good.

review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-fixing-2011-12-09T00-07-22.351Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

The attempt to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:272 (message):
  Validation queue job bug-fixing-2011-12-09T00-07-22.351Z is finished. The
  final status was:

  1 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-fixing-2011-12-09T00-34-01.746Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job bug-fixing-2011-12-09T00-34-01.746Z is finished. The final status was:

All tests succeeded!

lp:~matthias-brantner/zorba/bug-fixing updated
10579. By Matthias Brantner

exclude .bzr dir from source packages Approved: Cezar Andrei, Matthias Brantner

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CPackSourceConfig.cmake.in'
2--- CPackSourceConfig.cmake.in 2009-10-30 16:24:51 +0000
3+++ CPackSourceConfig.cmake.in 2011-12-08 23:07:26 +0000
4@@ -19,7 +19,7 @@
5
6 SET(CPACK_CMAKE_GENERATOR "Unix Makefiles")
7 SET(CPACK_GENERATOR "TGZ;TZ")
8-SET(CPACK_IGNORE_FILES "test/coverity/;dist/;_CPack_Packages/;build/;build./;CVS/;/\\.svn/;\\.swp$;\\.#;/#")
9+SET(CPACK_IGNORE_FILES "test/coverity/;dist/;_CPack_Packages/;build/;build./;CVS/;/\\.svn/;\\.swp$;\\.#;/#;\\.bzr/")
10 SET(CPACK_INSTALLED_DIRECTORIES "@CMAKE_SOURCE_DIR@;/")
11 SET(CPACK_INSTALL_CMAKE_PROJECTS "")
12 SET(CPACK_MODULE_PATH "")

Subscribers

People subscribed via source and target branches