Source Mage code commit list

[Arwed von Merkatz <v.merkatz AT gmx.net>]

On Sat, May 20, 2006 at 12:42:18PM -0500, Jaka Kranjc wrote:
> GIT changes to test grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:
> 
>  kde-core/kdebase/CONFIGURE |    4 ++--
>  kde-core/kdebase/DETAILS   |    7 ++++++-
>  kde-core/kdebase/HISTORY   |    5 +++++
>  kde-core/kdebase/INSTALL   |    8 ++++++++
>  kde-core/kdebase/PREPARE   |    1 +
>  kde-core/kdebase/PRE_BUILD |    5 +++++
>  6 files changed, 27 insertions(+), 3 deletions(-)
> 
> New commits:
> commit a2da6db8517fb6bf31f90a503ab3840912f2b8c5
> Merge: 0938891... 62582e8...
> Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
> Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
> 
>     Merge branch 'master' of http://scm.sourcemage.org/smgl/grimoire

Just a note. As Jeremy wrote in his mail to this list, there's a 'git
rebase' command that gives a cleaner commit message (as it doesn't
include this merge stuff). I tried it and it should work pretty well for
this 'need to update before commiting' use-case.
Just do a 'git fetch', followed by a 'git rebase origin' (when working
in the master branch of course). This will re-start the master branch
based on the current origin and apply all commits you've done on top of
that.
This will result in the exactly same content (assuming there are no
conflicts), but won't mess up the commit message like git pull does :)

> commit 0938891675afa74d265500a60f753c384359d5e4
> Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
> Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
> 
>     kdebase: added optional smgl splash #8376
> 
> commit d1490aed94c198e5231647a794651b0e7161b8f2
> Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
> Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
> 
>     kde-core maintained in git
> 
> diff --git a/kde-core/kdebase/CONFIGURE b/kde-core/kdebase/CONFIGURE
> index dfbb199..66ef42f 100755
> --- a/kde-core/kdebase/CONFIGURE
> +++ b/kde-core/kdebase/CONFIGURE
> @@ -3,12 +3,12 @@ source  $SECTION_DIRECTORY/KDE_CONFIGURE
>  config_query_option  KDEBASE_XCONSOLE                        \
>                       "Build kdm with built-in xconsole?"  n  \
>                       "--with-kdm-xconsole"                   \
> -                     "--without-kdm-xconsole"
> +                     "--without-kdm-xconsole"               &&
>  
>  config_query_option  KDEBASE_DPMS                    \
>                       "Enable DPMS power saving?"  y  \
>                       "--with-dpms"                   \
> -                     "--without-dpms"
> +                     "--without-dpms"               &&
>  
>  config_query_option  KDEBASE_XDMCP              \
>                       "Enable XDMCP in KDM?"  y  \
> diff --git a/kde-core/kdebase/DETAILS b/kde-core/kdebase/DETAILS
> index 5c7669a..ae9d1a8 100755
> --- a/kde-core/kdebase/DETAILS
> +++ b/kde-core/kdebase/DETAILS
> @@ -6,13 +6,18 @@ source  $SECTION_DIRECTORY/KDE_DETAILS
>            SOURCE=$SPELL-$VERSION.tar.bz2
>  SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
>     SOURCE_URL[0]=$KDE_URL/stable/${VERSION//.0/}/src/$SOURCE
> +if [[ $SMGL_THEME == "y" ]]; then
> +         SOURCE2=21602-sourcemage.tar.gz
> +  SOURCE2_URL[0]=http://www.kde-look.org/content/download.php?content=21602
> +    
> SOURCE2_HASH=sha512:2e5197edff2664da0a28881144da3372206b29847ede98ef3d3e3c7313d02f6643642d3fa4f5c60ca5cd77804254bb4fa1acbf59b13c61c528904aee148bc6d6
> +fi
>         BUILD_API=2
>          WEB_SITE=http://www.kde.org
>           ENTERED=20010912
>           UPDATED=20051202
>        PATCHLEVEL=1
>        LICENSE[0]=GPL
> -                                      KEYWORDS="kde"
> +        KEYWORDS="kde"
>             SHORT="Base applications that form the core of KDE."
>  cat << EOF
>  This package contains the base applications that form the core of
> diff --git a/kde-core/kdebase/HISTORY b/kde-core/kdebase/HISTORY
> index 99d7b4f..e42b54c 100644
> --- a/kde-core/kdebase/HISTORY
> +++ b/kde-core/kdebase/HISTORY
> @@ -1,3 +1,8 @@
> +2006-05-20 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
> +     * CONFIGURE: added missing &&
> +     * PREPARE, PRE_BUILD: added
> +     * PREPARE, DETAILS, PRE_BUILD, INSTALL: added optional smgl splash 
> #8376
> +
>  2006-04-14 Juuso Alasuutari <iuso AT sourcemage.org>
>       * BUILD: Same fix as below, but based on spell_ok as was 
>         decided is the best option.
> diff --git a/kde-core/kdebase/INSTALL b/kde-core/kdebase/INSTALL
> index 6ca9f5d..aabe074 100755
> --- a/kde-core/kdebase/INSTALL
> +++ b/kde-core/kdebase/INSTALL
> @@ -8,4 +8,12 @@ if [ -d "$TMP_DIR/kdm" ]; then
>    install_config_file $TMP_DIR/kdm/backgroundrc.new 
> $INSTALL_ROOT/usr/share/config/kdm/backgroundrc  &&
>    install_config_file $TMP_DIR/kdm/kdmrc.new 
> $INSTALL_ROOT/usr/share/config/kdm/kdmrc  &&
>    rm -r $TMP_DIR/kdm
> +fi &&
> +if [[ $SMGL_THEME == "y" ]]; then
> +  if [[ ! -e $INSTALL_ROOT/usr/share/apps/ksplash/Themes/SourceMage ]]; 
> then
> +    mkdir $INSTALL_ROOT/usr/share/apps/ksplash/Themes/SourceMage
> +  fi &&
> +  for file in SourceMage*; do
> +    mv $file 
> $INSTALL_ROOT/usr/share/apps/ksplash/Themes/SourceMage/${file#*\\}
> +  done
>  fi
> diff --git a/kde-core/kdebase/PREPARE b/kde-core/kdebase/PREPARE
> new file mode 100755
> index 0000000..1c5049a
> --- /dev/null
> +++ b/kde-core/kdebase/PREPARE
> @@ -0,0 +1 @@
> +config_query SMGL_THEME "Do you want to install a Source Mage splash?" n
> diff --git a/kde-core/kdebase/PRE_BUILD b/kde-core/kdebase/PRE_BUILD
> new file mode 100755
> index 0000000..add83a4
> --- /dev/null
> +++ b/kde-core/kdebase/PRE_BUILD
> @@ -0,0 +1,5 @@
> +default_pre_build      &&
> +if [[ $SMGL_THEME == "y" ]]; then
> +  cd  $SOURCE_DIRECTORY  &&
> +  unpack_file 2
> +fi
> _______________________________________________
> 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