diff --git a/kde4-support/libdbusmenu-qt/DEPENDS
b/kde4-support/libdbusmenu-qt/DEPENDS
index 42b56fc..a1d545b 100755
--- a/kde4-support/libdbusmenu-qt/DEPENDS
+++ b/kde4-support/libdbusmenu-qt/DEPENDS
@@ -1,4 +1,5 @@
depends cmake &&
depends -sub CXX gcc &&
-optional_depends doxygen "-DWITH_DOC=ON" "-DWITH_DOC=OFF" &&
+optional_depends qjson "" "" &&
+optional_depends doxygen "-DWITH_DOC=ON" "-DWITH_DOC=OFF" "for installing
docs" &&
depends -sub DBUS qt4
diff --git a/kde4-support/libdbusmenu-qt/HISTORY
b/kde4-support/libdbusmenu-qt/HISTORY
index c06d34f..d306d35 100644
--- a/kde4-support/libdbusmenu-qt/HISTORY
+++ b/kde4-support/libdbusmenu-qt/HISTORY
@@ -1,3 +1,6 @@
+2011-08-19 Bor Kraljič <pyrobor AT ver.si>
+ * DEPENDS: added optional dependency on qjson
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/kde4/kdevplatform4/DEPENDS b/kde4/kdevplatform4/DEPENDS
index 0db596c..5ef2950 100755
--- a/kde4/kdevplatform4/DEPENDS
+++ b/kde4/kdevplatform4/DEPENDS
@@ -2,4 +2,5 @@ source $SECTION_DIRECTORY/KDE_DEPENDS &&
optional_depends subversion '' '' 'Subversion support' &&
optional_depends rapidsvn '' '' 'subversion support' &&
optional_depends -sub 'THREAD SERIALIZATION' boost '' '' 'Teamwork plugin'
&&
+optional_depends qjson "" "" "for Uploading Patches to
reviewboard" &&
optional_depends commoncpp2 '' '' 'Teamwork plugin'
diff --git a/kde4/kdevplatform4/HISTORY b/kde4/kdevplatform4/HISTORY
index 861a605..eefee85 100644
--- a/kde4/kdevplatform4/HISTORY
+++ b/kde4/kdevplatform4/HISTORY
@@ -1,3 +1,6 @@
+2011-08-19 Bor Kraljič <pyrobor AT ver.si>
+ * DEPENDS: added qjson as optional dependency
+
2011-04-06 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 1.2.2
diff --git a/libs/libusb/BUILD b/libs/libusb/BUILD
deleted file mode 100755
index 3923fbb..0000000
--- a/libs/libusb/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-OPTS="$LIBUSB_DOC \
- $OPTS" &&
-
-default_build
diff --git a/libs/libusb/CONFIGURE b/libs/libusb/CONFIGURE
deleted file mode 100755
index c09e029..0000000
--- a/libs/libusb/CONFIGURE
+++ /dev/null
@@ -1,13 +0,0 @@
-#if spell_ok openjade &&
-# spell_ok docbook-sgml-dtd; then
-# config_query_option LIBUSB_DOC "Enable building of documentation?" y \
-# '--enable-build-docs' '--disable-build-docs'
-#else
-
-config_query_option LIBUSB_DOC "Enable building of documentation?" n \
- '--enable-build-docs' '--disable-build-docs'
-
-#fi
-#above were commented out to disable docs in either case -- change back when
fixed
-# true
-# make sure we return true when otherwise empty
diff --git a/libs/libusb/HISTORY b/libs/libusb/HISTORY
index 987c89d..eb15c8c 100644
--- a/libs/libusb/HISTORY
+++ b/libs/libusb/HISTORY
@@ -1,3 +1,6 @@
+2011-08-19 Bor Kraljič <pyrobor AT ver.si>
+ * BUILD,CONFIGURE: removed, it only contained unrecognized options
(issue #30)
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/libs/sdl_mixer/CONFIGURE b/libs/sdl_mixer/CONFIGURE
index 7ab5ac3..9626462 100755
--- a/libs/sdl_mixer/CONFIGURE
+++ b/libs/sdl_mixer/CONFIGURE
@@ -15,7 +15,7 @@ config_query_option SDLMIXER_TIMIDITY_MIDI \
"Enable MIDI via timidity" \
y \
"--enable-music-midi" \
- "--disable-music--midi" &&
+ "--disable-music-midi" &&
if [[ "$SDLMIXER_TIMIDITY_MIDI" == "--enable-music-midi" ]]
then
config_query_option SDLMIXER_TIMIDITY_MIDI_OUTPUT \
diff --git a/libs/sdl_mixer/DEPENDS b/libs/sdl_mixer/DEPENDS
index d1d9893..2998320 100755
--- a/libs/sdl_mixer/DEPENDS
+++ b/libs/sdl_mixer/DEPENDS
@@ -1,15 +1,10 @@
depends sdl &&
depends audiofile &&
-optional_depends libmikmod \
- "--enable-music-libmikmod" \
- "--disable-music-libmikmod" \
- "to play mods via libmikmod"
-
optional_depends mikmod \
"--enable-music-mod" \
"--disable-music-mod" \
- "to play mods via mikmod"
+ "to play mods via mikmod" &&
if [[ "$SDLMIXER_TIMIDITY_MIDI" == "--enable-music-midi" ]]
then
diff --git a/libs/sdl_mixer/HISTORY b/libs/sdl_mixer/HISTORY
index 742de68..7ff2b6d 100644
--- a/libs/sdl_mixer/HISTORY
+++ b/libs/sdl_mixer/HISTORY
@@ -1,3 +1,8 @@
+2011-08-19 Bor Kraljič <pyrobor AT ver.si>
+ * SUB_DEPENDS, PRE_SUB_DEPENDS: removed, no longer available
+ * DEPENDS: removing optional depenency on libmikmod, fixed typo
+ option --{disable,enable}-music-libmikmod is no longer available
(bug #30)
+
2009-11-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.2.11
diff --git a/libs/sdl_mixer/PRE_SUB_DEPENDS b/libs/sdl_mixer/PRE_SUB_DEPENDS
deleted file mode 100755
index b7f0356..0000000
--- a/libs/sdl_mixer/PRE_SUB_DEPENDS
+++ /dev/null
@@ -1,4 +0,0 @@
-case $THIS_SUB_DEPENDS in
-LIBMIKMOD) is_depends_enabled $SPELL libmikmod && return 0;;
-esac
-return 1
diff --git a/libs/sdl_mixer/SUB_DEPENDS b/libs/sdl_mixer/SUB_DEPENDS
deleted file mode 100755
index b78d886..0000000
--- a/libs/sdl_mixer/SUB_DEPENDS
+++ /dev/null
@@ -1,6 +0,0 @@
-case $THIS_SUB_DEPENDS in
-LIBMIKMOD) echo "libmikmod support requested, forcing libmikmod dependency."
&&
- depends libmikmod
- ;;
-*) echo unknown sub-depends!!! ; return 1 ;;
-esac
diff --git a/libs/tbb/CONFLICTS b/libs/tbb/CONFLICTS
new file mode 100755
index 0000000..cdf9246
--- /dev/null
+++ b/libs/tbb/CONFLICTS
@@ -0,0 +1 @@
+conflicts $SPELL y
diff --git a/libs/tbb/HISTORY b/libs/tbb/HISTORY
index 0e0766c..e837cd0 100644
--- a/libs/tbb/HISTORY
+++ b/libs/tbb/HISTORY
@@ -1,3 +1,6 @@
+2011-08-19 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: conflict with self to avoid failure during INSTALL
(fixes #46)
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/science/qalculate/BUILD b/science/qalculate/BUILD
index f88004c..57f2ecd 100755
--- a/science/qalculate/BUILD
+++ b/science/qalculate/BUILD
@@ -3,6 +3,5 @@ autoconf
&&
OPTS="${!tempopts} $OPTS" &&
OPTS="$OPTS --build=${BUILD}" &&
./configure --prefix=${INSTALL_ROOT}/usr \
- --disable-clntest \
$OPTS &&
default_build_make
diff --git a/science/qalculate/HISTORY b/science/qalculate/HISTORY
index 1b13c05..6cf8352 100644
--- a/science/qalculate/HISTORY
+++ b/science/qalculate/HISTORY
@@ -1,3 +1,6 @@
+2011-08-19 Bor Kraljič <pyrobor AT ver.si>
+ * BUILD: removed "--disable-clntest" (unrecognized option)
+
2010-01-15 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.9.7
* PRE_BUILD, libqalculate*.patch: removed
diff --git a/smgl/linux-initramfs/DETAILS b/smgl/linux-initramfs/DETAILS
index 9629c8b..0f0444d 100755
--- a/smgl/linux-initramfs/DETAILS
+++ b/smgl/linux-initramfs/DETAILS
@@ -1,5 +1,5 @@
SPELL=linux-initramfs
- VERSION=0.5
+ VERSION=0.6
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
WEB_SITE="http://www.sourcemage.org/"
ENTERED=20030803
diff --git a/smgl/linux-initramfs/HISTORY b/smgl/linux-initramfs/HISTORY
index 84dda13..fb08969 100644
--- a/smgl/linux-initramfs/HISTORY
+++ b/smgl/linux-initramfs/HISTORY
@@ -1,3 +1,7 @@
+2011-08-16 Julien"_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 0.6
+ * mkinitrd, installkernel: added support for kernel 3.x
+
2010-07-28 Finn Haedicke <finn AT sourcemage.org>
* mkinitrd: use which to find static dmsetup, lvm, cryptsetup
* mkinitrd: read /proc/cmdline for root= and init=
diff --git a/smgl/linux-initramfs/installkernel
b/smgl/linux-initramfs/installkernel
index 6542e7e..819e05a 100755
--- a/smgl/linux-initramfs/installkernel
+++ b/smgl/linux-initramfs/installkernel
@@ -22,6 +22,10 @@ if grep 'CONFIG_MODULES=y' ./.config ; then
echo "installing for a 2.x kernel" &&
ARCH="$kernel_arch" make
INSTALL_MOD_PATH="${INSTALL_ROOT}" modules_install
;;
+ 3.*)
+ echo "installing for a 3.x kernel" &&
+ ARCH="$kernel_arch" make
INSTALL_MOD_PATH="${INSTALL_ROOT}" modules_install
+ ;;
*)
echo "I again don't know what version: $VERSION is" &&
return 1
diff --git a/smgl/linux-initramfs/mkinitrd b/smgl/linux-initramfs/mkinitrd
index 75ce834..2c4f82f 100755
--- a/smgl/linux-initramfs/mkinitrd
+++ b/smgl/linux-initramfs/mkinitrd
@@ -1326,7 +1326,7 @@ do
INITRD_FILE="${2}"
shift
;;
- 2.[46]*)
+ 2.[46]*|3.*)
KVERSION=$1
;;
*)
diff --git a/utils/bluez/CONFIGURE b/utils/bluez/CONFIGURE
index 5e84b97..996eb2f 100755
--- a/utils/bluez/CONFIGURE
+++ b/utils/bluez/CONFIGURE
@@ -8,8 +8,8 @@ config_query_option BLUEZOPTS "Build the test programs?" n
"--enable-test" "--di
config_query_option BLUEZOPTS "Build HID mode switching utility?" n
"--enable-hid2hci" "--disable-hid2hci" &&
config_query_option BLUEZOPTS "Build DFU firmware upgrade utility?" n
"--enable-dfutool" "--disable-dfutool" &&
config_query_option BLUEZOPTS "Build BCCMD interface utility?" n
"--enable-bccmd" "--disable-bccmd" &&
-config_query_option BLUEZOPTS "Install Bluetooth configuration files?" y
"--enable-configfiles" "--disable-configfiles" &&
-config_query_option BLUEZOPTS "Install udev rules?" y "--enable-udevrules"
"--disable-udevrules" &&
+config_query_option BLUEZOPTS "Install Bluetooth configuration files?" y
"--enable-datafiles" "--disable-datafiles" &&
+#config_query_option BLUEZOPTS "Install udev rules?" y "--enable-udevrules"
"--disable-udevrules" &&
config_query_option BLUEZOPTS "Install PCMCIA serial script?" n
"--enable-pcmcia" "--disable-pcmcia" &&
config_query_option BLUEZOPTS "Build the input plugin?" n "--enable-input"
"--disable-input" &&
config_query_option BLUEZOPTS "Build the network plugin?" n
"--enable-network" "--disable-network" &&
diff --git a/utils/bluez/DEPENDS b/utils/bluez/DEPENDS
index 89e28d8..2801cd3 100755
--- a/utils/bluez/DEPENDS
+++ b/utils/bluez/DEPENDS
@@ -23,10 +23,10 @@ optional_depends gstreamer \
"--disable-gstreamer" \
"for GStreamer support" &&