Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.35 grimoire by Arwed von Merkatz (07172acfe17ff13ab5598c47a2f26c5592efc10a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-rc-0.35 grimoire by Arwed von Merkatz (07172acfe17ff13ab5598c47a2f26c5592efc10a)
  • Date: Mon, 17 Aug 2009 12:39:30 -0500

GIT changes to stable-rc-0.35 grimoire by Arwed von Merkatz
<v.merkatz AT gmx.net>:

crypto/gpgme/DETAILS | 2 +-
crypto/gpgme/HISTORY | 3 +++
gnome2-libs/gconf2/DETAILS | 1 +
gnome2-libs/gconf2/HISTORY | 7 +++++++
gnome2-libs/gconf2/PRE_BUILD | 3 +++
gnome2-libs/gconf2/gconf.xml.system.patch | 16 ++++++++++++++++
6 files changed, 31 insertions(+), 1 deletion(-)

New commits:
commit 07172acfe17ff13ab5598c47a2f26c5592efc10a
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

gpgme: set default GPGME_BRANCH to 1.2 [Bug 15326]
(cherry picked from commit 88d98b06ea78b0009e063fb9b703ff35270fbc4b)

commit 398e979c5c8f046e13c13a73e68bbf9db0d00df6
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

gconf2: Fixes Bug #15306
and upstream http://bugzilla.gnome.org/show_bug.cgi?id=572027
PATCHLEVEL++ so system directory gets installed with proper
permissions
(cherry picked from commit 3b83cfaa12da37c3e5f1772f7bdd05a9944c34ea)

diff --git a/crypto/gpgme/DETAILS b/crypto/gpgme/DETAILS
index f4a7140..3446fbe 100755
--- a/crypto/gpgme/DETAILS
+++ b/crypto/gpgme/DETAILS
@@ -15,7 +15,7 @@ fi
###

if [[ -z "$GPGME_BRANCH" ]] || [[ $GPGME_BRANCH == DEFAULT ]]; then
- GPGME_BRANCH="1.1"
+ GPGME_BRANCH="1.2"
fi

case $GPGME_BRANCH in
diff --git a/crypto/gpgme/HISTORY b/crypto/gpgme/HISTORY
index 77f4bb0..e5066af 100644
--- a/crypto/gpgme/HISTORY
+++ b/crypto/gpgme/HISTORY
@@ -1,3 +1,6 @@
+2009-08-14 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: set default GPGME_BRANCH to 1.2 [Bug 15326]
+
2009-06-20 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS, PREPARE: added 1.2 branch, version 1.2.0

diff --git a/gnome2-libs/gconf2/DETAILS b/gnome2-libs/gconf2/DETAILS
index 0b7d8dd..6ef7f3e 100755
--- a/gnome2-libs/gconf2/DETAILS
+++ b/gnome2-libs/gconf2/DETAILS
@@ -6,6 +6,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/GConf-$VERSION"
SOURCE_URL[0]=$GNOME_URL/sources/GConf/$BRANCH/$SOURCE
SOURCE_GPG=gurus.gpg:$SOURCE.sig
LICENSE[0]=LGPL
+ PATCHLEVEL=1
WEB_SITE=http://www.gnome.org/projects/gconf/
ENTERED=20020505
KEYWORDS="gnome2 libs"
diff --git a/gnome2-libs/gconf2/HISTORY b/gnome2-libs/gconf2/HISTORY
index 076d669..c46f5eb 100644
--- a/gnome2-libs/gconf2/HISTORY
+++ b/gnome2-libs/gconf2/HISTORY
@@ -1,3 +1,10 @@
+2009-08-02 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++ so system directory gets installed with proper
+ permissions
+ * PRE_BUILD: Apply gconf.xml.system.patch
+ * gconf.xml.system.patch: Fixes Bug #15306 and upstream
+ http://bugzilla.gnome.org/show_bug.cgi?id=572027
+
2009-05-15 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.26.2

diff --git a/gnome2-libs/gconf2/PRE_BUILD b/gnome2-libs/gconf2/PRE_BUILD
new file mode 100755
index 0000000..09e909d
--- /dev/null
+++ b/gnome2-libs/gconf2/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+patch $SOURCE_DIRECTORY/Makefile.in \
+ $SCRIPT_DIRECTORY/gconf.xml.system.patch
diff --git a/gnome2-libs/gconf2/gconf.xml.system.patch
b/gnome2-libs/gconf2/gconf.xml.system.patch
new file mode 100644
index 0000000..5557bab
--- /dev/null
+++ b/gnome2-libs/gconf2/gconf.xml.system.patch
@@ -0,0 +1,16 @@
+#
+# Adds gconf.xml.system to creation list, fixing SMGL Bug #155306 and
upstream
+# bug http://bugzilla.gnome.org/show_bug.cgi?id=572027
+#
+diff -Naur GConf-2.26.2.orig/Makefile.in GConf-2.26.2/Makefile.in
+--- GConf-2.26.2.orig/Makefile.in 2009-05-14 08:20:45.000000000 -0700
++++ GConf-2.26.2/Makefile.in 2009-08-02 19:12:35.289525579 -0700
+@@ -765,6 +765,8 @@
+
+
+ install-data-local:
++ -mkdir -p $(DESTDIR)$(sysgconfdir)/gconf.xml.system
++ -chmod 755 $(DESTDIR)$(sysgconfdir)/gconf.xml.system
+ -mkdir -p $(DESTDIR)$(sysgconfdir)/gconf.xml.defaults
+ -chmod 755 $(DESTDIR)$(sysgconfdir)/gconf.xml.defaults
+ -mkdir -p $(DESTDIR)$(sysgconfdir)/gconf.xml.mandatory



  • [SM-Commit] GIT changes to stable-rc-0.35 grimoire by Arwed von Merkatz (07172acfe17ff13ab5598c47a2f26c5592efc10a), Arwed von Merkatz, 08/17/2009

Archive powered by MHonArc 2.6.24.

Top of Page