Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (611d347b69c3b506b59076a69a0a74480477950f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (611d347b69c3b506b59076a69a0a74480477950f)
  • Date: Sun, 2 Dec 2007 22:44:04 -0600

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

dev/null |binary
xfce/exo/DEPENDS | 31 +-
xfce/exo/DETAILS | 10
xfce/exo/HISTORY | 4
xfce/exo/exo-0.3.4.tar.bz2.sig | 0
xfce/gtk-xfce-engine/DEPENDS | 2
xfce/gtk-xfce-engine/DETAILS | 13 -
xfce/gtk-xfce-engine/HISTORY | 3
xfce/gtk-xfce-engine/gtk-xfce-engine-2.4.1.tar.bz2.sig | 0
xfce/libxfce4mcs/DEPENDS | 4
xfce/libxfce4mcs/DETAILS | 11 -
xfce/libxfce4mcs/HISTORY | 4
xfce/libxfce4mcs/libxfce4mcs-4.4.1.tar.bz2.sig | 0
xfce/libxfce4util/DEPENDS | 2
xfce/libxfce4util/DETAILS | 10
xfce/libxfce4util/HISTORY | 4
xfce/libxfce4util/libxfce4util-4.4.1.tar.bz2.sig | 0
xfce/libxfcegui4/DETAILS | 13 -
xfce/libxfcegui4/HISTORY | 3
xfce/libxfcegui4/libxfcegui4-4.4.1.tar.bz2.sig | 0
xfce/mousepad/DEPENDS | 5
xfce/mousepad/DETAILS | 10
xfce/mousepad/HISTORY | 4
xfce/mousepad/mousepad-0.2.12.tar.bz2.sig | 0
xfce/orage/DEPENDS | 2
xfce/orage/DETAILS | 12 -
xfce/orage/HISTORY | 5
xfce/orage/orage-4.4.1.tar.bz2.sig | 0
xfce/terminal/DEPENDS | 24 +-
xfce/terminal/DETAILS | 11 -
xfce/terminal/HISTORY | 6
xfce/terminal/PRE_BUILD | 2
xfce/terminal/Terminal-0.2.6.tar.bz2.sig | 0
xfce/thunar/DETAILS | 9
xfce/thunar/HISTORY | 3
xfce/thunar/Thunar-0.9.0.tar.bz2.sig | 0
xfce/xfce-mcs-manager/DEPENDS | 4
xfce/xfce-mcs-manager/DETAILS | 8
xfce/xfce-mcs-manager/HISTORY | 4
xfce/xfce-mcs-manager/xfce-mcs-manager-4.4.1.tar.bz2.sig | 0
xfce/xfce-mcs-plugins/DEPENDS | 2
xfce/xfce-mcs-plugins/DETAILS | 8
xfce/xfce-mcs-plugins/HISTORY | 4
xfce/xfce-mcs-plugins/xfce-mcs-plugins-4.4.1.tar.bz2.sig | 0
xfce/xfce-utils/DEPENDS | 12 -
xfce/xfce-utils/DETAILS | 8
xfce/xfce-utils/HISTORY | 4
xfce/xfce-utils/xfce-utils-4.4.1.tar.bz2.sig | 0
xfce/xfce.gpg |binary
xfce/xfce4-appfinder/DEPENDS | 2
xfce/xfce4-appfinder/DETAILS | 10
xfce/xfce4-appfinder/HISTORY | 4
xfce/xfce4-appfinder/xfce4-appfinder-4.4.1.tar.bz2.sig | 0
xfce/xfce4-icon-theme/DETAILS | 8
xfce/xfce4-icon-theme/HISTORY | 3
xfce/xfce4-icon-theme/xfce4-icon-theme-4.4.1.tar.bz2.sig | 0
xfce/xfce4-mixer/BUILD | 2
xfce/xfce4-mixer/DEPENDS | 17 -
xfce/xfce4-mixer/DETAILS | 13 -
xfce/xfce4-mixer/HISTORY | 5
xfce/xfce4-mixer/xfce4-mixer-4.4.1.tar.bz2.sig | 0
xfce/xfce4-panel/DEPENDS | 10
xfce/xfce4-panel/DETAILS | 14 -
xfce/xfce4-panel/HISTORY | 4
xfce/xfce4-panel/xfce4-panel-4.4.1.tar.bz2.sig | 0
xfce/xfce4-profile/DEPENDS | 1
xfce/xfce4-profile/DETAILS | 2
xfce/xfce4-profile/HISTORY | 4
xfce/xfce4-session/DEPENDS | 26 +-
xfce/xfce4-session/DETAILS | 8
xfce/xfce4-session/HISTORY | 4
xfce/xfce4-session/xfce4-session-4.4.1.tar.bz2.sig | 0
xfce/xfdesktop/DEPENDS | 13 -
xfce/xfdesktop/DETAILS | 8
xfce/xfdesktop/HISTORY | 4
xfce/xfdesktop/xfdesktop-4.4.1.tar.bz2.sig | 0
xfce/xfprint/DEPENDS | 15 -
xfce/xfprint/DETAILS | 12 -
xfce/xfprint/HISTORY | 4
xfce/xfprint/xfprint-4.4.1.tar.bz2.sig | 0
xfce/xfwm4-themes/DETAILS | 8
xfce/xfwm4-themes/HISTORY | 3
xfce/xfwm4-themes/xfwm4-themes-4.4.1.tar.bz2.sig | 0
xfce/xfwm4/DETAILS | 9
xfce/xfwm4/HISTORY | 3
xfce/xfwm4/PRE_BUILD | 3
xfce/xfwm4/xfwm4-4.4.1.tar.bz2.sig | 0
xfce/xfwm4/xfwm4-gtk+2.patch | 157
---------------
88 files changed, 308 insertions(+), 329 deletions(-)

New commits:
commit 611d347b69c3b506b59076a69a0a74480477950f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

xfwm4: Xfce 4.4.2

commit e375afcd9538876cdfe824653b303dd3f3937caa
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

xfwm4-themes: Xfce 4.4.2

commit d9a116c751ee17b020db9abf44b8b964d00c58d1
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

xfprint: Xfce 4.4.2

commit 5b35980e48f2907f768e968a5fe6cd76cff49647
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

xfdesktop: Xfce 4.4.2

commit 4595a6c722c2c89c519c7190487c78e15bd99e94
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

xfce4-session: Xfce 4.4.2

commit 01c723b6e6e6019d81a3b2f9ab436243ff9b0a57
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

xfce4-profile: Xfce 4.4.2

commit 8d18377324c946efaef00cad5d4ca77303e3db08
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

xfce4-panel: Xfce 4.4.2

commit 2ec2c71f95e56d783ddc2f3f760d6fa36d2f99e1
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

xfce4-mixer: Xfce 4.4.2

commit e96dbcb3cf4d32f230be57239222be020a9174f4
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

xfce4-icon-theme: Xfce 4.4.2

commit 2b59e557e6ee0297ebbc0373c122a623fd1b5759
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

xfce4-appfinder: Xfce 4.4.2

commit 9e73c12ebe497f7b756b1536cdb4d7a3eac8e508
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

xfce-utils: Xfce 4.4.2

commit 0d94833ffd9214ea02220c4a1e4296da83c42dcf
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

xfce-mcs-plugins: Xfce 4.4.2

commit 2fa8a2e893bb4fe8dd5f059c53f2b9b5e9cb497c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

xfce-mcs-manager: Xfce 4.4.2

commit c0934fda459950693aa1543b19a8a54a09835143
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

thunar: Xfce 4.4.2

commit 662cd96c4013ef16980c59448e57d462b36c3fbc
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

terminal: Xfce 4.4.2

commit ff914993ada372a62b5dce517026b015c163fb5c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

orage: Xfce 4.4.2

commit 535795b70d70b02c513130337408a5ad4ef70d41
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mousepad: Xfce 4.4.2

commit 24a35bf3a52ca27383e3f2ed94a1a9efe520c97f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

libxfcegui4: Xfce 4.4.2

commit d74ee94f956d1e3f9e082d3b67f4637275e5b95a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

libxfce4util: Xfce 4.4.2

commit 60bd6a3d4da1242c470d682ab4f991e6073d5ec2
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

libxfce4mcs: Xfce 4.4.2

commit 4134a7ae1225ac69b4cbb1f27dc49fe1218122f3
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

gtk-xfce-engine: Xfce 4.4.2

commit b9b7556b32f1b6a821450f132944d7f84c32d13d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

exo: Xfce 4.4.2

diff --git a/xfce/exo/DEPENDS b/xfce/exo/DEPENDS
index 3cde112..78ca7af 100755
--- a/xfce/exo/DEPENDS
+++ b/xfce/exo/DEPENDS
@@ -1,14 +1,17 @@
-depends libxfcegui4 &&
-depends uri &&
-optional_depends pygtk2 \
- "--enable-python" \
- "--disable-python" \
- "for Python bindings" &&
-optional_depends hal \
- "--enable-hal" \
- "--disable-hal" \
- "for HAL support" &&
-optional_depends libnotify \
- "--enable-notifications" \
- "--disable-notifications" \
- "for libnotify support"
+depends libxfcegui4 &&
+depends uri &&
+
+optional_depends pygtk2 \
+ "--enable-python" \
+ "--disable-python" \
+ "for Python bindings" &&
+
+optional_depends hal \
+ "--enable-hal" \
+ "--disable-hal" \
+ "for HAL support" &&
+
+optional_depends libnotify \
+ "--enable-notifications" \
+ "--disable-notifications" \
+ "for libnotify support"
diff --git a/xfce/exo/DETAILS b/xfce/exo/DETAILS
index 08f0874..c9bf493 100755
--- a/xfce/exo/DETAILS
+++ b/xfce/exo/DETAILS
@@ -1,14 +1,16 @@
SPELL=exo
VERSION=0.3.4
SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-
SOURCE_URL[0]=http://thunar.xfce.org/download/sources/$SPELL/$VERSION/$SOURCE
- SOURCE_GPG="gurus.gpg:$SOURCE.sig"
- WEB_SITE=http://thunar.xfce.org
+ SOURCE_URL[0]=http://www.xfce.org/archive/xfce-4.4.2/src/$SOURCE
+ SOURCE2_URL[0]=$SOURCE_URL.asc
+ SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
+ WEB_SITE=http://thunar.xfce.org/
ENTERED=20050101
LICENSE=LGPL
KEYWORDS="xfce"
- SHORT="libexo is an extension library for Xfce."
+ SHORT="libexo is an extension library for Xfce"
cat << EOF
libexo is an extension library for Xfce. While Xfce ships with quite a few
libraries that are primarly targeted at desktop development, libexo is
targeted
diff --git a/xfce/exo/HISTORY b/xfce/exo/HISTORY
index 1561876..649d668 100644
--- a/xfce/exo/HISTORY
+++ b/xfce/exo/HISTORY
@@ -1,3 +1,7 @@
+2007-12-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: gurus => upstream, refixed SOURCE_URL
+ * DEPENDS: cleaned up
+
2007-12-02 Elisamuel Resto <ryuji AT sourcemage.org>
* DEPENDS: optionally depend on hal and libnotify

diff --git a/xfce/exo/exo-0.3.4.tar.bz2.sig b/xfce/exo/exo-0.3.4.tar.bz2.sig
deleted file mode 100644
index d763749..0000000
Binary files a/xfce/exo/exo-0.3.4.tar.bz2.sig and /dev/null differ
diff --git a/xfce/gtk-xfce-engine/DEPENDS b/xfce/gtk-xfce-engine/DEPENDS
index a0e80ef..edffa0e 100755
--- a/xfce/gtk-xfce-engine/DEPENDS
+++ b/xfce/gtk-xfce-engine/DEPENDS
@@ -1 +1 @@
-depends gtk+2
+depends gtk+2
diff --git a/xfce/gtk-xfce-engine/DETAILS b/xfce/gtk-xfce-engine/DETAILS
index f6e8499..95d9384 100755
--- a/xfce/gtk-xfce-engine/DETAILS
+++ b/xfce/gtk-xfce-engine/DETAILS
@@ -1,14 +1,17 @@
SPELL=gtk-xfce-engine
- VERSION=2.4.1
+ VERSION=2.4.2
SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://www.xfce.org/archive/xfce-4.4.1/src/$SOURCE
- WEB_SITE=http://www.xfce.org
- SOURCE_GPG="gurus.gpg:$SOURCE.sig"
+ SOURCE_URL[0]=http://www.xfce.org/archive/xfce-4.4.2/src/$SOURCE
+ SOURCE2_URL[0]=$SOURCE_URL.asc
+ WEB_SITE=http://www.xfce.org/
+ SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
LICENSE[0]=GPL
ENTERED=20030608
KEYWORDS="theme xfce"
SHORT="gtk-xfce-engine is a gtk+2 theme engine desinged for xfce"
cat << EOF
-gtk-xfce-engine is a gtk+2 theme engine designed for xfce4, but can be used
without xfce.
+gtk-xfce-engine is a gtk+2 theme engine designed for xfce4,
+but can be used without xfce.
EOF
diff --git a/xfce/gtk-xfce-engine/HISTORY b/xfce/gtk-xfce-engine/HISTORY
index 0384a65..b4af632 100644
--- a/xfce/gtk-xfce-engine/HISTORY
+++ b/xfce/gtk-xfce-engine/HISTORY
@@ -1,3 +1,6 @@
+2007-12-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.4.2 (Xfce 4.4.2), gurus => upstream
+
2007-04-10 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 2.4.1. Removed UPDATED.

diff --git a/xfce/gtk-xfce-engine/gtk-xfce-engine-2.4.1.tar.bz2.sig
b/xfce/gtk-xfce-engine/gtk-xfce-engine-2.4.1.tar.bz2.sig
deleted file mode 100644
index 5748bd0..0000000
Binary files a/xfce/gtk-xfce-engine/gtk-xfce-engine-2.4.1.tar.bz2.sig and
/dev/null differ
diff --git a/xfce/libxfce4mcs/DEPENDS b/xfce/libxfce4mcs/DEPENDS
index 4e9e0f1..318ee72 100755
--- a/xfce/libxfce4mcs/DEPENDS
+++ b/xfce/libxfce4mcs/DEPENDS
@@ -1,2 +1,2 @@
-depends libxfce4util &&
-depends X11-LIBS
+depends libxfce4util &&
+depends X11-LIBS
diff --git a/xfce/libxfce4mcs/DETAILS b/xfce/libxfce4mcs/DETAILS
index 00a9bc2..2f4483f 100755
--- a/xfce/libxfce4mcs/DETAILS
+++ b/xfce/libxfce4mcs/DETAILS
@@ -1,14 +1,17 @@
SPELL=libxfce4mcs
- VERSION=4.4.1
+ VERSION=4.4.2
SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$VERSION/src/$SOURCE
- WEB_SITE=http://www.xfce.org
- SOURCE_GPG="gurus.gpg:$SOURCE.sig"
+ SOURCE2_URL[0]=$SOURCE_URL.asc
+ WEB_SITE=http://www.xfce.org/
+ SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
LICENSE[0]=LGPL
ENTERED=20030608
KEYWORDS="xfce"
SHORT="multi-channel settings management support for xfce"
cat << EOF
-multi-channel settings management support for xfce
+libxfce4mcs is the settings management library used by most XFce 4
+modules.
EOF
diff --git a/xfce/libxfce4mcs/HISTORY b/xfce/libxfce4mcs/HISTORY
index 59b4190..88845b5 100644
--- a/xfce/libxfce4mcs/HISTORY
+++ b/xfce/libxfce4mcs/HISTORY
@@ -1,3 +1,7 @@
+2007-12-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.4.2 (Xfce 4.4.2), gurus => upstream
+ * DEPENDS: cleaned up
+
2007-04-10 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 4.4.1

diff --git a/xfce/libxfce4mcs/libxfce4mcs-4.4.1.tar.bz2.sig
b/xfce/libxfce4mcs/libxfce4mcs-4.4.1.tar.bz2.sig
deleted file mode 100644
index 21b2514..0000000
Binary files a/xfce/libxfce4mcs/libxfce4mcs-4.4.1.tar.bz2.sig and /dev/null
differ
diff --git a/xfce/libxfce4util/DEPENDS b/xfce/libxfce4util/DEPENDS
index c123523..150d45a 100755
--- a/xfce/libxfce4util/DEPENDS
+++ b/xfce/libxfce4util/DEPENDS
@@ -1 +1 @@
-depends glib2
+depends glib2
diff --git a/xfce/libxfce4util/DETAILS b/xfce/libxfce4util/DETAILS
index 87274cd..4c74967 100755
--- a/xfce/libxfce4util/DETAILS
+++ b/xfce/libxfce4util/DETAILS
@@ -1,11 +1,15 @@
SPELL=libxfce4util
- VERSION=4.4.1
+ VERSION=4.4.2
SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$VERSION/src/$SOURCE
- WEB_SITE=http://www.xfce.org
- SOURCE_GPG="gurus.gpg:$SOURCE.sig"
+ SOURCE2_URL[0]=$SOURCE_URL.asc
+ WEB_SITE=http://www.xfce.org/
+ SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
LICENSE[0]=BSD
+ LICENSE[1]=GPL
+ LICENSE[2]=LGPL
ENTERED=20030608
KEYWORDS="xfce"
SHORT="Utility library for the XFce4 desktop environment"
diff --git a/xfce/libxfce4util/HISTORY b/xfce/libxfce4util/HISTORY
index 2db7679..6f77bbf 100644
--- a/xfce/libxfce4util/HISTORY
+++ b/xfce/libxfce4util/HISTORY
@@ -1,3 +1,7 @@
+2007-12-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.4.2 (Xfce 4.4.2), gurus => upstream
+ * DEPENDS: cleaned up
+
2007-04-10 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 4.4.1

diff --git a/xfce/libxfce4util/libxfce4util-4.4.1.tar.bz2.sig
b/xfce/libxfce4util/libxfce4util-4.4.1.tar.bz2.sig
deleted file mode 100644
index d5ccf52..0000000
Binary files a/xfce/libxfce4util/libxfce4util-4.4.1.tar.bz2.sig and /dev/null
differ
diff --git a/xfce/libxfcegui4/DETAILS b/xfce/libxfcegui4/DETAILS
index d624e93..a0ff11e 100755
--- a/xfce/libxfcegui4/DETAILS
+++ b/xfce/libxfcegui4/DETAILS
@@ -1,15 +1,16 @@
SPELL=libxfcegui4
- VERSION=4.4.1
+ VERSION=4.4.2
SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$VERSION/src/$SOURCE
- WEB_SITE=http://www.xfce.org
- SOURCE_GPG="gurus.gpg:$SOURCE.sig"
+ SOURCE2_URL[0]=$SOURCE_URL.asc
+ WEB_SITE=http://www.xfce.org/
+ SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
LICENSE[0]=LGPL
ENTERED=20030608
- PATCHLEVEL=1
KEYWORDS="xfce"
- SHORT="various gtk widgets for xfce"
+ SHORT="widget library for xfce4"
cat << EOF
-various gtk widgets for xfce
+Various gtk widgets for xfce
EOF
diff --git a/xfce/libxfcegui4/HISTORY b/xfce/libxfcegui4/HISTORY
index 0926311..ef6576b 100644
--- a/xfce/libxfcegui4/HISTORY
+++ b/xfce/libxfcegui4/HISTORY
@@ -1,3 +1,6 @@
+2007-12-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.4.2 (Xfce 4.4.2), gurus => upstream
+
2007-11-05 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: fixed dbh dep, cleaned up

diff --git a/xfce/libxfcegui4/libxfcegui4-4.4.1.tar.bz2.sig
b/xfce/libxfcegui4/libxfcegui4-4.4.1.tar.bz2.sig
deleted file mode 100644
index 838ae07..0000000
Binary files a/xfce/libxfcegui4/libxfcegui4-4.4.1.tar.bz2.sig and /dev/null
differ
diff --git a/xfce/mousepad/DEPENDS b/xfce/mousepad/DEPENDS
index 2e55c50..42b1a9a 100755
--- a/xfce/mousepad/DEPENDS
+++ b/xfce/mousepad/DEPENDS
@@ -1,2 +1,3 @@
-depends libxfcegui4 &&
-optional_depends xfprint "" "" "for printing support"
+depends libxfcegui4 &&
+
+optional_depends xfprint "" "" "for printing support"
diff --git a/xfce/mousepad/DETAILS b/xfce/mousepad/DETAILS
index a9541dc..62e83a2 100755
--- a/xfce/mousepad/DETAILS
+++ b/xfce/mousepad/DETAILS
@@ -1,10 +1,12 @@
SPELL=mousepad
- VERSION=0.2.12
+ VERSION=0.2.13
SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://www.xfce.org/archive/xfce-4.4.0/src/$SOURCE
- WEB_SITE=http://erikharrison.net/software/mousescreen.png
- SOURCE_GPG="gurus.gpg:$SOURCE.sig"
+ SOURCE_URL[0]=http://www.xfce.org/archive/xfce-4.4.2/src/$SOURCE
+ SOURCE2_URL[0]=$SOURCE_URL.asc
+ WEB_SITE=http://www.xfce.org/
+ SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
LICENSE[0]=GPL
ENTERED=20050128
KEYWORDS="xfce editors"
diff --git a/xfce/mousepad/HISTORY b/xfce/mousepad/HISTORY
index 31af662..4d0a03c 100644
--- a/xfce/mousepad/HISTORY
+++ b/xfce/mousepad/HISTORY
@@ -1,3 +1,7 @@
+2007-12-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.2.13, gurus => upstream
+ * DEPENDS: cleaned up
+
2007-01-23 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to 0.2.12. Updated SOURCE & SOURCE_URL.

diff --git a/xfce/mousepad/mousepad-0.2.12.tar.bz2.sig
b/xfce/mousepad/mousepad-0.2.12.tar.bz2.sig
deleted file mode 100644
index 0cb1452..0000000
Binary files a/xfce/mousepad/mousepad-0.2.12.tar.bz2.sig and /dev/null differ
diff --git a/xfce/orage/DEPENDS b/xfce/orage/DEPENDS
index 198ef65..cb293d3 100755
--- a/xfce/orage/DEPENDS
+++ b/xfce/orage/DEPENDS
@@ -1 +1 @@
-depends xfce4-panel
+depends xfce4-panel
diff --git a/xfce/orage/DETAILS b/xfce/orage/DETAILS
index 76b96b9..d0468ed 100755
--- a/xfce/orage/DETAILS
+++ b/xfce/orage/DETAILS
@@ -1,14 +1,16 @@
SPELL=orage
- VERSION=4.4.1
+ VERSION=4.4.2
SOURCE=orage-$VERSION.tar.bz2
+ SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://www.xfce.org/archive/xfce-4.4.1/src/$SOURCE
- WEB_SITE=http://www.xfce.org
- SOURCE_GPG="gurus.gpg:$SOURCE.sig"
+ SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$VERSION/src/$SOURCE
+ SOURCE2_URL[0]=$SOURCE_URL.asc
+ WEB_SITE=http://www.xfce.org/
+ SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
LICENSE[0]=GPL
ENTERED=20070123
KEYWORDS="xfce"
- SHORT="Claendar for the XFce Desktop Environment"
+ SHORT="Calendar for the XFce Desktop Environment"
cat << EOF
Orage provides a calendar which integrates nicely into the Xfce desktop
environment. It is highly configurable and supports alerts based on
diff --git a/xfce/orage/HISTORY b/xfce/orage/HISTORY
index af8cc12..433a371 100644
--- a/xfce/orage/HISTORY
+++ b/xfce/orage/HISTORY
@@ -1,3 +1,8 @@
+2007-12-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.4.2 (Xfce 4.4.2),
+ gurus => upstream, cleaned up
+ * DEPENDS: cleaned up
+
2007-04-10 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 4.4.1

diff --git a/xfce/orage/orage-4.4.1.tar.bz2.sig
b/xfce/orage/orage-4.4.1.tar.bz2.sig
deleted file mode 100644
index 8c16b83..0000000
Binary files a/xfce/orage/orage-4.4.1.tar.bz2.sig and /dev/null differ
diff --git a/xfce/terminal/DEPENDS b/xfce/terminal/DEPENDS
index 1197530..31781dc 100755
--- a/xfce/terminal/DEPENDS
+++ b/xfce/terminal/DEPENDS
@@ -1,11 +1,13 @@
-depends exo &&
-depends vte &&
-depends xml-parser-expat &&
-optional_depends startup-notification \
- "--enable-startup-notification" \
- "--disable-startup-notification" \
- "for startup notification support" &&
-optional_depends dbus-glib \
- "--enable-dbus" \
- "--disable-dbus" \
- "for dbus remoting support"
+depends exo &&
+depends vte &&
+depends xml-parser-expat &&
+
+optional_depends startup-notification \
+ "--enable-startup-notification" \
+ "--disable-startup-notification" \
+ "for startup notification support" &&
+
+optional_depends dbus-glib \
+ "--enable-dbus" \
+ "--disable-dbus" \
+ "for dbus remoting support"
diff --git a/xfce/terminal/DETAILS b/xfce/terminal/DETAILS
index 8be67a7..85329a2 100755
--- a/xfce/terminal/DETAILS
+++ b/xfce/terminal/DETAILS
@@ -1,16 +1,17 @@
SPELL=terminal
- VERSION=0.2.6
+ VERSION=0.2.8
SOURCE=Terminal-$VERSION.tar.bz2
+ SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/Terminal-$VERSION
- SOURCE_URL[0]=http://www.xfce.org/archive/xfce-4.4.0/src/$SOURCE
- SOURCE_GPG="gurus.gpg:$SOURCE.sig"
+ SOURCE_URL[0]=http://www.xfce.org/archive/xfce-4.4.2/src/$SOURCE
+ SOURCE2_URL[0]=$SOURCE_URL.asc
+ SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
WEB_SITE=http://terminal.os-cillation.com/
ENTERED=20050101
- PATCHLEVEL=3
LICENSE=GPL
DOCS="COPYING NEWS README"
KEYWORDS="terminal xfce"
- SHORT="A modern terminal emulater, primarily for Xfce"
+ SHORT="A modern terminal emulator, primarily for Xfce"
cat << EOF
Terminal is a modern terminal emulator for the Unix/Linux desktop, primarly
for
the Xfce desktop environment. It was developed because Xfce needed a
diff --git a/xfce/terminal/HISTORY b/xfce/terminal/HISTORY
index 7b37dbb..87bae31 100644
--- a/xfce/terminal/HISTORY
+++ b/xfce/terminal/HISTORY
@@ -1,3 +1,9 @@
+2007-12-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.2.8 (Xfce 4.4.2),
+ gurus => upstream, cleaned up
+ * DEPENDS: cleaned up
+ * HISTORY: added fr lang
+
2007-02-19 Pol Vinogradov <vin.public AT gmail.com>
* PRE_BUILD: added more sedits for proper japan docs installation,
made
it in loop, for easy adding new language
diff --git a/xfce/terminal/PRE_BUILD b/xfce/terminal/PRE_BUILD
index b254517..2ddd105 100755
--- a/xfce/terminal/PRE_BUILD
+++ b/xfce/terminal/PRE_BUILD
@@ -2,7 +2,7 @@ default_pre_build
&&
cd ${SOURCE_DIRECTORY} &&
sedit "s:doc/Terminal:doc/${SPELL}:g" doc/Makefile.am &&
sedit "s:doc/Terminal:doc/${SPELL}:g" doc/Makefile.in &&
-for lang in C ja
+for lang in C fr ja
do
sedit "s:doc/Terminal:doc/${SPELL}:g" doc/${lang}/Makefile.am &&
sedit "s:doc/Terminal:doc/${SPELL}:g" doc/${lang}/Makefile.in &&
diff --git a/xfce/terminal/Terminal-0.2.6.tar.bz2.sig
b/xfce/terminal/Terminal-0.2.6.tar.bz2.sig
deleted file mode 100644
index 910c786..0000000
Binary files a/xfce/terminal/Terminal-0.2.6.tar.bz2.sig and /dev/null differ
diff --git a/xfce/thunar/DETAILS b/xfce/thunar/DETAILS
index ea343e9..b03c78d 100755
--- a/xfce/thunar/DETAILS
+++ b/xfce/thunar/DETAILS
@@ -1,11 +1,14 @@
SPELL=thunar
VERSION=0.9.0
SOURCE=Thunar-$VERSION.tar.bz2
+ SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/Thunar-$VERSION
-
SOURCE_URL[0]=http://thunar.xfce.org/download/sources/Thunar/$VERSION/$SOURCE
- WEB_SITE=http://thunar.xfce.org
- SOURCE_GPG="gurus.gpg:$SOURCE.sig"
+ SOURCE_URL[0]=http://www.xfce.org/archive/xfce-4.4.2/src/$SOURCE
+ SOURCE2_URL[0]=$SOURCE_URL.asc
+ WEB_SITE=http://thunar.xfce.org/
+ SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
LICENSE[0]=GPL
+ LICENSE[1]=LGPL
ENTERED=20030608
KEYWORDS="xfce"
SHORT="File manager for the XFce Desktop Environment"
diff --git a/xfce/thunar/HISTORY b/xfce/thunar/HISTORY
index 1ccad38..d9c2afe 100644
--- a/xfce/thunar/HISTORY
+++ b/xfce/thunar/HISTORY
@@ -1,3 +1,6 @@
+2007-12-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: refixed SOURCE_URL, gurus => upstream
+
2007-12-02 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 0.9.0. Fixed SOURCE_URL and WEB_SITE

diff --git a/xfce/thunar/Thunar-0.9.0.tar.bz2.sig
b/xfce/thunar/Thunar-0.9.0.tar.bz2.sig
deleted file mode 100644
index 10223a3..0000000
Binary files a/xfce/thunar/Thunar-0.9.0.tar.bz2.sig and /dev/null differ
diff --git a/xfce/xfce-mcs-manager/DEPENDS b/xfce/xfce-mcs-manager/DEPENDS
index 669685a..3479cb8 100755
--- a/xfce/xfce-mcs-manager/DEPENDS
+++ b/xfce/xfce-mcs-manager/DEPENDS
@@ -1,2 +1,2 @@
-depends libxfcegui4 &&
-depends libxfce4mcs
+depends libxfcegui4 &&
+depends libxfce4mcs
diff --git a/xfce/xfce-mcs-manager/DETAILS b/xfce/xfce-mcs-manager/DETAILS
index c88b4ee..e0917d3 100755
--- a/xfce/xfce-mcs-manager/DETAILS
+++ b/xfce/xfce-mcs-manager/DETAILS
@@ -1,10 +1,12 @@
SPELL=xfce-mcs-manager
- VERSION=4.4.1
+ VERSION=4.4.2
SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$VERSION/src/$SOURCE
- WEB_SITE=http://www.xfce.org
- SOURCE_GPG="gurus.gpg:$SOURCE.sig"
+ SOURCE2_URL[0]=$SOURCE_URL.asc
+ WEB_SITE=http://www.xfce.org/
+ SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
LICENSE[0]=LGPL
ENTERED=20030608
KEYWORDS="xfce"
diff --git a/xfce/xfce-mcs-manager/HISTORY b/xfce/xfce-mcs-manager/HISTORY
index 1eacdd1..7402e52 100644
--- a/xfce/xfce-mcs-manager/HISTORY
+++ b/xfce/xfce-mcs-manager/HISTORY
@@ -1,3 +1,7 @@
+2007-12-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.4.2 (Xfce 4.4.2), gurus => upstream
+ * DEPENDS: cleaned up
+
2007-04-10 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 4.4.1

diff --git a/xfce/xfce-mcs-manager/xfce-mcs-manager-4.4.1.tar.bz2.sig
b/xfce/xfce-mcs-manager/xfce-mcs-manager-4.4.1.tar.bz2.sig
deleted file mode 100644
index 396ec76..0000000
Binary files a/xfce/xfce-mcs-manager/xfce-mcs-manager-4.4.1.tar.bz2.sig and
/dev/null differ
diff --git a/xfce/xfce-mcs-plugins/DEPENDS b/xfce/xfce-mcs-plugins/DEPENDS
index a4bb149..568f5c9 100755
--- a/xfce/xfce-mcs-plugins/DEPENDS
+++ b/xfce/xfce-mcs-plugins/DEPENDS
@@ -1 +1 @@
-depends xfce-mcs-manager
+depends xfce-mcs-manager
diff --git a/xfce/xfce-mcs-plugins/DETAILS b/xfce/xfce-mcs-plugins/DETAILS
index bd1d02b..6054bff 100755
--- a/xfce/xfce-mcs-plugins/DETAILS
+++ b/xfce/xfce-mcs-plugins/DETAILS
@@ -1,10 +1,12 @@
SPELL=xfce-mcs-plugins
- VERSION=4.4.1
+ VERSION=4.4.2
SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$VERSION/src/$SOURCE
- WEB_SITE=http://www.xfce.org
- SOURCE_GPG="gurus.gpg:$SOURCE.sig"
+ SOURCE2_URL[0]=$SOURCE_URL.asc
+ WEB_SITE=http://www.xfce.org/
+ SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
LICENSE[0]=GPL
ENTERED=20030608
KEYWORDS="xfce"
diff --git a/xfce/xfce-mcs-plugins/HISTORY b/xfce/xfce-mcs-plugins/HISTORY
index 1eacdd1..7402e52 100644
--- a/xfce/xfce-mcs-plugins/HISTORY
+++ b/xfce/xfce-mcs-plugins/HISTORY
@@ -1,3 +1,7 @@
+2007-12-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.4.2 (Xfce 4.4.2), gurus => upstream
+ * DEPENDS: cleaned up
+
2007-04-10 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 4.4.1

diff --git a/xfce/xfce-mcs-plugins/xfce-mcs-plugins-4.4.1.tar.bz2.sig
b/xfce/xfce-mcs-plugins/xfce-mcs-plugins-4.4.1.tar.bz2.sig
deleted file mode 100644
index 60c87b9..0000000
Binary files a/xfce/xfce-mcs-plugins/xfce-mcs-plugins-4.4.1.tar.bz2.sig and
/dev/null differ
diff --git a/xfce/xfce-utils/DEPENDS b/xfce/xfce-utils/DEPENDS
index c30afaf..cfde328 100755
--- a/xfce/xfce-utils/DEPENDS
+++ b/xfce/xfce-utils/DEPENDS
@@ -1,7 +1,7 @@
-depends xfce-mcs-manager &&
-depends which &&
+depends which &&
+depends xfce-mcs-manager &&

-optional_depends dbus-glib \
- '--enable-dbus' \
- '--disable-dbus' \
- 'for D-Bus support'
+optional_depends dbus-glib \
+ "--enable-dbus" \
+ "--disable-dbus" \
+ "for D-Bus support"
diff --git a/xfce/xfce-utils/DETAILS b/xfce/xfce-utils/DETAILS
index b6bf7bf..e97e8a1 100755
--- a/xfce/xfce-utils/DETAILS
+++ b/xfce/xfce-utils/DETAILS
@@ -1,10 +1,12 @@
SPELL=xfce-utils
- VERSION=4.4.1
+ VERSION=4.4.2
SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$VERSION/src/$SOURCE
- WEB_SITE=http://www.xfce.org
- SOURCE_GPG="gurus.gpg:$SOURCE.sig"
+ SOURCE2_URL[0]=$SOURCE_URL.asc
+ WEB_SITE=http://www.xfce.org/
+ SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
LICENSE[0]=GPL
ENTERED=20030608
KEYWORDS="xfce"
diff --git a/xfce/xfce-utils/HISTORY b/xfce/xfce-utils/HISTORY
index 87df992..e26c87a 100644
--- a/xfce/xfce-utils/HISTORY
+++ b/xfce/xfce-utils/HISTORY
@@ -1,3 +1,7 @@
+2007-12-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.4.2 (Xfce 4.4.2), gurus => upstream
+ * DEPENDS: cleaned up
+
2007-08-20 Pol Vinogradov <vin.public AT gmail.com>
* DEPENDS: added dbus-glib as optional

diff --git a/xfce/xfce-utils/xfce-utils-4.4.1.tar.bz2.sig
b/xfce/xfce-utils/xfce-utils-4.4.1.tar.bz2.sig
deleted file mode 100644
index b31c068..0000000
Binary files a/xfce/xfce-utils/xfce-utils-4.4.1.tar.bz2.sig and /dev/null
differ
diff --git a/xfce/xfce.gpg b/xfce/xfce.gpg
new file mode 100644
index 0000000..0ec3cff
Binary files /dev/null and b/xfce/xfce.gpg differ
diff --git a/xfce/xfce4-appfinder/DEPENDS b/xfce/xfce4-appfinder/DEPENDS
index fc4ab20..500db30 100755
--- a/xfce/xfce4-appfinder/DEPENDS
+++ b/xfce/xfce4-appfinder/DEPENDS
@@ -1 +1 @@
-depends libxfcegui4
+depends libxfcegui4
diff --git a/xfce/xfce4-appfinder/DETAILS b/xfce/xfce4-appfinder/DETAILS
index 758cebc..a2e9376 100755
--- a/xfce/xfce4-appfinder/DETAILS
+++ b/xfce/xfce4-appfinder/DETAILS
@@ -1,14 +1,16 @@
SPELL=xfce4-appfinder
- VERSION=4.4.1
+ VERSION=4.4.2
SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$VERSION/src/$SOURCE
- WEB_SITE=http://www.xfce.org
- SOURCE_GPG="gurus.gpg:$SOURCE.sig"
+ SOURCE2_URL[0]=$SOURCE_URL.asc
+ WEB_SITE=http://www.xfce.org/
+ SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
LICENSE[0]=GPL
ENTERED=20030608
KEYWORDS="menu xfce"
- SHORT="Xfce4 Appfinder lets you search your system for installed
programs to add them to the menu"
+ SHORT="xfce4 application finder"
cat << EOF
Xfce4 Appfinder is an useful software that permits you to find every
application in the system supporting Desktop entry format.
diff --git a/xfce/xfce4-appfinder/HISTORY b/xfce/xfce4-appfinder/HISTORY
index b58bef2..cbcdc03 100644
--- a/xfce/xfce4-appfinder/HISTORY
+++ b/xfce/xfce4-appfinder/HISTORY
@@ -1,3 +1,7 @@
+2007-12-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.4.2 (Xfce 4.4.2), gurus => upstream
+ * DEPENDS: cleaned up
+
2007-04-10 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 4.4.1

diff --git a/xfce/xfce4-appfinder/xfce4-appfinder-4.4.1.tar.bz2.sig
b/xfce/xfce4-appfinder/xfce4-appfinder-4.4.1.tar.bz2.sig
deleted file mode 100644
index 48a7dd0..0000000
Binary files a/xfce/xfce4-appfinder/xfce4-appfinder-4.4.1.tar.bz2.sig and
/dev/null differ
diff --git a/xfce/xfce4-icon-theme/DETAILS b/xfce/xfce4-icon-theme/DETAILS
index 113ebee..ac303b7 100755
--- a/xfce/xfce4-icon-theme/DETAILS
+++ b/xfce/xfce4-icon-theme/DETAILS
@@ -1,10 +1,12 @@
SPELL=xfce4-icon-theme
- VERSION=4.4.1
+ VERSION=4.4.2
SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$VERSION/src/$SOURCE
- WEB_SITE=http://www.xfce.org
- SOURCE_GPG="gurus.gpg:$SOURCE.sig"
+ SOURCE2_URL[0]=$SOURCE_URL.asc
+ WEB_SITE=http://www.xfce.org/
+ SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
LICENSE[0]=GPL
ENTERED=20030608
KEYWORDS="theme xfce"
diff --git a/xfce/xfce4-icon-theme/HISTORY b/xfce/xfce4-icon-theme/HISTORY
index 8843fc0..2a6dd1f 100644
--- a/xfce/xfce4-icon-theme/HISTORY
+++ b/xfce/xfce4-icon-theme/HISTORY
@@ -1,3 +1,6 @@
+2007-12-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.4.2 (Xfce 4.4.2), gurus => upstream
+
2007-04-10 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 4.4.1

diff --git a/xfce/xfce4-icon-theme/xfce4-icon-theme-4.4.1.tar.bz2.sig
b/xfce/xfce4-icon-theme/xfce4-icon-theme-4.4.1.tar.bz2.sig
deleted file mode 100644
index a319590..0000000
Binary files a/xfce/xfce4-icon-theme/xfce4-icon-theme-4.4.1.tar.bz2.sig and
/dev/null differ
diff --git a/xfce/xfce4-mixer/BUILD b/xfce/xfce4-mixer/BUILD
index 62767ff..589720d 100755
--- a/xfce/xfce4-mixer/BUILD
+++ b/xfce/xfce4-mixer/BUILD
@@ -1,2 +1,2 @@
-make_single &&
+make_single &&
default_build
diff --git a/xfce/xfce4-mixer/DEPENDS b/xfce/xfce4-mixer/DEPENDS
index b0b5a82..92f5f24 100755
--- a/xfce/xfce4-mixer/DEPENDS
+++ b/xfce/xfce4-mixer/DEPENDS
@@ -1,9 +1,8 @@
-depends xfce4-panel &&
-optional_depends "alsa-lib" \
- "--with-sound=alsa" \
- "" \
- "for ALSA support (not detected correctly if you have
OSS)" &&
-optional_depends "startup-notification" \
- "" \
- "" \
- "for startup notification"
+depends xfce4-panel &&
+
+optional_depends startup-notification "" "" "for startup notification" &&
+
+optional_depends alsa-lib \
+ "--with-sound=alsa" \
+ "" \
+ "for ALSA support (not detected correctly if you have OSS)"
diff --git a/xfce/xfce4-mixer/DETAILS b/xfce/xfce4-mixer/DETAILS
index 38b5ccb..aa0c7f8 100755
--- a/xfce/xfce4-mixer/DETAILS
+++ b/xfce/xfce4-mixer/DETAILS
@@ -1,16 +1,17 @@
SPELL=xfce4-mixer
- VERSION=4.4.1
+ VERSION=4.4.2
SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$VERSION/src/$SOURCE
- WEB_SITE=http://www.xfce.org
- SOURCE_GPG="gurus.gpg:$SOURCE.sig"
+ SOURCE2_URL[0]=$SOURCE_URL.asc
+ WEB_SITE=http://www.xfce.org/
+ SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
LICENSE[0]=BSD
ENTERED=20030608
- UPDATED=20070515
KEYWORDS="xfce"
SHORT="Volume control plugin for the XFce 4 panel"
cat << EOF
-xfce4-mixer is the volume control plugin for the XFce 4 panel. Includes a
-simple sound mixer.
+xfce4-mixer is the volume control plugin for the XFce 4 panel.
+Includes a simple sound mixer.
EOF
diff --git a/xfce/xfce4-mixer/HISTORY b/xfce/xfce4-mixer/HISTORY
index 443b824..7942f5d 100644
--- a/xfce/xfce4-mixer/HISTORY
+++ b/xfce/xfce4-mixer/HISTORY
@@ -1,3 +1,8 @@
+2007-12-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.4.2 (Xfce 4.4.2),
+ gurus => upstream, removed UPDATED
+ * BUILD, DEPENDS: cleaned up
+
2007-09-21 Eric Sandall <sandalle AT sourcemage.org>
* BUILD: Fails to compile with multiple make jobs

diff --git a/xfce/xfce4-mixer/xfce4-mixer-4.4.1.tar.bz2.sig
b/xfce/xfce4-mixer/xfce4-mixer-4.4.1.tar.bz2.sig
deleted file mode 100644
index e73a5df..0000000
Binary files a/xfce/xfce4-mixer/xfce4-mixer-4.4.1.tar.bz2.sig and /dev/null
differ
diff --git a/xfce/xfce4-panel/DEPENDS b/xfce/xfce4-panel/DEPENDS
index 4a1c945..71155fb 100755
--- a/xfce/xfce4-panel/DEPENDS
+++ b/xfce/xfce4-panel/DEPENDS
@@ -1,6 +1,4 @@
-depends xfce-mcs-manager &&
-depends libxml2 &&
-optional_depends "startup-notification" \
- "" \
- "" \
- "for startup notification"
+depends libxml2 &&
+depends xfce-mcs-manager &&
+
+optional_depends startup-notification "" "" "for startup notification"
diff --git a/xfce/xfce4-panel/DETAILS b/xfce/xfce4-panel/DETAILS
index be47a6e..40cbbce 100755
--- a/xfce/xfce4-panel/DETAILS
+++ b/xfce/xfce4-panel/DETAILS
@@ -1,14 +1,20 @@
SPELL=xfce4-panel
- VERSION=4.4.1
+ VERSION=4.4.2
SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$VERSION/src/$SOURCE
- WEB_SITE=http://www.xfce.org
- SOURCE_GPG="gurus.gpg:$SOURCE.sig"
+ SOURCE2_URL[0]=$SOURCE_URL.asc
+ WEB_SITE=http://www.xfce.org/
+ SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
LICENSE[0]=GPL
ENTERED=20030608
KEYWORDS="xfce"
SHORT="Next generation panel for xfce"
cat << EOF
-Next generation panel for xfce
+xfce4-panel is the panel of the XFce Desktop Environment. It is modeled
+slightly after the CDE panel and, of course, previous versions of xfce.
+The panel provides program lauchers, detachable, non-hierarchical menus
+(easier to read at a glance), and several panel 'plugins' like a clock
+and a pager. Additional plugins may be installed separately.
EOF
diff --git a/xfce/xfce4-panel/HISTORY b/xfce/xfce4-panel/HISTORY
index e5115d9..696bdb0 100644
--- a/xfce/xfce4-panel/HISTORY
+++ b/xfce/xfce4-panel/HISTORY
@@ -1,3 +1,7 @@
+2007-12-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.4.2 (Xfce 4.4.2), gurus => upstream
+ * DEPENDS: cleaned up
+
2007-04-10 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 4.4.1

diff --git a/xfce/xfce4-panel/xfce4-panel-4.4.1.tar.bz2.sig
b/xfce/xfce4-panel/xfce4-panel-4.4.1.tar.bz2.sig
deleted file mode 100644
index 6a43dd0..0000000
Binary files a/xfce/xfce4-panel/xfce4-panel-4.4.1.tar.bz2.sig and /dev/null
differ
diff --git a/xfce/xfce4-profile/DEPENDS b/xfce/xfce4-profile/DEPENDS
index eec1921..9576c7c 100755
--- a/xfce/xfce4-profile/DEPENDS
+++ b/xfce/xfce4-profile/DEPENDS
@@ -1,7 +1,6 @@
depends X11-LIBS &&
depends gtk+2 &&
depends libxml2 &&
-depends dbh &&
depends libxfce4util &&
depends libxfce4mcs &&
depends libxfcegui4 &&
diff --git a/xfce/xfce4-profile/DETAILS b/xfce/xfce4-profile/DETAILS
index 05affb8..b8de75b 100755
--- a/xfce/xfce4-profile/DETAILS
+++ b/xfce/xfce4-profile/DETAILS
@@ -1,5 +1,5 @@
SPELL=xfce4-profile
- VERSION=4.4.1
+ VERSION=4.4.2
WEB_SITE=http://www.xfce.org/
ENTERED=20030621
KEYWORDS="xfce"
diff --git a/xfce/xfce4-profile/HISTORY b/xfce/xfce4-profile/HISTORY
index 10ba2bd..a08b37d 100644
--- a/xfce/xfce4-profile/HISTORY
+++ b/xfce/xfce4-profile/HISTORY
@@ -1,3 +1,7 @@
+2007-12-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.4.2 (Xfce 4.4.2)
+ * DEPENDS: removed useless dbh dep
+
2007-11-25 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Added optional dependency on xfmedia and xfburn

diff --git a/xfce/xfce4-session/DEPENDS b/xfce/xfce4-session/DEPENDS
index f96bae6..d53c381 100755
--- a/xfce/xfce4-session/DEPENDS
+++ b/xfce/xfce4-session/DEPENDS
@@ -1,17 +1,17 @@
-depends xfce-mcs-manager &&
+depends xfce-mcs-manager &&

-source $GRIMOIRE/FUNCTIONS &&
+source $GRIMOIRE/FUNCTIONS &&

-if check_if_xorg_modular_libs gtk+2; then
- depends iceauth
-fi &&
+if check_if_xorg_modular_libs gtk+2; then
+ depends iceauth
+fi &&

-optional_depends dbus \
- '--enable-dbus' \
- '--disable-dbus' \
- 'for D-Bus support' &&
+optional_depends dbus \
+ "--enable-dbus" \
+ "--disable-dbus" \
+ "for D-Bus support" &&

-optional_depends gconf2 \
- '--enable-gnome' \
- '--disable-gnome' \
- 'for Assistive technologies support'
+optional_depends gconf2 \
+ "--enable-gnome" \
+ "--disable-gnome" \
+ "for Assistive technologies support"
diff --git a/xfce/xfce4-session/DETAILS b/xfce/xfce4-session/DETAILS
index 3227f66..2546ca2 100755
--- a/xfce/xfce4-session/DETAILS
+++ b/xfce/xfce4-session/DETAILS
@@ -1,10 +1,12 @@
SPELL=xfce4-session
- VERSION=4.4.1
+ VERSION=4.4.2
SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$VERSION/src/$SOURCE
- WEB_SITE=http://www.xfce.org
- SOURCE_GPG="gurus.gpg:$SOURCE.sig"
+ SOURCE2_URL[0]=$SOURCE_URL.asc
+ WEB_SITE=http://www.xfce.org/
+ SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
LICENSE[0]=GPL
ENTERED=20030608
KEYWORDS="xfce"
diff --git a/xfce/xfce4-session/HISTORY b/xfce/xfce4-session/HISTORY
index 77c3103..f45bced 100644
--- a/xfce/xfce4-session/HISTORY
+++ b/xfce/xfce4-session/HISTORY
@@ -1,3 +1,7 @@
+2007-12-03 Vlad Glagolev <stealth AT surcemage.org>
+ * DETAILS: updated spell to 4.4.2 (Xfce 4.4.2), gurus => upstream
+ * DEPENDS: cleaned up
+
2007-08-20 Pol Vinogradov <vin.public AT gmail.com>
* DEPENDS: added dbus as optional, fixed gconf2 flags
* PRE_BUILD, gconf2.patch: removed, fixed by upstream
diff --git a/xfce/xfce4-session/xfce4-session-4.4.1.tar.bz2.sig
b/xfce/xfce4-session/xfce4-session-4.4.1.tar.bz2.sig
deleted file mode 100644
index ae9558f..0000000
Binary files a/xfce/xfce4-session/xfce4-session-4.4.1.tar.bz2.sig and
/dev/null differ
diff --git a/xfce/xfdesktop/DEPENDS b/xfce/xfdesktop/DEPENDS
index ac0576f..f94c26b 100755
--- a/xfce/xfdesktop/DEPENDS
+++ b/xfce/xfdesktop/DEPENDS
@@ -1,10 +1,13 @@
-depends xfce4-panel &&
-optional_depends dbus "" "" "To use dbus" &&
+depends xfce4-panel &&
+
+optional_depends dbus "" "" "To use dbus" &&
+
optional_depends thunar \
"--enable-thunarx" \
"--disable-thunarx" \
"For desktop launcher icons" &&
-optional_depends exo \
- "--enable-exo" \
- "--disable-exo" \
+
+optional_depends exo \
+ "--enable-exo" \
+ "--disable-exo" \
"For nifty icon effects"
diff --git a/xfce/xfdesktop/DETAILS b/xfce/xfdesktop/DETAILS
index 3b0d3c8..ef2309b 100755
--- a/xfce/xfdesktop/DETAILS
+++ b/xfce/xfdesktop/DETAILS
@@ -1,10 +1,12 @@
SPELL=xfdesktop
- VERSION=4.4.1
+ VERSION=4.4.2
SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$VERSION/src/$SOURCE
- WEB_SITE=http://www.xfce.org
- SOURCE_GPG="gurus.gpg:$SOURCE.sig"
+ SOURCE2_URL[0]=$SOURCE_URL.asc
+ WEB_SITE=http://www.xfce.org/
+ SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
LICENSE[0]=GPL
ENTERED=20030608
KEYWORDS="xfce"
diff --git a/xfce/xfdesktop/HISTORY b/xfce/xfdesktop/HISTORY
index d8c2c2f..89528e7 100644
--- a/xfce/xfdesktop/HISTORY
+++ b/xfce/xfdesktop/HISTORY
@@ -1,3 +1,7 @@
+2007-12-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.4.2 (Xfce 4.4.2), gurus => upstream
+ * DEPENDS: cleaned up
+
2007-04-10 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 4.4.1

diff --git a/xfce/xfdesktop/xfdesktop-4.4.1.tar.bz2.sig
b/xfce/xfdesktop/xfdesktop-4.4.1.tar.bz2.sig
deleted file mode 100644
index 3a7bba8..0000000
Binary files a/xfce/xfdesktop/xfdesktop-4.4.1.tar.bz2.sig and /dev/null differ
diff --git a/xfce/xfprint/DEPENDS b/xfce/xfprint/DEPENDS
index b47cf3d..0a80bc8 100755
--- a/xfce/xfprint/DEPENDS
+++ b/xfce/xfprint/DEPENDS
@@ -1,7 +1,8 @@
-depends gtk+2 &&
-depends libxfcegui4 &&
-depends libxfce4util &&
-depends libxfce4mcs &&
-depends xfce-mcs-manager &&
-depends a2ps &&
-optional_depends "CUPS" "--enable-cups" "--disable-cups" "to print to
cups printers"
+depends gtk+2 &&
+depends libxfcegui4 &&
+depends libxfce4util &&
+depends libxfce4mcs &&
+depends xfce-mcs-manager &&
+depends a2ps &&
+
+optional_depends "CUPS" "--enable-cups" "--disable-cups" "to print to cups
printers"
diff --git a/xfce/xfprint/DETAILS b/xfce/xfprint/DETAILS
index ac049c2..2f15f46 100755
--- a/xfce/xfprint/DETAILS
+++ b/xfce/xfprint/DETAILS
@@ -1,15 +1,17 @@
SPELL=xfprint
- VERSION=4.4.1
+ VERSION=4.4.2
SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$VERSION/src/$SOURCE
- WEB_SITE=http://www.xfce.org
- SOURCE_GPG="gurus.gpg:$SOURCE.sig"
+ SOURCE2_URL[0]=$SOURCE_URL.asc
+ WEB_SITE=http://www.xfce.org/
+ SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
LICENSE[0]=BSD
ENTERED=20030608
KEYWORDS="printer xfce"
SHORT="Print dialog and printer manager for XFce 4"
cat << EOF
-xfprint contains a print dialog and a printer manager for the XFce 4 Desktop
-Environment
+xfprint contains a print dialog and a printer manager
+for the XFce 4 Desktop Environment.
EOF
diff --git a/xfce/xfprint/HISTORY b/xfce/xfprint/HISTORY
index 2f7a486..b607879 100644
--- a/xfce/xfprint/HISTORY
+++ b/xfce/xfprint/HISTORY
@@ -1,3 +1,7 @@
+2007-12-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.4.2 (Xfce 4.4.2), gurus => upstream
+ * DEPENDS: cleaned up
+
2007-04-10 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 4.4.1

diff --git a/xfce/xfprint/xfprint-4.4.1.tar.bz2.sig
b/xfce/xfprint/xfprint-4.4.1.tar.bz2.sig
deleted file mode 100644
index 7481509..0000000
Binary files a/xfce/xfprint/xfprint-4.4.1.tar.bz2.sig and /dev/null differ
diff --git a/xfce/xfwm4-themes/DETAILS b/xfce/xfwm4-themes/DETAILS
index ffa4a0b..c9ece7e 100755
--- a/xfce/xfwm4-themes/DETAILS
+++ b/xfce/xfwm4-themes/DETAILS
@@ -1,10 +1,12 @@
SPELL=xfwm4-themes
- VERSION=4.4.1
+ VERSION=4.4.2
SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$VERSION/src/$SOURCE
- WEB_SITE=http://www.xfce.org
- SOURCE_GPG="gurus.gpg:$SOURCE.sig"
+ SOURCE2_URL[0]=$SOURCE_URL.asc
+ WEB_SITE=http://www.xfce.org/
+ SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
LICENSE[0]=GPL
ENTERED=20030608
ARCHIVE=off
diff --git a/xfce/xfwm4-themes/HISTORY b/xfce/xfwm4-themes/HISTORY
index bb9b0e0..4a1b591 100644
--- a/xfce/xfwm4-themes/HISTORY
+++ b/xfce/xfwm4-themes/HISTORY
@@ -1,3 +1,6 @@
+2007-12-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.4.2 (Xfce 4.4.2), gurus => upstream
+
2007-04-10 George Sherwood <george AT beernabeer.com>
* DETAILS: updated spell to 4.4.1

diff --git a/xfce/xfwm4-themes/xfwm4-themes-4.4.1.tar.bz2.sig
b/xfce/xfwm4-themes/xfwm4-themes-4.4.1.tar.bz2.sig
deleted file mode 100644
index 772905c..0000000
Binary files a/xfce/xfwm4-themes/xfwm4-themes-4.4.1.tar.bz2.sig and /dev/null
differ
diff --git a/xfce/xfwm4/DETAILS b/xfce/xfwm4/DETAILS
index b735333..a624dbd 100755
--- a/xfce/xfwm4/DETAILS
+++ b/xfce/xfwm4/DETAILS
@@ -1,13 +1,14 @@
SPELL=xfwm4
- VERSION=4.4.1
+ VERSION=4.4.2
SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$VERSION/src/$SOURCE
- WEB_SITE=http://www.xfce.org
- SOURCE_GPG="gurus.gpg:$SOURCE.sig"
+ SOURCE2_URL=$SOURCE_URL.asc
+ WEB_SITE=http://www.xfce.org/
+ SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
LICENSE[0]=GPL
ENTERED=20030608
- PATCHLEVEL=1
KEYWORDS="xfce"
SHORT="Next generation window manager for xfce"
cat << EOF
diff --git a/xfce/xfwm4/HISTORY b/xfce/xfwm4/HISTORY
index fe13e4c..3056260 100644
--- a/xfce/xfwm4/HISTORY
+++ b/xfce/xfwm4/HISTORY
@@ -1,3 +1,6 @@
+2007-12-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.4.2 (Xfce 4.4.2), gurus => upstream
+
2007-10-23 George Sherwood <george AT beernabeer.com>
* DETAILS: PATCHLEVEL++
* PRE_BUILD: Added to apply patch from
diff --git a/xfce/xfwm4/PRE_BUILD b/xfce/xfwm4/PRE_BUILD
deleted file mode 100755
index b831fe9..0000000
--- a/xfce/xfwm4/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p0 < $SCRIPT_DIRECTORY/xfwm4-gtk+2.patch
diff --git a/xfce/xfwm4/xfwm4-4.4.1.tar.bz2.sig
b/xfce/xfwm4/xfwm4-4.4.1.tar.bz2.sig
deleted file mode 100644
index 6ebcf15..0000000
Binary files a/xfce/xfwm4/xfwm4-4.4.1.tar.bz2.sig and /dev/null differ
diff --git a/xfce/xfwm4/xfwm4-gtk+2.patch b/xfce/xfwm4/xfwm4-gtk+2.patch
deleted file mode 100644
index c56bfbb..0000000
--- a/xfce/xfwm4/xfwm4-gtk+2.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-Index: src/display.c
-===================================================================
---- src/display.c (revision 25820)
-+++ src/display.c (working copy)
-@@ -178,6 +178,19 @@
- FALSE, display_info->atoms) != 0);
- }
-
-+static void
-+myDisplayCreateTimestampWin (DisplayInfo *display_info)
-+{
-+ XSetWindowAttributes attributes;
-+
-+ attributes.event_mask = PropertyChangeMask;
-+ attributes.override_redirect = TRUE;
-+ display_info->timestamp_win =
-+ XCreateWindow (display_info->dpy, DefaultRootWindow
(display_info->dpy),
-+ -100, -100, 10, 10, 0, 0, CopyFromParent,
CopyFromParent,
-+ CWEventMask | CWOverrideRedirect, &attributes);
-+}
-+
- DisplayInfo *
- myDisplayInit (GdkDisplay *gdisplay)
- {
-@@ -309,6 +322,8 @@
- display->resize_cursor[CORNER_COUNT + SIDE_BOTTOM] =
- XCreateFontCursor (display->dpy, XC_bottom_side);
-
-+ myDisplayCreateTimestampWin (display);
-+
- display->xfilter = NULL;
- display->screens = NULL;
- display->clients = NULL;
-@@ -340,6 +355,8 @@
- display->move_cursor = None;
- XFreeCursor (display->dpy, display->root_cursor);
- display->root_cursor = None;
-+ XDestroyWindow (display->dpy, display->timestamp_win);
-+ display->timestamp_win = None;
-
- if (display->hostname)
- {
-Index: src/display.h
-===================================================================
---- src/display.h (revision 25820)
-+++ src/display.h (working copy)
-@@ -226,6 +226,7 @@
- gboolean quit;
- gboolean reload;
-
-+ Window timestamp_win;
- Cursor busy_cursor;
- Cursor move_cursor;
- Cursor root_cursor;
-Index: src/client.c
-===================================================================
---- src/client.c (revision 25820)
-+++ src/client.c (working copy)
-@@ -4868,21 +4868,19 @@
-
- if (passdata.c)
- {
-- GdkPixbuf *icon;
--
- TRACE ("entering cycle loop");
- passdata.wireframe = wireframeCreate (passdata.c);
-- icon = getAppIcon (display_info, passdata.c->window, 32, 32);
- passdata.tabwin = tabwinCreate (passdata.c->screen_info->gscr, c,
- passdata.c, passdata.cycle_range,
-
screen_info->params->cycle_workspaces);
- eventFilterPush (display_info->xfilter, clientCycleEventFilter,
&passdata);
- gtk_main ();
- eventFilterPop (display_info->xfilter);
-- wireframeDelete (screen_info, passdata.wireframe);
- TRACE ("leaving cycle loop");
- tabwinDestroy (passdata.tabwin);
- g_free (passdata.tabwin);
-+ wireframeDelete (screen_info, passdata.wireframe);
-+ updateXserverTime (display_info);
- }
-
- if (passdata.c)
-Index: src/hints.c
-===================================================================
---- src/hints.c (revision 25820)
-+++ src/hints.c (working copy)
-@@ -1167,27 +1167,18 @@
- return setXAtomManagerOwner(display_info, display_info->atoms[atom_id],
root, w);
- }
-
--
--static Bool
--checkPropEvent (Display *display, XEvent *xevent, XPointer arg)
-+void
-+updateXserverTime (DisplayInfo *display_info)
- {
-- DisplayInfo *display_info;
- ScreenInfo *screen_info;
-+ char c = '\0';
-
-- display_info = (DisplayInfo *) arg;
-- g_return_val_if_fail (display_info, FALSE);
-+ g_return_if_fail (display_info);
-
-- screen_info = myDisplayGetDefaultScreen (display_info);
-- g_return_val_if_fail (screen_info, FALSE);
--
-- if ((xevent->type == PropertyNotify) &&
-- (xevent->xproperty.window == screen_info->xfwm4_win) &&
-- (xevent->xproperty.atom ==
display_info->atoms[XFWM4_TIMESTAMP_PROP]))
-- {
-- return TRUE;
-- }
--
-- return FALSE;
-+ XChangeProperty (display_info->dpy, display_info->timestamp_win,
-+ display_info->atoms[XFWM4_TIMESTAMP_PROP],
-+ display_info->atoms[XFWM4_TIMESTAMP_PROP],
-+ 8, PropModeReplace, (unsigned char *) &c, 1);
- }
-
- Time
-@@ -1196,7 +1187,6 @@
- ScreenInfo *screen_info;
- XEvent xevent;
- Time timestamp;
-- char c = '\0';
-
- g_return_val_if_fail (display_info, (Time) CurrentTime);
- timestamp = myDisplayGetCurrentTime (display_info);
-@@ -1206,12 +1196,8 @@
- g_return_val_if_fail (screen_info, (Time) CurrentTime);
-
- TRACE ("getXServerTime: Using X server roundtrip");
-- XChangeProperty (display_info->dpy, screen_info->xfwm4_win,
-- display_info->atoms[XFWM4_TIMESTAMP_PROP],
-- display_info->atoms[XFWM4_TIMESTAMP_PROP],
-- 8, PropModeReplace, (unsigned char *) &c, 1);
-- XIfEvent (display_info->dpy, &xevent, checkPropEvent, (XPointer)
display_info);
--
-+ updateXserverTime (display_info);
-+ XWindowEvent (display_info->dpy, display_info->timestamp_win,
PropertyChangeMask, &xevent);
- timestamp = (Time) myDisplayUpdateCurrentTime (display_info,
&xevent);
- }
-
-Index: src/hints.h
-===================================================================
---- src/hints.h (revision 25820)
-+++ src/hints.h (working copy)
-@@ -269,6 +269,7 @@
- int,
- Window ,
- Window);
-+void updateXserverTime
(DisplayInfo *);
- Time getXServerTime
(DisplayInfo *);
-
- #ifdef ENABLE_KDE_SYSTRAY_PROXY



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (611d347b69c3b506b59076a69a0a74480477950f), Vlad Glagolev, 12/02/2007

Archive powered by MHonArc 2.6.24.

Top of Page