Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.43 grimoire by Arwed von Merkatz (fa7cab7585aa6be2b2c244306f6f74d38099ee38)

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.43 grimoire by Arwed von Merkatz (fa7cab7585aa6be2b2c244306f6f74d38099ee38)
  • Date: Tue, 13 Apr 2010 12:08:56 -0500

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

gnome2-libs/gnome-panel/DEPENDS | 1 +
gnome2-libs/gnome-panel/HISTORY | 3 +++
kde4-apps/koffice2/HISTORY | 3 +++
kde4-apps/koffice2/PRE_BUILD | 6 +-----
kde4/kdelibs4/DEPENDS | 2 +-
kde4/kdelibs4/HISTORY | 3 +++
6 files changed, 12 insertions(+), 6 deletions(-)

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

koffice2: stable has ora CMakeList.txt in same location as unstable

commit f4edc2c735a8b23c288b77d0646b92d25e6fe317
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

kdelibs4: depends on hal, bug 15666

commit 10b78555d9eac3a9d062a0872b92b9cfe6508c45
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

gnome-panel: depends on libcanberra with GTK, bug 15665

diff --git a/gnome2-libs/gnome-panel/DEPENDS b/gnome2-libs/gnome-panel/DEPENDS
index 207b6d2..598f6a1 100755
--- a/gnome2-libs/gnome-panel/DEPENDS
+++ b/gnome2-libs/gnome-panel/DEPENDS
@@ -18,6 +18,7 @@ depends libgnome-keyring &&
depends libgweather &&
depends libxml2 &&
depends gnome-vfs2 &&
+depends -sub GTK libcanberra &&

optional_depends evolution-data-server \
'--enable-eds' \
diff --git a/gnome2-libs/gnome-panel/HISTORY b/gnome2-libs/gnome-panel/HISTORY
index a42037b..a46c70b 100644
--- a/gnome2-libs/gnome-panel/HISTORY
+++ b/gnome2-libs/gnome-panel/HISTORY
@@ -1,3 +1,6 @@
+2010-04-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: depends on libcanberra with GTK, bug #15665
+
2010-03-31 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 2.30.0

diff --git a/kde4-apps/koffice2/HISTORY b/kde4-apps/koffice2/HISTORY
index 3e85d14..1bffd61 100644
--- a/kde4-apps/koffice2/HISTORY
+++ b/kde4-apps/koffice2/HISTORY
@@ -1,3 +1,6 @@
+2010-04-12 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: stable has ora CMakeList.txt in same location as unstable
+
2010-02-08 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: add optional create

diff --git a/kde4-apps/koffice2/PRE_BUILD b/kde4-apps/koffice2/PRE_BUILD
index 23b7f12..83ee8c5 100755
--- a/kde4-apps/koffice2/PRE_BUILD
+++ b/kde4-apps/koffice2/PRE_BUILD
@@ -1,7 +1,3 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-if [[ $KOFF_VER == unstable ]];then
- sed -i '/update_xdg_mimetypes/D' krita/plugins/formats/ora/CMakeLists.txt
-else
- sed -i '/update_xdg_mimetypes/D' filters/krita/ora/CMakeLists.txt
-fi
+sed -i '/update_xdg_mimetypes/D' krita/plugins/formats/ora/CMakeLists.txt
diff --git a/kde4/kdelibs4/DEPENDS b/kde4/kdelibs4/DEPENDS
index f1b54e0..4e6807c 100755
--- a/kde4/kdelibs4/DEPENDS
+++ b/kde4/kdelibs4/DEPENDS
@@ -1,7 +1,7 @@
source $SECTION_DIRECTORY/KDE_DEPENDS &&
depends jpeg &&
depends attica &&
-optional_depends hal '-DDONT_USE_HAL=0' '-DDONT_USE_HAL=1'
'hardware detection' &&
+depends hal &&
depends shared-desktop-ontologies &&
depends soprano &&
depends redland &&
diff --git a/kde4/kdelibs4/HISTORY b/kde4/kdelibs4/HISTORY
index 78be2b8..9ff16e3 100644
--- a/kde4/kdelibs4/HISTORY
+++ b/kde4/kdelibs4/HISTORY
@@ -1,3 +1,6 @@
+2010-04-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: hal seems to be required now, bug #15666
+
2010-03-05 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.4.1 (stable)




  • [SM-Commit] GIT changes to stable-rc-0.43 grimoire by Arwed von Merkatz (fa7cab7585aa6be2b2c244306f6f74d38099ee38), Arwed von Merkatz, 04/13/2010

Archive powered by MHonArc 2.6.24.

Top of Page