[SM-Commit] GIT changes to test grimoire by Treeve Jelbert (9265335a39ddc6218112993f08cb598eef619328)

Flavien Bridault vlaaad at sourcemage.org
Sun Jun 18 19:21:44 EDT 2006


Le dimanche 18 juin 2006 à 15:48 -0500, Treeve Jelbert a écrit :
> GIT changes to test grimoire by Treeve Jelbert <treeve at scarlet.be>:
> 
>  database/libiodbc/BUILD     |    5 ++---
>  database/libiodbc/CONFLICTS |    1 +
>  database/libiodbc/DETAILS   |    4 +---
>  database/libiodbc/HISTORY   |    5 +++++
>  4 files changed, 9 insertions(+), 6 deletions(-)
> 
> New commits:
> commit 9265335a39ddc6218112993f08cb598eef619328
> Merge: ea93e3cd8e476537a7d5895089c1fba278696b70 04cd54b441fbf70b1ba514d6b1764ef071b9697c
> Author: Treeve Jelbert <treeve at scarlet.be>
> Commit: Treeve Jelbert <treeve at scarlet.be>
> 
>     Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire
> 
> commit ea93e3cd8e476537a7d5895089c1fba278696b70
> Author: Treeve Jelbert <treeve at scarlet.be>
> Commit: Treeve Jelbert <treeve at scarlet.be>
> 
>     libiodbc - add CONFLICTS
> 

Was there a bug filed somewhere for this or did you discover that
problem yourself ?
I ask that because if I'm right, that should solve at least this one :-)

http://bugs.sourcemage.org/show_bug.cgi?id=12148


> diff --git a/database/libiodbc/BUILD b/database/libiodbc/BUILD
> index d22e99f..bdbcdf2 100755
> --- a/database/libiodbc/BUILD
> +++ b/database/libiodbc/BUILD
> @@ -1,3 +1,2 @@
> -make_single &&
> -default_build &&
> -make_normal
> +OPTS="--disable-static $OPTS"  &&
> +default_build 
> diff --git a/database/libiodbc/CONFLICTS b/database/libiodbc/CONFLICTS
> new file mode 100755
> index 0000000..127dc83
> --- /dev/null
> +++ b/database/libiodbc/CONFLICTS
> @@ -0,0 +1 @@
> +conflicts  unixodbc
> diff --git a/database/libiodbc/DETAILS b/database/libiodbc/DETAILS
> index bae0048..763e2c6 100755
> --- a/database/libiodbc/DETAILS
> +++ b/database/libiodbc/DETAILS
> @@ -8,9 +8,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
>        LICENSE[0]=BSD
>        LICENSE[1]=LGPL
>           ENTERED=20050707
> -         UPDATED=20050707
> -       BUILD_API=2
> -        KEYWORDS="database"
> +        KEYWORDS="database interface"
>             SHORT='ODBC driver manager and SDK'
>  cat << EOF
>  ODBC is the acronym for Open DataBase Connectivity, a Microsoft Universal
> diff --git a/database/libiodbc/HISTORY b/database/libiodbc/HISTORY
> index fd9651e..6586312 100644
> --- a/database/libiodbc/HISTORY
> +++ b/database/libiodbc/HISTORY
> @@ -1,3 +1,8 @@
> +2006-06-18 Treeve Jelbert <treeve01 at pi.be>
> +	* CONFLICTS: added, don't know where it went
> +	* BUILD: disable-static
> +	* DETAILS: add Keywords
> +
>  2006-05-27 Treeve Jelbert <treeve01 at pi.be>
>  	* DEPENDS: gtk+ is optional
>  
> _______________________________________________
> SM-Commit mailing list
> SM-Commit at lists.ibiblio.org
> http://lists.ibiblio.org/mailman/listinfo/sm-commit
> 
-- 
Flavien Bridault

Disk, Graphics, Graphics-libs sections Guru
Source Mage GNU/Linux - http://www.sourcemage.org

irc: vlaaad
jabber: vlaaad at amessage.be
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Ceci est une partie de message
	=?ISO-8859-1?Q?num=E9riquement?= =?ISO-8859-1?Q?_sign=E9e?=
Url : http://lists.ibiblio.org/pipermail/sm-commit/attachments/20060619/8454b96b/attachment.bin 


More information about the SM-Commit mailing list