From: Zdeněk Šustr <sustr4@cesnet.cz>
Date: Thu, 26 Jul 2012 08:09:29 +0000 (+0000)
Subject: Updating version, ChangeLog and copying the most recent configure from ./org.glite... 
X-Git-Tag: glite-lb-client_R_5_1_5_1~1
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=dac3da4aedca995ae1399f82c71a61b620ee702c;p=jra1mw.git

Updating version, ChangeLog and copying the most recent configure from ./org.glite.lb for v. 5.1.5-1
---

diff --git a/org.glite.lb.client/configure b/org.glite.lb.client/configure
index 007c7b2..24bfc01 100755
--- a/org.glite.lb.client/configure
+++ b/org.glite.lb.client/configure
@@ -285,6 +285,9 @@ if ($project =~ /^([^0-9]*)(.*)$/) {
 }
 %project = %{$projects{$project}};
 $project_version = $project{current_version} unless $project_version;
+if ($project ne 'emi' or $project_version <= 1) {
+	$lbmodules{'gridsite'} = [ qw/apache shared commands core devel slashgrid services service-clients gsexec/ ];
+}
 for my $platform (keys %{$project{etics_externs}}) {
 	for $_ (keys %{$project{etics_externs}{$platform}}) {
 		$etics_externs{$platform}{$_} = $project{etics_externs}{$platform}{$_};
@@ -625,6 +628,7 @@ BEGIN{
 	'gridsite.commands' => [ qw/curl:R openssl:R/ ],
 	'gridsite.apache' => [ qw/libxml2:R openssl:R curl:R/ ],
 	'gridsite.libs' => [ qw/libxml2:R openssl:R/ ],
+	'gridsite.shared' => [ qw/libxml2:R openssl:R/ ],
 	'gridsite.devel' => [ qw// ],
 	'gridsite.slashgrid' => [ qw/curl:R fuse:R/],
 	'gridsite.services' => [ qw/curl:R gsoap:R/ ],
@@ -633,7 +637,7 @@ BEGIN{
 	'gridsite.1.5-compat' => [ qw/httpd-devel:B gsoap:B globus:B curl:B doxygen:B fuse-devel:B libxml2:B openssl:B doxygen:B/ ],
 	'px.proxyrenewal' => [ qw/globus:B globus_essentials:R myproxy-devel:B voms:B libtool:B pkgconfig:B/ ],
 	'px.myproxy-config' => [ qw/myproxy-admin:R/ ], # in myproxy-config.spec
-	'canl.c' => [ qw/cares:B openssl:B libtool:B bison:B flex:B krb5-devel:B pkgconfig:B/ ],
+	'canl.c' => [ qw/cares:B openssl:B libtool:B bison:B flex:B krb5-devel:B pkgconfig:B tetex-latex:B/ ],
 );
 
 %need_jars = (
@@ -751,6 +755,7 @@ for my $jar (keys %need_jars) {
 	'gridsite.commands' => [ qw/gridsite.core:B/ ],
 	'gridsite.apache' => [ qw/gridsite.core:B/ ],
 	'gridsite.libs' => [ qw/gridsite.core:B / ],
+	'gridsite.shared' => [ qw/gridsite.core:B / ],
 	'gridsite.devel' => [ qw/gridsite.core:B/ ],
 	'gridsite.slashgrid' => [ qw/gridsite.core:B/],
 	'gridsite.services' => [ qw/gridsite.core:B/ ],
@@ -1407,43 +1412,48 @@ top_srcdir = $top_srcdir
 		}
 	}
 
-	print "Creating ${build}debian/\n" if ($debug);;
-
-	`rm -rfv  ${build}debian`;
-	mkdir $build."debian" or die $!;
-	`cp $abs_srcdir/project/debian.* ${build}debian/ 2>/dev/null`;
-	`mv ${build}debian.* ${build}debian/ 2>/dev/null`;
-	`rm -f ${build}debian/*.orig`;
-	opendir $dh, "${build}debian" || die "Can't open ${build}debian: $!";
-	for $_ (readdir $dh) {
-		if (/^debian\.(.*)/) {
-			`mv ${build}debian/$_ ${build}debian/$1`;
-			$debian = 1;
+	if ($module and -d $build."debian") {
+		print "Skipping ${build}debian/ (no rewrite in single module mode)\n" if ($debug);
+		`rm -f ${build}debian.*`;
+	} else {
+		print "Creating ${build}debian/\n" if ($debug);;
+
+		`rm -rfv  ${build}debian`;
+		mkdir $build."debian" or die $!;
+		`cp $abs_srcdir/project/debian.* ${build}debian/ 2>/dev/null`;
+		`mv ${build}debian.* ${build}debian/ 2>/dev/null`;
+		`rm -f ${build}debian/*.orig`;
+		opendir $dh, "${build}debian" || die "Can't open ${build}debian: $!";
+		for $_ (readdir $dh) {
+			if (/^debian\.(.*)/) {
+				`mv ${build}debian/$_ ${build}debian/$1`;
+				$debian = 1;
+			}
 		}
-	}
-	closedir $dh;
+		closedir $dh;
 
-	if ($debian) {
-		my ($dir, $file);
+		if ($debian) {
+			my ($dir, $file);
 
-		chmod 0755, "${build}debian/rules";
-		$file="${build}debian/docs"; if (not -f $file) { `touch $file`; }
-		$dir="${build}debian/source"; if (not -d $dir) { mkdir $dir; }
-		$file="${build}debian/source/format"; if (not -f $file) { `echo "3.0 (quilt)" > $file` }
-		$file="${build}debian/compat"; if (not -f $file) { `echo "7" > $file` }
-		$file="${build}debian/changelog"; if (not -f $file) {
-			open FH, ">$file" or die $!;
-			print FH qq{$packageName ($major.$minor.$rev-$age) unstable; urgency=low
+			chmod 0755, "${build}debian/rules";
+			$file="${build}debian/docs"; if (not -f $file) { `touch $file`; }
+			$dir="${build}debian/source"; if (not -d $dir) { mkdir $dir; }
+			$file="${build}debian/source/format"; if (not -f $file) { `echo "3.0 (quilt)" > $file` }
+			$file="${build}debian/compat"; if (not -f $file) { `echo "7" > $file` }
+			$file="${build}debian/changelog"; if (not -f $file) {
+				open FH, ">$file" or die $!;
+				print FH qq{$packageName ($major.$minor.$rev-$age) unstable; urgency=low
 
   * Automatically generated package
 
  -- $package{maintainer}  $debdate
 };
-			close FH;
-		}
+				close FH;
+			}
 
-	} else {
-		`rm -rf ${build}debian`;
+		} else {
+			`rm -rf ${build}debian`;
+		}
 	}
 }
 
@@ -1455,7 +1465,7 @@ sub mode_etics_packaging {
 	my ($workspaceDir, $srcPackageName, $srcAge, $topDir);
 
 	# old-school packaging by ETICS for EMI-1
-	if ($project eq 'emi' and $project_version == 1) { return; }
+	if ($project eq 'emi' and $project_version == 1 and $fmod ne 'gridsite.core') { return; }
 
 	if ($fmod eq 'gridsite.core') {
 		$workspaceDir = '..';
@@ -1559,7 +1569,7 @@ sub mode_etics {
 	else {
 		$conf = "$confprefix$subsys-${module}_R_${major}_${minor}_${rev}_${age}";
 # XXX: gridsite hack
-		$conftag = $subsys eq 'gridsite' ? "$project{tag_prefix}{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}" : 
+		$conftag = $subsys eq 'gridsite' ? "$project{tag_prefix}{$subsys}${subsys}_R_${major}_${minor}_${rev}" : 
 			"$project{tag_prefix}{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}_${age}";
 
 		# lowering age for older packaging
@@ -1634,7 +1644,7 @@ sub mode_etics {
 			}
 
 			$cmd{default}{configure} = "cat > Makefile.inc <<EOF
-	project = $project
+	project = $project$project_version
 	top_srcdir = ..
 	$flags
 	EOF";
diff --git a/org.glite.lb.client/project/ChangeLog b/org.glite.lb.client/project/ChangeLog
index 490e25e..f6fdbd7 100644
--- a/org.glite.lb.client/project/ChangeLog
+++ b/org.glite.lb.client/project/ChangeLog
@@ -228,3 +228,8 @@
 5.1.4-2
 - Module rebuilt
 
+5.1.5-1
+- Showing CREAM data for WMS+CREAM jobs in the job_status example
+- Fixed conditions parsing in the query_ext example
+- Avoid logging unnecessary events when registering sandbox transfers
+
diff --git a/org.glite.lb.client/project/version.properties b/org.glite.lb.client/project/version.properties
index 60bf675..812be64 100644
--- a/org.glite.lb.client/project/version.properties
+++ b/org.glite.lb.client/project/version.properties
@@ -1,3 +1,3 @@
 # $Header$
-module.version=5.1.4
-module.age=2
+module.version=5.1.5
+module.age=1