Source Mage code commit list

[Ladislav Hagara <ladislav.hagara AT unob.cz>]

I am very sorry but I still don't get accustomed to git, specially git
integrations and git reviews.
For me they are still confusing or even chaotic. Of course it can be
only my problem.
For example this mail. It is impossible to responsibly review it.
Why so much conflicts? Why these strange changes?
For example firefox, small change in DEPENDS together with over 30
deleted lines from HISTORY.
Next kopete, added deprecated UPDATED with again so much deleted lines
from HISTORY.
How is it possible?

-- 
Ladislav Hagara
just remembering gold times with p4 integ


> GIT changes to stable-rc-0.6 grimoire by Eric Sandall 
> <sandalle@moby.(none)>:
>
>  http/firefox/DEPENDS     |    3 +--
>  http/firefox/HISTORY     |   35 -----------------------------------
>  kde-apps/kopete/DETAILS  |    1 +
>  kde-apps/kopete/HISTORY  |   35 -----------------------------------
>  net/dictd/HISTORY        |    3 ---
>  utils/util-linux/HISTORY |    8 --------
>  6 files changed, 2 insertions(+), 83 deletions(-)
>
> New commits:
> commit dd31c98820847d9a5e86f6331010decb1012f43d
> Author: Eric Sandall <sandalle@moby.(none)>
> Commit: Eric Sandall <sandalle@moby.(none)>
>
>     net/dictd: 2006/06/15 sync from p4
>     
>     Conflicts:
>     
>       net/dictd/HISTORY
>
> commit 3fc63293d711f709e7b8f0431d502f679a85d75c
> Author: Jason Flatt <jflatt AT sourcemage.org>
> Commit: Eric Sandall <sandalle@moby.(none)>
>
>     Fixed the SOURCE_URL.
>
> commit a2b80992b09c0c7ee91db96577981cdc015c484b
> Author: Matthew Clark <matthewclark AT inlesserterms.net>
> Commit: Eric Sandall <sandalle@moby.(none)>
>
>     Updated to version 8.64 and fixed SOURCE_URL
>     
>     Conflicts:
>     
>       archive/alien/DETAILS
>       archive/alien/HISTORY
>
> commit b78122f9ff991a648c071f8ba185fdbe5aeea0d3
> Author: Jeremy Blosser <jblosser AT fawkes.sourcemage.org>
> Commit: Eric Sandall <sandalle@moby.(none)>
>
>     sync kde-apps/kopete from test
>     
>     Conflicts:
>     
>       kde-apps/kopete/DETAILS
>       kde-apps/kopete/HISTORY
>
> commit b37e3a511723fe0bc6743bb7ee72256a6c50c4ef
> Author: David Kowis <dkowis AT shlrm.org>
> Commit: Eric Sandall <sandalle@moby.(none)>
>
>     firefox
>     
>     fixing bug 11526 and 10093
>     
>     Conflicts:
>     
>       http/firefox/DEPENDS
>       http/firefox/HISTORY
>
> commit 868a99f939fdea61e6269f363f4e758401ade493
> Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
> Commit: Eric Sandall <sandalle@moby.(none)>
>
>     util-linux: create group tty #7768
>     
>     Conflicts:
>     
>       utils/util-linux/HISTORY
>
> diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
> index 429983f..6b860a5 100755
> --- a/http/firefox/DEPENDS
> +++ b/http/firefox/DEPENDS
> @@ -10,8 +10,7 @@ depends  zip                           &
>  depends  zlib    '--with-system-zlib'  &&
>  depends  nss                           &&
>  
> -suggest_depends_2 firefox-smglwiki '' '' \
> -  'to enable searching the SMGL Wiki from the Search Bar' &&
> +suggest_depends firefox-smglwiki '' '' 'to enable searching the SMGL Wiki 
> from the Search Bar' &&
>  
>  if  [  "$FIREFOX_GTK"  ==  "2.x"  ];  then
>    depends  gtk+2  \
> diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
> index 1f28591..9b48ce9 100644
> --- a/http/firefox/HISTORY
> +++ b/http/firefox/HISTORY
> @@ -1,38 +1,3 @@
> -2006-11-07 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
> -     * DEPENDS: change suggest_depends to sub_depends_2 for #13244
> -
> -2006-10-06 Juuso Alasuutari <iuso AT sourcemage.org>
> -     * firefox.sh: Removed bashism.
> -
> -2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
> -     * PROVIDES: [automated] Fixed invalid entries.
> -
> -2006-09-14 Ladislav Hagara <hgr AT vabo.cz>
> -     * DETAILS: 1.5.0.7
> -
> -2006-08-13 Pieter Lenaerts <e-type AT sourcemage.org>
> -     * staged_install off
> -
> -2006-08-09 Juuso Alasuutari <iuso AT sourcemage.org>
> -     * firefox: Removed bashisms, bug #12882.
> -
> -2006-08-02 Flavien Bridault <vlaaad AT sourcemage.org>
> -     * DETAILS: reset PATCHLEVEL 
> -
> -2006-08-02 Flavien Bridault <vlaaad AT sourcemage.org>
> -     * BUILD: Attempt to replace /usr/lib/firefox-$VERSION by 
> /usr/lib/firefox
> -       in pkgconfig files and firefox-config
> -
> -2006-08-02 Ladislav Hagara <hgr AT vabo.cz>
> -     * DETAILS: 1.5.0.6
> -
> -2006-07-27 Ladislav Hagara <hgr AT vabo.cz>
> -     * DETAILS: SECURITY_PATCH=4
> -       http://www.mozilla.org/projects/security/known-vulnerabilities.html
> -
> -2006-07-26 Ladislav Hagara <hgr AT vabo.cz>
> -     * DETAILS: 1.5.0.5, removed UPDATED and BUILD_API
> -
>  2006-07-07 David Kowis <dkowis AT shlrm.org>
>       * DEPENDS: made nss non-optional
>  
> diff --git a/kde-apps/kopete/DETAILS b/kde-apps/kopete/DETAILS
> index f0ea47e..6be2496 100755
> --- a/kde-apps/kopete/DETAILS
> +++ b/kde-apps/kopete/DETAILS
> @@ -6,6 +6,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
>     SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
>          WEB_SITE=http://kopete.kde.org
>           ENTERED=20020406
> +         UPDATED=20031127
>          KEYWORDS="kde"
>             SHORT="a multiple protocol IM client for KDE"
>        LICENSE[0]=GPL
> diff --git a/kde-apps/kopete/HISTORY b/kde-apps/kopete/HISTORY
> index dabc476..7335c4c 100644
> --- a/kde-apps/kopete/HISTORY
> +++ b/kde-apps/kopete/HISTORY
> @@ -1,38 +1,3 @@
> -2006-10-05 Juuso Alasuutari <iuso AT sourcemage.org>
> -     * TRIGGERS: Added, check self on kdelibs cast.
> -
> -2006-08-09 Matthew Clark <matthewclark AT inlesserterms.net>
> -     * DETAILS: v0.12.2
> -     * PRE_BUILD: removed ICQ patch, deleted PRE_BUILD
> -
> -2006-08-09 Matthew Clark <matthewclark AT inlesserterms.net>
> -     * PRE_BUILD: Added ICQ patch
> -
> -2006-08-05 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
> -     * DEPENDS: added libidn, xorg-modules
> -
> -2006-08-02 Matthew Clark <matthewclark AT inlesserterms.net>
> -     * DEPENDS: Moved the xmms optional dependecy from
> -       kdenetwork to kopete, bug 12936
> -
> -2006-08-01 Matthew Clark <matthewclark AT inlesserterms.net>
> -     * CONFLICTS: Removed, as kdenetwork no longer builds kopete
> -
> -2006-07-13 Treeve Jelbert <treeve01 AT pi.be>
> -     * DETAILS: version 0.12.1
> -
> -2006-06-29 Eric Sandall <eric AT sandall.us>
> -     * DETAILS: Removed BUILD_API=2, set grimoire-wide
> -
> -2006-06-29 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
> -     * DEPENDS: change qssl to qca-tls
> -
> -2006-05-31 Treeve Jelbert <treeve01 AT pi.be>
> -     * DETAILS: version 0.12
> -
> -2006-05-30 Treeve Jelbert <treeve01 AT pi.be>
> -     * DETAILS: version 0.12-beta2
> -
>  2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
>       * DETAILS: (automated) Add KEYWORDS
>  
> diff --git a/net/dictd/HISTORY b/net/dictd/HISTORY
> index a6f4f4e..9ee639b 100644
> --- a/net/dictd/HISTORY
> +++ b/net/dictd/HISTORY
> @@ -1,6 +1,3 @@
> -2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
> -     * DETAILS: [automated] Removed BUILD_API=2.
> -
>  2006-05-13 Matthew Clark <matthewclark AT inlesserterms.net>
>       * DETAILS: Version bump to v1.9.15, fixes bug 11055
>  
> diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
> index 09d12d0..d3e0eee 100755
> --- a/utils/util-linux/HISTORY
> +++ b/utils/util-linux/HISTORY
> @@ -1,11 +1,3 @@
> -2006-10-23 David Brown <dmlb2000 AT gmail.com>
> -     * DETAILS updated patch level
> -     * util-linux-2.12p-cramfs-1.patch: added back from previous removal
> -
> -2006-10-21 Treeve Jelbert <treeve AT pi.be>
> -     * DETAILS: SOURCE_URL=$KERNEL_URL
> -     * util-linux-2.12p-cramfs-1.patch: removed unintentionally
> -
>  2006-09-03 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
>       * BUILD: create group tty #7768
>  
> _______________________________________________
> SM-Commit mailing list
> SM-Commit AT lists.ibiblio.org
> http://lists.ibiblio.org/mailman/listinfo/sm-commit
>
>