[SM-Commit] GIT changes to devel grimoire by Eric Sandall

Arwed von Merkatz v.merkatz at gmx.net
Sat May 6 16:51:08 EDT 2006


On Sat, May 06, 2006 at 03:40:30PM -0500, Eric Sandall wrote:
> GIT changes to devel grimoire by Eric Sandall <sandalle at sourcemage.org>:
> 
>  libs/aqbanking/BUILD   |   15 ++++++---------
>  libs/aqbanking/DEPENDS |    8 ++++----
>  libs/aqbanking/HISTORY |   10 ++++++++++
>  3 files changed, 20 insertions(+), 13 deletions(-)
> 
> New commits:
> commit 84aa8430647bdc1ceed56a6849c69bd335559b86
> Author: Eric Sandall <sandalle at sourcemage.org>
> Commit: Eric Sandall <sandalle at sourcemage.org>
> 
>     Merging changes from test (master) to devel

Why? In my working with git I came to the conclusion that a standing
devel branch is probably not a good idea, instead we should create new
branches for WIP stuff if that's possible. Does anyone know whether it's
possible with git to create a new branch in a remote repository? If not,
a standing devel branch is what we'd have to deal with, but there's
various drawbacks to that compared to 'real' feature branches.

> diff --git a/libs/aqbanking/BUILD b/libs/aqbanking/BUILD
> index c761596..de48d10 100755
> --- a/libs/aqbanking/BUILD
> +++ b/libs/aqbanking/BUILD
> @@ -1,17 +1,14 @@
> -#  [aqbanking_frontends="cbanking g2banking qbanking kbanking"]
> -#  [aqbanking_backends="aqhbci aqdtaus aqgeldkarte aqofxconnect"]
> -
>  local BACKENDS FRONTENDS                      &&
>  
> -BACKENDS="aqhbci"                             &&
> -FRONTENDS="cbanking"                          &&
> +local BACKENDS="aqhbci aqdtaus"               &&
> +local FRONTENDS="cbanking"                    &&
>  
> -if [ "${AQBANKING_GTK}" == "y" ]; then
> -   FRONTENDS="${FRONTENDS} g2banking"
> +if  list_find  "$OPTS"  "--enable-libofx";  then
> +  BACKENDS="$BACKENDS aqofxconnect"
>  fi                                            &&
>  
> -if spell_ok libofx; then
> -   BACKEND="${BACKENDS} aqofxconnect"
> +if [ "${AQBANKING_GTK}" == "y" ]; then
> +   FRONTENDS="${FRONTENDS} g2banking"
>  fi                                            &&
>  
>  if [ "${AQBANKING_QT}" == "y" ]; then
> diff --git a/libs/aqbanking/DEPENDS b/libs/aqbanking/DEPENDS
> index d3abddd..895c673 100755
> --- a/libs/aqbanking/DEPENDS
> +++ b/libs/aqbanking/DEPENDS
> @@ -19,10 +19,10 @@ optional_depends libchipcard2           
>                   "--disable-chipcard-client"        \
>                   "Enable chipcard_client support?"  &&
>  
> -optional_depends libofx                             \
> -                 "--enable-libofx"                  \
> -                 "--disable-libofx"                 \
> -                 "use OFX?"                         &&
> +optional_depends libofx                          \
> +                 "--enable-libofx"               \
> +                 "--disable-libofx"              \
> +                 "use Open Financial eXchange?"  &&
>  
>  optional_depends python                             \
>                   "--enable-python"                  \
> diff --git a/libs/aqbanking/HISTORY b/libs/aqbanking/HISTORY
> index 59a279e..e0a09ea 100644
> --- a/libs/aqbanking/HISTORY
> +++ b/libs/aqbanking/HISTORY
> @@ -1,3 +1,12 @@
> +2006-05-04 Eric Sandall <eric at sandall.us>
> +	* BUILD: Removed adding aqofxconnect via checking `spell_ok libofx`
> +
> +2006-05-04 Eric Sandall <eric at sandall.us>
> +	* BUILD: Remove explicitly enabling aqofxconnect backend (requires
> +	  libofx) (Bug #10669)
> +	  Add aqofxconnect if depending on libofx (Bug #10669)
> +	* DEPENDS: Expand OFX acronym in 'for' usage of optional depends on libofx
> +
>  2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
>  	* DETAILS: (automated) Add KEYWORDS
>  
> @@ -9,3 +18,4 @@
>  
>  2006-02-10 Robin Cook <rcook at wyrms.net>
>  	* Initial Spell
> +
> _______________________________________________
> SM-Commit mailing list
> SM-Commit at lists.ibiblio.org
> http://lists.ibiblio.org/mailman/listinfo/sm-commit
> 

-- 
Arwed v. Merkatz                              Source Mage GNU/Linux developer
                                                    http://www.sourcemage.org



More information about the SM-Commit mailing list