New commits:
commit a6693bf363907caabd1d83f442b821bda9a306e3
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
commit 62ddf7a8f6ef23c020d35eadb9bbb30c669dca63
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
eel2: removed dependency on libglade2, libgnome, libgnomeui,
startup-notification,
depends on libgail-gnome
(cherry picked from commit 18b8d968d8339d43123a2b613ba8aa8c760e8d78)
commit 71c04f0f7dda553e8bdffc261bbec06de1f977c9
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
profile-gnome2-desktop: deprecated unmaintained profile spell
(cherry picked from commit 82c2c32e986f9693601291f4cd6e7e63af0ec1e1)
commit 7c2028ac26773339a249996f82cd9ad0da3d97ce
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
nautilus-cd-burner: deprecated for brasero
(cherry picked from commit fedaa6467e3742fc84df1c7542e5801dd23df871)
commit f3252cdada18a5d21b872ca5215b4d668bffd4c8
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
mail-notification: updated to 5.3
(cherry picked from commit c5a9768c2cbe9b898f75be004e09271a62697f31)
commit abaf406006a506d00329bdd091104481a8b4ab70
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
orca: removed eel2 dependency
(cherry picked from commit 106d8ece10c7c52c66f2f0ad30296627f72da6a6)
commit 94b074ea3c2cd083010b05e0f1ff81a58ffc93ab
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
mlview: dependency cleanup and fixed compile with current gcc
(cherry picked from commit bdad7341e6f64ec1bd7c874408a46a8b7c3483d7)
commit 9ce65c79440fdc9bc8ffff0ed4cfadcc48a2ee14
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
gnome-control-center: removed dependency on eel2, gnome-panel,
depends on libxext, need libcanberra with GTK
(cherry picked from commit b03083924ffa151fb95ee060826d0837c1bfc3c4)
commit 15454907e9402aa873e7af854056b00218fd777e
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
libgweather: actually needs pygtk2 for python support
(cherry picked from commit 3527f8ee615babf1b0c44d83f4c07c14baea0909)
commit 49431ffa8657bf8789033cfce2b7fc29c1c7653d
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
libgweather: needs pygobject, not plain python, bug 15650
(cherry picked from commit c3b41f1df37091b4fb07867a3742b9db0cb0fa1e)
commit 42f67812c503e7a9972e03580f1ac9f42c1c0b40
Author: George Sherwood <george AT beernabeer.com>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
firefox: Updated to version 3.6.3. SECURITY_PATCH++
(cherry picked from commit 7171f58e2482d3293c3f9d6bb4fa1944f08dbb15)
commit c32ee4b9c4fb2025a61cb8ab48214fe1d75b0d37
Author: George Sherwood <george AT beernabeer.com>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
xulrunner: Updated to version 1.9.2.3 SECURITY_PATCH++
(cherry picked from commit c61fff9203bb61563ed80bba24182bc2de08ab92)
commit 47223a6e711e2f9b3660cbd607298221b70ff390
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
shared-desktop-ontologies: fixed SOURCE_URL, bug 15639
(cherry picked from commit 6a4db895733c21306c23aaea43bddcc47ed54ed7)
commit f01193439de5c6aa2752983b872e30d6df839cc2
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
feh: new SOURCE and SOURCE_URL[0] #15638
(cherry picked from commit da51de2ae345ad1a106a2b10077fffcd62e3a383)
commit b4928d6a84c27d4a2e8e096ab07f74e86c3b4cfb
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
feh 1.4.2
(cherry picked from commit a4d0402093bccd6bb7651707cd0b43f5c716206c)
diff --git a/disk/brasero/CONFLICTS b/disk/brasero/CONFLICTS
new file mode 100755
index 0000000..d387200
--- /dev/null
+++ b/disk/brasero/CONFLICTS
@@ -0,0 +1 @@
+conflicts nautilus-cd-burner y
diff --git a/disk/brasero/HISTORY b/disk/brasero/HISTORY
index 0f22e46..15b50ab 100644
--- a/disk/brasero/HISTORY
+++ b/disk/brasero/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * CONFLICTS: added conflict nautilus-cd-burner for deprecation
+
2010-03-30 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 2.30.0
optional_depends gtk-doc \
diff --git a/gnome2-libs/libgweather/HISTORY b/gnome2-libs/libgweather/HISTORY
index f5777c0..40cc041 100644
--- a/gnome2-libs/libgweather/HISTORY
+++ b/gnome2-libs/libgweather/HISTORY
@@ -1,3 +1,8 @@
+2010-04-06 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: optionally depend on pygtk2 instead of python. Don't
+ pass --disable-python if it should not be used, as that actually
+ enables it, bug #15650
+
2010-03-31 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 2.30.0
diff --git a/gnome2-libs/nautilus-cd-burner/BUILD
b/gnome2-libs/nautilus-cd-burner/BUILD
index 8ab6bc8..27ba77d 100755
--- a/gnome2-libs/nautilus-cd-burner/BUILD
+++ b/gnome2-libs/nautilus-cd-burner/BUILD
@@ -1,4 +1 @@
-# don't know why but 2.10.2 doesn't seem to find pkg-config could be removed
-# could be removed when 2.12 shows up
-export PKG_CONFIG=$(which pkg-config) &&
-default_build
+true
diff --git a/gnome2-libs/nautilus-cd-burner/DEPENDS
b/gnome2-libs/nautilus-cd-burner/DEPENDS
index 527ba42..66a38ff 100755
--- a/gnome2-libs/nautilus-cd-burner/DEPENDS
+++ b/gnome2-libs/nautilus-cd-burner/DEPENDS
@@ -1,16 +1 @@
-depends CD-BURN-UTILITY &&
-depends glib2 &&
-depends gtk+2 &&
-depends gconf2 &&
-depends eel2 &&
-depends libglade2 &&
-depends libgnome &&
-depends libgnomeui &&
-depends nautilus2 &&
-depends dbus &&
-depends hal &&
-
-optional_depends gnome-mount \
- "--enable-gnome-mount" \
- "--disable-gnome-mount" \
- "Use gnome-mount?"
\ No newline at end of file
+depends brasero
diff --git a/gnome2-libs/nautilus-cd-burner/DETAILS
b/gnome2-libs/nautilus-cd-burner/DETAILS
index 1f9e212..85f8ee0 100755
--- a/gnome2-libs/nautilus-cd-burner/DETAILS
+++ b/gnome2-libs/nautilus-cd-burner/DETAILS
@@ -1,12 +1,13 @@
SPELL=nautilus-cd-burner
VERSION=2.24.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
- SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+# SOURCE=$SPELL-$VERSION.tar.bz2
+#SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+# SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
+# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE[0]=GPL
LICENSE[1]=LGPL
+PATCHLEVEL=1
WEB_SITE=http://developer.gnome.org
ENTERED=20020509
KEYWORDS="gnome2 libs"
diff --git a/gnome2-libs/nautilus-cd-burner/G_SCHEMAS
b/gnome2-libs/nautilus-cd-burner/G_SCHEMAS
deleted file mode 100644
index 4268b72..0000000
--- a/gnome2-libs/nautilus-cd-burner/G_SCHEMAS
+++ /dev/null
@@ -1 +0,0 @@
-nautilus-cd-burner.schemas
diff --git a/gnome2-libs/nautilus-cd-burner/HISTORY
b/gnome2-libs/nautilus-cd-burner/HISTORY
index 0a53d60..1a286ed 100644
--- a/gnome2-libs/nautilus-cd-burner/HISTORY
+++ b/gnome2-libs/nautilus-cd-burner/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * all: deprecated in favor of brasero
+
2008-10-03 Robin Cook <rcook AT wyrms.net>
* DEPENDS: removed gnome-vfs2
added explicit gnome depends
diff --git a/gnome2-libs/nautilus-cd-burner/INSTALL
b/gnome2-libs/nautilus-cd-burner/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/gnome2-libs/nautilus-cd-burner/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/gnome2-libs/nautilus-cd-burner/PRE_BUILD
b/gnome2-libs/nautilus-cd-burner/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/gnome2-libs/nautilus-cd-burner/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git
a/gnome2-libs/nautilus-cd-burner/REPAIR^f28a3645c12b689590aaf423d217e22e^FUNCTIONS