Skip to Content.
Sympa Menu

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

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 (12e6a5ce1746700d62768488b1fbe0d9fdea482a)
  • Date: Sat, 5 May 2007 12:18:01 -0500

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

ChangeLog | 3 +++
kde-apps/digikam/CONFLICTS | 3 +++
kde-apps/digikam/DEPENDS | 3 +++
kde-apps/digikam/DETAILS | 4 ++--
kde-apps/digikam/HISTORY | 40 ++++++++++++++++++++++++----------------
kde-apps/digikam/PRE_BUILD | 2 ++
6 files changed, 37 insertions(+), 18 deletions(-)

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

digikam-0.9.2-beta1

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

missing Changelog entry

diff --git a/ChangeLog b/ChangeLog
index 0b4ba87..4d4791f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2007-05-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * kde-apps/libkdcraw: new spell, needed by digikam
+
2007-05-05 Eric Sandall <sandalle AT sourcemage.org>
* kernels/cdemu: Deprecated in favour of the userland cdemu
* kernels/cdemu-module: Added cdemu kernel module package
diff --git a/kde-apps/digikam/CONFLICTS b/kde-apps/digikam/CONFLICTS
new file mode 100755
index 0000000..0eee588
--- /dev/null
+++ b/kde-apps/digikam/CONFLICTS
@@ -0,0 +1,3 @@
+if [[ "$DG_VER" == "y" ]];then
+conflicts digikamplugins y
+fi
diff --git a/kde-apps/digikam/DEPENDS b/kde-apps/digikam/DEPENDS
index 0b5a395..cbc5bd7 100755
--- a/kde-apps/digikam/DEPENDS
+++ b/kde-apps/digikam/DEPENDS
@@ -7,4 +7,7 @@ depends libkipi &&
depends imlib2 &&
depends sqlite &&
depends libkexiv2 &&
+if [[ "$DG_VER" == "y" ]];then
+ depends libkdcraw
+fi &&
depends jasper
diff --git a/kde-apps/digikam/DETAILS b/kde-apps/digikam/DETAILS
index f4708ca..04f0df4 100755
--- a/kde-apps/digikam/DETAILS
+++ b/kde-apps/digikam/DETAILS
@@ -1,7 +1,7 @@
SPELL=digikam
if [[ "$DG_VER" == "y" ]];then
- VERSION=0.9.1
-
SOURCE_HASH=sha512:97a3687b7b744da6871e133d1c9fc5db53dd2fae7d14e9fd7f532a3bbeda8cdb24a9f3f451358405bf3ffb72356dde8e8593b6078366bc475e90f781cedaaec5
+ VERSION=0.9.2-beta1
+
SOURCE_HASH=sha512:a836890e320cfb1f9c216655cba126d74582b3cc04123eb0603b54278f3e89dcbdebae6373d504e2457543b596015053bd351d07621e2b93d1dc0bff75092ddd
else
VERSION=0.9.1

SOURCE_HASH=sha512:97a3687b7b744da6871e133d1c9fc5db53dd2fae7d14e9fd7f532a3bbeda8cdb24a9f3f451358405bf3ffb72356dde8e8593b6078366bc475e90f781cedaaec5
diff --git a/kde-apps/digikam/HISTORY b/kde-apps/digikam/HISTORY
index af976ac..233a114 100644
--- a/kde-apps/digikam/HISTORY
+++ b/kde-apps/digikam/HISTORY
@@ -1,37 +1,45 @@
-2007-03-20 Treeve Jelbert <treevepi.be>
+2007-05-05 Treeve Jelbert <treevesourcemage.org>
+ * DETAILS: version 0.9.2-beta1 (devel)
+ * DEPENDS: add libkdcraw
+ * PRE_BUILD: patch only applies to stable version
+
+2007-04-06 Treeve Jelbert <treevesourcemage.org>
+ CONFLICTS: added, digikamplugins is now part of digikam
+
+2007-03-20 Treeve Jelbert <treevesourcemage.org>
* TRIGGERS: libkexiv2, not exiv2
* DETAILS: PATCHLEVEL++
* PRE_BUILD, exiv2.diff.bz2: added
upstream patch for latest exiv2

-2007-03-05 Treeve Jelbert <treevepi.be>
+2007-03-05 Treeve Jelbert <treevesourcemage.org>
* DEPENDS: all versions now dpend on libkexiv2, jasper

-2007-03-05 Treeve Jelbert <treevepi.be>
+2007-03-05 Treeve Jelbert <treevesourcemage.org>
* DETAILS: version 0.9.1 (both)

-2007-02-28 Treeve Jelbert <treevepi.be>
+2007-02-28 Treeve Jelbert <treevesourcemage.org>
* DETAILS: update HASH

-2007-02-27 Treeve Jelbert <treevepi.be>
+2007-02-27 Treeve Jelbert <treevesourcemage.org>
* DETAILS: version 0.9.1-rc2 (devel)

-2007-02-20 Treeve Jelbert <treevepi.be>
+2007-02-20 Treeve Jelbert <treevesourcemage.org>
* DETAILS: version 0.9.1-rc1 (devel)

-2007-02-12 Treeve Jelbert <treevepi.be>
+2007-02-12 Treeve Jelbert <treevesourcemage.org>
* DETAILS: version 0.9.1-beta1a (devel)
* DEPENDS: add libkexiv2, jasper

-2007-01-24 Treeve Jelbert <treevepi.be>
+2007-01-24 Treeve Jelbert <treevesourcemage.org>
* DETAILS: refix typo in hash for stable
fixes bug #13340

-2006-12-19 Treeve Jelbert <treevepi.be>
+2006-12-19 Treeve Jelbert <treevesourcemage.org>
* DETAILS: fix typo in hash for stable
fixes bug #13340

-2006-12-18 Treeve Jelbert <treevepi.be>
+2006-12-18 Treeve Jelbert <treevesourcemage.org>
* DETAILS: version 0.9.0 (both versions)
* DEPENDS: both versions depend on exiv2
* TRIGGERS: replace libexif by exiv2
@@ -39,16 +47,16 @@
2006-12-14 Juuso Alasuutari <iuso AT sourcemage.org>
* DEPENDS: Removed depends kdelibs (now in KDE_DEPENDS).

-2006-12-06 Treeve Jelbert <treevepi.be>
+2006-12-06 Treeve Jelbert <treevesourcemage.org>
* DETAILS: version 0.9.0-rc2 (devel)

-2006-11-23 Treeve Jelbert <treevepi.be>
+2006-11-23 Treeve Jelbert <treevesourcemage.org>
* DEPENDS: exiv2 (devel), libexif (stable)

-2006-11-21 Treeve Jelbert <treevepi.be>
+2006-11-21 Treeve Jelbert <treevesourcemage.org>
* DETAILS: version 0.9.0-rc1

-2006-10-21 Treeve Jelbert <treevepi.be>
+2006-10-21 Treeve Jelbert <treevesourcemage.org>
* DETAILS: version 0.9.0-beta3

2006-10-05 Juuso Alasuutari <iuso AT sourcemage.org>
@@ -58,10 +66,10 @@
* DEPENDS: Added depends kdelibs.
* TRIGGERS: Added check self on kdelibs cast.

-2006-09-27 Treeve Jelbert <treeve0pi.be>
+2006-09-27 Treeve Jelbert <treeve0sourcemage.org>
* DEPENDS: both versions need libkexif

-2006-09-15 Treeve Jelbert <treeve0pi.be>
+2006-09-15 Treeve Jelbert <treeve0sourcemage.org>
* DETAILS: version 0.9.0-beta2

2006-08-19 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
diff --git a/kde-apps/digikam/PRE_BUILD b/kde-apps/digikam/PRE_BUILD
index f238705..afdc1e9 100755
--- a/kde-apps/digikam/PRE_BUILD
+++ b/kde-apps/digikam/PRE_BUILD
@@ -1,3 +1,5 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+if [[ "$DG_VER" == "n" ]];then
bzcat $SPELL_DIRECTORY/exiv2.diff.bz2|patch -p3
+fi



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (12e6a5ce1746700d62768488b1fbe0d9fdea482a), Treeve Jelbert, 05/05/2007

Archive powered by MHonArc 2.6.24.

Top of Page