diff options
| author | Bor Kraljič | 2011-09-05 13:47:49 +0200 |
|---|---|---|
| committer | Bor Kraljič | 2011-09-05 13:47:49 +0200 |
| commit | 5f42d8989791ea984f308f49907d1d807f9bcb37 (patch) | |
| tree | a3cbf8ca2773808f4bdb6aa2f6dd302b8f950d60 | |
| parent | 0ff379d73dfaf4574ab79ced2af1534fd3d3ad28 (diff) | |
| parent | 964066f7d30dc094e748be4ea4e95104a20379b4 (diff) | |
Merge branch 'master' into devel-kde47
Conflicts:
kde4-support/libdbusmenu-qt/DETAILS
kde4-support/libdbusmenu-qt/HISTORY
| -rwxr-xr-x | kde4-support/libdbusmenu-qt/DETAILS | 2 | ||||
| -rw-r--r-- | kde4-support/libdbusmenu-qt/HISTORY | 3 | ||||
| -rwxr-xr-x | kernels/kvm/BUILD | 1 | ||||
| -rw-r--r-- | kernels/kvm/HISTORY | 3 | ||||
| -rw-r--r-- | kernels/kvm/qemu-kvm-0.15.0.tar.gz.sig | bin | 0 -> 287 bytes |
5 files changed, 8 insertions, 1 deletions
diff --git a/kde4-support/libdbusmenu-qt/DETAILS b/kde4-support/libdbusmenu-qt/DETAILS index 580baf5426..ad72a30958 100755 --- a/kde4-support/libdbusmenu-qt/DETAILS +++ b/kde4-support/libdbusmenu-qt/DETAILS @@ -1,5 +1,5 @@ SPELL=libdbusmenu-qt - VERSION=0.8.3 + VERSION=0.9.0 PATCHLEVEL=1 SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE2=$SOURCE.asc diff --git a/kde4-support/libdbusmenu-qt/HISTORY b/kde4-support/libdbusmenu-qt/HISTORY index a1acd8f2f4..e81466ca52 100644 --- a/kde4-support/libdbusmenu-qt/HISTORY +++ b/kde4-support/libdbusmenu-qt/HISTORY @@ -1,3 +1,6 @@ +2011-09-05 Bor Kraljič <pyrobor@ver.si> + * DETAILS: updated spell to 0.9.0 + 2011-09-04 Bor Kraljič <pyrobor@ver.si> * DETAILS: PATCHLEVEL++ for /opt/kde4 -> /usr change diff --git a/kernels/kvm/BUILD b/kernels/kvm/BUILD index cb36736236..f5a155f3cb 100755 --- a/kernels/kvm/BUILD +++ b/kernels/kvm/BUILD @@ -1,6 +1,7 @@ message "Target list: $KVM_ARCHS" && ./configure --prefix=${INSTALL_ROOT}/usr \ + --sysconfdir=${INSTALL_ROOT}/etc \ --extra-cflags="${CFLAGS}" \ --extra-ldflags="${LDFLAGS}" \ --kerneldir="/lib/modules/$(get_kernel_version)/build" \ diff --git a/kernels/kvm/HISTORY b/kernels/kvm/HISTORY index d725d819cc..c1e74c1886 100644 --- a/kernels/kvm/HISTORY +++ b/kernels/kvm/HISTORY @@ -1,3 +1,6 @@ +2011-09-05 Bor Kraljič <pyrobor@ver.si> + * BUILD: install config files in /etc + 2011-03-04 Bor Kraljič <pyrobor@ver.si> * DETAILS: updated spell to 0.14.0 * pci.patch: fixes non-x86 targets which have no PCI support. (upstream patch) diff --git a/kernels/kvm/qemu-kvm-0.15.0.tar.gz.sig b/kernels/kvm/qemu-kvm-0.15.0.tar.gz.sig Binary files differnew file mode 100644 index 0000000000..ba92d177f0 --- /dev/null +++ b/kernels/kvm/qemu-kvm-0.15.0.tar.gz.sig |