Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Flavien Bridault (e89b104cd5f7f4eac00b0056af2b7117ef92c41e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Flavien Bridault <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Flavien Bridault (e89b104cd5f7f4eac00b0056af2b7117ef92c41e)
  • Date: Thu, 29 Jun 2006 06:04:31 -0500

GIT changes to master grimoire by Flavien Bridault <vlaaad AT sourcemage.org>:

gnome2-apps/sensors-applet/DEPENDS | 3 +
gnome2-apps/sensors-applet/DETAILS | 4 +-
gnome2-apps/sensors-applet/HISTORY | 4 ++
gnome2-apps/sensors-applet/sensors-applet-1.7.1.tar.gz.sig |binary
graphics/gimp/HISTORY | 4 ++
graphics/gimp/PRE_BUILD | 3 +
graphics/gimp/gimp-png.patch | 20
+++++++++++++
kernels/hibernate-script/DETAILS | 4 --
kernels/hibernate-script/HISTORY | 6 +++
kernels/hibernate-script/INSTALL | 6 +++
kernels/hibernate-script/PRE_BUILD | 4 +-
kernels/hibernate-script/hibernate-script-1.91.tar.gz.sig |binary
kernels/hibernate-script/sourcemage-config.patch | 20
++-----------
kernels/hibernate-script/sourcemage-help.patch | 9 ++---
14 files changed, 58 insertions(+), 29 deletions(-)

New commits:
commit e89b104cd5f7f4eac00b0056af2b7117ef92c41e
Merge: 2ab24a7c5f42c0ede2a1beecc42b66a8c33068b6
b960c3f25db3f89774cf144870efc45c3df862b2
Author: Flavien Bridault <vlaaad AT sourcemage.org>
Commit: Flavien Bridault <vlaaad AT sourcemage.org>

Merge branch 'master' of ssh://fbridault AT scm.sourcemage.org/smgl/grimoire

commit 2ab24a7c5f42c0ede2a1beecc42b66a8c33068b6
Author: Flavien Bridault <vlaaad AT sourcemage.org>
Commit: Flavien Bridault <vlaaad AT sourcemage.org>

Added a patch to fix build with latest libpng

commit ae31c2a889ec73dc799820f1c45c6f8307b9a65a
Author: Flavien Bridault <vlaaad AT sourcemage.org>
Commit: Flavien Bridault <vlaaad AT sourcemage.org>

updated hibernate-script to 1.91

commit 2f7210629769a603489f4bef13afb1d2b00111ab
Author: Flavien Bridault <vlaaad AT sourcemage.org>
Commit: Flavien Bridault <vlaaad AT sourcemage.org>

updated sensors-applet to 1.7.1

diff --git a/gnome2-apps/sensors-applet/DEPENDS
b/gnome2-apps/sensors-applet/DEPENDS
index dbcae16..1796aad 100755
--- a/gnome2-apps/sensors-applet/DEPENDS
+++ b/gnome2-apps/sensors-applet/DEPENDS
@@ -1,3 +1,4 @@
depends gnome-panel
&&
optional_depends lm_sensors "" "" "for reading temperatures with lm_sensors"
&&
-optional_depends hddtemp "" "" "for reading temperatures on S.M.A.R.T
capable hard disks"
+optional_depends hddtemp "" "" "for reading temperatures on S.M.A.R.T
capable hard disks" &&
+optional_depends "libnotify" "" "" "Enable notifications"
diff --git a/gnome2-apps/sensors-applet/DETAILS
b/gnome2-apps/sensors-applet/DETAILS
index c1566c0..dc4f91d 100755
--- a/gnome2-apps/sensors-applet/DETAILS
+++ b/gnome2-apps/sensors-applet/DETAILS
@@ -1,8 +1,8 @@
SPELL=sensors-applet
- VERSION=1.6.1
+ VERSION=1.7.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:a78a9de6744b558614671db0103a14960b05005a4020f86f1c4017b63fb07fb2d603e440705014e76f4b2a3de0568a66d32c72cdd191fbb3bcdbf5cd45edca81
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
WEB_SITE=http://sensors-applet.sourceforge.net/
ENTERED=20060106
diff --git a/gnome2-apps/sensors-applet/HISTORY
b/gnome2-apps/sensors-applet/HISTORY
index ab51382..38f7fc3 100644
--- a/gnome2-apps/sensors-applet/HISTORY
+++ b/gnome2-apps/sensors-applet/HISTORY
@@ -1,3 +1,7 @@
+2006-06-28 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DETAILS: Updated to 1.7.1
+ * DEPENDS: Added optional libnotify
+
2006-03-24 Flavien Bridault <vlaaad AT sourcemage.org>
* DETAILS: updated to 1.6.1

diff --git a/gnome2-apps/sensors-applet/sensors-applet-1.7.1.tar.gz.sig
b/gnome2-apps/sensors-applet/sensors-applet-1.7.1.tar.gz.sig
new file mode 100644
index 0000000..8893119
Binary files /dev/null and
b/gnome2-apps/sensors-applet/sensors-applet-1.7.1.tar.gz.sig differ
diff --git a/graphics/gimp/HISTORY b/graphics/gimp/HISTORY
index cf7e3d9..aaa3907 100644
--- a/graphics/gimp/HISTORY
+++ b/graphics/gimp/HISTORY
@@ -1,3 +1,7 @@
+2006-06-29 Flavien Bridault <vlaaad AT sourcemage.org>
+ * gimp-png: added to allow building with latest libpng
+ * PRE_BUILD: added to apply patch above
+
2006-06-06 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.3.9 (devel)

diff --git a/graphics/gimp/PRE_BUILD b/graphics/gimp/PRE_BUILD
new file mode 100755
index 0000000..91b0978
--- /dev/null
+++ b/graphics/gimp/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SCRIPT_DIRECTORY/gimp-png.patch
diff --git a/graphics/gimp/gimp-png.patch b/graphics/gimp/gimp-png.patch
new file mode 100644
index 0000000..92fddcf
--- /dev/null
+++ b/graphics/gimp/gimp-png.patch
@@ -0,0 +1,20 @@
+--- plug-ins/common/png.c.orig 2006-06-15 19:45:07.000000000 +0200
++++ plug-ins/common/png.c 2006-06-15 19:45:51.000000000 +0200
+@@ -1012,7 +1012,7 @@
+ * Done with the file...
+ */
+
+- png_read_destroy (pp, info, NULL);
++ png_destroy_read_struct(&pp, &info, NULL);
+
+ g_free (pixel);
+ g_free (pixels);
+@@ -1441,7 +1441,7 @@
+ };
+
+ png_write_end (pp, info);
+- png_write_destroy (pp);
++ png_destroy_write_struct(&pp, &info);
+
+ g_free (pixel);
+ g_free (pixels);
diff --git a/kernels/hibernate-script/DETAILS
b/kernels/hibernate-script/DETAILS
index 7bba334..48552ad 100755
--- a/kernels/hibernate-script/DETAILS
+++ b/kernels/hibernate-script/DETAILS
@@ -1,5 +1,5 @@
SPELL=hibernate-script
- VERSION=1.12
+ VERSION=1.91
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.suspend2.net/downloads/all/$SOURCE
@@ -9,9 +9,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
WEB_SITE=http://www.suspend2.net/
ENTERED=20050720
- UPDATED=20050720
LICENSE[0]=GPL
- BUILD_API=2
DOCS='CHANGELOG COPYING README SCRIPTLET-API TODO'
KEYWORDS="kernels"
SHORT='machine suspend scripts'
diff --git a/kernels/hibernate-script/HISTORY
b/kernels/hibernate-script/HISTORY
index e05d43f..2ce6a75 100644
--- a/kernels/hibernate-script/HISTORY
+++ b/kernels/hibernate-script/HISTORY
@@ -1,3 +1,9 @@
+2006-06-28 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DETAILS: Updated to 1.91, removed implicit BUILD_API=2
+ * INSTALL: installs new modular config files
+ * sourcemage-{config,help}: updated
+ * PRE_BUILD: updated to match updated patches
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/kernels/hibernate-script/INSTALL
b/kernels/hibernate-script/INSTALL
index 9ea6437..274adbd 100755
--- a/kernels/hibernate-script/INSTALL
+++ b/kernels/hibernate-script/INSTALL
@@ -5,6 +5,12 @@ #
mkdir -p $INSTALL_ROOT/usr/share/hibernate &&
install -o root -g root -m 0755 hibernate.sh \
$INSTALL_ROOT/usr/sbin/hibernate &&
+install_config_file disk.conf \
+ $INSTALL_ROOT/etc/hibernate/disk.conf &&
+install_config_file suspend2.conf \
+ $INSTALL_ROOT/etc/hibernate/suspend2.conf &&
+install_config_file common.conf \
+ $INSTALL_ROOT/etc/hibernate/common.conf &&
install_config_file hibernate.conf \
$INSTALL_ROOT/etc/hibernate/hibernate.conf &&
install_config_file blacklisted-modules \
diff --git a/kernels/hibernate-script/PRE_BUILD
b/kernels/hibernate-script/PRE_BUILD
index 9500545..268208e 100755
--- a/kernels/hibernate-script/PRE_BUILD
+++ b/kernels/hibernate-script/PRE_BUILD
@@ -1,5 +1,5 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p1 < $SCRIPT_DIRECTORY/sourcemage-config.patch &&
-patch -p1 < $SCRIPT_DIRECTORY/sourcemage-help.patch &&
+patch -p0 < $SCRIPT_DIRECTORY/sourcemage-config.patch &&
+patch -p0 < $SCRIPT_DIRECTORY/sourcemage-help.patch &&
patch -p1 < $SCRIPT_DIRECTORY/sourcemage-services.patch
diff --git a/kernels/hibernate-script/hibernate-script-1.91.tar.gz.sig
b/kernels/hibernate-script/hibernate-script-1.91.tar.gz.sig
new file mode 100644
index 0000000..66d3abb
Binary files /dev/null and
b/kernels/hibernate-script/hibernate-script-1.91.tar.gz.sig differ
diff --git a/kernels/hibernate-script/sourcemage-config.patch
b/kernels/hibernate-script/sourcemage-config.patch
index a56e56c..886dabe 100644
--- a/kernels/hibernate-script/sourcemage-config.patch
+++ b/kernels/hibernate-script/sourcemage-config.patch
@@ -1,24 +1,12 @@
-diff -Naur hibernate-script-1.10.orig/hibernate.conf
hibernate-script-1.10/hibernate.conf
---- hibernate-script-1.10.orig/hibernate.conf 2005-07-20 21:13:14.545868536
-0700
-+++ hibernate-script-1.10/hibernate.conf 2005-07-20 21:16:33.740586336
-0700
-@@ -64,7 +64,8 @@
+--- common.conf.old 2006-06-28 10:30:42.000000000 +0200
++++ common.conf 2006-06-28 10:31:05.000000000 +0200
+@@ -14,7 +14,8 @@
# AlwaysForce yes
# AlwaysKill yes
# HibernateVT 15
-# Distribution debian (or fedora/gentoo/mandrake/redhat/slackware/suse)
-+# Distribution (or fedora/gentoo/mandrake/redhat/slackware/suse/sourcemage)
++# Distribution debian (or
fedora/gentoo/mandrake/redhat/slackware/suse/sourcemage)
+Distribution sourcemage
# XDisplay :0


##############################################################################
-diff -Naur hibernate-script-1.10.orig/ram.conf hibernate-script-1.10/ram.conf
---- hibernate-script-1.10.orig/ram.conf 2005-07-20 21:13:14.547868232
-0700
-+++ hibernate-script-1.10/ram.conf 2005-07-20 21:16:04.034102408 -0700
-@@ -17,6 +17,7 @@
- # AlwaysKill yes
- # HibernateVT 15
- # Distribution debian (or fedora/gentoo/mandrake/redhat/slackware/suse)
-+Distribution sourcemage
- # XDisplay :0
-
-
##############################################################################
diff --git a/kernels/hibernate-script/sourcemage-help.patch
b/kernels/hibernate-script/sourcemage-help.patch
index 1b32006..0c8edca 100644
--- a/kernels/hibernate-script/sourcemage-help.patch
+++ b/kernels/hibernate-script/sourcemage-help.patch
@@ -1,12 +1,11 @@
-diff -Naur hibernate-script-1.10.orig/hibernate.sh
hibernate-script-1.10/hibernate.sh
---- hibernate-script-1.10.orig/hibernate.sh 2005-07-20 21:13:14.547868232
-0700
-+++ hibernate-script-1.10/hibernate.sh 2005-07-20 21:21:17.888389304 -0700
-@@ -670,7 +670,7 @@
+--- hibernate.sh.old 2006-06-28 10:37:41.000000000 +0200
++++ hibernate.sh 2006-06-28 10:38:08.000000000 +0200
+@@ -702,7 +702,7 @@
AddConfigHelp "LogVerbosity N" "Same as Verbosity, but controls what is
written to the logfile."
AddConfigHelp "AlwaysForce <boolean>" "If set to yes, the script will
always run as if --force had been passed."
AddConfigHelp "AlwaysKill <boolean>" "If set to yes, the script will
always run as if --kill had been passed."
- AddConfigHelp "Distribution
<debian|fedora|mandrake|redhat|gentoo|suse|slackware>" "If specified, tweaks
some scriptlets to be more integrated with the given distribution."
+ AddConfigHelp "Distribution
<debian|fedora|mandrake|redhat|gentoo|suse|slackware|sourcemage>" "If
specified, tweaks some scriptlets to be more integrated with the given
distribution."
- AddConfigHelp "Include <filename>" "Read configuration directives from
the given file."
+ AddConfigHelp "Include <filename>" "Immediately include configuration
directives from the given file."
AddConfigHelp "XDisplay <display location>" "Specifies where scriptlets
that use the X server should find one. (Default: :0)"
}



  • [SM-Commit] GIT changes to master grimoire by Flavien Bridault (e89b104cd5f7f4eac00b0056af2b7117ef92c41e), Flavien Bridault, 06/29/2006

Archive powered by MHonArc 2.6.24.

Top of Page