Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Julien ROZO (0b188ba1db3b6533cc3e864e44e64f6af4be60d1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Julien ROZO <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Julien ROZO (0b188ba1db3b6533cc3e864e44e64f6af4be60d1)
  • Date: Mon, 1 Mar 2010 14:17:27 -0600

GIT changes to master grimoire by Julien ROZO <julien AT rozo.org>:

kde4/kdeedu4/HISTORY | 4 ++++
kde4/kdeedu4/PRE_BUILD | 5 -----
kde4/kdeedu4/gpsd-2.9.0.patch | 12 ------------
3 files changed, 4 insertions(+), 17 deletions(-)

New commits:
commit aa2290f70b1ce21997abd6a18519416815443631
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

kdeedu4: removed PRE_BUILD and gpsd-2.9.0.patch, which is included
upstream

diff --git a/kde4/kdeedu4/HISTORY b/kde4/kdeedu4/HISTORY
index e69b7d9..3a57f1b 100644
--- a/kde4/kdeedu4/HISTORY
+++ b/kde4/kdeedu4/HISTORY
@@ -1,8 +1,12 @@
+2010-03-01 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * PRE_BUILD, gpsd-2.9.0.patch : removed, patch is included upstream
+
2010-02-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.4.0 (stable)

2010-01-28 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 4.3.5
+
2010-01-25 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.3.95 (unstable)

diff --git a/kde4/kdeedu4/PRE_BUILD b/kde4/kdeedu4/PRE_BUILD
deleted file mode 100755
index fc5175d..0000000
--- a/kde4/kdeedu4/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-if is_depends_enabled $SPELL gpsd -a "$(installed_version gpsd)" >= "2.9.0";
then
- patch -p1 < $SPELL_DIRECTORY/gpsd-2.9.0.patch
-fi
diff --git a/kde4/kdeedu4/gpsd-2.9.0.patch b/kde4/kdeedu4/gpsd-2.9.0.patch
deleted file mode 100644
index 897bb01..0000000
--- a/kde4/kdeedu4/gpsd-2.9.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur
kdeedu-4.3.4.orig/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
kdeedu-4.3.4/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
----
kdeedu-4.3.4.orig/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
2009-05-27 21:53:49.000000000 +0200
-+++ kdeedu-4.3.4/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
2009-12-14 22:59:36.000000000 +0100
-@@ -29,7 +29,7 @@
- }
-
- void GpsdConnection::update() {
-- gps_data_t* data = m_gpsd.query( "o" );
-+ gps_data_t* data = m_gpsd.send( "o" );
- if ( data )
- emit gpsdInfo( *data );
- }



  • [SM-Commit] GIT changes to master grimoire by Julien ROZO (0b188ba1db3b6533cc3e864e44e64f6af4be60d1), Julien ROZO, 03/01/2010

Archive powered by MHonArc 2.6.24.

Top of Page