Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] PERFORCE change 77646 by Maurizio Boriani for review

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Perforce Review Daemon <p4review AT smee.org>
  • To: "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT sourcemage.org>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "David Kowis" <dkowis+smgl-p4 AT shlrm.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Eric Sandall" <eric AT sandall.us>, "Ethan Grammatikidis" <eekee AT eekee.is-a-geek.org>, "Gareth Clay" <gareth AT caffeinefuelled.co.uk>, "George J. Sherwood" <george AT beernabeer.com>, "Jason Flatt" <jflatt AT sourcemage.org>, "Juuso Alasuutari" <iuso AT sourcemage.org>, "Ladislav Hagara" <ladislav.hagara AT unob.cz>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Pol Vinogradov" <vin.public AT gmail.com>, "Robin Cook" <rcook AT wyrms.net>, "Seth Woolley" <seth AT swoolley.homeip.net>, "Unet" <unet AT sourcemage.org>, "vladimir_marek" <vlmarek AT volny.cz>
  • Subject: [SM-Commit] PERFORCE change 77646 by Maurizio Boriani for review
  • Date: Wed, 12 Apr 2006 17:50:00 +0100 (BST)

Change 77646 by maurizio_boriani@baux-elisya on 2006/04/12 17:45:14

Integrate.

Affected files ...

... //sgl/grimoires/test/gnustep-apps/FUNCTIONS#3 integrate
... //sgl/grimoires/test/gnustep-apps/gnustep-emacs/BUILD#2 integrate
... //sgl/grimoires/test/gnustep-apps/gnustep-emacs/HISTORY#5 integrate
... //sgl/grimoires/test/gnustep-apps/gnustep-gnumail/BUILD#2 integrate
... //sgl/grimoires/test/gnustep-apps/gnustep-gnumail/HISTORY#7 integrate
... //sgl/grimoires/test/gnustep-apps/gnustep-gworkspace/BUILD#2 integrate
... //sgl/grimoires/test/gnustep-apps/gnustep-gworkspace/HISTORY#10 integrate
... //sgl/grimoires/test/gnustep-apps/gnustep-preferences/BUILD#2 integrate
... //sgl/grimoires/test/gnustep-apps/gnustep-preferences/DETAILS#7 integrate
... //sgl/grimoires/test/gnustep-apps/gnustep-preferences/HISTORY#8 integrate
... //sgl/grimoires/test/gnustep-apps/gnustep-preferences/PRE_BUILD#1 branch
... //sgl/grimoires/test/gnustep-apps/gnustep-terminal/BUILD#2 integrate
... //sgl/grimoires/test/gnustep-apps/gnustep-terminal/HISTORY#8 integrate
... //sgl/grimoires/test/gnustep-apps/gnustep-textedit/BUILD#2 integrate
... //sgl/grimoires/test/gnustep-apps/gnustep-textedit/HISTORY#8 integrate
... //sgl/grimoires/test/gnustep-libs/FUNCTIONS#3 integrate
... //sgl/grimoires/test/gnustep-libs/gnustep-back-art/BUILD#3 integrate
... //sgl/grimoires/test/gnustep-libs/gnustep-back-art/DEPENDS#2 integrate
... //sgl/grimoires/test/gnustep-libs/gnustep-back-art/HISTORY#10 integrate
... //sgl/grimoires/test/gnustep-libs/gnustep-back-xlib/BUILD#3 integrate
... //sgl/grimoires/test/gnustep-libs/gnustep-back-xlib/DEPENDS#2 integrate
... //sgl/grimoires/test/gnustep-libs/gnustep-back-xlib/HISTORY#10 integrate
... //sgl/grimoires/test/gnustep-libs/gnustep-base/CONFIGURE#5 integrate
... //sgl/grimoires/test/gnustep-libs/gnustep-base/DEPENDS#3 integrate
... //sgl/grimoires/test/gnustep-libs/gnustep-base/HISTORY#13 integrate
... //sgl/grimoires/test/gnustep-libs/gnustep-gdl2/DEPENDS#3 integrate
... //sgl/grimoires/test/gnustep-libs/gnustep-gdl2/HISTORY#8 integrate
... //sgl/grimoires/test/gnustep-libs/gnustep-gui/DEPENDS#3 integrate
... //sgl/grimoires/test/gnustep-libs/gnustep-gui/HISTORY#9 integrate
... //sgl/grimoires/test/gnustep-libs/gnustep-make/BUILD#3 integrate
... //sgl/grimoires/test/gnustep-libs/gnustep-make/HISTORY#10 integrate
... //sgl/grimoires/test/gnustep-libs/gnustep-prefsmodule/BUILD#2 integrate
... //sgl/grimoires/test/gnustep-libs/gnustep-prefsmodule/DETAILS#7 integrate
... //sgl/grimoires/test/gnustep-libs/gnustep-prefsmodule/HISTORY#7 integrate
... //sgl/grimoires/test/gnustep-libs/gnustep-prefsmodule/PRE_BUILD#1 branch
... //sgl/grimoires/test/gnustep-libs/gnustep-sqlclient/DEPENDS#3 integrate
... //sgl/grimoires/test/gnustep-libs/gnustep-sqlclient/HISTORY#5 integrate
... //sgl/grimoires/test/gnustep-libs/gnustep-steptalk/BUILD#2 integrate
... //sgl/grimoires/test/gnustep-libs/gnustep-steptalk/DEPENDS#2 integrate
... //sgl/grimoires/test/gnustep-libs/gnustep-steptalk/HISTORY#8 integrate

Differences ...

==== //sgl/grimoires/test/gnustep-apps/FUNCTIONS#3 (xtext) ====

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

if [ -f ./configure ]
@@ -26,6 +26,7 @@
make &&
cd ../
fi
+ return 0
}


@@ -43,4 +44,5 @@
make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install &&
cd ../
fi
-}+ return 0
+}

==== //sgl/grimoires/test/gnustep-apps/gnustep-emacs/BUILD#2 (xtext) ====

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

==== //sgl/grimoires/test/gnustep-apps/gnustep-emacs/HISTORY#5 (text) ====

@@ -1,3 +1,6 @@
+2006-04-12 Maurizio Boriani <baux AT sourcemage.org>
+ * BUILD: Fix bug#10842.
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS


==== //sgl/grimoires/test/gnustep-apps/gnustep-gnumail/BUILD#2 (xtext) ====

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

make_single
@@ -32,4 +32,6 @@
cd ../../
fi

-make_normal+make_normal
+
+return 0

==== //sgl/grimoires/test/gnustep-apps/gnustep-gnumail/HISTORY#7 (text) ====

@@ -1,3 +1,7 @@
+2006-04-12 Maurizio Boriani <baux AT sourcemage.org>
+ * BUILD: Fix bug#10843.
+ * DEPENDS: Fix bug#10844.
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS


==== //sgl/grimoires/test/gnustep-apps/gnustep-gworkspace/BUILD#2 (xtext) ====

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

./configure $OPTS &&
@@ -26,4 +26,6 @@
cd ../
fi

-make_normal+make_normal
+
+return 0

==== //sgl/grimoires/test/gnustep-apps/gnustep-gworkspace/HISTORY#10 (text)
====

@@ -1,3 +1,7 @@
+2006-04-12 Maurizio Boriani <baux AT sourcemage.org>
+ * BUILD: Fix bug#10845.
+ * DEPENDS: Fix bug#10846.
+
2006-03-24 Maurizio Boriani <baux AT sourcemage.org>
* DETAILS: Bump to release 0.8.2.


==== //sgl/grimoires/test/gnustep-apps/gnustep-preferences/BUILD#2 (xtext)
====

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

cd Applications/Preferences
@@ -12,3 +12,5 @@
make

cd ../../
+
+return 0

==== //sgl/grimoires/test/gnustep-apps/gnustep-preferences/DETAILS#7 (xtext)
====

@@ -7,7 +7,7 @@
fi
SOURCE=Preferences-cvs.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/Preferences-cvs
-
SOURCE_URL[0]=cvs://:pserver:anoncvs AT cvs.savannah.gnu.org:/cvsroot/backbone:System
+SOURCE_URL[0]=SOURCE_URL[0]=cvs://:pserver:anonymous AT cvs.savannah.nongnu.org:/sources/backbone:System
WEB_SITE=http://www.nongnu.org/backbone
SOURCE_IGNORE=volatile
LICENSE[0]=GPL

==== //sgl/grimoires/test/gnustep-apps/gnustep-preferences/HISTORY#8 (text)
====

@@ -1,3 +1,7 @@
+2006-04-12 Maurizio Boriani <baux AT sourcemage.org>
+ * BUILD: Fix bug#10847.
+ * DETAILS: Fix bug#10878.
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS


==== //sgl/grimoires/test/gnustep-apps/gnustep-terminal/BUILD#2 (xtext) ====

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

cd Applications/Terminal
@@ -12,3 +12,5 @@
make

cd ../../
+
+return 0

==== //sgl/grimoires/test/gnustep-apps/gnustep-terminal/HISTORY#8 (text) ====

@@ -1,3 +1,6 @@
+2006-04-12 Maurizio Boriani <baux AT sourcemage.org>
+ * BUILD: Fix bug#10848.
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS


==== //sgl/grimoires/test/gnustep-apps/gnustep-textedit/BUILD#2 (xtext) ====

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

cd Applications/TextEdit
@@ -12,3 +12,5 @@
make

cd ../../
+
+return 0

==== //sgl/grimoires/test/gnustep-apps/gnustep-textedit/HISTORY#8 (text) ====

@@ -1,3 +1,6 @@
+2006-04-12 Maurizio Boriani <baux AT sourcemage.org>
+ * BUILD: Fix bug#10849.
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS


==== //sgl/grimoires/test/gnustep-libs/FUNCTIONS#3 (xtext) ====

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

if [ -f ./configure ]
@@ -26,6 +26,7 @@
make &&
cd ../
fi
+ return 0
}


@@ -43,4 +44,5 @@
make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install &&
cd ../
fi
-}+ return 0
+}

==== //sgl/grimoires/test/gnustep-libs/gnustep-back-art/BUILD#3 (xtext) ====

@@ -19,3 +19,5 @@
make_normal &&
cd ../
fi
+
+return 0

==== //sgl/grimoires/test/gnustep-libs/gnustep-back-art/DEPENDS#2 (xtext) ====

@@ -1,8 +1,8 @@
-depends gnustep-gui &&
-depends X11-LIBS &&
-depends libart_lgpl &&
-depends gnustep-artresources &&
-optional_depends glitz &&
+depends gnustep-gui &&
+depends X11-LIBS &&
+depends libart_lgpl &&
+depends gnustep-artresources &&
+optional_depends glitz "" "" "Add glitz support." &&

if [ "$DOCU" == "y" ];
then

==== //sgl/grimoires/test/gnustep-libs/gnustep-back-art/HISTORY#10 (text) ====

@@ -1,3 +1,7 @@
+2006-04-12 Maurizio Boriani <baux AT sourcemage.org>
+ * BUILD: Fix bug#10834.
+ * DEPENDS: Fix bug#10835.
+
2006-03-24 Maurizio Boriani <baux AT sourcemage.org>
* DETAILS: Bump to release 0.10.3.


==== //sgl/grimoires/test/gnustep-libs/gnustep-back-xlib/BUILD#3 (xtext) ====

@@ -20,3 +20,4 @@
cd ../
fi

+return 0

==== //sgl/grimoires/test/gnustep-libs/gnustep-back-xlib/DEPENDS#2 (xtext)
====

@@ -1,6 +1,6 @@
-depends gnustep-gui &&
-depends X11-LIBS &&
-optional_depends glitz &&
+depends gnustep-gui &&
+depends X11-LIBS &&
+optional_depends glitz "" "" "Add glitz support." &&

if [ "$DOCU" == "y" ];
then

==== //sgl/grimoires/test/gnustep-libs/gnustep-back-xlib/HISTORY#10 (text)
====

@@ -1,3 +1,7 @@
+2006-04-12 Maurizio Boriani <baux AT sourcemage.org>
+ * 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/test/gnustep-libs/gnustep-base/CONFIGURE#5 (xtext) ====

@@ -1,2 +1,1 @@
config_query GNUSTEP_BUILD_DOC "Build and install documentation?" n
-config_query_option GNUSTEP_SSL "Enable ssl support" y
"--enable-openssl"

==== //sgl/grimoires/test/gnustep-libs/gnustep-base/DEPENDS#3 (xtext) ====

@@ -1,17 +1,12 @@
-depends gnustep-make &&
-depends ffcall &&
-depends libxml2 &&
-optional_depends libxslt &&
-optional_depends openssl &&
-optional_depends gmp &&
+depends gnustep-make &&
+depends ffcall &&
+depends libxml2 &&
+optional_depends libxslt "" "" "Enable xml support." &&
+optional_depends openssl "" "" "Enable ssl crypto support." &&
+optional_depends gmp "" "" "Enable gmp support." &&

if [ "$GNUSTEP_BUILD_DOC" == "y" ]
then
depends tetex &&
depends texinfo
fi
-
-if [ "$GNUSTEP_SSL" == "y" ]
-then
- depends openssl
-fi

==== //sgl/grimoires/test/gnustep-libs/gnustep-base/HISTORY#13 (text) ====

@@ -1,3 +1,7 @@
+2006-04-12 Maurizio Boriani <baux AT sourcemage.org>
+ * DEPENDS: Close bug#10827 and bug#10838
+ * BUILD: Fix bug#10838.
+
2006-03-15 Maurizio Boriani <baux AT sourcemage.org>
* DETAILS: Bump to release 1.12.0.
* UP_TRIGGERS: Fix up triggering, was broken.

==== //sgl/grimoires/test/gnustep-libs/gnustep-gdl2/DEPENDS#3 (xtext) ====

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

==== //sgl/grimoires/test/gnustep-libs/gnustep-gdl2/HISTORY#8 (text) ====

@@ -1,3 +1,6 @@
+2006-04-12 Maurizio Boriani <baux AT sourcemage.org>
+ * DEPENDS: Fix bug#10828.
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS


==== //sgl/grimoires/test/gnustep-libs/gnustep-gui/DEPENDS#3 (xtext) ====

@@ -1,11 +1,11 @@
-depends gnustep-base &&
-depends tiff &&
-depends libpng &&
-optional_depends libungif &&
-optional_depends aspell &&
-optional_depends cups &&
-optional_depends audiofile &&
-optional_depends portaudio &&
+depends gnustep-base &&
+depends tiff &&
+depends libpng &&
+optional_depends libungif "" "" "Add gif support." &&
+optional_depends aspell "" "" "Add spell checking support." &&
+optional_depends cups "" "" "Add printing support. " &&
+optional_depends audiofile "" "" "Add sound support." &&
+optional_depends portaudio "" "" "Add portable audio support." &&

if [ "$GNUSTEP_BUILD_DOC" == "y" ];
then

==== //sgl/grimoires/test/gnustep-libs/gnustep-gui/HISTORY#9 (text) ====

@@ -1,3 +1,6 @@
+2006-04-12 Maurizio Boriani <baux AT sourcemage.org>
+ * DEPENDS: Fix bug#10829 and bug#10839.
+
2006-03-15 Maurizio Boriani <baux AT sourcemage.org>
* DETAILS: Bump to release 0.10.3.
* UP_TRIGGERS: Trigger a spell depend cast upon a versgion upgrade.

==== //sgl/grimoires/test/gnustep-libs/gnustep-make/BUILD#3 (xtext) ====

@@ -10,15 +10,5 @@
unset GNUSTEP_SYSTEM_ROOT
unset GNUSTEP_PATHLIST

-./configure \
- --prefix=/opt/GNUstep #FSHS and openstep spec
- $OPTS &&
-
-make &&
-
-if [ "$DOCU" == "y" ];
-then
- cd Documentation &&
- make &&
- cd ../
-fi
+OPTS="--prefix=/opt/GNUstep $OPTS" &&
+default_build

==== //sgl/grimoires/test/gnustep-libs/gnustep-make/HISTORY#10 (text) ====

@@ -1,3 +1,6 @@
+2006-04-12 Maurizio Boriani <baux AT sourcemage.org>
+ * BUILD: Fix bug#10830.
+
2006-03-15 Maurizio Boriani <baux AT sourcemage.org>
* DETAILS: Bump to release 1.12.0.


==== //sgl/grimoires/test/gnustep-libs/gnustep-prefsmodule/BUILD#2 (xtext)
====

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

cd Frameworks/PrefsModule
@@ -12,3 +12,5 @@
make

cd ../../
+
+return 0

==== //sgl/grimoires/test/gnustep-libs/gnustep-prefsmodule/DETAILS#7 (xtext)
====

@@ -7,7 +7,13 @@
fi
SOURCE=PrefsModule-cvs.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/PrefsModule-cvs
+>>>> ORIGINAL DETAILS#6
+
SOURCE_URL[0]=cvs://:pserver:anoncvs AT cvs.savannah.gnu.org:/cvsroot/backbone:System
+==== THEIRS DETAILS#8
+SOURCE_URL[0]=SOURCE_URL[0]=cvs://:pserver:anonymous AT cvs.savannah.nongnu.org:/sources/backbone:System
+==== YOURS DETAILS
SOURCE_URL[0]=cvs://:ext:anoncvs AT savannah.gnu.org:/cvsroot/backbone:System
+<<<<
WEB_SITE=http://www.nongnu.org/backbone
SOURCE_IGNORE=volatile
LICENSE[0]=LGPL
@@ -15,6 +21,7 @@
ENTERED=20050908
UPDATED=20050908
BUILD_API=2
+ KEYWORDS="gnustep libs"
SHORT="GNUstep preference settings library."

cat << EOF

==== //sgl/grimoires/test/gnustep-libs/gnustep-prefsmodule/HISTORY#7 (text)
====

@@ -1,3 +1,10 @@
+2006-04-12 Maurizio Boriani <baux AT sourcemage.org>
+ * BUILD: Fix bug#10840
+ * DETAILS: Fix bug#10857.
+
+2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
+ * DETAILS: (automated) Add KEYWORDS
+
2006-01-24 Maurizio Boriani <baux AT sourcemage.org>
* DETAILS: Fix license field, close bug#10444.


==== //sgl/grimoires/test/gnustep-libs/gnustep-sqlclient/DEPENDS#3 (xtext)
====

@@ -1,6 +1,6 @@
-depends gnustep-base &&
-depends gnustep-performance &&
-optional_depends mysql &&
-optional_depends postgresql &&
-optional_depends sqlite
+depends gnustep-base &&
+depends gnustep-performance &&
+optional_depends mysql "" "" "Add mysql support." &&
+optional_depends postgresql "" "" "Add postgresql support." &&
+optional_depends sqlite "" "" "Add sqlite support."


==== //sgl/grimoires/test/gnustep-libs/gnustep-sqlclient/HISTORY#5 (text) ====

@@ -1,3 +1,6 @@
+2006-04-12 Maurizio Boriani <baux AT sourcemage.org>
+ * DEPENDS: Fix bug#10832.
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS


==== //sgl/grimoires/test/gnustep-libs/gnustep-steptalk/BUILD#2 (xtext) ====

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

make_single
@@ -17,4 +17,6 @@
else
make
fi
-make_normal+make_normal
+
+return 0

==== //sgl/grimoires/test/gnustep-libs/gnustep-steptalk/DEPENDS#2 (xtext) ====

@@ -1,3 +1,3 @@
-depends gnustep-gui &&
-optional_depends gnustep-gdl2
+depends gnustep-gui &&
+optional_depends gnustep-gdl2 "" "" "Add EObject support."


==== //sgl/grimoires/test/gnustep-libs/gnustep-steptalk/HISTORY#8 (text) ====

@@ -1,3 +1,7 @@
+2006-04-12 Maurizio Boriani <baux AT sourcemage.org>
+ * DEPENDS: Fix bug#10833.
+ * BUILD: Fix bug#10841.
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS





Archive powered by MHonArc 2.6.24.

Top of Page