[Pkg-grid-commits] gpt/debian/patches 00list, NONE, 1.1 01_globus_package_dtd.dpatch, NONE, 1.1 02_gpt_globus395.dpatch, NONE, 1.1 03_gpt_setupdir.dpatch, NONE, 1.1

[Steffen Möller]

Update of /cvsroot/pkg-grid/gpt/debian/patches
In directory alioth:/tmp/cvs-serv16994/debian/patches

Added Files:
	00list 01_globus_package_dtd.dpatch 02_gpt_globus395.dpatch 
	03_gpt_setupdir.dpatch 
Log Message:
Changes to the gpt release to serve as input for cvs/dpkg-buildpackage,
first cvs upload. Patches and some lines of the debian/rules files come
the source RPM of the NordGrid GPT package.


--- NEW FILE: 01_globus_package_dtd.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 01_globus_package_dtd.dpatch by  <moeller at inb.uni-luebeck.de>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Small change to the DTD, was created from the patch of
## DP: Anders Wäänänen who prepared the RPMs.

@DPATCH@

diff -ur gpt-3.2.shipped/packaging_tools/etc/globus_package.dtd gpt-3.2/packaging_tools/etc/globus_package.dtd
--- gpt-3.2.shipped/packaging_tools/etc/globus_package.dtd	2004-05-20 19:42:17.000000000 +0200
+++ gpt-3.2/packaging_tools/etc/globus_package.dtd	2005-03-18 18:20:01.000000000 +0100
@@ -148,8 +148,8 @@
 <!ELEMENT Environment (Cflags?, 
                              PackageLibs?, 
                              ExternalLibs?, 
-                             ExternalIncludes?
-                             Variable?
+                             ExternalIncludes?,
+                             Variable?,
                              SourcedFile?
                       )>
 <!ELEMENT Cflags (#PCDATA)>
@@ -162,7 +162,7 @@
 <!ATTLIST SourcedFile Shell (sh | csh) #REQUIRED>
 
 <!ELEMENT Build_Instructions (Build_Step*, flavor_choice*)>
-<!ATTLIST Build_Instructions SrcDir CDATA>
+<!ATTLIST Build_Instructions SrcDir CDATA #REQUIRED>
 
 <!ELEMENT Build_Step (#PCDATA)>
 <!ATTLIST Build_Step

--- NEW FILE: 00list ---
01_globus_package_dtd.dpatch
02_gpt_globus395.dpatch
03_gpt_setupdir.dpatch

--- NEW FILE: 02_gpt_globus395.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 02_gpt_globus395.dpatch by  <moeller at inb.uni-luebeck.de>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Just took the patch of Anders for his RPMs without much thinking.

@DPATCH@

diff -ur gpt-3.2/packaging_tools/etc/gpt_autoconf_macros.m4 gpt-3.2autotools2004/packaging_tools/etc/gpt_autoconf_macros.m4
--- gpt-3.2/packaging_tools/etc/gpt_autoconf_macros.m4	2004-05-20 19:42:17.000000000 +0200
+++ gpt-3.2autotools2004/packaging_tools/etc/gpt_autoconf_macros.m4	2004-05-26 22:49:26.000000000 +0200
@@ -1,5 +1,5 @@
 dnl GPT_INIT()
-AC_DEFUN(GPT_INIT, [
+AC_DEFUN([GPT_INIT], [
         if test "x$GPT_LOCATION" = "x"; then
                 echo "ERROR Please specify GPT_LOCATION" >&2
                 exit 1
@@ -99,20 +99,20 @@
 	AC_SUBST(builddir)
 ])
 
-AC_DEFUN(GPT_SET_CFLAGS, [
+AC_DEFUN([GPT_SET_CFLAGS], [
 	GPT_CFLAGS_TMP=$1
 	GPT_CFLAGS="$GPT_CFLAGS_TMP $GPT_CFLAGS"
 	GPT_PKG_CFLAGS="$GPT_CFLAGS_TMP $GPT_PKG_CFLAGS"
 ])
 
-AC_DEFUN(GPT_SET_INCLUDES, [
+AC_DEFUN([GPT_SET_INCLUDES], [
 
 	GPT_INCLUDES_TMP=$1
 	GPT_EXTERNAL_INCLUDES="$GPT_EXTERNAL_INCLUDES $GPT_INCLUDES_TMP"
 	GPT_INCLUDES="$GPT_INCLUDES_TMP $GPT_INCLUDES"
 ])
 
-AC_DEFUN(GPT_SET_LIBS, [
+AC_DEFUN([GPT_SET_LIBS], [
 
 	GPT_LIBS_TMP=$1
 	GPT_EXTERNAL_LIBS="$GPT_EXTERNAL_LIBS $GPT_LIBS_TMP"
@@ -120,7 +120,7 @@
 	GPT_PGM_LINKS=" $GPT_PGM_LINKS $GPT_LIBS_TMP"
 ])
 
-AC_DEFUN(GPT_SET_LDFLAGS, [
+AC_DEFUN([GPT_SET_LDFLAGS], [
  
          GPT_LDFLAGS_TMP=$1
 	 GPT_EXTERNAL_LDFLAGS="$GPT_EXTERNAL_LDFLAGS $GPT_LDFLAGS_TMP"
diff -ur gpt-3.2/packaging_tools/perl/GPT/PkgMngmt/FlavorMacros.pm gpt-3.2autotools2004/packaging_tools/perl/GPT/PkgMngmt/FlavorMacros.pm
--- gpt-3.2/packaging_tools/perl/GPT/PkgMngmt/FlavorMacros.pm	2004-05-20 19:42:17.000000000 +0200
+++ gpt-3.2autotools2004/packaging_tools/perl/GPT/PkgMngmt/FlavorMacros.pm	2004-05-26 22:43:51.000000000 +0200
@@ -92,7 +92,6 @@
 #      print "VAR: CXX = $cxxvalue\n";
       $macros{"$ {flavor}_CXX_GPTMACRO"} = "CXX=$cxxvalue; export CXX;";
       $macros{"$ {flavor}_CXX_VALUE_GPTMACRO"} = "$cxxvalue";
-      $core_envs .= $macros{"$ {flavor}_CXX_GPTMACRO"} . " ";
       $me->{'macrolist'}->{'CXX_GPTMACRO'}++;
     }
 
diff -ur gpt-3.2/packaging_tools/perl/GPT/V1/FlavorDefinition.pm gpt-3.2autotools2004/packaging_tools/perl/GPT/V1/FlavorDefinition.pm
--- gpt-3.2/packaging_tools/perl/GPT/V1/FlavorDefinition.pm	2004-05-20 19:42:17.000000000 +0200
+++ gpt-3.2autotools2004/packaging_tools/perl/GPT/V1/FlavorDefinition.pm	2004-05-26 22:42:11.000000000 +0200
@@ -38,7 +38,7 @@
 
   for my $l (<BUILD>) {
     chomp $l;
-    next if $l !~ m!(\S+)=(.+)$!;
+    next if $l !~ m!(\w+)=(.+)$!;
     my ($var, $value) = ($1, $2);
 
     # remove all quotes this could be trouble some day.
@@ -96,6 +96,7 @@
     }
     next if $foundit;
     my $nolabel = $choice->{'nolabel'};
+    next if $choice->{$nolabel} eq "";
     $me->add_configure_option(switch => $choice->{$nolabel}, 
                                   nolabel=> $nolabel);
   }

--- NEW FILE: 03_gpt_setupdir.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 03_gpt_setupdir.dpatch by  <moeller at inb.uni-luebeck.de>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Just took Anders' patch of his RPMs

@DPATCH@

diff -ur gpt-3.2.orig/packaging_tools/perl/GPT/Filelist.pm gpt-3.2/packaging_tools/perl/GPT/Filelist.pm
--- gpt-3.2.orig/packaging_tools/perl/GPT/Filelist.pm	2004-05-20 19:42:17.000000000 +0200
+++ gpt-3.2/packaging_tools/perl/GPT/Filelist.pm	2005-06-01 10:42:34.000000000 +0200
@@ -153,7 +153,7 @@
   my $list = $self->{'list'};
   my @newlist;
   for (@{$list}) {
-    if ($_->{'dir'} =~ m!^/setup/!) {
+    if ($_->{'dir'} =~ m!(?:/|^)setup/!) {
       push @newlist, $_;
     }
   }
diff -ur gpt-3.2.orig/packaging_tools/perl/GPT/FilelistSort.pm gpt-3.2/packaging_tools/perl/GPT/FilelistSort.pm
--- gpt-3.2.orig/packaging_tools/perl/GPT/FilelistSort.pm	2004-05-20 19:42:17.000000000 +0200
+++ gpt-3.2/packaging_tools/perl/GPT/FilelistSort.pm	2005-06-01 10:42:45.000000000 +0200
@@ -148,7 +148,7 @@
   my $list = $self->{'list'};
   my @newlist;
   for (@{$list}) {
-    if ($_->{'dir'} =~ m!^/setup/!) {
+    if ($_->{'dir'} =~ m!(?:/|^)setup/!) {
       push @newlist, $_;
     }
   }