Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Bor Kraljič (8b29db61cfaf7b6a4a567b11760c5e60aabcf638)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Bor Kraljič <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Bor Kraljič (8b29db61cfaf7b6a4a567b11760c5e60aabcf638)
  • Date: Fri, 23 Sep 2011 03:57:27 -0500

GIT changes to master grimoire by Bor Kraljič <pyrobor AT ver.si>:

ChangeLog | 4 ++++
kde4-apps/digikam4/CONFLICTS | 1 +
kde4-apps/digikam4/DEPENDS | 8 ++++++++
kde4-apps/digikam4/HISTORY | 4 ++++
kde4-apps/kipi-plugins4/BUILD | 1 +
kde4-apps/kipi-plugins4/CONFIGURE | 1 -
kde4-apps/kipi-plugins4/CONFLICTS | 1 +
kde4-apps/kipi-plugins4/DEPENDS | 12 ------------
kde4-apps/kipi-plugins4/DETAILS | 24 +++++++-----------------
kde4-apps/kipi-plugins4/DOWNLOAD | 1 +
kde4-apps/kipi-plugins4/HISTORY | 5 +++++
kde4-apps/kipi-plugins4/INSTALL | 1 +
kde4-apps/kipi-plugins4/PRE_BUILD | 1 +
kde4-apps/kipi-plugins4/TRIGGERS | 1 -
kde4-apps/kipi-plugins4/UP_TRIGGERS | 2 ++
15 files changed, 36 insertions(+), 31 deletions(-)

New commits:
commit 8b29db61cfaf7b6a4a567b11760c5e60aabcf638
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

digikam4: added optional dependencies from kipi-plugins4

commit bf3af58d83ba58f3d939e84e67e49899a5bcf2e9
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

digikam4: conflict with kipi-plugins4

commit 5c6e141e9173080be1d9b80d4c5994349c11476f
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kde4-apps/kipi-plugins4: spell deprecated [kipi-plugins4 are now part of
digikam4]

diff --git a/ChangeLog b/ChangeLog
index bbd7d53..ed7436f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-23 Bor Kraljič <pyrobor AT ver.si>
+ * kde4-apps/kipi-plugins4: spell deprecated [kipi-plugins4 are now
part
+ of digikam4]
+
2011-09-22 Ladislav Hagara <hgr AT vabo.cz>
* libs/libunistring: new spell, Unicode string library

diff --git a/kde4-apps/digikam4/CONFLICTS b/kde4-apps/digikam4/CONFLICTS
new file mode 100644
index 0000000..20a78dc
--- /dev/null
+++ b/kde4-apps/digikam4/CONFLICTS
@@ -0,0 +1 @@
+conflicts kipi-plugins4 y
diff --git a/kde4-apps/digikam4/DEPENDS b/kde4-apps/digikam4/DEPENDS
index d8da9fc..f61829f 100755
--- a/kde4-apps/digikam4/DEPENDS
+++ b/kde4-apps/digikam4/DEPENDS
@@ -10,6 +10,14 @@ depends JPEG &&

optional_depends qjson "" "" &&
optional_depends kdepimlibs4 '' '' 'PIM support' &&
+# added optional dependencies from kipi-plugins4
+# TODO find flags for enabling and disabling.
+optional_depends libxslt "" "" "for HtmlExport plugin" &&
+optional_depends libgphoto2 "" "" "for kameraklient plugin" &&
+optional_depends libgpod "" "" "for iPod Export support" &&
+optional_depends opencv "" "" "for RemoveRedEyes plugin" &&
+optional_depends tiff "" "" "for
AcquireImages/JpegLossless/RawConverter plugins" &&
+
optional_depends lensfun \
'-DWITH_LensFun=ON' \
'-DWITH_LensFun=OFF' \
diff --git a/kde4-apps/digikam4/HISTORY b/kde4-apps/digikam4/HISTORY
index c859b43..a083343 100644
--- a/kde4-apps/digikam4/HISTORY
+++ b/kde4-apps/digikam4/HISTORY
@@ -1,3 +1,7 @@
+2011-09-23 Bor Kraljič <pyrobor AT ver.si>
+ * DEPENDS: added optional dependencies from kipi-plugins4
+ * CONFLICTS: added kipi-plugins4 (deprecated)
+
2011-09-22 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 2.1.1
* DEPENDS: kipi-plugins4 are now part of digikam4
diff --git a/kde4-apps/kipi-plugins4/BUILD b/kde4-apps/kipi-plugins4/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/kde4-apps/kipi-plugins4/BUILD
@@ -0,0 +1 @@
+true
diff --git a/kde4-apps/kipi-plugins4/CONFIGURE
b/kde4-apps/kipi-plugins4/CONFIGURE
deleted file mode 100755
index 7794ee1..0000000
--- a/kde4-apps/kipi-plugins4/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-source $SECTION_DIRECTORY/KDE_CONFIGURE
diff --git a/kde4-apps/kipi-plugins4/CONFLICTS
b/kde4-apps/kipi-plugins4/CONFLICTS
new file mode 100755
index 0000000..20a78dc
--- /dev/null
+++ b/kde4-apps/kipi-plugins4/CONFLICTS
@@ -0,0 +1 @@
+conflicts kipi-plugins4 y
diff --git a/kde4-apps/kipi-plugins4/DEPENDS b/kde4-apps/kipi-plugins4/DEPENDS
deleted file mode 100755
index 5312ddf..0000000
--- a/kde4-apps/kipi-plugins4/DEPENDS
+++ /dev/null
@@ -1,12 +0,0 @@
-source $SECTION_DIRECTORY/KDE_DEPENDS &&
-depends JPEG &&
-depends libkipi4 &&
-depends libkdcraw4 &&
-depends libkexiv24 &&
-optional_depends qjson "" "" &&
-optional_depends libxslt "" "" "for HtmlExport plugin" &&
-optional_depends libgphoto2 "" "" "for kameraklient plugin" &&
-optional_depends libgpod "" "" "for iPod Export support" &&
-optional_depends opencv "" "" "for RemoveRedEyes plugin" &&
-optional_depends tiff "" "" "for
AcquireImages/JpegLossless/RawConverter plugins"
-
diff --git a/kde4-apps/kipi-plugins4/DETAILS b/kde4-apps/kipi-plugins4/DETAILS
index fb001b4..1c36b61 100755
--- a/kde4-apps/kipi-plugins4/DETAILS
+++ b/kde4-apps/kipi-plugins4/DETAILS
@@ -1,17 +1,7 @@
- SPELL=kipi-plugins4
- VERSION=1.9.0
- PATCHLEVEL=1
-
SOURCE_HASH=sha512:4d1f5eb600faa45d81f61d0fdaf9900aca32d3f46bcd2eb56e8749563b6b45d75baa2d955c0065c251425a735275c1b9382adf135c798f64a1e4e1c3af9f9181
- SOURCE=${SPELL//4}-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL//4}-$VERSION
- SOURCE_URL[0]=$SOURCEFORGE_URL/kipi/$SOURCE
- WEB_SITE=http://www.kipi-plugins.org/
- LICENSE=GPL
- ENTERED=20080921
- KEYWORDS="kde4"
- SHORT="kde4 image plugin interface plugins"
-cat << EOF
-kipi (KDE Image Plugin Interface) is an effort to develop a common
-plugin structure for Digikam, KimDaBa, Showimg, and GwenView. Its aim is to
be
-able to share image plugins among graphic applications.
-EOF
+ SPELL=kipi-plugins4
+ VERSION=0
+ PATCHLEVEL=9999
+ SHORT="deprecated"
+ cat << EOF
+ deprecated spell [replaced by digikam4]
+ EOF
diff --git a/kde4-apps/kipi-plugins4/DOWNLOAD
b/kde4-apps/kipi-plugins4/DOWNLOAD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/kde4-apps/kipi-plugins4/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/kde4-apps/kipi-plugins4/HISTORY b/kde4-apps/kipi-plugins4/HISTORY
index dda98c7..1b30f71 100644
--- a/kde4-apps/kipi-plugins4/HISTORY
+++ b/kde4-apps/kipi-plugins4/HISTORY
@@ -1,3 +1,8 @@
+2011-09-23 Bor Kraljič <pyrobor AT ver.si>
+ * spell deprecated [kipi-plugins4 are now part of digikam4]
+ * PATCHLEVEL=9999
+ * DETAILS: version 0
+
2011-09-04 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: PATCHLEVEL++ for /opt/kde4 -> /usr change

diff --git a/kde4-apps/kipi-plugins4/INSTALL b/kde4-apps/kipi-plugins4/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/kde4-apps/kipi-plugins4/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/kde4-apps/kipi-plugins4/PRE_BUILD
b/kde4-apps/kipi-plugins4/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/kde4-apps/kipi-plugins4/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/kde4-apps/kipi-plugins4/TRIGGERS
b/kde4-apps/kipi-plugins4/TRIGGERS
deleted file mode 100755
index 09d8497..0000000
--- a/kde4-apps/kipi-plugins4/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast opencv check_self
diff --git a/kde4-apps/kipi-plugins4/UP_TRIGGERS
b/kde4-apps/kipi-plugins4/UP_TRIGGERS
new file mode 100755
index 0000000..7420d14
--- /dev/null
+++ b/kde4-apps/kipi-plugins4/UP_TRIGGERS
@@ -0,0 +1,2 @@
+up_trigger kipi-plugins4 dispel_self
+up_trigger digikam4 cast_self



  • [SM-Commit] GIT changes to master grimoire by Bor Kraljič (8b29db61cfaf7b6a4a567b11760c5e60aabcf638), Bor Kraljič, 09/23/2011

Archive powered by MHonArc 2.6.24.

Top of Page