"Forgotten" merge from branch_2_1 to HEAD. Only ChangeLogs are trully affected, though.

diff --git a/org.glite.lbjp-common.db/configure b/org.glite.lbjp-common.db/configure
index 3258454..a8e7b09 100755 (executable)
--- a/org.glite.lbjp-common.db/configure
+++ b/org.glite.lbjp-common.db/configure
@@ -735,8 +735,14 @@ BEGIN{
                gridsite=>'emi.gridsite.shared',
                yaim_core=>'emi.yaim.yaim-core'
        );
+       %etics_externs_emi = (
+               globus_essentials=>'globus-gssapi-gsi',
+               globus=>'globus-gssapi-gsi-devel',
+               gridsite=>'emi.gridsite.shared',
+               yaim_core=>'emi.yaim.yaim-core'
+       );
        %etics_projects = (
-               vdt=>[qw/globus globus_essentials myproxy/],
+               vdt=>[qw/globus globus_essentials/],
                'org.glite'=>[qw/voms gridsite lcas gpt gip_release gip_service bdii glite_version glite_info_templates glue_schema yaim_core/],
        );
        %etics_projects_emi = (

diff --git a/org.glite.lbjp-common.db/project/ChangeLog b/org.glite.lbjp-common.db/project/ChangeLog
index 1bb011a..a31b4b1 100644 (file)
--- a/org.glite.lbjp-common.db/project/ChangeLog
+++ b/org.glite.lbjp-common.db/project/ChangeLog
@@ -63,6 +63,15 @@
 2.0.4-3
 - Module rebuilt
 
+2.0.5-1
+- Fixed build-time warnings in logging calls
+
+2.0.5-2
+- Module rebuilt
+
+2.0.5-3
+- Module rebuilt
+
 3.0.0-1
 - Fixes for parallel release in EMI & gLite
 - Notice allocation failures in database fetch.

diff --git a/org.glite.lbjp-common.jp-interface/project/ChangeLog b/org.glite.lbjp-common.jp-interface/project/ChangeLog
index 2004674..4879b04 100644 (file)
--- a/org.glite.lbjp-common.jp-interface/project/ChangeLog
+++ b/org.glite.lbjp-common.jp-interface/project/ChangeLog
@@ -35,6 +35,12 @@
 2.0.3-1
 - Makefile a configuration updated to work across org.glite & EMI
 
+2.0.3-2
+- Module rebuilt
+
+2.0.3-3
+- Module rebuilt
+
 2.1.0-1
 - Fixes for parallel release in EMI & gLite
 

diff --git a/org.glite.lbjp-common.log/configure b/org.glite.lbjp-common.log/configure
index 3258454..a8e7b09 100755 (executable)
--- a/org.glite.lbjp-common.log/configure
+++ b/org.glite.lbjp-common.log/configure
@@ -735,8 +735,14 @@ BEGIN{
                gridsite=>'emi.gridsite.shared',
                yaim_core=>'emi.yaim.yaim-core'
        );
+       %etics_externs_emi = (
+               globus_essentials=>'globus-gssapi-gsi',
+               globus=>'globus-gssapi-gsi-devel',
+               gridsite=>'emi.gridsite.shared',
+               yaim_core=>'emi.yaim.yaim-core'
+       );
        %etics_projects = (
-               vdt=>[qw/globus globus_essentials myproxy/],
+               vdt=>[qw/globus globus_essentials/],
                'org.glite'=>[qw/voms gridsite lcas gpt gip_release gip_service bdii glite_version glite_info_templates glue_schema yaim_core/],
        );
        %etics_projects_emi = (

diff --git a/org.glite.lbjp-common.log/project/ChangeLog b/org.glite.lbjp-common.log/project/ChangeLog
index 44df683..f7972d1 100644 (file)
--- a/org.glite.lbjp-common.log/project/ChangeLog
+++ b/org.glite.lbjp-common.log/project/ChangeLog
@@ -21,6 +21,17 @@
 1.0.4-1
 - Makefile adopts compilation and linking flags from the environment.
 
+1.0.5-1
+- Increase message size -- syslog can use it (RFC #3164).
+- Workaround for a bug in log4c included in configuration (non-zero buffer required)
+- Fixes to build-time warnings in logging calls
+
+1.0.5-2
+- Module rebuilt
+
+1.0.5-3
+- Module rebuilt
+
 1.1.0-1
 - Fixes for parallel release in EMI & gLite
 

diff --git a/org.glite.lbjp-common.log/project/version.properties b/org.glite.lbjp-common.log/project/version.properties
index d560267..556297d 100644 (file)
--- a/org.glite.lbjp-common.log/project/version.properties
+++ b/org.glite.lbjp-common.log/project/version.properties
@@ -1,4 +1,3 @@
 # $Header$
 module.version=1.1.0
 module.age=1
-

diff --git a/org.glite.lbjp-common.maildir/project/ChangeLog b/org.glite.lbjp-common.maildir/project/ChangeLog
index 0b0556f..768b815 100644 (file)
--- a/org.glite.lbjp-common.maildir/project/ChangeLog
+++ b/org.glite.lbjp-common.maildir/project/ChangeLog
@@ -26,6 +26,12 @@
 2.0.2-1
 - Makefile adopts compilation and linking flags from the environment.
 
+2.0.2-2
+- Module rebuilt
+
+2.0.2-3
+- Module rebuilt
+
 2.1.0-1
 - Fixes for parallel release in EMI & gLite
 

diff --git a/org.glite.lbjp-common.server-bones/project/ChangeLog b/org.glite.lbjp-common.server-bones/project/ChangeLog
index 4052669..59b3f2b 100644 (file)
--- a/org.glite.lbjp-common.server-bones/project/ChangeLog
+++ b/org.glite.lbjp-common.server-bones/project/ChangeLog
@@ -30,6 +30,12 @@
 - Makefile adopts compilation and linking flags from the environment.
 - Memory handling fixes
 
+2.0.3-1
+- Fixed build-time warnings in logging calls
+
+2.0.3-2
+- Module rebuilt
+
 2.1.0-1
 - Documentation update and cleanup
 - Fixes for parallel release in EMI & gLite

diff --git a/org.glite.lbjp-common.trio/project/ChangeLog b/org.glite.lbjp-common.trio/project/ChangeLog
index 24672a6..dab92d7 100644 (file)
--- a/org.glite.lbjp-common.trio/project/ChangeLog
+++ b/org.glite.lbjp-common.trio/project/ChangeLog
@@ -35,6 +35,12 @@
 2.0.3-1
 - Makefile adopts compilation and linking flags from the environment.
 
+2.0.3-2
+- Module rebuilt
+
+2.0.3-3
+- Module rebuilt
+
 2.1.0-1
 - Fixes for parallel release in EMI & gLite