[SM-Commit] PERFORCE change 78813 by Arwed von Merkatz for review

Perforce Review Daemon p4review at smee.org
Tue May 2 07:20:01 EDT 2006


Change 78813 by arwed_von_merkatz at arwed-Otherland on 2006/05/02 12:17:33

	fixing broken ChangeLog

Affected files ...

... //sgl/grimoires/test/ChangeLog#267 edit

Differences ...

==== //sgl/grimoires/test/ChangeLog#267 (text) ====

@@ -2,8 +2,6 @@
 	* gnustep-libs/gnustep-cenonlib: New spell.
 	* gnustep-apps/gnustep-cenon: Likewise.
 	
->>>> ORIGINAL ChangeLog#289
-==== THEIRS ChangeLog#315
 2006-05-01 David Brown <dmlb2000 at gmail.com>
 	* FUNCTIONS: disable_pic needs curly braces to check SMGL_COMPAT_ARCHS 
 	  or it shows up as 64[1] instead of x86_64
@@ -13,9 +11,6 @@
 	  added dropping of '-sub SUB_DEPENDS' parameter for depends and
 	  optional_depends, bug #10802
 
-2006-04-28 Treeve Jelbert <treeve01 at pi.be>
-	* database/dbstep: remove dead spell
-
 2006-04-27 Alex S. Tsamutali <astsmtl at gmail.com>
 	* libs/libstatgrab: new spell, cross platform system stats access library
 	* python-devel/pystatgrab: new spell, python bindings for libstatgrab
@@ -55,77 +50,15 @@
 2006-04-20 Pol Vinogradov <vin.public at gmail.com>
 	* gurus.gpg: my key for signing added, key id E2C9B83E
 
-2006-04-18 Matthew Clark <matthewclark at inlesserterms.net>
-	* net/cutecom: new spell
-
-2006-04-18 Juuso Alasuutari <iuso at sourcemage.org>
-	* kde-*/KDE_BUILD: Sets $QTDIR if possible, fixes bug #10764.
-
 2006-04-18 Pieter Lenaerts <e-type at sourcemage.org>
 	* editors/pico to z-rejected/z-editors
 	
-2006-04-18 Treeve Jelbert <treeve01 at pi.be>
-	* x11-toolkits/lazarus: added
-
-==== YOURS ChangeLog
-2006-05-01 David Brown <dmlb2000 at gmail.com>
-	* FUNCTIONS: disable_pic needs curly braces to check SMGL_COMPAT_ARCHS 
-	  or it shows up as 64[1] instead of x86_64
-
-2006-04-28 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* libcompat: added fast_up_depends function, bug #10661,
-	  added dropping of '-sub SUB_DEPENDS' parameter for depends and
-	  optional_depends, bug #10802
-
-2006-04-27 Alex S. Tsamutali <astsmtl at gmail.com>
-	* libs/libstatgrab: new spell, cross platform system stats access library
-	* python-devel/pystatgrab: new spell, python bindings for libstatgrab
-
-2006-04-27 Flavien Bridault <vlaaad at sourcemage.org>
-	* gurus.gpg: removed previous key id E0D7A9AE because it was a DSA
-	  key and not a RSA. New key id is AF8857ED
-
-2006-04-26 Flavien Bridault <vlaaad at sourcemage.org>
-	* gurus.gpg: my key for spell signing added, key id E0D7A9AE
-
-2006-04-25 Juuso Alasuutari <iuso at sourcemage.org>
-	* libs/libnxml: XML library added
-	* libs/libmrss: RSS library added
-	* news/rsstail: RSS monitor added, needs above libs
-
-2006-04-24 Eric Sandall <eric at sandall.us>
-	* e/e_module-moon: Moon phase module for e17 added
-	* libs/libnl: A netlink socket library added
-	* net/dhcdbd: DHCP D-BUS Daemon added
-
-2006-04-22 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* mozilla.gpg: added the current mozilla signing key (1AF32821)
-
-2006-04-21 Eric Sandall <eric at sandall.us>
-	* libs/liblzf: LZF compression library added
-	* kernels/suspend: Userspace suspend tool
-
-2006-04-21 Ladislav Hagara <hgr at vabo.cz>
-	* gnu.gpg: added key FF325CF3 from ftp://ftp.gnu.org/gnu/gnu-keyring.gpg
-	  needed for check gdb-6.4 sources
-
-2006-04-21 Pol Vinogradov <vin.public at gmail.com>
-	* spelling/stardict: new spell, StarDict - A Cross-Platform and
-	  international dictionary
-
-2006-04-20 Pol Vinogradov <vin.public at gmail.com>
-	* gurus.gpg: my key for signing added, key id E2C9B83E
-
-2006-04-18 Pieter Lenaerts <e-type at sourcemage.org>
-	* editors/pico to z-rejected/z-editors
-	
 2006-04-18 Matthew Clark <matthewclark at inlesserterms.net>
 	* net/cutecom: new spell
 
 2006-04-18 Juuso Alasuutari <iuso at sourcemage.org>
 	* kde-*/KDE_BUILD: Sets $QTDIR if possible, fixes bug #10764.
 
-<<<<
 2006-04-18 David Kowis <dkowis at shlrm.org>
 	* mail/pine-{pop2,pop3,client,imap}: Moved to z-rejected due to license
 	  incompatibilities



More information about the SM-Commit mailing list