[SM-Commit] PERFORCE change 77768 by Maurizio Boriani for review

Perforce Review Daemon p4review at smee.org
Fri Apr 14 06:25:01 EDT 2006


Change 77768 by maurizio_boriani at baux-elisya on 2006/04/14 11:23:54

	Fix another bunch of dummy and annoyng bugs.

Affected files ...

... //sgl/grimoires/devel/gnustep-apps/FUNCTIONS#4 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-addressbook/CONFIGURE#3 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-addressbook/HISTORY#8 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-addressbook/INSTALL#2 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-affiche/DEPENDS#2 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-affiche/HISTORY#7 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-cynthiune/BUILD#4 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-cynthiune/DEPENDS#3 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-cynthiune/HISTORY#9 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-emacs/BUILD#3 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-emacs/HISTORY#6 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-emacs/INSTALL#2 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-expense/DEPENDS#2 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-expense/HISTORY#2 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-gnumail/BUILD#3 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-gnumail/DEPENDS#3 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-gnumail/HISTORY#8 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-gnumail/INSTALL#2 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-gorm/DEPENDS#3 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-gorm/HISTORY#13 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-gworkspace/BUILD#3 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-gworkspace/DEPENDS#2 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-gworkspace/HISTORY#12 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-gworkspace/INSTALL#2 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-mylibrary/DEPENDS#2 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-mylibrary/HISTORY#7 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-notebook/DEPENDS#2 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-notebook/HISTORY#2 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-oolite/DEPENDS#2 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-oolite/HISTORY#6 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-oolite/INSTALL#3 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-photoclip/DEPENDS#2 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-photoclip/HISTORY#4 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-preferences/BUILD#3 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-preferences/DEPENDS#2 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-preferences/HISTORY#10 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-preferences/INSTALL#2 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-preview/DEPENDS#2 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-preview/HISTORY#7 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-projectcenter/DEPENDS#2 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-projectcenter/HISTORY#7 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-stepulator/DEPENDS#2 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-stepulator/HISTORY#7 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-talksoup/DEPENDS#2 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-talksoup/HISTORY#7 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-terminal/BUILD#3 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-terminal/DEPENDS#2 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-terminal/HISTORY#9 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-terminal/INSTALL#2 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-textedit/BUILD#3 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-textedit/DEPENDS#2 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-textedit/HISTORY#9 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-textedit/INSTALL#2 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-ticker/DEPENDS#2 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-ticker/HISTORY#4 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-viewpdf/DEPENDS#2 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-viewpdf/HISTORY#7 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-vindaloo/DEPENDS#2 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-vindaloo/HISTORY#7 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-zipper/DEPENDS#3 edit
... //sgl/grimoires/devel/gnustep-apps/gnustep-zipper/HISTORY#9 edit
... //sgl/grimoires/devel/gnustep-libs/FUNCTIONS#4 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-artresources/BUILD#2 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-artresources/HISTORY#6 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-artresources/INSTALL#2 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-back-art/BUILD#4 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-back-art/DEPENDS#3 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-back-art/HISTORY#12 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-back-xlib/BUILD#4 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-back-xlib/DEPENDS#3 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-back-xlib/HISTORY#12 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-base/CONFIGURE#6 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-base/DEPENDS#4 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-base/HISTORY#14 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-base/UP_TRIGGERS#7 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-gdl2/DEPENDS#4 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-gdl2/HISTORY#9 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-gsweb/BUILD#2 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-gsweb/CONFIGURE#2 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-gsweb/DEPENDS#2 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-gsweb/HISTORY#2 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-gsweb/INSTALL#2 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-gui/CONFIGURE#3 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-gui/DEPENDS#5 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-gui/HISTORY#11 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-gui/UP_TRIGGERS#2 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-make/CONFIGURE#3 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-make/DEPENDS#2 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-make/FINAL#3 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-make/HISTORY#11 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-make/INSTALL#4 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-make/UP_TRIGGERS#2 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-mknfonts/DEPENDS#2 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-mknfonts/HISTORY#7 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-netclasses/DEPENDS#3 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-netclasses/HISTORY#10 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-pantomime/DEPENDS#2 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-pantomime/HISTORY#8 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-pdfkit/DEPENDS#2 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-pdfkit/HISTORY#7 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-performance/DEPENDS#2 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-performance/HISTORY#4 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-popplerkit/DEPENDS#2 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-popplerkit/HISTORY#7 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-prefsmodule/BUILD#3 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-prefsmodule/DEPENDS#2 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-prefsmodule/HISTORY#11 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-prefsmodule/INSTALL#2 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-renaissance/CONFIGURE#2 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-renaissance/DEPENDS#2 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-renaissance/HISTORY#7 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-steptalk/BUILD#3 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-steptalk/CONFIGURE#2 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-steptalk/HISTORY#9 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-webserver/DEPENDS#3 edit
... //sgl/grimoires/devel/gnustep-libs/gnustep-webserver/HISTORY#4 edit

Differences ...

==== //sgl/grimoires/devel/gnustep-apps/FUNCTIONS#4 (xtext) ====

@@ -7,8 +7,8 @@
     then
 	. /etc/profile.d/GNUstep.sh
     else
-	message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh"
-	message "Rebuild gnustep-make${DEFAULT_COLOR}"
+	message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh" &&
+	message "Rebuild gnustep-make${DEFAULT_COLOR}"                   &&
 	return 1
     fi                                                                   &&
 
@@ -26,10 +26,8 @@
 	make                                                             &&
 	cd ../                                        
     fi
-    return 0
 }
 
-
 # ------------------------------------------------------------------------------
 ## Replace sorcerys default_install with a custom one
 # ------------------------------------------------------------------------------
@@ -44,5 +42,4 @@
 	make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install        &&
 	cd ../
     fi
-    return 0
 }

==== //sgl/grimoires/devel/gnustep-apps/gnustep-addressbook/CONFIGURE#3 (xtext) ====

@@ -1,3 +1,2 @@
-#config_query ADVCF "Build VCFViewer?" y
 config_query ADSRV "Build adserver?"  y
 config_query ADTOL "Build adtool?"    y

==== //sgl/grimoires/devel/gnustep-apps/gnustep-addressbook/HISTORY#8 (text) ====

@@ -1,3 +1,6 @@
+2006-04-14 Maurizio Boriani <baux at sourcemage.org>
+	* Fix dummy concatenation bugs and others. 
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 

==== //sgl/grimoires/devel/gnustep-apps/gnustep-addressbook/INSTALL#2 (xtext) ====

@@ -1,24 +1,15 @@
 export TAR_OPTIONS="--no-same-owner"
 
-make_single
-make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install           
+make_single                                                           &&
+make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install            &&
 
-# A bug in gworkspace installer, missing some include files
-#if [ "$ADVCF" == "y" ];
-#then
-#    cd Goodies/VCFViewer                                              &&
-#    make                                                              &&
-#    make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install        &&
-#    cd ../../
-#fi
-
 if [ "$ADSRV" == "y" ];
 then
     cd Goodies/adserver                                               &&
     make                                                              &&
     make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install        &&
     cd ../../
-fi
+fi                                                                    &&
 
 
 if [ "$ADTOL" == "y" ];
@@ -27,6 +18,6 @@
     make                                                              &&
     make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install        &&
     cd ../../
-fi
+fi                                                                    &&
 
 make_normal

==== //sgl/grimoires/devel/gnustep-apps/gnustep-affiche/DEPENDS#2 (xtext) ====

@@ -1,2 +1,1 @@
-depends          gnustep-gui
-
+depends gnustep-gui

==== //sgl/grimoires/devel/gnustep-apps/gnustep-affiche/HISTORY#7 (text) ====

@@ -1,3 +1,6 @@
+2006-04-14 Maurizio Boriani <baux at sourcemage.org>
+	* Fix dummy concatenation bugs and others. 
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 

==== //sgl/grimoires/devel/gnustep-apps/gnustep-cynthiune/BUILD#4 (xtext) ====

@@ -1,5 +1,5 @@
 sedit 's/^ID3TAG_LIBS.*$/ID3TAG_LIBS\ :=\ -lid3tag/' \
-	Bundles/MP3/GNUmakefile.preamble
-make_single
-default_build
+	Bundles/MP3/GNUmakefile.preamble                &&
+make_single                                             &&
+default_build                                           &&
 make_normal

==== //sgl/grimoires/devel/gnustep-apps/gnustep-cynthiune/DEPENDS#3 (xtext) ====

@@ -1,14 +1,14 @@
-depends          gnustep-gui    &&
-depends          libid3tag      &&
-depends          libmad         &&
-depends          libvorbis      &&
-depends          libogg         &&
-depends          libmodplug     &&
-depends          libmpcdec      &&
-depends          libmusicbrainz &&
-depends          audiofile      &&
-depends          avifile        &&
-depends          flac           &&
-depends          taglib         &&
-depends          esound
+depends gnustep-gui    &&
+depends libid3tag      &&
+depends libmad         &&
+depends libvorbis      &&
+depends libogg         &&
+depends libmodplug     &&
+depends libmpcdec      &&
+depends libmusicbrainz &&
+depends audiofile      &&
+depends avifile        &&
+depends flac           &&
+depends taglib         &&
+depends esound
 

==== //sgl/grimoires/devel/gnustep-apps/gnustep-cynthiune/HISTORY#9 (text) ====

@@ -1,3 +1,6 @@
+2006-04-14 Maurizio Boriani <baux at sourcemage.org>
+	* Fix dummy concatenation bugs and others. 
+
 2006-04-01 Maurizio Boriani <baux at sourcemage.org>
 	* DETAILS: Bump up to release 0.9.5.
 	* DEPENDS: Add depends for new features support.

==== //sgl/grimoires/devel/gnustep-apps/gnustep-emacs/BUILD#3 (xtext) ====

@@ -1,4 +1,2 @@
-cd GNUstep
+cd GNUstep &&
 ./compile
-
-return 0

==== //sgl/grimoires/devel/gnustep-apps/gnustep-emacs/HISTORY#6 (text) ====

@@ -1,3 +1,6 @@
+2006-04-14 Maurizio Boriani <baux at sourcemage.org>
+	* Fix dummy concatenation bugs and others. 
+
 2006-04-12 Maurizio Boriani <baux at sourcemage.org>
 	* BUILD: Fix bug#10842.
 

==== //sgl/grimoires/devel/gnustep-apps/gnustep-emacs/INSTALL#2 (xtext) ====

@@ -2,4 +2,3 @@
 
 cp -vrf build/Emacs.app \
 	$GNUSTEP_SYSTEM_ROOT/Applications/
-

==== //sgl/grimoires/devel/gnustep-apps/gnustep-expense/DEPENDS#2 (xtext) ====

@@ -1,1 +1,1 @@
-depends          gnustep-gui
+depends gnustep-gui

==== //sgl/grimoires/devel/gnustep-apps/gnustep-expense/HISTORY#2 (text) ====

@@ -1,2 +1,5 @@
+2006-04-14 Maurizio Boriani <baux at sourcemage.org>
+	* Fix dummy concatenation bugs and others. 
+
 2006-03-12 Maurizio Boriani <baux at sourcemage.org>
 	* DEPENDS, DETAILS: created the spell.

==== //sgl/grimoires/devel/gnustep-apps/gnustep-gnumail/BUILD#3 (xtext) ====

@@ -2,8 +2,8 @@
 then
     . /etc/profile.d/GNUstep.sh
 else
-    message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh"
-    message "Rebuild gnustep-make${DEFAULT_COLOR}"
+    message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh"  &&
+    message "Rebuild gnustep-make${DEFAULT_COLOR}"                    &&
     return 1
 fi                                                                    &&
 
@@ -15,14 +15,14 @@
     cd Bundles/Emoticon                                               &&
     make                                                              &&
     cd ../../
-fi
+fi                                                                    &&
 
 if [ "$GMFAC" == "y" ];
 then
     cd Bundles/Face                                                   &&
     make                                                              &&
     cd ../../
-fi
+fi                                                                    &&
 
 
 if [ "$GMPGP" == "y" ];
@@ -30,8 +30,6 @@
     cd Bundles/PGP                                                    &&
     make                                                              &&
     cd ../../
-fi
+fi                                                                    &&
 
 make_normal
-
-return 0

==== //sgl/grimoires/devel/gnustep-apps/gnustep-gnumail/DEPENDS#3 (xtext) ====

@@ -1,5 +1,4 @@
-depends          gnustep-gui         &&
-depends	         gnustep-pantomime   &&
-depends          gnustep-addressbook &&
-optional_depends gnustep-steptalk
-
+depends          gnustep-gui                                    &&
+depends	         gnustep-pantomime                              &&
+depends          gnustep-addressbook                            &&
+optional_depends gnustep-steptalk "" "" "Add scripting support" 

==== //sgl/grimoires/devel/gnustep-apps/gnustep-gnumail/HISTORY#8 (text) ====

@@ -1,3 +1,6 @@
+2006-04-14 Maurizio Boriani <baux at sourcemage.org>
+	Fix dummy concatenation bugs and other.
+
 2006-04-12 Maurizio Boriani <baux at sourcemage.org>
 	* BUILD: Fix bug#10843.
 	* DEPENDS: Fix bug#10844.

==== //sgl/grimoires/devel/gnustep-apps/gnustep-gnumail/INSTALL#2 (xtext) ====

@@ -1,21 +1,21 @@
 export TAR_OPTIONS="--no-same-owner"
 
-make_single
-make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install           
+make_single                                                           &&
+make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install            &&
 
 if [ "$GMEMO" == "y" ];
 then
     cd Bundles/Emoticon                                               &&
     make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install        && 
     cd ../../
-fi
+fi                                                                    &&
 
 if [ "$GMFAC" == "y" ];
 then
     cd Bundles/Face                                                   &&
     make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install        && 
     cd ../../
-fi
+fi                                                                    &&
 
 
 if [ "$GMPGP" == "y" ];
@@ -23,6 +23,6 @@
     cd Bundles/PGP                                                    &&
     make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install        &&
     cd ../../
-fi
+fi                                                                    &&
 
 make_normal

==== //sgl/grimoires/devel/gnustep-apps/gnustep-gorm/DEPENDS#3 (xtext) ====

@@ -1,8 +1,7 @@
-depends          gnustep-gui   &&
+depends gnustep-gui                 &&
 
 if [ "$GNUSTEP_BUILD_DOC" == "y" ]; 
 then
-	depends tetex           &&
+	depends tetex               &&
 	depends texinfo
 fi
-

==== //sgl/grimoires/devel/gnustep-apps/gnustep-gorm/HISTORY#13 (text) ====

@@ -1,3 +1,6 @@
+2006-04-14 Maurizio Boriani <baux at sourcemage.org>
+	Fix dummy concatenation bugs and other.
+
 2006-04-10 Maurizio Boriani <baux at sourcemage.org>
 	* DETAILS: Bump to release 1.0.6.
 

==== //sgl/grimoires/devel/gnustep-apps/gnustep-gworkspace/BUILD#3 (xtext) ====

@@ -2,30 +2,28 @@
 then
     . /etc/profile.d/GNUstep.sh
 else
-    message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh"
-    message "Rebuild gnustep-make${DEFAULT_COLOR}"
+    message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh"  &&
+    message "Rebuild gnustep-make${DEFAULT_COLOR}"                    &&
     return 1
 fi                                                                    &&
 
 ./configure $OPTS                                                     &&
 
-make_single
-make                                                                  
+make_single                                                           &&
+make                                                                  &&
 
 if [ "$GWREM" == "y" ];
 then
     cd GWRemote                                                       &&
     make                                                              &&
     cd ../
-fi
+fi                                                                    &&
 
 if [ "$GWCLP" == "y" ];
 then
     cd ClipBook                                                       &&
     make                                                              &&
     cd ../
-fi
+fi                                                                    &&
 
-make_normal
-
-return 0
+make_normal                                                           

==== //sgl/grimoires/devel/gnustep-apps/gnustep-gworkspace/DEPENDS#2 (xtext) ====

@@ -1,3 +1,2 @@
-depends          gnustep-gui    &&
-optional_depends gnustep-pdfkit 
-
+depends          gnustep-gui                                     &&
+optional_depends gnustep-pdfkit "" "" "Add pdf viewing support."

==== //sgl/grimoires/devel/gnustep-apps/gnustep-gworkspace/HISTORY#12 (text) ====

@@ -1,3 +1,6 @@
+2006-04-14 Maurizio Boriani <baux at sourcemage.org>
+	* Fix dummy concatenation bugs and other.
+
 2006-04-12 Maurizio Boriani <baux at sourcemage.org>
 	* BUILD: Fix bug#10845.
 	* DEPENDS: Fix bug#10846.

==== //sgl/grimoires/devel/gnustep-apps/gnustep-gworkspace/INSTALL#2 (xtext) ====

@@ -1,20 +1,20 @@
 export TAR_OPTIONS="--no-same-owner"
 
-make_single
-make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install           
+make_single                                                           &&
+make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install            &&
 
 if [ "$GWREM" == "y" ];
 then
     cd GWRemote                                                       &&
     make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install        &&
     cd ../
-fi
+fi                                                                    &&
 
 if [ "$GWCLP" == "y" ];
 then
     cd ClipBook                                                       &&
     make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install        &&
     cd ../
-fi
+fi                                                                    &&
 
 make_normal

==== //sgl/grimoires/devel/gnustep-apps/gnustep-mylibrary/DEPENDS#2 (xtext) ====

@@ -1,3 +1,2 @@
 depends          gnustep-gui &&
 depends          namazu 
-

==== //sgl/grimoires/devel/gnustep-apps/gnustep-mylibrary/HISTORY#7 (text) ====

@@ -1,3 +1,6 @@
+2006-04-14 Maurizio Boriani <baux at sourcemage.org>
+	* Fix dummy concatenation bugs and other.
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 

==== //sgl/grimoires/devel/gnustep-apps/gnustep-notebook/DEPENDS#2 (xtext) ====

@@ -1,2 +1,2 @@
-depends          gnustep-gui
+depends gnustep-gui
 

==== //sgl/grimoires/devel/gnustep-apps/gnustep-notebook/HISTORY#2 (text) ====

@@ -1,2 +1,5 @@
+2006-04-14 Maurizio Boriani <baux at sourcemage.org>
+	* Fix dummy concatenation bugs and other.
+
 2006-03-13 Maurizio Boriani <baux at sourcemage.org>
 	* DEPENDS, DETAILS: New spell.

==== //sgl/grimoires/devel/gnustep-apps/gnustep-oolite/DEPENDS#2 (xtext) ====

@@ -1,5 +1,5 @@
-depends gnustep-gui
-depends sdl
-depends sdl_image
-depends sdl_mixer
-depends sdl_gfx
+depends gnustep-gui &&
+depends sdl         &&
+depends sdl_image   &&
+depends sdl_mixer   &&
+depends sdl_gfx     

==== //sgl/grimoires/devel/gnustep-apps/gnustep-oolite/HISTORY#6 (text) ====

@@ -1,3 +1,6 @@
+2006-04-14 Maurizio Boriani <baux at sourcemage.org>
+	* Fix dummy concatenation bugs and other.
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 

==== //sgl/grimoires/devel/gnustep-apps/gnustep-oolite/INSTALL#3 (xtext) ====

@@ -1,5 +1,5 @@
 export TAR_OPTIONS="--no-same-owner"
 
-make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install           
+make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install && 
 cp -vrf oolite.app/Contents \
 	$GNUSTEP_SYSTEM_ROOT/Applications/oolite.app

==== //sgl/grimoires/devel/gnustep-apps/gnustep-photoclip/DEPENDS#2 (xtext) ====

@@ -1,2 +1,1 @@
-depends          gnustep-gui
-
+depends gnustep-gui

==== //sgl/grimoires/devel/gnustep-apps/gnustep-photoclip/HISTORY#4 (text) ====

@@ -1,3 +1,6 @@
+2006-04-14 Maurizio Boriani <baux at sourcemage.org>
+	* Fix dummy concatenation bugs and other.
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 

==== //sgl/grimoires/devel/gnustep-apps/gnustep-preferences/BUILD#3 (xtext) ====

@@ -2,15 +2,13 @@
 then
     . /etc/profile.d/GNUstep.sh
 else
-    message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh"
-    message "Rebuild gnustep-make${DEFAULT_COLOR}"
+    message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh"  &&
+    message "Rebuild gnustep-make${DEFAULT_COLOR}"                    &&
     return 1
 fi                                                                    &&
 
-cd Applications/Preferences
+cd Applications/Preferences                                           &&
 
-make
+make                                                                  &&
 
 cd ../../
-
-return 0

==== //sgl/grimoires/devel/gnustep-apps/gnustep-preferences/DEPENDS#2 (xtext) ====

@@ -1,2 +1,1 @@
-depends          gnustep-prefsmodule
-
+depends gnustep-prefsmodule

==== //sgl/grimoires/devel/gnustep-apps/gnustep-preferences/HISTORY#10 (text) ====

@@ -1,3 +1,6 @@
+2006-04-14 Maurizio Boriani <baux at sourcemage.org>
+	* Fix dummy concatenation bugs and other.
+
 2006-04-13 Maurizio Boriani <baux at sourcemage.org>
 	* DETAILS: Fix bug#10878.
 

==== //sgl/grimoires/devel/gnustep-apps/gnustep-preferences/INSTALL#2 (xtext) ====

@@ -1,5 +1,5 @@
 export TAR_OPTIONS="--no-same-owner"
 
-cd Applications/Preferences
-make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install           
-cd ../../+cd Applications/Preferences                                &&
+make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install &&         
+cd ../../

==== //sgl/grimoires/devel/gnustep-apps/gnustep-preview/DEPENDS#2 (xtext) ====

@@ -1,2 +1,1 @@
-depends          gnustep-gui
-
+depends gnustep-gui

==== //sgl/grimoires/devel/gnustep-apps/gnustep-preview/HISTORY#7 (text) ====

@@ -1,3 +1,6 @@
+2006-04-14 Maurizio Boriani <baux at sourcemage.org>
+	* Fix dummy concatenation bugs and other.
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 

==== //sgl/grimoires/devel/gnustep-apps/gnustep-projectcenter/DEPENDS#2 (xtext) ====

@@ -1,2 +1,1 @@
-depends          gnustep-gui   
-
+depends gnustep-gui   

==== //sgl/grimoires/devel/gnustep-apps/gnustep-projectcenter/HISTORY#7 (text) ====

@@ -1,3 +1,6 @@
+2006-04-14 Maurizio Boriani <baux at sourcemage.org>
+	* Fix dummy concatenations bugs and others.
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 

==== //sgl/grimoires/devel/gnustep-apps/gnustep-stepulator/DEPENDS#2 (xtext) ====

@@ -1,2 +1,1 @@
-depends          gnustep-gui
-
+depends gnustep-gui

==== //sgl/grimoires/devel/gnustep-apps/gnustep-stepulator/HISTORY#7 (text) ====

@@ -1,3 +1,6 @@
+2006-04-14 Maurizio Boriani <baux at sourcemage.org>
+	* Fix dummy concatenations bugs and others.
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 

==== //sgl/grimoires/devel/gnustep-apps/gnustep-talksoup/DEPENDS#2 (xtext) ====

@@ -1,1 +1,1 @@
-depends          gnustep-netclasses
+depends gnustep-netclasses

==== //sgl/grimoires/devel/gnustep-apps/gnustep-talksoup/HISTORY#7 (text) ====

@@ -1,3 +1,6 @@
+2006-04-14 Maurizio Boriani <baux at sourcemage.org>
+	* Fix dummy concatenations bugs and others.
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 

==== //sgl/grimoires/devel/gnustep-apps/gnustep-terminal/BUILD#3 (xtext) ====

@@ -2,15 +2,13 @@
 then
     . /etc/profile.d/GNUstep.sh
 else
-    message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh"
-    message "Rebuild gnustep-make${DEFAULT_COLOR}"
+    message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh"  &&
+    message "Rebuild gnustep-make${DEFAULT_COLOR}"                    &&
     return 1
 fi                                                                    &&
 
-cd Applications/Terminal
+cd Applications/Terminal                                              &&
 
-make
+make                                                                  &&
 
-cd ../../
-
-return 0
+cd ../../                                                             &&

==== //sgl/grimoires/devel/gnustep-apps/gnustep-terminal/DEPENDS#2 (xtext) ====

@@ -1,2 +1,1 @@
-depends          gnustep-gui
-
+depends gnustep-gui

==== //sgl/grimoires/devel/gnustep-apps/gnustep-terminal/HISTORY#9 (text) ====

@@ -1,5 +1,8 @@
+2006-04-14 Maurizio Boriani <baux at sourcemage.org>
+	* Fix dummy concatenations bugs and others.
+
 2006-04-12 Maurizio Boriani <baux at sourcemage.org>
-        * BUILD: Fix bug#10848.
+	* BUILD: Fix bug#10848.
 
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS

==== //sgl/grimoires/devel/gnustep-apps/gnustep-terminal/INSTALL#2 (xtext) ====

@@ -1,5 +1,5 @@
 export TAR_OPTIONS="--no-same-owner"
 
-cd Applications/Terminal
-make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install           
-cd ../../+cd Applications/Terminal                                   &&
+make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install &&        
+cd ../../

==== //sgl/grimoires/devel/gnustep-apps/gnustep-textedit/BUILD#3 (xtext) ====

@@ -2,15 +2,13 @@
 then
     . /etc/profile.d/GNUstep.sh
 else
-    message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh"
-    message "Rebuild gnustep-make${DEFAULT_COLOR}"
+    message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh"  &&
+    message "Rebuild gnustep-make${DEFAULT_COLOR}"                    &&
     return 1
 fi                                                                    &&
 
-cd Applications/TextEdit
+cd Applications/TextEdit                                              &&
 
-make
+make                                                                  &&
 
 cd ../../
-
-return 0

==== //sgl/grimoires/devel/gnustep-apps/gnustep-textedit/DEPENDS#2 (xtext) ====

@@ -1,2 +1,1 @@
-depends          gnustep-gui
-
+depends gnustep-gui

==== //sgl/grimoires/devel/gnustep-apps/gnustep-textedit/HISTORY#9 (text) ====

@@ -1,5 +1,8 @@
+2006-04-14 Maurizio Boriani <baux at sourcemage.org>
+	* Fix dummy contatenation bugs and others.
+
 2006-04-12 Maurizio Boriani <baux at sourcemage.org>
-        * BUILD: Fix bug#10849.
+	* BUILD: Fix bug#10849.
 
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS

==== //sgl/grimoires/devel/gnustep-apps/gnustep-textedit/INSTALL#2 (xtext) ====

@@ -1,5 +1,5 @@
 export TAR_OPTIONS="--no-same-owner"
 
-cd Applications/TextEdit
-make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install           
-cd ../../+cd Applications/TextEdit                                   &&
+make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install &&         
+cd ../../

==== //sgl/grimoires/devel/gnustep-apps/gnustep-ticker/DEPENDS#2 (xtext) ====

@@ -1,1 +1,1 @@
-depends          gnustep-gui
+depends gnustep-gui

==== //sgl/grimoires/devel/gnustep-apps/gnustep-ticker/HISTORY#4 (text) ====

@@ -1,3 +1,6 @@
+2006-04-14 Maurizio Boriani <baux at sourcemage.org>
+	* Fix dummy contatenation bugs and others.
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 

==== //sgl/grimoires/devel/gnustep-apps/gnustep-viewpdf/DEPENDS#2 (xtext) ====

@@ -1,2 +1,1 @@
-depends          gnustep-pdfkit
-
+depends gnustep-pdfkit

==== //sgl/grimoires/devel/gnustep-apps/gnustep-viewpdf/HISTORY#7 (text) ====

@@ -1,3 +1,6 @@
+2006-04-14 Maurizio Boriani <baux at sourcemage.org>
+	* Fix dummy contatenation bugs and others.
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 

==== //sgl/grimoires/devel/gnustep-apps/gnustep-vindaloo/DEPENDS#2 (xtext) ====

@@ -1,2 +1,1 @@
-depends          gnustep-popplerkit
-
+depends gnustep-popplerkit

==== //sgl/grimoires/devel/gnustep-apps/gnustep-vindaloo/HISTORY#7 (text) ====

@@ -1,3 +1,6 @@
+2006-04-14 Maurizio Boriani <baux at sourcemage.org>
+	* Fix dummy contatenation bugs and others.
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 

==== //sgl/grimoires/devel/gnustep-apps/gnustep-zipper/DEPENDS#3 (xtext) ====

@@ -1,2 +1,2 @@
-depends          gnustep-gui
-depends          gnustep-renaissance
+depends gnustep-gui         &&
+depends gnustep-renaissance

==== //sgl/grimoires/devel/gnustep-apps/gnustep-zipper/HISTORY#9 (text) ====

@@ -1,3 +1,6 @@
+2006-04-14 Maurizio Boriani <baux at sourcemage.org>
+	* Fix dummy contatenation bugs and others.
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 

==== //sgl/grimoires/devel/gnustep-libs/FUNCTIONS#4 (xtext) ====

@@ -7,8 +7,8 @@
     then
 	. /etc/profile.d/GNUstep.sh
     else
-	message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh"
-	message "Rebuild gnustep-make${DEFAULT_COLOR}"
+	message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh" &&
+	message "Rebuild gnustep-make${DEFAULT_COLOR}"                   &&
 	return 1
     fi                                                                   &&
 
@@ -26,16 +26,14 @@
 	make                                                             &&
 	cd ../                                        
     fi
-    return 0
 }
 
-
 # ------------------------------------------------------------------------------
 ## Replace sorcerys default_install with a custom one
 # ------------------------------------------------------------------------------
 function default_install ()
 {
-    make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install           &&
+    make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install            &&
 
     if [ "$GNUSTEP_BUILD_DOC" == "y" ]
     then
@@ -44,5 +42,4 @@
 	make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install        &&
 	cd ../
     fi
-    return 0
 }

==== //sgl/grimoires/devel/gnustep-libs/gnustep-artresources/BUILD#2 (xtext) ====

@@ -2,10 +2,7 @@
 then
     . /etc/profile.d/GNUstep.sh
 else
-    message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh"
-    message "Rebuild gnustep-make${DEFAULT_COLOR}"
-    exit 1
+    message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh" &&
+    message "Rebuild gnustep-make${DEFAULT_COLOR}"                   &&
+    return 1
 fi                                                                    
-
-
-

==== //sgl/grimoires/devel/gnustep-libs/gnustep-artresources/HISTORY#6 (text) ====

@@ -1,3 +1,6 @@
+2006-04-14 Maurizio Boriani <baux at sourcemage.org>
+	* Fix dummy concatenations bugs and others.
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 

==== //sgl/grimoires/devel/gnustep-libs/gnustep-artresources/INSTALL#2 (xtext) ====

@@ -1,8 +1,6 @@
 if ! [ -d $GNUSTEP_SYSTEM_ROOT/Library/Fonts ]; 
 then
     mkdir $GNUSTEP_SYSTEM_ROOT/Library/Fonts
-fi
+fi                                                  &&
 
 cp -arf *.nfont $GNUSTEP_SYSTEM_ROOT/Library/Fonts/
-
-

==== //sgl/grimoires/devel/gnustep-libs/gnustep-back-art/BUILD#4 (xtext) ====

@@ -2,9 +2,9 @@
 then
     . /etc/profile.d/GNUstep.sh
 else
-    message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh"
-    message "Rebuild gnustep-make${DEFAULT_COLOR}"
-    exit 1
+    message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh"  &&
+    message "Rebuild gnustep-make${DEFAULT_COLOR}"                    &&
+    return 1
 fi                                                                    &&
 
 ./configure --enable-graphics=art --with-name=art                     \
@@ -18,6 +18,4 @@
     make                                                              &&
     make_normal                                                       &&
     cd ../
-fi
-
-return 0
+fi                                                                    &&

==== //sgl/grimoires/devel/gnustep-libs/gnustep-back-art/DEPENDS#3 (xtext) ====

@@ -6,6 +6,6 @@
 
 if [ "$DOCU" == "y" ]; 
 then
-	depends tetex            &&
+	depends tetex                                            &&
 	depends texinfo
 fi

==== //sgl/grimoires/devel/gnustep-libs/gnustep-back-art/HISTORY#12 (text) ====

@@ -1,3 +1,6 @@
+2006-04-14 Maurizio Boriani <baux at sourcemage.org>
+	* Fix dummy concatenations bugs and others.
+
 2006-04-13 Maurizio Boriani <baux at sourcemage.org>
 	* PROVIDES: New, fix bug#10826.
 

==== //sgl/grimoires/devel/gnustep-libs/gnustep-back-xlib/BUILD#4 (xtext) ====

@@ -2,9 +2,9 @@
 then
     . /etc/profile.d/GNUstep.sh
 else
-    message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh"
-    message "Rebuild gnustep-make${DEFAULT_COLOR}"
-    exit 1
+    message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh"  &&
+    message "Rebuild gnustep-make${DEFAULT_COLOR}"                    &&
+    return 1
 fi                                                                    &&
 
 ./configure --enable-graphics=xlib --with-name=xlib                   \
@@ -18,6 +18,4 @@
     make                                                              &&
     make_normal                                                       &&
     cd ../
-fi
-
-return 0
+fi                                                                    &&

==== //sgl/grimoires/devel/gnustep-libs/gnustep-back-xlib/DEPENDS#3 (xtext) ====

@@ -4,7 +4,7 @@
 
 if [ "$DOCU" == "y" ]; 
 then
-	depends tetex            &&
+	depends tetex                                      &&
 	depends texinfo
 fi
 

==== //sgl/grimoires/devel/gnustep-libs/gnustep-back-xlib/HISTORY#12 (text) ====

@@ -1,9 +1,12 @@
+2006-04-14 Maurizio Boriani <baux at sourcemage.org>
+	* Fix dummy concatenations bugs and others.
+
 2006-04-13 Maurizio Boriani <baux at sourcemage.org>
 	* PROVIDES: New, fix bug#10826.
 
 2006-04-12 Maurizio Boriani <baux at sourcemage.org>
-        * BUILD: Fix bug#10836.
-        * DEPENDS: Fix bug#10837.
+	* BUILD: Fix bug#10836.
+	* DEPENDS: Fix bug#10837.
 
 2006-03-24 Maurizio Boriani <baux at sourcemage.org>
 	* DETAILS: Bump to release 0.10.3.

==== //sgl/grimoires/devel/gnustep-libs/gnustep-base/CONFIGURE#6 (xtext) ====

@@ -1,1 +1,1 @@
-config_query        GNUSTEP_BUILD_DOC "Build and install documentation?" n
+config_query GNUSTEP_BUILD_DOC "Build and install documentation?" n

==== //sgl/grimoires/devel/gnustep-libs/gnustep-base/DEPENDS#4 (xtext) ====

@@ -7,6 +7,6 @@
 
 if [ "$GNUSTEP_BUILD_DOC" == "y" ] 
 then
-    depends tetex           &&
+    depends tetex                                           &&
     depends texinfo
 fi

==== //sgl/grimoires/devel/gnustep-libs/gnustep-base/HISTORY#14 (text) ====

@@ -1,3 +1,6 @@
+2006-04-14 Maurizio Boriani <baux at sourcemage.org>
+	* Fix dummy concatenations bugs and others.
+
 2006-04-12 Maurizio Boriani <baux at sourcemage.org>
 	* DEPENDS: Close bug#10827 and bug#10838
 	* BUILD: Fix bug#10838.

==== //sgl/grimoires/devel/gnustep-libs/gnustep-base/UP_TRIGGERS#7 (xtext) ====

@@ -1,7 +1,7 @@
 if [ -z $(installed_version gnustep-base) ]
 then
-    return
-fi
+    return 0
+fi                                                   &&
 
 if [ $(installed_version gnustep-base) != $VERSION ]
 then

==== //sgl/grimoires/devel/gnustep-libs/gnustep-gdl2/DEPENDS#4 (xtext) ====

@@ -1,3 +1,3 @@
-depends          gnustep-base                                       &&
+depends          gnustep-base                                         &&
 optional_depends postgresql "--with-postgres" \
-                            "--without-postgrs" "Postgresql support" 
+                            "--without-postgres" "Postgresql support" 

==== //sgl/grimoires/devel/gnustep-libs/gnustep-gdl2/HISTORY#9 (text) ====

@@ -1,4 +1,7 @@
 2006-04-12 Maurizio Boriani <baux at sourcemage.org>
+	* Fix dummy concatenations bugs and others.
+
+2006-04-12 Maurizio Boriani <baux at sourcemage.org>
 	* DEPENDS: Fix bug#10828.
 
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>

==== //sgl/grimoires/devel/gnustep-libs/gnustep-gsweb/BUILD#2 (xtext) ====

@@ -4,6 +4,6 @@
 then
 	cd $SOURCE_DIRECTORY/GSWAdaptors/Apache &&
 	./configure                             &&
-	make
+	make                                    &&
 	cd $SOURCE_DIRECTORY
 fi

==== //sgl/grimoires/devel/gnustep-libs/gnustep-gsweb/CONFIGURE#2 (xtext) ====

@@ -1,1 +1,1 @@
-config_query  GS_USE_APACHE  "Build gsweb apache module?" n+config_query GS_USE_APACHE "Build gsweb apache module?" n

==== //sgl/grimoires/devel/gnustep-libs/gnustep-gsweb/DEPENDS#2 (xtext) ====

@@ -1,5 +1,5 @@
-depends          gnustep-gui  &&
-depends		 libproplist  &&
+depends gnustep-gui            &&
+depends	libproplist            &&
 
 if [ "$GS_USE_APACHE" == "y" ]
 then

==== //sgl/grimoires/devel/gnustep-libs/gnustep-gsweb/HISTORY#2 (text) ====

@@ -1,2 +1,5 @@
+2006-04-12 Maurizio Boriani <baux at sourcemage.org>
+	* Fix dummy concatenations bugs and others.
+
 2006-04-10 Maurizio Boriani <baux at sourcemage.org>
 	* DEPENDS, DETAILS, BUILD, CONFIGURE, INSTALL: created the spell.

==== //sgl/grimoires/devel/gnustep-libs/gnustep-gsweb/INSTALL#2 (xtext) ====

@@ -3,6 +3,6 @@
 if [ "$GS_USE_APACHE" == "y" ]
 then
 	cd $SOURCE_DIRECTORY/GSWAdaptors/Apache &&
-	make install
+	make install                            &&
 	cd $SOURCE_DIRECTORY
-fi+fi

==== //sgl/grimoires/devel/gnustep-libs/gnustep-gui/CONFIGURE#3 (xtext) ====

@@ -1,1 +1,1 @@
-config_query        GNUSTEP_BUILD_DOC "Build and install documentation?" n
+config_query GNUSTEP_BUILD_DOC "Build and install documentation?" n

==== //sgl/grimoires/devel/gnustep-libs/gnustep-gui/DEPENDS#5 (xtext) ====

@@ -10,6 +10,6 @@
 
 if [ "$GNUSTEP_BUILD_DOC" == "y" ]; 
 then
-	depends tetex           &&
+	depends tetex                                             &&
 	depends texinfo
 fi

==== //sgl/grimoires/devel/gnustep-libs/gnustep-gui/HISTORY#11 (text) ====

@@ -1,3 +1,6 @@
+2006-04-14 Maurizio Boriani <baux at sourcemage.org>
+	* Fix dummy concatenations stuff and others bugs.
+
 2006-04-13 Maurizio Boriani <baux at sourcemage.org>
 	* DEPENDS: Add backend depends.
 

==== //sgl/grimoires/devel/gnustep-libs/gnustep-gui/UP_TRIGGERS#2 (xtext) ====

@@ -1,7 +1,7 @@
 if [ -z $(installed_version gnustep-base) ]
 then
-    return
-fi
+    return 0
+fi                                                  &&
 
 if [ $(installed_version gnustep-gui) != $VERSION ]
 then

==== //sgl/grimoires/devel/gnustep-libs/gnustep-make/CONFIGURE#3 (xtext) ====

@@ -1,1 +1,1 @@
-config_query  DOCU     "Build and install documentation?" n
+config_query DOCU "Build and install documentation?" n

==== //sgl/grimoires/devel/gnustep-libs/gnustep-make/DEPENDS#2 (xtext) ====

@@ -7,4 +7,3 @@
     depends latex2html &&
     depends netpbm
 fi
-

==== //sgl/grimoires/devel/gnustep-libs/gnustep-make/FINAL#3 (xtext) ====

@@ -5,14 +5,14 @@
     echo "MANPATH /opt/GNUstep/System/Library/Documentaition/man"    \
 	>> /etc/man.conf                                             &&
     echo "GNUstep MANPATH added to /etc/man.conf."
-fi
+fi                                                                   &&
 
 if  !  grep  -q "GNUstep" /etc/ld.so.conf;  
 then
     echo "/opt/GNUstep/System/Library/Libraries"                     \
 	>> /etc/ld.so.conf                                           &&
     echo "GNUstep library path added to /etc/ld.so.conf."
-fi
+fi                                                                   &&
 
 unset GNUSTEP_LOCAL_ROOT
 unset GNUSTEP_HOST

==== //sgl/grimoires/devel/gnustep-libs/gnustep-make/HISTORY#11 (text) ====

@@ -1,3 +1,6 @@
+2006-04-14 Maurizio Boriani <baux at sourcemage.org>
+	* Fix dummy concatenations stuff and others bugs.
+
 2006-04-12 Maurizio Boriani <baux at sourcemage.org>
 	* BUILD: Fix bug#10830.
 
@@ -8,7 +11,6 @@
 	* DETAILS: (automated) Add KEYWORDS
 
 2006-12-24 Maurizio Boriani <baux at sourcemage.org>
-
 	* DETAILS: Fix bug#10444.
 	* INSTALL: Fix bug#10428.
 

==== //sgl/grimoires/devel/gnustep-libs/gnustep-make/INSTALL#4 (xtext) ====

@@ -6,17 +6,17 @@
     cd Documentation                                                 &&
     make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install       &&
     cd ../
-fi
+fi                                                                   &&
 
 if [ -f /etc/profile.d/GNUstep.sh ];
 then
 	rm -f /etc/profile.d/GNUstep.sh
-fi
+fi                                                                   &&
 
 if [ -a /etc/profile.d/GNUstep.sh ];
 then
     rm -f /etc/profile.d/GNUstep.sh
-fi
+fi                                                                   &&
 
 ln -s /opt/GNUstep/System/Library/Makefiles/GNUstep.sh \
     /etc/profile.d/GNUstep.sh

==== //sgl/grimoires/devel/gnustep-libs/gnustep-make/UP_TRIGGERS#2 (xtext) ====

@@ -1,12 +1,14 @@
 if [ -z $(installed_version gnustep-base) ];
 then
-	return
-fi
+	return 0
+fi                                                                    &&
 
 if [ -d /usr/GNUstep ];
 then
-    message "${WARNING_COLOR} Found stuff in /urs/GNUstep!"
-    message "GNUstep stuff must be moved to /opt/GNUstep to be FSHS compliant."
-    message "Going to recast gnustep base and dependants too.${DEFAULT_COLOR}"
+    message "${WARNING_COLOR} Found stuff in /urs/GNUstep!"           &&
+    message "GNUstep stuff must be moved to /opt/GNUstep to be FSHS " &&
+    message "compliant."                                              &&
+    message "Going to recast gnustep base and dependants too."        &&
+    message "${DEFAULT_COLOR}"                                        &&
     up_trigger gnustep-base	
 fi

==== //sgl/grimoires/devel/gnustep-libs/gnustep-mknfonts/DEPENDS#2 (xtext) ====

@@ -1,1 +1,1 @@
-depends          gnustep-gui
+depends gnustep-gui

==== //sgl/grimoires/devel/gnustep-libs/gnustep-mknfonts/HISTORY#7 (text) ====

@@ -1,3 +1,6 @@
+2006-04-12 Maurizio Boriani <baux at sourcemage.org>
+	* Fix dummy concatenations bugs and ohers.
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 

==== //sgl/grimoires/devel/gnustep-libs/gnustep-netclasses/DEPENDS#3 (xtext) ====

@@ -1,7 +1,7 @@
-depends          gnustep-base
+depends          gnustep-base      &&
 
 if [ "$GNUSTEP_BUILD_DOC" == "y" ]
 then
-    depends tetex           &&
+    depends tetex                  &&
     depends texinfo
 fi

==== //sgl/grimoires/devel/gnustep-libs/gnustep-netclasses/HISTORY#10 (text) ====

@@ -1,3 +1,6 @@
+2006-04-12 Maurizio Boriani <baux at sourcemage.org>
+	* Fix dummy concatenations bugs and ohers.
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 

==== //sgl/grimoires/devel/gnustep-libs/gnustep-pantomime/DEPENDS#2 (xtext) ====

@@ -1,1 +1,1 @@
-depends          gnustep-base  
+depends gnustep-base  

==== //sgl/grimoires/devel/gnustep-libs/gnustep-pantomime/HISTORY#8 (text) ====

@@ -1,3 +1,6 @@
+2006-04-14 Maurizio Boriani <baux at sourcemage.org>
+	* Fix dummy concatenations and other bugs.
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 

==== //sgl/grimoires/devel/gnustep-libs/gnustep-pdfkit/DEPENDS#2 (xtext) ====

@@ -1,2 +1,1 @@
-depends          gnustep-gui
-
+depends gnustep-gui

==== //sgl/grimoires/devel/gnustep-libs/gnustep-pdfkit/HISTORY#7 (text) ====

@@ -1,3 +1,6 @@
+2006-04-14 Maurizio Boriani <baux at sourcemage.org>
+	* Fix dummy concatenations bugs.
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 

==== //sgl/grimoires/devel/gnustep-libs/gnustep-performance/DEPENDS#2 (xtext) ====

@@ -1,1 +1,1 @@
-depends          gnustep-base 
+depends gnustep-base 

==== //sgl/grimoires/devel/gnustep-libs/gnustep-performance/HISTORY#4 (text) ====

@@ -1,3 +1,6 @@
+2006-04-14 Maurizio Boriani <baux at sourcemage.org>
+	* Fix dummy concatenations bugs.
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 

==== //sgl/grimoires/devel/gnustep-libs/gnustep-popplerkit/DEPENDS#2 (xtext) ====

@@ -1,2 +1,2 @@
-depends          gnustep-base  &&
-depends          poppler
+depends gnustep-base &&
+depends poppler

==== //sgl/grimoires/devel/gnustep-libs/gnustep-popplerkit/HISTORY#7 (text) ====

@@ -1,3 +1,6 @@
+2006-04-14 Maurizio Boriani <baux at sourcemage.org>
+	* Fix dummy concatenations bugs.
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 

==== //sgl/grimoires/devel/gnustep-libs/gnustep-prefsmodule/BUILD#3 (xtext) ====

@@ -2,15 +2,13 @@
 then
     . /etc/profile.d/GNUstep.sh
 else
-    message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh"
-    message "Rebuild gnustep-make${DEFAULT_COLOR}"
+    message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh"  &&
+    message "Rebuild gnustep-make${DEFAULT_COLOR}"                    &&
     return 1
 fi                                                                    &&
 
 cd Frameworks/PrefsModule
 
-make
+make                                                                  &&
 
-cd ../../
-
-return 0
+cd ../../                                                             &&

==== //sgl/grimoires/devel/gnustep-libs/gnustep-prefsmodule/DEPENDS#2 (xtext) ====

@@ -1,2 +1,1 @@
-depends          gnustep-gui
-
+depends gnustep-gui

==== //sgl/grimoires/devel/gnustep-libs/gnustep-prefsmodule/HISTORY#11 (text) ====

@@ -1,3 +1,6 @@
+2006-04-14 Maurizio Boriani <baux at sourcemage.org>
+	* Fix dummy concatenations bugs.
+
 2006-04-13 Maurizio Boriani <baux at sourcemage.org>
 	* DETAILS: Fix bug#10857.
 

==== //sgl/grimoires/devel/gnustep-libs/gnustep-prefsmodule/INSTALL#2 (xtext) ====

@@ -1,5 +1,5 @@
 export TAR_OPTIONS="--no-same-owner"
 
-cd Frameworks/PrefsModule
-make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install           
-cd ../../+cd Frameworks/PrefsModule                                  &&
+make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install &&          
+cd ../../

==== //sgl/grimoires/devel/gnustep-libs/gnustep-renaissance/CONFIGURE#2 (xtext) ====

@@ -1,1 +1,1 @@
-config_query  DOCU     "Build and install documentation?" y
+config_query DOCU "Build and install documentation?" y

==== //sgl/grimoires/devel/gnustep-libs/gnustep-renaissance/DEPENDS#2 (xtext) ====

@@ -1,7 +1,7 @@
-depends          gnustep-gui    &&
+depends gnustep-gui     &&
 
 if [ "$DOCU" == "y" ]; 
 then
-	depends tetex           &&
+	depends tetex   &&
 	depends texinfo
 fi

==== //sgl/grimoires/devel/gnustep-libs/gnustep-renaissance/HISTORY#7 (text) ====

@@ -1,3 +1,6 @@
+2006-04-14 Maurizio Boriani <baux at sourcemage.org>
+	* Fix dummy concatenations bugs.
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 

==== //sgl/grimoires/devel/gnustep-libs/gnustep-steptalk/BUILD#3 (xtext) ====

@@ -4,19 +4,17 @@
 then
     . /etc/profile.d/GNUstep.sh
 else
-    message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh"
-    message "Rebuild gnustep-make${DEFAULT_COLOR}"
+    message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh"      &&
+    message "Rebuild gnustep-make${DEFAULT_COLOR}"                        &&
     return 1
 fi                                                                        &&
 
 make_single
 if [ "$APPK" == "n" ];
 then
-    message "Building StepTalk without AppKit extensions${DEFAULT_COLOR}"
+    message "Building StepTalk without AppKit extensions${DEFAULT_COLOR}" &&
     make appkit=no
 else
     make
-fi
+fi                                                                        &&
 make_normal
-
-return 0

==== //sgl/grimoires/devel/gnustep-libs/gnustep-steptalk/CONFIGURE#2 (xtext) ====

@@ -1,1 +1,1 @@
-config_query  APPK     "Build AppKit extensions?" y
+config_query APPK "Build AppKit extensions?" y

==== //sgl/grimoires/devel/gnustep-libs/gnustep-steptalk/HISTORY#9 (text) ====

@@ -1,6 +1,9 @@
+2006-04-14 Maurizio Boriani <baux at sourcemage.org>
+	* Fix dummy concatenations bugs.
+
 2006-04-12 Maurizio Boriani <baux at sourcemage.org>
-        * DEPENDS: Fix bug#10833.
-        * BUILD: Fix bug#10841.
+	* DEPENDS: Fix bug#10833.
+	* BUILD: Fix bug#10841.
 
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS

==== //sgl/grimoires/devel/gnustep-libs/gnustep-webserver/DEPENDS#3 (xtext) ====

@@ -1,2 +1,1 @@
-depends          gnustep-base        
-
+depends gnustep-base        

==== //sgl/grimoires/devel/gnustep-libs/gnustep-webserver/HISTORY#4 (text) ====

@@ -1,3 +1,6 @@
+2006-04-14 Maurizio Boriani <baux at sourcemage.org>
+	* Fix dummy connections bugs.
+
 2006-03-16 Maurizio Boriani <baux at sourcemage.org>
 	* DETAILS: Bump up to release 1.1.0.
 



More information about the SM-Commit mailing list