zorba-coders team mailing list archive

[Chris Hillery <chillery+launchpad@xxxxxxxxx>]

Chris Hillery has proposed merging lp:~zorba-coders/zorba/bump-2.6 into lp:zorba.

Requested reviews:
  Chris Hillery (ceejatec)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bump-2.6/+merge/118625
-- 
https://code.launchpad.net/~zorba-coders/zorba/bump-2.6/+merge/118625
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-07-24 08:48:48 +0000
+++ CMakeLists.txt	2012-08-07 19:55:24 +0000
@@ -474,7 +474,7 @@
 
 # zorba versioning
 SET(ZORBA_MAJOR_NUMBER "2")
-SET(ZORBA_MINOR_NUMBER "5")
+SET(ZORBA_MINOR_NUMBER "6")
 SET(ZORBA_PATCH_NUMBER "0")
 SET(ZORBA_VERSION ${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER})
 MESSAGE(STATUS "Zorba version number: ${ZORBA_VERSION}")

=== modified file 'NOTICE.txt'
--- NOTICE.txt	2012-08-06 17:19:02 +0000
+++ NOTICE.txt	2012-08-07 19:55:24 +0000
@@ -1,5 +1,5 @@
 -----------
-Zorba 2.5.0
+Zorba 2.6.0
 -----------
 
 (Note: This file is generated automatically from NOTICE.xml.

=== modified file 'modules/ExternalModules.conf'
--- modules/ExternalModules.conf	2012-08-04 06:12:48 +0000
+++ modules/ExternalModules.conf	2012-08-07 19:55:24 +0000
@@ -26,23 +26,23 @@
 #   "tag" is the VCS tag to check out (optional - defaults to HEAD;
 #       currently only works for bzr, since svn tags are just different URLS)
 
-csv             bzr  lp:zorba/csv-module
-data-cleaning   bzr  lp:zorba/data-cleaning-module    zorba-2.5
-data-formatting bzr  lp:zorba/data-formatting-module  zorba-2.5
-excel           bzr  lp:zorba/excel-module            zorba-2.5
-geo             bzr  lp:zorba/geo-module              zorba-2.5
-graphviz        bzr  lp:zorba/graphviz-module
-html            bzr  lp:zorba/html-module
-http-client     bzr  lp:zorba/http-client-module
-image           bzr  lp:zorba/image-module
-languages       bzr  lp:zorba/languages-module        zorba-2.5
-oauth           bzr  lp:zorba/oauth-module
-process         bzr  lp:zorba/process-module          zorba-2.5
-security        bzr  lp:zorba/security-module         zorba-2.5
-system          bzr  lp:zorba/system-module           zorba-2.5
-xqxq            bzr  lp:zorba/xqxq-module             zorba-2.5
-email           bzr  lp:zorba/email-module            zorba-2.5
-util-jvm        bzr  lp:zorba/util-jvm-module         zorba-2.5
-schema-tools    bzr  lp:zorba/schema-tools-module     zorba-2.5
-stack           bzr  lp:zorba/stack-module            zorba-2.5
-queue           bzr  lp:zorba/queue-module            zorba-2.5
+csv             bzr  lp:zorba/csv-module              zorba-2.6
+data-cleaning   bzr  lp:zorba/data-cleaning-module    zorba-2.6
+data-formatting bzr  lp:zorba/data-formatting-module  zorba-2.6
+excel           bzr  lp:zorba/excel-module            zorba-2.6
+geo             bzr  lp:zorba/geo-module              zorba-2.6
+graphviz        bzr  lp:zorba/graphviz-module         zorba-2.6
+html            bzr  lp:zorba/html-module             zorba-2.6
+http-client     bzr  lp:zorba/http-client-module      zorba-2.6
+image           bzr  lp:zorba/image-module            zorba-2.6
+languages       bzr  lp:zorba/languages-module        zorba-2.6
+oauth           bzr  lp:zorba/oauth-module            zorba-2.6
+process         bzr  lp:zorba/process-module          zorba-2.6
+security        bzr  lp:zorba/security-module         zorba-2.6
+system          bzr  lp:zorba/system-module           zorba-2.6
+xqxq            bzr  lp:zorba/xqxq-module             zorba-2.6
+email           bzr  lp:zorba/email-module            zorba-2.6
+util-jvm        bzr  lp:zorba/util-jvm-module         zorba-2.6
+schema-tools    bzr  lp:zorba/schema-tools-module     zorba-2.6
+stack           bzr  lp:zorba/stack-module            zorba-2.6
+queue           bzr  lp:zorba/queue-module            zorba-2.6