[SM-Commit] GIT changes to master grimoire by Bor Kraljič (04ab34e054805688350debc52f3dbf9e95483ea0)

Bor Kraljič scm at sourcemage.org
Fri Feb 11 10:49:29 EST 2011


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

 ChangeLog                            |    3 +++
 kde4-apps/digikam4/DEPENDS           |    3 ---
 kde4-apps/digikam4/DETAILS           |    8 --------
 kde4-apps/digikam4/HISTORY           |    4 ++++
 kde4-apps/digikam4/PREPARE           |    1 -
 kde4-apps/k3b4/DEPENDS               |    4 ----
 kde4-apps/k3b4/DETAILS               |    9 ---------
 kde4-apps/k3b4/HISTORY               |    4 ++++
 kde4-apps/k3b4/PREPARE               |    1 -
 kde4-apps/konqueror4-plugins/DEPENDS |    3 ---
 kde4-apps/konqueror4-plugins/DETAILS |   20 --------------------
 kde4-apps/konqueror4-plugins/HISTORY |    2 --
 kde4-support/automoc/DEPENDS         |    6 +-----
 kde4-support/automoc/DETAILS         |   13 -------------
 kde4-support/automoc/HISTORY         |    4 ++++
 kde4-support/automoc/PREPARE         |    3 ---
 kde4-support/policykit-kde/DEPENDS   |    5 +----
 kde4-support/policykit-kde/DETAILS   |   13 -------------
 kde4-support/policykit-kde/HISTORY   |    4 ++++
 kde4-support/policykit-kde/PREPARE   |    6 ------
 kde4-support/polkit-qt/DEPENDS       |    5 +----
 kde4-support/polkit-qt/DETAILS       |   13 -------------
 kde4-support/polkit-qt/HISTORY       |    4 ++++
 kde4-support/polkit-qt/PREPARE       |    6 ------
 24 files changed, 26 insertions(+), 118 deletions(-)

New commits:
commit 522f1273decece92876b6417818cda6a3968e5ae
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    polkit-qt: removed svn version

commit 605e7af4f7ec6ae94ea4b7ed7e102df02964ac15
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    policykit-kde: removed svn version

commit f91c2aa0b8203c2cffd96f0d92df4a4020c163f9
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    automoc: removed svn version

commit 61a4d9886458b65362f94fa6356098fcd9ada1cd
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    kde4-apps/konqueror4-plugins: removed, source no longer available

commit c7709a4a99fa3c0812c8778b0843c5989d4f3ea1
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    k3b4: removed svn version

commit bd3dc4d392cc81123b24e5e59acd73ceecd3a501
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    digikam4: removed svn version

diff --git a/ChangeLog b/ChangeLog
index b7753c2..8881e69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2011-02-11 Bor Kraljič <pyrobor at ver.si>
+	* kde4-apps/konqueror4-plugins: removed, source no longer available
+
 2011-02-07 Treeve Jelbert <treeve at sourcemage.org>
 	* python-pypi/dulwich: new spell, Python implementation of the Git file formats and protocols
 
diff --git a/kde4-apps/digikam4/DEPENDS b/kde4-apps/digikam4/DEPENDS
index cc0da80..7dc04cc 100755
--- a/kde4-apps/digikam4/DEPENDS
+++ b/kde4-apps/digikam4/DEPENDS
@@ -6,9 +6,6 @@ depends  kdegraphics4  &&
 depends  kipi-plugins4  &&
 depends  jasper       &&
 depends  JPEG         &&
-if [[ $VERSION == svn ]];then
-depends subversion
-fi  &&
 
 optional_depends  kdepimlibs4 '' '' 'PIM support' &&
 optional_depends  lensfun                    \
diff --git a/kde4-apps/digikam4/DETAILS b/kde4-apps/digikam4/DETAILS
index 61809a5..78e9c70 100755
--- a/kde4-apps/digikam4/DETAILS
+++ b/kde4-apps/digikam4/DETAILS
@@ -1,17 +1,9 @@
            SPELL=digikam4
           SPELLX=${SPELL//4}
-if [[ $DIG_SVN == y ]];then
-         VERSION=svn
-  FORCE_DOWNLOAD=on
-    SOURCE_IGNORE=volatile
-          SOURCE=${SPELLX}-$VERSION.tar.bz2
-   SOURCE_URL[0]=svn://anonsvn.kde.org/home/kde/trunk/extragear/graphics/$SPELLX:$SPELLX
-else
          VERSION=1.8.0
      SOURCE_HASH=sha512:7ec2cb713341f874c5e002e33a037131c7a7ca11bd3d39ffe64d220f3211a1f12bfa1a6a39d55ba14fe8c9bbcbdba3621c6535ac84372f3c6d6c3c7a7b925fa9
           SOURCE=${SPELLX}-$VERSION.tar.bz2
    SOURCE_URL[0]=$SOURCEFORGE_URL/digikam/$SOURCE
-fi
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELLX}-${VERSION}
         WEB_SITE=http://digikam.org
          ENTERED=20080501
diff --git a/kde4-apps/digikam4/HISTORY b/kde4-apps/digikam4/HISTORY
index 18b4198..8e7c154 100644
--- a/kde4-apps/digikam4/HISTORY
+++ b/kde4-apps/digikam4/HISTORY
@@ -1,3 +1,7 @@
+2011-02-11 Bor Kraljič <pyrobor at ver.si>
+	* DEPENDS, DETAILS: removed svn version
+	* PREPARE: removed, no longer needed
+
 2011-01-24 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.8.0
 
diff --git a/kde4-apps/digikam4/PREPARE b/kde4-apps/digikam4/PREPARE
deleted file mode 100755
index 1cf704e..0000000
--- a/kde4-apps/digikam4/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query DIG_SVN 'build SVN version?' n
diff --git a/kde4-apps/k3b4/DEPENDS b/kde4-apps/k3b4/DEPENDS
index 7043d37..f37169b 100755
--- a/kde4-apps/k3b4/DEPENDS
+++ b/kde4-apps/k3b4/DEPENDS
@@ -1,10 +1,6 @@
 source $SECTION_DIRECTORY/KDE_DEPENDS  &&
 depends  CD-BURN-UTILITY  &&
 depends  libsamplerate    &&
-
-if [[ $VERSION == svn ]];then
-depends subversion
-fi                        &&
 depends libdvdread        &&
 optional_depends  polkit-qt-1      '' ''  'K3bSetup administrator privileges' &&
 optional_depends  hal '' '-DK3B_ENABLE_HAL_SUPPORT=OFF'  'Support for inhibiting HAL from polling disk during write.' &&
diff --git a/kde4-apps/k3b4/DETAILS b/kde4-apps/k3b4/DETAILS
index f088e12..611f2c6 100755
--- a/kde4-apps/k3b4/DETAILS
+++ b/kde4-apps/k3b4/DETAILS
@@ -1,19 +1,10 @@
            SPELL=k3b4
           SPELLX=k3b
-if [[ $K3B_VER == devel ]];then
-         VERSION=svn
-   SOURCE_IGNORE=volatile
-          SOURCE=${SPELLX}-${VERSION}.tar.bz2
-   SOURCE_URL[0]=svn://anonsvn.kde.org/home/kde/trunk/extragear/multimedia/$SPELLX:$SPELLX
-  FORCE_DOWNLOAD=1
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
-else
          VERSION=2.0.2
      SOURCE_HASH=sha512:e0a3d357decf7120a67d391d2311aaa5992f42cddbd20c5dc67f3d0e2ce15d6c53c0978cf2de6c09b96d57d273bca915fbbc0ca28547d708e2db20c795b86aa9
           SOURCE=${SPELLX}-${VERSION}.tar.bz2
    SOURCE_URL[0]=${SOURCEFORGE_URL}/k3b/${SOURCE}
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
-fi
         WEB_SITE=http://k3b.plainblack.com
          ENTERED=20080501
       LICENSE[0]=GPL
diff --git a/kde4-apps/k3b4/HISTORY b/kde4-apps/k3b4/HISTORY
index fd37213..9825238 100644
--- a/kde4-apps/k3b4/HISTORY
+++ b/kde4-apps/k3b4/HISTORY
@@ -1,3 +1,7 @@
+2011-02-11 Bor Kraljič <pyrobor at ver.si>
+	* DEPENDS, DETAILS: removed svn version
+	* PREPARE: removed, no longer needed
+
 2011-01-28 Bor Kraljič <pyrobor at ver.si>
 	* DEPENDS: added option to disable hal (https://bugs.kde.org/show_bug.cgi?id=253388)
 
diff --git a/kde4-apps/k3b4/PREPARE b/kde4-apps/k3b4/PREPARE
deleted file mode 100755
index 3a39714..0000000
--- a/kde4-apps/k3b4/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query_list K3B_VER 'which version to build?' stable unstable devel
diff --git a/kde4-apps/konqueror4-plugins/DEPENDS b/kde4-apps/konqueror4-plugins/DEPENDS
deleted file mode 100755
index c33a115..0000000
--- a/kde4-apps/konqueror4-plugins/DEPENDS
+++ /dev/null
@@ -1,3 +0,0 @@
-depends  g++       &&
-depends  cmake     &&
-depends  kdebase4
diff --git a/kde4-apps/konqueror4-plugins/DETAILS b/kde4-apps/konqueror4-plugins/DETAILS
deleted file mode 100755
index 9a4a9b7..0000000
--- a/kde4-apps/konqueror4-plugins/DETAILS
+++ /dev/null
@@ -1,20 +0,0 @@
-           SPELL=konqueror4-plugins
-persistent_read kdelibs4 KDE_VCS_AUTOUPDATE KDE_VCS_AUTOUPDATE
-if [[ $KDE_VCS_AUTOUPDATE == y ]]; then
-         VERSION=$(date +%Y%m%d)
-else
-         VERSION=svn
-fi
-   SOURCE_IGNORE=volatile
-          SOURCE=$SPELL-svn.tar.bz2
-   SOURCE_URL[0]=svn://anonsvn.kde.org/home/kde/trunk/extragear/base/konq-plugins:$SPELL
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
-  FORCE_DOWNLOAD=1
-        WEB_SITE=http://www.kde.org
-         ENTERED=20090217
-      LICENSE[0]=GPL
-        KEYWORDS="kde4 konqueror4"
-           SHORT="Plugins for Konqueror 4"
-cat << EOF
-This KDE module contains plugins that interact with Konqueror 4.
-EOF
diff --git a/kde4-apps/konqueror4-plugins/HISTORY b/kde4-apps/konqueror4-plugins/HISTORY
deleted file mode 100644
index 98c9f90..0000000
--- a/kde4-apps/konqueror4-plugins/HISTORY
+++ /dev/null
@@ -1,2 +0,0 @@
-2009-02-17 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS, DEPENDS: Created spell.
diff --git a/kde4-support/automoc/DEPENDS b/kde4-support/automoc/DEPENDS
index 821a6f8..7efbab0 100755
--- a/kde4-support/automoc/DEPENDS
+++ b/kde4-support/automoc/DEPENDS
@@ -1,7 +1,3 @@
 depends cmake     &&
 depends g++       &&
-#depends -sub DBUS qt4    &&
-depends qt4       &&
-if [[ $KDE_VER == devel ]]; then
-  depends subversion
-fi
+depends qt4
diff --git a/kde4-support/automoc/DETAILS b/kde4-support/automoc/DETAILS
index 7d08a77..0542d57 100755
--- a/kde4-support/automoc/DETAILS
+++ b/kde4-support/automoc/DETAILS
@@ -1,23 +1,10 @@
            SPELL=automoc
-if [[ $AUTOMOC_VER == devel ]]; then
-if [[ $AUTOMOC_VCS_AUTOUPDATE == y ]]; then
-         VERSION=$(date +%Y%m%d)
-else
-         VERSION=svn
-fi
-          SOURCE=$SPELL-svn.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
-   SOURCE_URL[0]=svn://anonsvn.kde.org/home/kde/trunk/kdesupport/$SPELL:$SPELL
-   SOURCE_IGNORE=volatile
-  FORCE_DOWNLOAD=on
-else
          VERSION=0.9.88
      SOURCE_HASH=sha512:96dfa096a3793f93f6a4acf98c051c871c0285124bff09b12914a17e08a1f26cd63f0bb1c22fdf2c5c29550a1727a087b5de86bfa8a555c562e96052b4a2d820
       PATCHLEVEL=1
           SOURCE=${SPELL}4-$VERSION.tar.bz2
    SOURCE_URL[0]=$KDE_URL/stable/${SPELL}4/$VERSION/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SPELL}4-$VERSION"
-fi
         WEB_SITE=http://pim.kde.org/akonadi
       LICENSE[0]=LGPL
          ENTERED=20080501
diff --git a/kde4-support/automoc/HISTORY b/kde4-support/automoc/HISTORY
index 91b8ba7..f221c19 100644
--- a/kde4-support/automoc/HISTORY
+++ b/kde4-support/automoc/HISTORY
@@ -1,3 +1,7 @@
+2011-02-11 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS, DEPENDS: removed svn version
+	* PREPARE: removed, no longer needed
+
 2009-04-12 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: PATCHLEVEL=1
 	* PREPARE: add AUTOMOC_VER query
diff --git a/kde4-support/automoc/PREPARE b/kde4-support/automoc/PREPARE
deleted file mode 100755
index ab98837..0000000
--- a/kde4-support/automoc/PREPARE
+++ /dev/null
@@ -1,3 +0,0 @@
-config_query_list AUTOMOC_VER 'which version to build?' stable devel &&
-config_query  AUTOMOC_VCS_AUTOUPDATE  \
-              "Update automatically on every system update?"  n
diff --git a/kde4-support/policykit-kde/DEPENDS b/kde4-support/policykit-kde/DEPENDS
index 3eadc08..d8f6d79 100755
--- a/kde4-support/policykit-kde/DEPENDS
+++ b/kde4-support/policykit-kde/DEPENDS
@@ -7,7 +7,4 @@ depends polkit-qt &&
 depends pkgconfig &&
 depends gettext   &&
 depends kdelibs4  &&
-depends phonon    &&
-if [[ "${AK_VER}" == "devel" ]];then
-  depends subversion
-fi
+depends phonon
diff --git a/kde4-support/policykit-kde/DETAILS b/kde4-support/policykit-kde/DETAILS
index 522ae6b..924205c 100755
--- a/kde4-support/policykit-kde/DETAILS
+++ b/kde4-support/policykit-kde/DETAILS
@@ -1,23 +1,10 @@
            SPELL=policykit-kde
           SPELLX=PolicyKit-kde
-if [[ $AK_VER != devel ]]; then
          VERSION=0.9.2
      SOURCE_HASH=sha512:a8bb63ec1dea09fe7b06024e2980e14fa2ec11470915d348289c9168c7c7941d436be6870fac0d11469b35e532352a8482a9d062e1e622f28945349ccab68ac6
           SOURCE=$SPELLX-$VERSION.tar.bz2
    SOURCE_URL[0]=$KDE_URL/stable/apps/KDE4.x/admin/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
-else
-  if [[ $AK_VCS_AUTOUPDATE == y ]]; then
-         VERSION=$(date +%Y%m%d)
-  else
-         VERSION=svn
-  fi
-   SOURCE_IGNORE=volatile
-  FORCE_DOWNLOAD=on
-          SOURCE=$SPELL-svn.tar.bz2
-   SOURCE_URL[0]=svn://anonsvn.kde.org/home/kde/trunk/kdesupport/$SPELL:$SPELL
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
-fi
         WEB_SITE=
       LICENSE[0]=GPL
          ENTERED=20090413
diff --git a/kde4-support/policykit-kde/HISTORY b/kde4-support/policykit-kde/HISTORY
index 814daa6..cb73ad5 100644
--- a/kde4-support/policykit-kde/HISTORY
+++ b/kde4-support/policykit-kde/HISTORY
@@ -1,3 +1,7 @@
+2011-02-11 Bor Kraljič <pyrobor at ver.si>
+	* DEPENDS, DETAILS: removed svn version
+	* PREPARE: removed, no longer needed
+
 2009-04-13 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.9.2
 	  spell created
diff --git a/kde4-support/policykit-kde/PREPARE b/kde4-support/policykit-kde/PREPARE
deleted file mode 100644
index 778d3db..0000000
--- a/kde4-support/policykit-kde/PREPARE
+++ /dev/null
@@ -1,6 +0,0 @@
-config_query_list AK_VER "which version to build?" stable devel  &&
-if [[ $AK_VER == devel ]]; then
-  config_query  AK_VCS_AUTOUPDATE  \
-                "Update automatically on every system update?"  n
-fi
-
diff --git a/kde4-support/polkit-qt/DEPENDS b/kde4-support/polkit-qt/DEPENDS
index b837c8b..825ee37 100755
--- a/kde4-support/polkit-qt/DEPENDS
+++ b/kde4-support/polkit-qt/DEPENDS
@@ -2,7 +2,4 @@ depends -sub "DBUS" qt4  &&
 depends g++       &&
 depends cmake     &&
 depends automoc   &&
-depends policykit &&
-if [[ "${AK_VER}" == "devel" ]];then
-  depends subversion
-fi
+depends policykit
diff --git a/kde4-support/polkit-qt/DETAILS b/kde4-support/polkit-qt/DETAILS
index ef0474b..e53e5e1 100755
--- a/kde4-support/polkit-qt/DETAILS
+++ b/kde4-support/polkit-qt/DETAILS
@@ -1,22 +1,9 @@
            SPELL=polkit-qt
-if [[ $AK_VER != devel ]]; then
          VERSION=0.9.3
      SOURCE_HASH=sha512:ad737fa17f8662ac10b3cc5f845578e990bfbcfafa040d75a33e4ec483f78692ddf79f00e820388e496d90362dfbd09d065e4a7453c5b2f9e75dfc5c78020c7f
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=$KDE_URL/stable/apps/KDE4.x/admin/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-else
-  if [[ $AK_VCS_AUTOUPDATE == y ]]; then
-         VERSION=$(date +%Y%m%d)
-  else
-         VERSION=svn
-  fi
-   SOURCE_IGNORE=volatile
-  FORCE_DOWNLOAD=on
-          SOURCE=$SPELL-svn.tar.bz2
-   SOURCE_URL[0]=svn://anonsvn.kde.org/home/kde/trunk/kdesupport/$SPELL:$SPELL
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
-fi
         WEB_SITE=
       LICENSE[0]=GPL
          ENTERED=20090408
diff --git a/kde4-support/polkit-qt/HISTORY b/kde4-support/polkit-qt/HISTORY
index 2d62b0a..d9bbc1b 100644
--- a/kde4-support/polkit-qt/HISTORY
+++ b/kde4-support/polkit-qt/HISTORY
@@ -1,3 +1,7 @@
+2011-02-11 Bor Kraljič <pyrobor at ver.si>
+	* DEPENDS, DETAILS: removed svn version
+	* PREPARE: removed, no longer needed
+
 2009-12-23 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.9.3
 	  This MAY work with older versions of policykit
diff --git a/kde4-support/polkit-qt/PREPARE b/kde4-support/polkit-qt/PREPARE
deleted file mode 100755
index 778d3db..0000000
--- a/kde4-support/polkit-qt/PREPARE
+++ /dev/null
@@ -1,6 +0,0 @@
-config_query_list AK_VER "which version to build?" stable devel  &&
-if [[ $AK_VER == devel ]]; then
-  config_query  AK_VCS_AUTOUPDATE  \
-                "Update automatically on every system update?"  n
-fi
-



More information about the SM-Commit mailing list