[SM-Commit] GIT changes to master grimoire by Jaka Kranjc (36ec83e2ffae6bac47b2fcb05c210ae844423115)

Jaka Kranjc scm at mail.sourcemage.org
Fri Jan 26 13:26:09 EST 2007


GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx at sourcemage.org>:

 kde-core/kdenetwork/CONFLICTS               |    1 +
 kde-core/kdenetwork/DEPENDS                 |    5 -----
 kde-core/kdenetwork/DETAILS                 |    6 +++---
 kde-core/kdenetwork/HISTORY                 |    7 +++++++
 kde-core/kdenetwork/PRE_BUILD               |    3 ---
 kde-core/kdenetwork/REPAIR^none^UP_TRIGGERS |    5 +----
 kde-core/kdenetwork/UP_TRIGGERS             |    4 ----
 7 files changed, 12 insertions(+), 19 deletions(-)

New commits:
commit 36ec83e2ffae6bac47b2fcb05c210ae844423115
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    kdenetwork 3.5.6
    
    reinstating kopete, reverted 7e6a49a0ccf2232276bd184b6c623bbf26c5cbb5

diff --git a/kde-core/kdenetwork/CONFLICTS b/kde-core/kdenetwork/CONFLICTS
new file mode 100755
index 0000000..5bdfc99
--- /dev/null
+++ b/kde-core/kdenetwork/CONFLICTS
@@ -0,0 +1 @@
+conflicts kopete
diff --git a/kde-core/kdenetwork/DEPENDS b/kde-core/kdenetwork/DEPENDS
index d2dd979..d3168f5 100755
--- a/kde-core/kdenetwork/DEPENDS
+++ b/kde-core/kdenetwork/DEPENDS
@@ -23,11 +23,6 @@ optional_depends  wireless_tools
                   '--without-wifi'                                         \
                   'needed to build KWiFiManager and the KWireless applet'  &&
 
-optional_depends  kopete                             \
-                  ''                                 \
-                  ''                                 \
-                  'a multiprotocol chat client'      &&
-
 optional_depends  lisa                                \
                   ''                                  \
                   ''                                  \
diff --git a/kde-core/kdenetwork/DETAILS b/kde-core/kdenetwork/DETAILS
index 412c460..914cdcd 100755
--- a/kde-core/kdenetwork/DETAILS
+++ b/kde-core/kdenetwork/DETAILS
@@ -1,8 +1,8 @@
 source  $SECTION_DIRECTORY/KDE_DETAILS
 
            SPELL=kdenetwork
-         VERSION=3.5.5
-     SOURCE_HASH=sha512:3e2e6e042de521b0022b2e17f1b61c347e258083ab6365901b0127c307dd72a07f12286769aa56336d546a99a85e52efac2f78439133da07d4c7bacac36abbb1
+         VERSION=3.5.6
+     SOURCE_HASH=sha512:c823d892e97037594b1cedf47b821d35a1192b2da531a02426971eef570c8fc0fea45c88ddad6bbca646981d76ef7fe25cc548f821fd8be822d7809dce407f53
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$KDE_URL/stable/${VERSION//.0/}/src/$SOURCE
@@ -14,5 +14,5 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
 cat << EOF
 Network applications. Currently contains the news
 reader, and several other network-related programs.
-NO LONGER CONTAINS KMAIL OR KOPETE (Kopete is a separate spell)
+NO LONGER CONTAINS KMAIL
 EOF
diff --git a/kde-core/kdenetwork/HISTORY b/kde-core/kdenetwork/HISTORY
index e03cdf3..4664d6b 100644
--- a/kde-core/kdenetwork/HISTORY
+++ b/kde-core/kdenetwork/HISTORY
@@ -1,3 +1,10 @@
+2007-01-26 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* CONFLICTS: readded, kopete isn't available as a standalone app anymore
+	* DEPENDS: removed kopete, now we build it again
+	* REPAIR^none^UP_TRIGGERS: changed to noop
+	* UP_TRIGGERS, PRE_BUILD: removed
+	* DETAILS: updated spell to 3.5.6
+
 2006-10-11 Anton Brondz <dinolinux at sourcemage.org>
 	* DETAILS: updated to 3.5.5
 
diff --git a/kde-core/kdenetwork/PRE_BUILD b/kde-core/kdenetwork/PRE_BUILD
deleted file mode 100755
index 8706bb0..0000000
--- a/kde-core/kdenetwork/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build           &&
-cd  $SOURCE_DIRECTORY       &&
-sedit "/kopete/d" subdirs
diff --git a/kde-core/kdenetwork/REPAIR^none^UP_TRIGGERS b/kde-core/kdenetwork/REPAIR^none^UP_TRIGGERS
index 8c9ca42..27ba77d 100755
--- a/kde-core/kdenetwork/REPAIR^none^UP_TRIGGERS
+++ b/kde-core/kdenetwork/REPAIR^none^UP_TRIGGERS
@@ -1,4 +1 @@
-local knver=$(installed_version kdenetwork) &&
-if [[ $knver < 3.5.4 ]]; then
-  up_trigger kopete cast_self
-fi
+true
diff --git a/kde-core/kdenetwork/UP_TRIGGERS b/kde-core/kdenetwork/UP_TRIGGERS
deleted file mode 100755
index 8c9ca42..0000000
--- a/kde-core/kdenetwork/UP_TRIGGERS
+++ /dev/null
@@ -1,4 +0,0 @@
-local knver=$(installed_version kdenetwork) &&
-if [[ $knver < 3.5.4 ]]; then
-  up_trigger kopete cast_self
-fi



More information about the SM-Commit mailing list