Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (78a0e8f74a7611ec7bbded0bd64ee8069f0eacd3)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (78a0e8f74a7611ec7bbded0bd64ee8069f0eacd3)
  • Date: Fri, 18 May 2007 02:29:35 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

disk/zisofs-tools/DETAILS | 5 ++---
disk/zisofs-tools/HISTORY | 3 +++
kde4/NOTES | 1 +
kde4/kdebase4/BUILD | 14 ++++++++++++++
kde4/kdebase4/DEPENDS | 4 +---
kde4/kdebase4/FINAL | 8 +++++++-
kde4/kdebase4/HISTORY | 9 +++++++++
kde4/kdebase4/INSTALL | 22 ++++++++++++++++++++++
kde4/kdebase4/kde4.desktop | 9 +++++++++
python-devel/scons/DETAILS | 4 ++--
python-devel/scons/HISTORY | 3 +++
11 files changed, 73 insertions(+), 9 deletions(-)

New commits:
commit d6223a7f0771c04807e1a9655466b57b0322af8f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kdebase4 - protect existing kdm data

commit f2365480685236b86d897bb15b9cf57be30ca6dd
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

scons-0.97

commit ce4518e1d82a3c8023340e98de01630579ed74ae
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

zisofs-tools-1.0.8

diff --git a/disk/zisofs-tools/DETAILS b/disk/zisofs-tools/DETAILS
index 3ed1ceb..993bbd6 100755
--- a/disk/zisofs-tools/DETAILS
+++ b/disk/zisofs-tools/DETAILS
@@ -1,15 +1,14 @@
SPELL=zisofs-tools
- VERSION=1.0.6
+ VERSION=1.0.8
+
SOURCE_HASH=sha512:2c50bb73428c065e02e95def81950e1f64aff3cec0a4d74ee91ddbf4c15b81a423d8a128a4abc2e11aeb866b9d5f67f55019f7ae884c9e1a8b013ed3133db50d
# Reminder to self not to forget to modify cdrtools when modifying
zisofs-tools.
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$KERNEL_URL/pub/linux/utils/fs/zisofs/$SOURCE
SOURCE_URL[1]=ftp://ftp.kernel.org/pub/linux/utils/fs/zisofs/$SOURCE
-
SOURCE_HASH=sha512:7928c40bd421853adde1da874a574ccaaa2b9ac3cb6d0fe241763bb64f66717dd83991f92bad093a1044e35f72f84643568af4a4999cfe62b85777df24fc0b96
WEB_SITE=http://www.kernel.org/pub/linux/utils/fs/zisofs/
LICENSE[0]=GPL
ENTERED=20011123
- UPDATED=20040127
KEYWORDS="iso filesystem disk"
SHORT="tools for creating a compressed ISO9660 filesystem."
cat << EOF
diff --git a/disk/zisofs-tools/HISTORY b/disk/zisofs-tools/HISTORY
index 488dff8..f30888f 100644
--- a/disk/zisofs-tools/HISTORY
+++ b/disk/zisofs-tools/HISTORY
@@ -1,3 +1,6 @@
+2007-05-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.0.8
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/kde4/NOTES b/kde4/NOTES
index 638e0d6..4131584 100644
--- a/kde4/NOTES
+++ b/kde4/NOTES
@@ -24,3 +24,4 @@
10. add an entry for kde4 to /usr/share/xsessions (similar to that for kde3),
so that can run kde4 from kdm

+11. use the logic from kdebase/{BUILD,INSTALL} to preserve
/opt/share/config/kdm/
diff --git a/kde4/kdebase4/BUILD b/kde4/kdebase4/BUILD
new file mode 100755
index 0000000..f8d4411
--- /dev/null
+++ b/kde4/kdebase4/BUILD
@@ -0,0 +1,14 @@
+default_build &&
+# Backup existing kdm dir
+if spell_ok $SPELL; then
+ OLD_VERSION=$(installed_version $SPELL) &&
+ if [[ ${VERSION:0:3} == ${OLD_VERSION:0:3} ]] &&
+ [[ -d "$INSTALL_ROOT/usr/share/config/kdm" ]]; then
+ mkdir -p kdm-3.141594 &&
+ echo "Backing up configuration files..." &&
+ mv $KDE4DIR/share/config/kdm/{background,kdm}rc \
+ kdm-3.141594 &&
+ rm -rf $KDE4DIR/share/config/kdm
+ fi
+fi
+
diff --git a/kde4/kdebase4/DEPENDS b/kde4/kdebase4/DEPENDS
index 2579ad3..8b5b263 100755
--- a/kde4/kdebase4/DEPENDS
+++ b/kde4/kdebase4/DEPENDS
@@ -15,7 +15,6 @@ if check_if_xorg_modular_libs qt4 ; then
depends xsetroot &&
depends xset
fi &&
-#depends -sub "SVG SSL" kdelibs &&

optional_depends freetype2 '' '' '' &&
optional_depends samba '' '' 'for the smb-ioslave' &&
@@ -23,8 +22,7 @@ optional_depends linux-pam '' '' '' &&
optional_depends lm_sensors '' '' 'harware monitoring' &&
optional_depends glib2 '' '' '' &&
optional_depends libraw1394 '' '' 'Firewire support' &&
-#optional_depends '' '' '' &&
-#optional_depends '' '' '' &&
+#optional_depends networkmanager '' '' '' &&
optional_depends fontconfig '' '' '' &&
optional_depends libusb '' '' 'usb support' &&
optional_depends bluez-libs '' '' 'Bluetooth support ' &&
diff --git a/kde4/kdebase4/FINAL b/kde4/kdebase4/FINAL
index 5229db7..144d0c0 100755
--- a/kde4/kdebase4/FINAL
+++ b/kde4/kdebase4/FINAL
@@ -1,7 +1,7 @@
if check_if_xorg_modular_libs qt4; then
message "$PROBLEM_COLOR"
message "kdm does not work out-of-the-box with xorg-modular since the "
- message "paths changed. Edit /usr/share/config/kdm/kdmrc and modify "
+ message "paths changed. Edit /opt/share/config/kdm/kdmrc and modify "
message "ServerCmd to point to /usr/bin/X . If needed, set Xrdb, "
message "FailsafeClient and Session to point to correct paths (no X11R6/)."
message "$DEFAULT_COLOR"
@@ -16,3 +16,9 @@ has to be created in /etc/dbus-1/system.d/hal.conf:
<allow send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/>
</policy>
'
+
+message '
+ensure that your ~/.xsession file contains the following line
+ eval $(dbus-launch --sh-syntax --exit-with-session)
+this is needed to handle interprocess communication in kde4
+'
diff --git a/kde4/kdebase4/HISTORY b/kde4/kdebase4/HISTORY
index 7ce49d0..101217a 100644
--- a/kde4/kdebase4/HISTORY
+++ b/kde4/kdebase4/HISTORY
@@ -1,3 +1,12 @@
+2007-05-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * FINAL: update message to refer to /opt, rather than /usr
+ tell user to setup ~/.xsession for dbus
+ * BUILD, INSTALL: added, preserve kdm data (copied from kdebase)
+ install desktop file
+ * kde4.desktop: added
+ * DEPENDS: cleanup, add networkmanager
+ (commented, nonexistent spell)
+
2007-05-15 Treeve Jelbert <treeve AT sourcemage.org>
* init.d/kdm: fix program location
* FINAL: added (copied from kde3)
diff --git a/kde4/kdebase4/INSTALL b/kde4/kdebase4/INSTALL
new file mode 100755
index 0000000..32cef05
--- /dev/null
+++ b/kde4/kdebase4/INSTALL
@@ -0,0 +1,22 @@
+default_install &&
+if [[ -d kdm-3.141594 ]]; then
+ # Restore backuped kdm dir
+ echo "Restoring configuration files..."
&&
+ mv $KDE4DIR/share/config/kdm/backgroundrc kdm-3.141594/backgroundrc.new &&
+ mv $KDE4DIR/share/config/kdm/kdmrc kdm-3.141594/kdmrc.new &&
+ mv kdm-3.141594/{background,kdm}rc $KDE4DIR/share/config/kdm/ &&
+ install_config_file kdm-3.141594/backgroundrc.new
$KDE4DIR/share/config/kdm/backgroundrc &&
+ install_config_file kdm-3.141594/kdmrc.new $KDE4DIR/share/config/kdm/kdmrc
&&
+ rm -r kdm-3.141594
+fi &&
+#if [[ $SMGL_THEME == "y" ]]; then
+# if [[ ! -e $KDE4DIR/share/apps/ksplash/Themes/SourceMage ]]; then
+# mkdir $KDE4DIR/share/apps/ksplash/Themes/SourceMage
+# fi &&
+# for file in SourceMage*; do
+# mv $file $KDE4DIR/share/apps/ksplash/Themes/SourceMage/${file#*\\}
+# done
+#fi &&
+
+install -m 0644 -o root -g root $SCRIPT_DIRECTORY/kde4.desktop \
+ $KDE4DIR/share/xsessions
diff --git a/kde4/kdebase4/kde4.desktop b/kde4/kdebase4/kde4.desktop
new file mode 100644
index 0000000..31b20b3
--- /dev/null
+++ b/kde4/kdebase4/kde4.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=KDE4
+Comment=This session logs you into KDE4
+Exec=/opt/bin/kstart
+TryExec=/opt/bin/kstart
+# no icon yet, only the top three are currently used
+Icon=
+Type=Application
diff --git a/python-devel/scons/DETAILS b/python-devel/scons/DETAILS
index 803f4f8..fa982f9 100755
--- a/python-devel/scons/DETAILS
+++ b/python-devel/scons/DETAILS
@@ -1,6 +1,6 @@
SPELL=scons
- VERSION=0.96.96
-
SOURCE_HASH=sha512:7be03df3b9c6ee4da0d164614882be25458df4cf41449b436cffbe6a342eeae549ed705ce975c1be25e848d24955031ac35ffbbb22a4d7efd877bacfac379aa9
+ VERSION=0.97
+
SOURCE_HASH=sha512:abec12812fc884a7c17c9ffbc69ca803b4d999aa92145194352c19a582c75e01102e2baedcb2dc83ec82e369b88c153a11a8b54131fd8878d212facd2b06333a
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/python-devel/scons/HISTORY b/python-devel/scons/HISTORY
index b0eaae9..c5c6da4 100644
--- a/python-devel/scons/HISTORY
+++ b/python-devel/scons/HISTORY
@@ -1,3 +1,6 @@
+2007-05-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: Update to 0.97
+
2007-04-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: Update to 0.96.96





Archive powered by MHonArc 2.6.24.

Top of Page