Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (12928e39c3fd748978b7579fad250214d1e7a81a)

Chronological Thread  
    < 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 (12928e39c3fd748978b7579fad250214d1e7a81a)
  • Date: Sat, 2 Feb 2008 03:30:12 -0600
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

kde4-apps/dragonplayer/CONFLICTS | 1 +
kde4-apps/dragonplayer/HISTORY | 4 ++++
kde4-apps/ktorrent4/DETAILS | 8 ++++----
kde4-apps/ktorrent4/HISTORY | 4 ++++
kde4/kde4-l10n/DETAILS | 2 +-
kde4/kde4-l10n/HISTORY | 4 ----
kde4/kdemultimedia4/CONFLICTS | 1 +
kde4/kdemultimedia4/HISTORY | 3 +++
kde4/kdenetwork4/DEPENDS | 4 +++-
kde4/kdenetwork4/HISTORY | 3 +++
10 files changed, 24 insertions(+), 10 deletions(-)

New commits:
commit 12928e39c3fd748978b7579fad250214d1e7a81a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

ktorrent4-3.0rc1

commit 79fbcfb49bc87870e4fde5896aea8ccc1a9be428
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kdenetwork4 - more dpends

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

Revert "kde4-l10n-4.0.60"
there are no l10n packeages at present

This reverts commit a1fa2c7b0a52231aa2f976dd5fb182bbb688e7c4.

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

dragonplayer - add CONFLICTS

commit 63fbad45f3fff79cdc3b3b13b533cecaafe53b70
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kdemultimedia4 - add CONFLICTS

diff --git a/kde4-apps/dragonplayer/CONFLICTS
b/kde4-apps/dragonplayer/CONFLICTS
new file mode 100755
index 0000000..4d015ed
--- /dev/null
+++ b/kde4-apps/dragonplayer/CONFLICTS
@@ -0,0 +1 @@
+conflicts kdemultimedia4
diff --git a/kde4-apps/dragonplayer/HISTORY b/kde4-apps/dragonplayer/HISTORY
index 7d6dd86..87e9bfa 100644
--- a/kde4-apps/dragonplayer/HISTORY
+++ b/kde4-apps/dragonplayer/HISTORY
@@ -1,3 +1,7 @@
+2008-02-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONFLICTS: added
+ dragon player is now part of kdemultimedia4
+
2008-01-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.0_rc1

diff --git a/kde4-apps/ktorrent4/DETAILS b/kde4-apps/ktorrent4/DETAILS
index fde5c03..2cd0b9f 100755
--- a/kde4-apps/ktorrent4/DETAILS
+++ b/kde4-apps/ktorrent4/DETAILS
@@ -1,9 +1,9 @@
SPELL=ktorrent4
- VERSION=4.0.0
-
SOURCE_HASH=sha512:f3fefe2e8e6aa8c09791f3fb884dbbb601b867803e88b67f6230c13e1809c6cab0569a208d7b6cbfb20c74c4a791c4e0142954d86d060eb47214b2bbb7552540
+ VERSION=3.0rc1
+
SOURCE_HASH=sha512:fd1d06f0721f02dc610831ef7a3f4453317beaa6ea10e5c7cf4efe1cec13408255f48ee90f22fc3072b14a21be8fdef4e4957beea94cba72df43fca707821407
SOURCE=${SPELL//4}-$VERSION.tar.bz2
- SOURCE_URL=$KDE_URL/stable/${VERSION}/src/extragear/$SOURCE
-# SOURCE_URL=http://ktorrent.org/downloads/$VERSION/$SOURCE
+# SOURCE_URL=$KDE_URL/stable/${VERSION}/src/extragear/$SOURCE
+ SOURCE_URL=http://ktorrent.org/downloads/$VERSION/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL//4}-$VERSION
WEB_SITE=http://www.ktorrent.org
ENTERED=20071211
diff --git a/kde4-apps/ktorrent4/HISTORY b/kde4-apps/ktorrent4/HISTORY
index 65365b4..f27fe2b 100644
--- a/kde4-apps/ktorrent4/HISTORY
+++ b/kde4-apps/ktorrent4/HISTORY
@@ -1,3 +1,7 @@
+2008-02-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.0rc1
+ use project url
+
2008-01-15 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.0.0

diff --git a/kde4/kde4-l10n/DETAILS b/kde4/kde4-l10n/DETAILS
index 83f3e88..8448888 100755
--- a/kde4/kde4-l10n/DETAILS
+++ b/kde4/kde4-l10n/DETAILS
@@ -1,7 +1,7 @@
# the remaining details of this spell are provided by CONFIGURE
SPELL=kde4-l10n
SPELLX=kde-l10n
- VERSION=4.0.60
+ VERSION=4.0.0
SITE=$KDE_URL/unstable/${VERSION//.0/}/src/$SPELLX
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX
source $SPELL_CONFIG
diff --git a/kde4/kde4-l10n/HISTORY b/kde4/kde4-l10n/HISTORY
index 13859fc..aefe8a0 100644
--- a/kde4/kde4-l10n/HISTORY
+++ b/kde4/kde4-l10n/HISTORY
@@ -1,7 +1,3 @@
-2008-01-31 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 4.0.60
- KEYWORDS=kde4
-
2008-01-11 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.0.0

diff --git a/kde4/kdemultimedia4/CONFLICTS b/kde4/kdemultimedia4/CONFLICTS
new file mode 100755
index 0000000..e639c69
--- /dev/null
+++ b/kde4/kdemultimedia4/CONFLICTS
@@ -0,0 +1 @@
+conflicts dragonplayer
diff --git a/kde4/kdemultimedia4/HISTORY b/kde4/kdemultimedia4/HISTORY
index de59b3c..fff5a9e 100644
--- a/kde4/kdemultimedia4/HISTORY
+++ b/kde4/kdemultimedia4/HISTORY
@@ -1,3 +1,6 @@
+2008-02-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONFLICTS: added, dragonplayer is no part of kdemultimedia4
+
2008-01-31 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.0.60
KEYWORDS=kde4
diff --git a/kde4/kdenetwork4/DEPENDS b/kde4/kdenetwork4/DEPENDS
index 5255b35..a2ce86e 100755
--- a/kde4/kdenetwork4/DEPENDS
+++ b/kde4/kdenetwork4/DEPENDS
@@ -5,6 +5,8 @@ optional_depends openslp '' '' 'to find available remote
desktops' &&
optional_depends wireless_tools '' '' 'Wireless support' &&
optional_depends libidn '' '' 'International Domain Name Support' &&
optional_depends decibel '' '' 'Decibel support' &&
-optional_depends qca2 '' '' 'needed to build kopete'
+optional_depends qca2 '' '' 'needed to build kopete' &&
+optional_depends ktorrent4 '' '' 'sdownload using torrents' &&
+optional_depends xmms '' '' 'nowlistening plugin'
# libdnssd: libvncserver jpeg?
#
diff --git a/kde4/kdenetwork4/HISTORY b/kde4/kdenetwork4/HISTORY
index 786d04e..4471a5d 100644
--- a/kde4/kdenetwork4/HISTORY
+++ b/kde4/kdenetwork4/HISTORY
@@ -1,3 +1,6 @@
+2008-02-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: add optional ktorrent4, xmms
+
2008-01-31 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.0.60
KEYWORDS=kde4


  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (12928e39c3fd748978b7579fad250214d1e7a81a), Treeve Jelbert, 02/02/2008

Archive powered by MHonArc 2.6.24.

Top of Page