moving kervala_libsquish to kervalasquish and adding the common.cmake CMake module, see http://dev.ryzom.com/issues/1485#note-5

4 files changed, 13 insertions, 11 deletions

diff --git a/libre/virtualbox-modules/PKGBUILD b/libre/virtualbox-modules/PKGBUILD
index 5e0feec6d..f965869f7 100644
--- a/libre/virtualbox-modules/PKGBUILD
+++ b/libre/virtualbox-modules/PKGBUILD
@@ -6,7 +6,7 @@
 pkgbase=virtualbox-modules
 pkgname=('virtualbox-modules' 'virtualbox-parabola-modules')
 pkgver=4.1.18
-pkgrel=5
+pkgrel=4
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
@@ -18,7 +18,7 @@ md5sums=('38db0a87cba659b484af868b0c2bd3ac'
          '4c88bd122677a35f68abd76eb01b378b'
          'ed1341881437455d9735875ddf455fbe')
 
-_extramodules=extramodules-3.5-LIBRE
+_extramodules=extramodules-3.4-LIBRE
 _kernver="$(cat /usr/lib/modules/${_extramodules}/version || true)"
 
 export KERN_DIR=/usr/lib/modules/${_kernver}/build
@@ -53,7 +53,7 @@ package_virtualbox-parabola-modules(){
     pkgdesc="Additions only for Parabola guests (kernel modules)"
     license=('GPL')
     install=virtualbox-parabola-modules.install
-    depends=('linux-libre>=3.5' 'linux-libre<3.6')
+    depends=('linux-libre>=3.4' 'linux-libre<3.5')
     replaces=('virtualbox-archlinux-modules')
     conflicts=('virtualbox-archlinux-modules')
     provides=("virtualbox-archlinux-modules=$pkgver")
@@ -79,7 +79,7 @@ package_virtualbox-modules(){
     pkgdesc="Kernel modules for VirtualBox"
     license=('GPL')
     install=virtualbox-modules.install
-    depends=('linux-libre>=3.5' 'linux-libre<3.6')
+    depends=('linux-libre>=3.4' 'linux-libre<3.5')
 
     source "$srcdir/VirtualBox-${pkgver}/env.sh"
 
diff --git a/libre/virtualbox-modules/virtualbox-modules.install b/libre/virtualbox-modules/virtualbox-modules.install
index 3f2a12a3f..b178686e2 100644
--- a/libre/virtualbox-modules/virtualbox-modules.install
+++ b/libre/virtualbox-modules/virtualbox-modules.install
@@ -3,17 +3,17 @@ post_install() {
 ===> You must load vboxdrv module before starting VirtualBox:
 ===> # modprobe vboxdrv
 EOF
-    EXTRAMODULES='extramodules-3.5-LIBRE'
+    EXTRAMODULES='extramodules-3.4-LIBRE'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.5-LIBRE'
+    EXTRAMODULES='extramodules-3.4-LIBRE'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
     echo 'In order to use the new version, reload all virtualbox modules manually.'
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-3.5-LIBRE'
+    EXTRAMODULES='extramodules-3.4-LIBRE'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
diff --git a/libre/virtualbox-modules/virtualbox-parabola-modules.install b/libre/virtualbox-modules/virtualbox-parabola-modules.install
index c3419c991..31575fb9d 100644
--- a/libre/virtualbox-modules/virtualbox-parabola-modules.install
+++ b/libre/virtualbox-modules/virtualbox-parabola-modules.install
@@ -2,16 +2,16 @@ post_install() {
 cat << EOF
 ===> You may want to load vboxguest, vboxsf and vboxvideo
 EOF
-    EXTRAMODULES='extramodules-3.5-LIBRE'
+    EXTRAMODULES='extramodules-3.4-LIBRE'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.5-LIBRE'
+    EXTRAMODULES='extramodules-3.4-LIBRE'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-3.5-LIBRE'
+    EXTRAMODULES='extramodules-3.4-LIBRE'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
diff --git a/pcr/kervalasquish-hg/PKGBUILD b/pcr/kervalasquish-hg/PKGBUILD
index c9ca2e7cd..0f2dd8124 100644
--- a/pcr/kervalasquish-hg/PKGBUILD
+++ b/pcr/kervalasquish-hg/PKGBUILD
@@ -9,7 +9,9 @@ url="http://code.google.com/p/libsquish/"
 license=('MIT')
 makedepends=('mercurial' 'gcc-libs')
 provides=('libsquish')
-conflicts=('libsquish' 'kervala_libsquish-hg')
+conflicts=('libsquish'
+           'kervala_libsquish-hg'
+           'kervalasquish-hg')
 
 _hgroot="http://hg.kervala.net"
 _hgrepo="packaging"