New commits:
commit cde3045eef4adf34a9fc6c1993de94c0d5d48a12
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
glade: deprecated in favor of glade3
commit 73d5565860321f0e3e3b60f76b239468ae1b0620
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
gnome-chess: deprecated in favor of gnome-games2
commit d7c4a2f4690f63ecb99ff094e05dfd766b5b5924
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
gnofin: deprecated in favor of gnucash2
commit de04db91d9032c4ed333a2a115272656038087d7
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
memprof: deprecated in favor of memprof2
commit e5ed85ab72ee1a1ec651b33e73f3923afc0efa1c
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
gnome-admin: deprecated in favor of gnome-util2 and gnome-cups-manager
commit f9107796a58cdb3acfbfc24ec663ec821300b72f
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
pan: deprecated in favor of pan2
commit d55b0425c1ca3297fc31b157740a37e901b1e491
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
gtop: deprecated in favor of gnome-system-monitor
commit d55625aacb22c22edce1756d99360b255cfcfeec
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
gedit: deprecated in favor of gedit2
commit cb18a4018e5f4bb71cf519ddc0172646251cc2b0
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
galeon: deprecated in favor of galeon2
commit 8df6c5a7dfbedd7370fdd122974ddf94000bbdb9
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
evolution: deprecated in favor of evolution2
commit a0238268a21f45a8381768a3955525e47b28b835
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
ee: deprecated in favor of eog2
commit 665f2dd00903e96fc46c1bbfc00d8f741914c5f0
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
balsa: deprecated in favor of balsa2
commit a95c2ffd8048f89b3262c58426738052acec647a
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
ggv: deprecated in favor of evince
diff --git a/doc/evince/CONFLICTS b/doc/evince/CONFLICTS
new file mode 100755
index 0000000..eea2bad
--- /dev/null
+++ b/doc/evince/CONFLICTS
@@ -0,0 +1 @@
+conflicts ggv y
diff --git a/doc/evince/HISTORY b/doc/evince/HISTORY
index ea82bbe..998f5d2 100644
--- a/doc/evince/HISTORY
+++ b/doc/evince/HISTORY
@@ -1,3 +1,6 @@
+2007-05-20 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * CONFLICTS: added conflict ggv for deprecation
+
2007-04-10 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 0.8.1
diff --git a/gnome1-apps/evolution/INSTALL b/gnome1-apps/evolution/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/gnome1-apps/evolution/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/gnome1-apps/evolution/PREPARE b/gnome1-apps/evolution/PREPARE
deleted file mode 100755
index 65a34a6..0000000
--- a/gnome1-apps/evolution/PREPARE
+++ /dev/null
@@ -1,5 +0,0 @@
-if [ -z "${DISPLAY}" ]
-then
- message "${MESSAGE_COLOR}An X display was not found; Recast
${SPELL_COLOR}evolution${MESSAGE_COLOR} in a console with access to an X
window.${DEFAULT_COLOR}"
- return 1
-fi
diff --git a/gnome1-apps/evolution/PRE_BUILD b/gnome1-apps/evolution/PRE_BUILD
index 9766706..27ba77d 100755
--- a/gnome1-apps/evolution/PRE_BUILD
+++ b/gnome1-apps/evolution/PRE_BUILD
@@ -1,10 +1 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-unpack $SOURCE2 ${MD5[1]} &&
-
-case $WITH_LDAP in
- y|Y|j|J) unpack $SOURCE3 ${MD5[2]}
- ;;
- *) true
- ;;
-esac
+true
diff --git a/gnome1-apps/evolution/PROVIDES b/gnome1-apps/evolution/PROVIDES
deleted file mode 100755
index 88e26d6..0000000
--- a/gnome1-apps/evolution/PROVIDES
+++ /dev/null
@@ -1 +0,0 @@
-EMAIL-CLIENT
diff --git a/gnome1-apps/evolution/TRIGGERS b/gnome1-apps/evolution/TRIGGERS
new file mode 100755
index 0000000..4112d8b
--- /dev/null
+++ b/gnome1-apps/evolution/TRIGGERS
@@ -0,0 +1 @@
+on_cast evolution dispel_self
diff --git a/gnome1-apps/evolution/evolution-1.0.3.patch
b/gnome1-apps/evolution/evolution-1.0.3.patch
deleted file mode 100755
index 6cf1e2c..0000000
--- a/gnome1-apps/evolution/evolution-1.0.3.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: camel-mime-utils.c
-===================================================================
-RCS file: /cvs/gnome/evolution/camel/camel-mime-utils.c,v
-retrieving revision 1.146.6.6
-diff -u -r1.146.6.6 camel-mime-utils.c
---- camel-mime-utils.c 12 Apr 2002 06:43:56 -0000 1.146.6.6
-+++ camel-mime-utils.c 3 May 2002 03:05:46 -0000
-@@ -2367,7 +2367,7 @@
- } else {
- /* Fix for stupidly-broken-mailers that like
to put '.''s in names unquoted */
- /* see bug #8147 */
-- if (*inptr && *inptr != '<') {
-+ while (!pre && *inptr && *inptr != '<') {
- w(g_warning("Working around stupid
mailer bug #5: unescaped characters in names"));
- name = g_string_append_c(name,
*inptr++);
- pre = header_decode_word(&inptr);
diff --git a/gnome1-apps/galeon/BUILD b/gnome1-apps/galeon/BUILD
index faa841c..27ba77d 100755
--- a/gnome1-apps/galeon/BUILD
+++ b/gnome1-apps/galeon/BUILD
@@ -1,17 +1 @@
-(
- FOO=$(gaze installed mozilla | cut -d. -s -f1-3 | cut -c-3)
- ./configure --prefix=${INSTALL_ROOT}/usr \
- --sysconfdir=${INSTALL_ROOT}/etc \
- --disable-werror \
- --with-mozilla-snapshot=$FOO \
- $OPTS &&
- make &&
- prepare_install &&
- make install &&
- echo "YES" |
- galeon-config-tool --install-schemas --fix-gconf-permissions
-# &&
-# echo "YES" |
-# gconftool -install-schema-file /etc/gconf/schemas/galeon.schemas
-
-) > $C_FIFO 2>&1
+true
diff --git a/gnome1-apps/galeon/DEPENDS b/gnome1-apps/galeon/DEPENDS
index 4b91a16..91a700c 100755
--- a/gnome1-apps/galeon/DEPENDS
+++ b/gnome1-apps/galeon/DEPENDS
@@ -1,8 +1 @@
-depends gnome-libs &&
-depends libglade &&
-depends gnome-vfs &&
-depends gconf &&
-depends oaf &&
-depends libxml &&
-depends intltool &&
-depends mozilla
+depends galeon2
diff --git a/gnome1-apps/galeon/DETAILS b/gnome1-apps/galeon/DETAILS
index 5ea2fed..d85b769 100755
--- a/gnome1-apps/galeon/DETAILS
+++ b/gnome1-apps/galeon/DETAILS
@@ -1,16 +1,17 @@
SPELL=galeon
VERSION=1.2.13
- SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:750e7823ee8707f70c5c145ae7d8193b9b2a904acc7f71ad4f9300667cf8c3ab4245f3fc02404f5f534c78165a6745c787e31e24bb3c49d3ec129af94e22e08b
+# SOURCE=$SPELL-$VERSION.tar.gz
+#SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+# SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+#
SOURCE_HASH=sha512:750e7823ee8707f70c5c145ae7d8193b9b2a904acc7f71ad4f9300667cf8c3ab4245f3fc02404f5f534c78165a6745c787e31e24bb3c49d3ec129af94e22e08b
LICENSE[0]=GPL
LICENSE[1]=FILE
+PATCHLEVEL=1
WEB_SITE=http://galeon.sourceforge.net
ENTERED=20010922
UPDATED=20030609
KEYWORDS="mozilla gnome1 web"
- BUILD_API=1
+
SHORT="Galeon is a GNOME Web browser based on Gecko (the Mozilla
rendering engine)."
cat << EOF
Galeon is a GNOME Web browser based on Gecko (the Mozilla rendering
diff --git a/gnome1-apps/galeon/HISTORY b/gnome1-apps/galeon/HISTORY
index e771757..93aad7a 100644
--- a/gnome1-apps/galeon/HISTORY
+++ b/gnome1-apps/galeon/HISTORY
@@ -1,3 +1,6 @@
+2007-05-20 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * all: deprecated in favor of galeon2
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed MAINTAINER.
diff --git a/gnome1-apps/galeon/INSTALL b/gnome1-apps/galeon/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/gnome1-apps/galeon/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/gnome1-apps/galeon/LICENSE b/gnome1-apps/galeon/LICENSE
deleted file mode 100644
index 2d650b4..0000000
--- a/gnome1-apps/galeon/LICENSE
+++ /dev/null
@@ -1,8 +0,0 @@
-The present copyright holders of this program have given permission, as a
-special exception, to link this program with the Mozilla XPCOM library,
-libxpcom and to include header files for xpcom components when those header
-files are covered by the MPL or NPL licenses, as long as the GNU GPL is
-followed for this program in all other ways. If at a future time xpcom
-and/or used header files are dual-licensed, where one of the licenses is
-the GNU GPL, this exception clause ceases to apply for the dual-licensed
-code, and such code must be used under the GNU GPL.
\ No newline at end of file
diff --git a/gnome1-apps/galeon/PRE_BUILD b/gnome1-apps/galeon/PRE_BUILD
index 0521040..27ba77d 100755
--- a/gnome1-apps/galeon/PRE_BUILD
+++ b/gnome1-apps/galeon/PRE_BUILD
@@ -1,7 +1 @@
-if ! $(gaze install mozilla | grep libgtksuperwin.so )
-then message "${WARNING}\n \t Mozilla has been built against the NEW gtk+2
toolkit,\n \t but this \
-version of galeon is for gnome1 only!\n \t You must recast mozilla and
choose OLD gtk+ toolkit" &&
-return 1
-fi &&
-
-default_pre_build
+true
diff --git a/gnome1-apps/galeon/TRIGGERS b/gnome1-apps/galeon/TRIGGERS
new file mode 100755
index 0000000..d094ea1
--- /dev/null
+++ b/gnome1-apps/galeon/TRIGGERS
@@ -0,0 +1 @@
+on_cast galeon dispel_self
diff --git a/gnome1-apps/gedit/BUILD b/gnome1-apps/gedit/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/gnome1-apps/gedit/BUILD
@@ -0,0 +1 @@
+true
diff --git a/gnome1-apps/gedit/DEPENDS b/gnome1-apps/gedit/DEPENDS
index 75c85c1..e65e1f2 100755
--- a/gnome1-apps/gedit/DEPENDS
+++ b/gnome1-apps/gedit/DEPENDS
@@ -1,5 +1 @@
-depends gnome-print &&
-depends gnome-vfs &&
-depends gnome-libs &&
-depends gtk+ &&
-depends libglade
+depends gedit2
diff --git a/gnome1-apps/gedit/DETAILS b/gnome1-apps/gedit/DETAILS
index 06734a4..6c7f016 100755
--- a/gnome1-apps/gedit/DETAILS
+++ b/gnome1-apps/gedit/DETAILS
@@ -1,9 +1,10 @@
SPELL=gedit
VERSION=0.9.6
- SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[1]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:72fcd5936123e7dfc8b58af48f16c4021485bf7c1798a97ea5b532c2920c4a59adbb77a897833f98e5c9b64c908a46ed00dd9f403b74fa489f734154dc3f210b
+# SOURCE=$SPELL-$VERSION.tar.gz
+#SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+# SOURCE_URL[1]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+#
SOURCE_HASH=sha512:72fcd5936123e7dfc8b58af48f16c4021485bf7c1798a97ea5b532c2920c4a59adbb77a897833f98e5c9b64c908a46ed00dd9f403b74fa489f734154dc3f210b
+PATCHLEVEL=1
WEB_SITE=http://gedit.sourceforge.net/
LICENSE[0]=GPL
ENTERED=20011123
@@ -12,7 +13,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
MENU_EXEC[0]=${SPELL}
MENU_DESC[0]=${SHORT}
KEYWORDS="gnome1 editors"
- BUILD_API=1
+
SHORT="gedit is a text editor for the GNOME Desktop."
cat << EOF
gedit is a text editor for the GNOME Desktop.
diff --git a/gnome1-apps/gedit/HISTORY b/gnome1-apps/gedit/HISTORY
index 7f14ab5..c344856 100644
--- a/gnome1-apps/gedit/HISTORY
+++ b/gnome1-apps/gedit/HISTORY
@@ -1,3 +1,6 @@
+2007-05-20 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * all: deprecated in favor of gedit2
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed MAINTAINER.
diff --git a/gnome1-apps/pan/INSTALL b/gnome1-apps/pan/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/gnome1-apps/pan/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/gnome1-apps/pan/PRE_BUILD b/gnome1-apps/pan/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/gnome1-apps/pan/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/gnome1-apps/pan/PROVIDES b/gnome1-apps/pan/PROVIDES
deleted file mode 100755
index 2f9300c..0000000
--- a/gnome1-apps/pan/PROVIDES
+++ /dev/null
@@ -1 +0,0 @@
-x11-news-reader
diff --git a/gnome1-apps/pan/TRIGGERS b/gnome1-apps/pan/TRIGGERS
new file mode 100755
index 0000000..e150be0
--- /dev/null
+++ b/gnome1-apps/pan/TRIGGERS
@@ -0,0 +1 @@
+on_cast pan dispel_self
diff --git a/gnome2-apps/balsa2/CONFLICTS b/gnome2-apps/balsa2/CONFLICTS
index 25eaa83..c41fe2e 100755
--- a/gnome2-apps/balsa2/CONFLICTS
+++ b/gnome2-apps/balsa2/CONFLICTS
@@ -1 +1 @@
-conflicts balsa
+conflicts balsa y
diff --git a/gnome2-apps/balsa2/HISTORY b/gnome2-apps/balsa2/HISTORY
index 246df0a..7e08894 100644
--- a/gnome2-apps/balsa2/HISTORY
+++ b/gnome2-apps/balsa2/HISTORY
@@ -1,3 +1,6 @@
+2007-05-20 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * CONFLICTS: added conflict balsa for deprecation
+
2006-12-17 Alexander Tsamutali <astsmtl AT gmail.com>
* DETAILS: updated to 2.3.14
diff --git a/gnome2-apps/eog2/CONFLICTS b/gnome2-apps/eog2/CONFLICTS
new file mode 100755
index 0000000..a9dcb38
--- /dev/null
+++ b/gnome2-apps/eog2/CONFLICTS
@@ -0,0 +1 @@
+conflicts ee y
diff --git a/gnome2-apps/eog2/HISTORY b/gnome2-apps/eog2/HISTORY
index 4fedb84..9bd6f34 100644
--- a/gnome2-apps/eog2/HISTORY
+++ b/gnome2-apps/eog2/HISTORY
@@ -1,3 +1,6 @@
+2007-05-20 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * CONFLICTS: added conflict ee for deprecation
+
2007-04-10 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.1
diff --git a/gnome2-apps/evolution2/CONFLICTS
b/gnome2-apps/evolution2/CONFLICTS
index 56e8c1d..dbcdad2 100755
--- a/gnome2-apps/evolution2/CONFLICTS
+++ b/gnome2-apps/evolution2/CONFLICTS
@@ -1 +1 @@
-conflicts evolution
+conflicts evolution y
diff --git a/gnome2-apps/evolution2/HISTORY b/gnome2-apps/evolution2/HISTORY
index a347a95..47060f2 100644
--- a/gnome2-apps/evolution2/HISTORY
+++ b/gnome2-apps/evolution2/HISTORY
@@ -1,3 +1,6 @@
+2007-05-20 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * CONFLICTS: added conflict evolution for deprecation
+
2007-04-09 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.10.1
diff --git a/gnome2-apps/gedit2/CONFLICTS b/gnome2-apps/gedit2/CONFLICTS
index 546f5c7..a2977ed 100755
--- a/gnome2-apps/gedit2/CONFLICTS
+++ b/gnome2-apps/gedit2/CONFLICTS
@@ -1 +1 @@
-conflicts gedit
+conflicts gedit y
diff --git a/gnome2-apps/gedit2/HISTORY b/gnome2-apps/gedit2/HISTORY
index c3de47e..1e6f7f9 100644
--- a/gnome2-apps/gedit2/HISTORY
+++ b/gnome2-apps/gedit2/HISTORY
@@ -1,3 +1,6 @@
+2007-05-20 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * CONFLICTS: added conflict gedit for deprecation
+
2007-04-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD: added, this time for real
diff --git a/gnome2-apps/glade3/CONFLICTS b/gnome2-apps/glade3/CONFLICTS
new file mode 100755
index 0000000..7a50504
--- /dev/null
+++ b/gnome2-apps/glade3/CONFLICTS
@@ -0,0 +1 @@
+conflicts glade y
diff --git a/gnome2-apps/glade3/HISTORY b/gnome2-apps/glade3/HISTORY
index ccf3ad6..4b3d6e7 100644
--- a/gnome2-apps/glade3/HISTORY
+++ b/gnome2-apps/glade3/HISTORY
@@ -1,3 +1,6 @@
+2007-05-20 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * CONFLICTS: added conflict glade for deprecation
+
2007-05-02 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 3.2.1
diff --git a/gnome2-apps/gnome-cups-manager/CONFLICTS
b/gnome2-apps/gnome-cups-manager/CONFLICTS
new file mode 100755
index 0000000..cccd667
--- /dev/null
+++ b/gnome2-apps/gnome-cups-manager/CONFLICTS
@@ -0,0 +1 @@
+conflicts gnome-admin y
diff --git a/gnome2-apps/gnome-cups-manager/HISTORY
b/gnome2-apps/gnome-cups-manager/HISTORY
index f07c6c2..88bb25e 100644
--- a/gnome2-apps/gnome-cups-manager/HISTORY
+++ b/gnome2-apps/gnome-cups-manager/HISTORY
@@ -1,3 +1,6 @@
+2007-05-20 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * CONFLICTS: added conflict to gnome-admin for deprecation
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.
diff --git a/gnome2-apps/gnucash2/CONFLICTS b/gnome2-apps/gnucash2/CONFLICTS
index 87ba41f..a7abef3 100755
--- a/gnome2-apps/gnucash2/CONFLICTS
+++ b/gnome2-apps/gnucash2/CONFLICTS
@@ -1 +1,2 @@
conflicts gnucash
+conflicts gnofin y
diff --git a/gnome2-apps/gnucash2/HISTORY b/gnome2-apps/gnucash2/HISTORY
index cc3d544..486a8aa 100644
--- a/gnome2-apps/gnucash2/HISTORY
+++ b/gnome2-apps/gnucash2/HISTORY
@@ -1,3 +1,6 @@
+2007-05-20 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * CONFLICTS: added conflict gnofin for deprecation
+
2007-05-09 Arwed v. Merkatz <v.merkatz AT gmx.net>
* PRE_BUILD, configure-fix.diff: fixed compile with current
goffice-dev
diff --git a/gnome2-apps/memprof2/CONFLICTS b/gnome2-apps/memprof2/CONFLICTS
new file mode 100755
index 0000000..e0ae95d
--- /dev/null
+++ b/gnome2-apps/memprof2/CONFLICTS
@@ -0,0 +1 @@
+conflicts memprof y
diff --git a/gnome2-apps/memprof2/HISTORY b/gnome2-apps/memprof2/HISTORY
index 79ae28a..2de9df1 100644
--- a/gnome2-apps/memprof2/HISTORY
+++ b/gnome2-apps/memprof2/HISTORY
@@ -1,3 +1,6 @@
+2007-05-20 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * CONFLICTS: added conflict memprof for deprecation
+
2006-09-07 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 0.6
added BRANCH
diff --git a/gnome2-apps/pan2/CONFLICTS b/gnome2-apps/pan2/CONFLICTS
index 6af7d79..0cf755e 100755
--- a/gnome2-apps/pan2/CONFLICTS
+++ b/gnome2-apps/pan2/CONFLICTS
@@ -1 +1 @@
-conflicts pan
+conflicts pan y
diff --git a/gnome2-apps/pan2/HISTORY b/gnome2-apps/pan2/HISTORY
index 10a5057..d3c336a 100644
--- a/gnome2-apps/pan2/HISTORY
+++ b/gnome2-apps/pan2/HISTORY
@@ -1,3 +1,6 @@
+2007-05-20 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * CONFLICTS: added conflict pan for deprecation
+
2007-05-19 George Sherwood <george AT beernabeer.com>
* DETAILS: Updates stable and devel to 0.130
diff --git a/gnome2-libs/gnome-games2/CONFLICTS
b/gnome2-libs/gnome-games2/CONFLICTS
index e7774af..41ecd4c 100755
--- a/gnome2-libs/gnome-games2/CONFLICTS
+++ b/gnome2-libs/gnome-games2/CONFLICTS
@@ -1,2 +1,3 @@
conflicts gnome-sudoku &&
conflicts gnome-games y
+conflicts gnome-chess y
diff --git a/gnome2-libs/gnome-games2/HISTORY
b/gnome2-libs/gnome-games2/HISTORY
index 1b6fe27..282ba74 100644
--- a/gnome2-libs/gnome-games2/HISTORY
+++ b/gnome2-libs/gnome-games2/HISTORY
@@ -1,3 +1,6 @@
+2007-05-20 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * CONFLICTS: added conflict gnome-chess for deprecation
+
2007-05-10 Arwed v. Merkatz <v.merkatz AT gmx.net>
* CONFLICTS: default to dispel gnome-games for deprecation
diff --git a/gnome2-libs/gnome-system-monitor/CONFLICTS
b/gnome2-libs/gnome-system-monitor/CONFLICTS
new file mode 100755
index 0000000..d632322
--- /dev/null
+++ b/gnome2-libs/gnome-system-monitor/CONFLICTS
@@ -0,0 +1 @@
+conflicts gtop y
diff --git a/gnome2-libs/gnome-system-monitor/HISTORY
b/gnome2-libs/gnome-system-monitor/HISTORY
index 3e28a30..f5afea6 100644
--- a/gnome2-libs/gnome-system-monitor/HISTORY
+++ b/gnome2-libs/gnome-system-monitor/HISTORY
@@ -1,3 +1,6 @@
+2007-05-20 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * CONFLICTS: added conflict gtop for deprecation
+
2007-04-10 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.18.1.1
diff --git a/gnome2-libs/gnome-utils2/CONFLICTS
b/gnome2-libs/gnome-utils2/CONFLICTS
index b784d28..da43672 100755
--- a/gnome2-libs/gnome-utils2/CONFLICTS
+++ b/gnome2-libs/gnome-utils2/CONFLICTS
@@ -1 +1,2 @@
conflicts gnome-utils y
+conflicts gnome-admin y
diff --git a/gnome2-libs/gnome-utils2/HISTORY
b/gnome2-libs/gnome-utils2/HISTORY
index d834763..04707cc 100644
--- a/gnome2-libs/gnome-utils2/HISTORY
+++ b/gnome2-libs/gnome-utils2/HISTORY
@@ -1,3 +1,6 @@
+2007-05-20 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * CONFLICTS: added conflict gnome-admin for deprecation
+
2007-05-10 Arwed v. Merkatz <v.merkatz AT gmx.net>
* CONFLICTS: default to dispelling gnome-utils for deprecation
diff --git a/http/galeon2/CONFLICTS b/http/galeon2/CONFLICTS
index 80a9583..7615068 100755
--- a/http/galeon2/CONFLICTS
+++ b/http/galeon2/CONFLICTS
@@ -1,2 +1 @@
-conflicts galeon
-
+conflicts galeon y
diff --git a/http/galeon2/HISTORY b/http/galeon2/HISTORY
index 4557ab5..f713728 100644
--- a/http/galeon2/HISTORY
+++ b/http/galeon2/HISTORY
@@ -1,3 +1,6 @@
+2007-05-20 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * CONFLICTS: added conflict galeon for deprecation
+
2006-11-15 Alexander Tsamutali <astsmtl AT gmail.com>
* PROVIDES: Added NS-PLUGIN-COMPATIBLE
[SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (cde3045eef4adf34a9fc6c1993de94c0d5d48a12),
Arwed von Merkatz, 05/20/2007