Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] PERFORCE change 77529 by Maurizio Boriani for review

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <v.merkatz AT gmx.net>
  • To: Maurizio Boriani <baux AT member.fsf.org>
  • Cc: duane_malcolm <d.malcolm AT auckland.ac.nz>, Unet <unet AT sourcemage.org>, Gareth Clay <gareth AT caffeinefuelled.co.uk>, Eric Sandall <eric AT sandall.us>, vladimir_marek <vlmarek AT volny.cz>, Jeremy Blosser <jblosser AT sourcemage.org>, Pol Vinogradov <vin.public AT gmail.com>, SM-Commit Daemon <sm-commit AT lists.ibiblio.org>, Juuso Alasuutari <iuso AT sourcemage.org>, Andrew Stitt <a AT t.armory.com>, Arjan Bouter <abouter AT sourcemage.org>, Ladislav Hagara <ladislav.hagara AT unob.cz>, David Kowis <dkowis+smgl-p4 AT shlrm.org>, Ethan Grammatikidis <eekee AT eekee.is-a-geek.org>, Seth Woolley <seth AT swoolley.homeip.net>
  • Subject: Re: [SM-Commit] PERFORCE change 77529 by Maurizio Boriani for review
  • Date: Mon, 10 Apr 2006 17:38:12 +0200

On Mon, Apr 10, 2006 at 10:10:04AM +0100, Perforce Review Daemon wrote:
> Change 77529 by maurizio_boriani@baux-elisya on 2006/04/10 10:08:45
>
> Integrate.
>
> Affected files ...
>
> ... //sgl/grimoires/test/ChangeLog#236 integrate
> ... //sgl/grimoires/test/gnustep-libs/gnustep-gsweb/BUILD#1 branch
> ... //sgl/grimoires/test/gnustep-libs/gnustep-gsweb/CONFIGURE#1 branch
> ... //sgl/grimoires/test/gnustep-libs/gnustep-gsweb/DEPENDS#1 branch
> ... //sgl/grimoires/test/gnustep-libs/gnustep-gsweb/DETAILS#1 branch
> ... //sgl/grimoires/test/gnustep-libs/gnustep-gsweb/HISTORY#1 branch
> ... //sgl/grimoires/test/gnustep-libs/gnustep-gsweb/INSTALL#1 branch
>
> Differences ...
>
> ==== //sgl/grimoires/test/ChangeLog#236 (text) ====
>
> @@ -1,3 +1,8 @@
> +2006-04-10 Maurizio Boriani <baux AT sourcemage.org>
> + * gnustep-libs/gnustep-gsweb: New spell.
> +
> +>>>> ORIGINAL ChangeLog#254
> +==== THEIRS ChangeLog#283

I've said this before, _never_ do a plain integrate on ChangeLogs. Also
never submit ChangeLog integrations without running a p4 diff first.
Always use p4 integrate devel/ChangeLog@<changenumber>,<changenumber>
test/ChangeLog, p4 resolve -am test/ChangeLog, p4 diff -du
test/ChangeLog and then submit if the diff looks correct.

> 2006-04-09 Alex S. Tsamutali <astsmtl AT gmail.com>
> * devel/empty: new spell, shell-tool replacement for expect
>
> @@ -45,6 +50,9 @@
> 2006-03-27 Eric Sandall <eric AT sandall.us>
> * audio-libs/libmpd: Added for gmpc 0.13.0
>
> +2006-03-26 David Brown <dmlb2000 AT gmail.com>
> + * science/seti_boinc: spell added
> +
> 2006-03-14 Pieter Lenaerts <e-type AT sourcemage.org>
> * python-devel/pytelemeter: added, small Python Telemeter
> * python-devel/fpconst: added, constants and functions for working
> @@ -55,6 +63,11 @@
> * gnome2-libs/ruby-gtktrayicon: added, Ruby binding for the System
> Tray
> Protocol Specification
>
> +2006-03-25 Unet <unet AT sourcemage.org>
> + * disk/ccd2iso: added
> + * disk/mdf2iso: added
> + * disk/nrg2iso: added
> +
> 2006-03-24 David Brown <dmlb2000 AT gmail.com>
> * science/boinc: Added BOINC client
>
> @@ -81,12 +94,114 @@
> * config_query_multi.function: branched from
> config_query_checkbox.function
> * FUNCTIONS: now sources config_query_multi.function
>
> +2006-03-17 Robin Cook <rcook AT wyrms.net>
> + * New: science/gnucap
> +
> 2006-03-21 Alex S. Tsamutali <astsmtl AT gmail.com>
> * doc/didiwiki: added, personal wiki written in C
>
> 2006-03-20 Ladislav Hagara <hgr AT vabo.cz>
> * shell-term-fm/tss: added, a text-mode screen saver
>
> +2006-03-17 Robin Cook <rcook AT wyrms.net>
> + * added spells:
> + gspiceui
> + gtkwave
> + gwave
> + ng-spice
> + gnetman
> +
> +==== YOURS ChangeLog
> +2006-04-09 Alex S. Tsamutali <astsmtl AT gmail.com>
> + * devel/empty: new spell, shell-tool replacement for expect
> +
> +2006-04-08 Alex S. Tsamutali <astsmtl AT gmail.com>
> + * wm-addons/fbxkb: new spell, keyboard indicator and switcher
> +
> +2006-04-08 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
> + * disk/libburn: new spell, burning library
> +
> +2006-04-06 Flavien Bridault <vlaaad AT sourcemage.org>
> + * gnome2-apps/gcfilms: added, movie collection management
> +
> +2006-04-06 Flavien Bridault <vlaaad AT sourcemage.org>
> + * disk/FUNCTIONS: moved common code from cdrtools and dvdrtools there,
> + giving two new functions: add_module_autoload and
> remove_module_autoload
> + This code is modified from the original, taking into account the
> + right version of the kernel. That should fix bug #10683
> +
> +2006-04-06 Pol Vinogradov <vin.public AT gmail.com>
> + * gnome2-apps/gideon: added, GUI designer for GTK+
> +
> +2006-04-04 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
> + * ftp/aria2: added, multi protocol downloader,
> + ftp, http, https, bittorrent
> +
> +2006-04-03 Jeremy Blosser <jblosser-smgl AT firinn.org>
> + * security/logsurfer: added, log auditing utility
> +
> +2006-03-29 Juuso Alasuutari <iuso AT sourcemage.org>
> + * kde-apps/KDE_CONFIGURE: removed dnotify query
> + * kde-apps/KDE_BUILD: added dnotify always on
> + * kde-look/KDE_CONFIGURE: removed dnotify query
> + * kde-look/KDE_BUILD: added dnotify always on
> +
> +2006-03-29 Juuso Alasuutari <iuso AT sourcemage.org>
> + * kde-core/KDE_CONFIGURE: removed dnotify query
> + * kde-core/KDE_BUILD: added dnotify always on
> +
> +2006-03-28 Jose Bernardo Silva <jbernardo AT sourcemage.org>
> + * kde-apps/kradio: added, kde radio application
> +
> +2006-03-28 Jeremy Blosser <jblosser-smgl AT firinn.org>
> + * utils/logrotate: added, standard log rotation utility
> +
> +2006-03-27 Eric Sandall <eric AT sandall.us>
> + * audio-libs/libmpd: Added for gmpc 0.13.0
> +
> +2006-03-14 Pieter Lenaerts <e-type AT sourcemage.org>
> + * python-devel/pytelemeter: added, small Python Telemeter
> + * python-devel/fpconst: added, constants and functions for working
> + with IEEE754 double-precision special values
> + * python-devel/soappy: added, web services toolkit
> +
> +2006-03-26 Pol Vinogradov <vin.public AT gmail.com>
> + * gnome2-libs/ruby-gtktrayicon: added, Ruby binding for the System
> Tray
> + Protocol Specification
> +
> +2006-03-24 David Brown <dmlb2000 AT gmail.com>
> + * science/boinc: Added BOINC client
> +
> +2006-03-24 Flavien Bridault <vlaaad AT sourcemage.org>
> + * graphics-libs/glew: deleted initial spell and replaced it by the
> spell
> + from the games grimoire
> + * graphics-libs/soya3d: deleted duplicated spell
> + * python-devel/soya: moved from the games grimoire (bug #10581)
> +
> +2006-03-24 Flavien Bridault <vlaaad AT sourcemage.org>
> + * gnome2-libs/gnome-python-desktop: added
> + * gnome2-apps/gnome-mount: added
> + * gnome2-apps/deskbar-applet: added
> +
> +2006-03-24 Pol Vinogradov <vin.public AT gmail.com>
> + * science-libs/cuba: added, a library for multidimensional numerical
> + integration
> +
> +2006-03-22 Rafael George <george.rafael AT gmail.com>
> + * perl-cpan/io-string: added, new Perl module
> +
> +2006-03-22 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
> + * config_query_checkbox.function: renamed to
> config_query_multi.function
> + * config_query_multi.function: branched from
> config_query_checkbox.function
> + * FUNCTIONS: now sources config_query_multi.function
> +
> +2006-03-21 Alex S. Tsamutali <astsmtl AT gmail.com>
> + * doc/didiwiki: added, personal wiki written in C
> +
> +2006-03-20 Ladislav Hagara <hgr AT vabo.cz>
> + * shell-term-fm/tss: added, a text-mode screen saver
> +
> +<<<<
> 2006-03-17 Arwed v. Merkatz <v.merkatz AT gmx.net>
> * kernels/glibc-kernel-headers: removed deprecated spells
>
>

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




Archive powered by MHonArc 2.6.24.

Top of Page