From 2f88e0305ffdc9382d093eca465fe9170e9d5f65 Mon Sep 17 00:00:00 2001
From: Mattias Andrée <maandree@operamail.com>
Date: Sun, 4 May 2014 00:35:42 +0200
Subject: dooble and dooble-qt4 are no longer self-contained packages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mattias Andrée <maandree@operamail.com>
---
 dooble-qt4/PKGBUILD | 31 +++++++++++++++----------------
 dooble/PKGBUILD     | 31 +++++++++++++++----------------
 2 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/dooble-qt4/PKGBUILD b/dooble-qt4/PKGBUILD
index 0cbcd9e..a05838b 100644
--- a/dooble-qt4/PKGBUILD
+++ b/dooble-qt4/PKGBUILD
@@ -71,23 +71,22 @@ build()
 package()
 {
     cd "$srcdir/dooble.d/trunk/browser/"
-    mkdir -p -- "${pkgdir}/opt/${pkgname}"
-    cp Dooble -- "${pkgdir}/opt/${pkgname}/Dooble"
-    cp dooble.sh -- "${pkgdir}/opt/${pkgname}/dooble"
-    for d in Icons Images Plugins Tab Translations; do
-	ln -sf "../../usr/share/dooble/${d}" -- "${pkgdir}/opt/${pkgname}/${d}"
-    done
-    mkdir -p -- "${pkgdir}/opt/${pkgname}/applications"
-    cp dooble.desktop -- "${pkgdir}/opt/${pkgname}/applications/dooble.desktop"
+    install -Dm755  Dooble         -- "${pkgdir}/usr/lib/${pkgname}/Dooble"
+    install -Dm755  dooble.sh      -- "${pkgdir}/usr/bin/${pkgname}"
+    install -Dm644  dooble.desktop -- "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+    
+    
+    msg "Editing files for the file system adaption"
+    
+    sed -i s_"/usr/local/dooble/"_"/usr/lib/${pkgname}/"_g -- "${pkgdir}/usr/bin/${pkgname}"
+    sed -i s_"/usr/local/dooble"_"/usr/share/dooble"_g     -- "${pkgdir}/usr/bin/${pkgname}"
+    sed -i s_"\./Dooble"_"../../lib/${pkgname}/Dooble"_g   -- "${pkgdir}/usr/bin/${pkgname}"
+    sed -i /LD_LIBRARY_PATH/d                              -- "${pkgdir}/usr/bin/${pkgname}"
     
-    msg "Editing files for the file structure modification"
-    sed -i s_"/usr/local/dooble"_"/opt/${pkgname}"_g  \
-	-- "${pkgdir}/opt/${pkgname}/dooble"
-    sed -i /LD_LIBRARY_PATH/d  \
-	-- "${pkgdir}/opt/${pkgname}/dooble"
     sed -i s_'/usr/local/dooble/Lib\x00'_'/usr/lib\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'_g  \
-	-- "${pkgdir}/opt/${pkgname}/Dooble" # The replacements's length must match the pattern's length
-    sed -i s_'/usr/local/dooble/dooble.sh'_"/opt/${pkgname}/dooble"_g  \
-	-- "${pkgdir}/opt/${pkgname}/applications/dooble.desktop"
+	-- "${pkgdir}/usr/lib/${pkgname}/Dooble" # The replacements's length must match the pattern's length
+    
+    sed -i s_'/usr/local/dooble/dooble.sh'_"/usr/bin/${pkgname}"_g  \
+	-- "${pkgdir}/usr/share/applications/${pkgname}.desktop"
 }
 
diff --git a/dooble/PKGBUILD b/dooble/PKGBUILD
index 1db8e31..4bb339a 100644
--- a/dooble/PKGBUILD
+++ b/dooble/PKGBUILD
@@ -67,23 +67,22 @@ build()
 package()
 {
     cd "$srcdir/dooble.d/trunk/browser/"
-    mkdir -p -- "${pkgdir}/opt/${pkgname}"
-    cp Dooble -- "${pkgdir}/opt/${pkgname}/Dooble"
-    cp dooble.sh -- "${pkgdir}/opt/${pkgname}/dooble"
-    for d in Icons Images Plugins Tab Translations; do
-	ln -sf "../../usr/share/dooble/${d}" -- "${pkgdir}/opt/${pkgname}/${d}"
-    done
-    mkdir -p -- "${pkgdir}/opt/${pkgname}/applications"
-    cp dooble.desktop -- "${pkgdir}/opt/${pkgname}/applications/dooble.desktop"
+    install -Dm755  Dooble         -- "${pkgdir}/usr/lib/${pkgname}/Dooble"
+    install -Dm755  dooble.sh      -- "${pkgdir}/usr/bin/${pkgname}"
+    install -Dm644  dooble.desktop -- "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+    
+    
+    msg "Editing files for the file system adaption"
+    
+    sed -i s_"/usr/local/dooble/"_"/usr/lib/${pkgname}/"_g -- "${pkgdir}/usr/bin/${pkgname}"
+    sed -i s_"/usr/local/dooble"_"/usr/share/dooble"_g     -- "${pkgdir}/usr/bin/${pkgname}"
+    sed -i s_"\./Dooble"_"../../lib/${pkgname}/Dooble"_g   -- "${pkgdir}/usr/bin/${pkgname}"
+    sed -i /LD_LIBRARY_PATH/d                              -- "${pkgdir}/usr/bin/${pkgname}"
     
-    msg "Editing files for the file structure modification"
-    sed -i s_"/usr/local/dooble"_"/opt/${pkgname}"_g  \
-	-- "${pkgdir}/opt/${pkgname}/dooble"
-    sed -i /LD_LIBRARY_PATH/d  \
-	-- "${pkgdir}/opt/${pkgname}/dooble"
     sed -i s_'/usr/local/dooble/Lib\x00'_'/usr/lib\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'_g  \
-	-- "${pkgdir}/opt/${pkgname}/Dooble" # The replacements's length must match the pattern's length
-    sed -i s_'/usr/local/dooble/dooble.sh'_"/opt/${pkgname}/dooble"_g  \
-	-- "${pkgdir}/opt/${pkgname}/applications/dooble.desktop"
+	-- "${pkgdir}/usr/lib/${pkgname}/Dooble" # The replacements's length must match the pattern's length
+    
+    sed -i s_'/usr/local/dooble/dooble.sh'_"/usr/bin/${pkgname}"_g  \
+	-- "${pkgdir}/usr/share/applications/${pkgname}.desktop"
 }
 
-- 
cgit v1.2.3-70-g09d2