fix debian dependencies and installation process

AKSW · Mar 31, 2014 · f525d90 · f525d90
1 parent 8c6ac12
commit f525d90
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 8 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,16 @@
+ontowiki (0.9.11-2) lod2; urgency=low
+
+  * fix lod2 virtuoso dependency
+  * fix special lod2 bd.ini handling
+
+ -- Sebastian Tramp <tramp@informatik.uni-leipzig.de>  Mon, 31 Mar 2014 15:16:09 +0200
+
+ontowiki (0.9.11-1) lod2; urgency=low
+
+  * downgrade virtuoso dependency to >= 6.1.4
+
+ -- Sebastian Tramp <tramp@informatik.uni-leipzig.de>  Wed, 05 Feb 2014 12:55:33 +0100
+
 ontowiki (0.9.11) lod2; urgency=low
 
   * Improve model selection in linkeddataserver extension

diff --git a/debian/control b/debian/control
@@ -10,7 +10,7 @@ Vcs-Browser: https://github.com/AKSW/OntoWiki
 
 Package: ontowiki-virtuoso
 Architecture: all
-Depends: ontowiki-common (>= 0.9.11), virtuoso-opensource-6.1 (>= 6.1.6), php5-odbc, ${misc:Depends}
+Depends: ontowiki-common (>= 0.9.11), lod2-virtuoso-opensource | virtuoso-opensource-6.1 (>= 6.1.4), php5-odbc, ${misc:Depends}
 Provides: ontowiki
 Conflicts: ontowiki, ontowiki-mysql
 Replaces: ontowiki (<< 0.9.6-10)

diff --git a/debian/ontowiki-mysql.links b/debian/ontowiki-mysql.links
@@ -1,3 +1,2 @@
 /etc/ontowiki/config.ini  /usr/share/ontowiki/config.ini
-/etc/ontowiki/apache.conf /etc/apache2/conf.d/ontowiki
 
diff --git a/debian/ontowiki-mysql.postinst b/debian/ontowiki-mysql.postinst
@@ -32,6 +32,10 @@ echo "FLUSH PRIVILEGES ;" | $mysql_run
 chown www-data:www-data /etc/ontowiki/config.ini
 chmod 600 /etc/ontowiki/config.ini
 
+# remove and relink the config
+rm -rf /etc/apache2/conf.d/ontowiki
+ln -s /etc/ontowiki/apache.conf /etc/apache2/conf.d/ontowiki
+
 a2enmod rewrite
 a2enmod env
 service apache2 restart

diff --git a/debian/ontowiki-virtuoso.links b/debian/ontowiki-virtuoso.links
@@ -1,3 +1,2 @@
 /etc/ontowiki/config.ini  /usr/share/ontowiki/config.ini
-/etc/ontowiki/apache.conf /etc/apache2/conf.d/ontowiki
 
diff --git a/debian/ontowiki-virtuoso.postinst b/debian/ontowiki-virtuoso.postinst
@@ -5,7 +5,13 @@
 
 echo "---- starting postinst $@"
 
-virtetc="/etc/virtuoso-opensource-6.1/"
+# check environment
+if [ -d "/etc/virtuoso-opensource-6.1" ]; then
+    virtetc="/etc/virtuoso-opensource-6.1/"
+fi
+if [ -d "/etc/virtuoso-opensource" ]; then
+    virtetc="/etc/virtuoso-opensource/"
+fi
 virtuosoini="$virtetc/virtuoso.ini"
 virtbdini="$virtetc/bd.ini"
 odbcini="/etc/odbc.ini"
@@ -53,14 +59,24 @@ sed "s/%%PASSWORD%%/$password/" -i $owini
 ### VIRTUOSO CONFIG
 # add ontowiki and erfurt directory to virtuoso.ini DirsAllowed
 # try to remove the addition first in order to avoid double entries
-sed 's/^\(DirsAllowed.*\)\(, \/usr\/share\/ontowiki\)\(.*\)/\1\3/' -i $virtuosoini
-sed 's/^\(DirsAllowed.*\)/\1, \/usr\/share\/ontowiki/' -i $virtuosoini
-sed 's/^\(DirsAllowed.*\)\(, \/usr\/share\/php\/liberfurt-php\)\(.*\)/\1\3/' -i $virtuosoini
-sed 's/^\(DirsAllowed.*\)/\1, \/usr\/share\/php\/liberfurt-php/' -i $virtuosoini
+if [ -e $virtuosoini ]; then
+    sed 's/^\(DirsAllowed.*\)\(, \/usr\/share\/ontowiki\)\(.*\)/\1\3/' -i $virtuosoini
+    sed 's/^\(DirsAllowed.*\)/\1, \/usr\/share\/ontowiki/' -i $virtuosoini
+    sed 's/^\(DirsAllowed.*\)\(, \/usr\/share\/php\/liberfurt-php\)\(.*\)/\1\3/' -i $virtuosoini
+    sed 's/^\(DirsAllowed.*\)/\1, \/usr\/share\/php\/liberfurt-php/' -i $virtuosoini
+fi
 
 ### APACHE CONFIG
+
+# remove and relink the config
+rm -rf /etc/apache2/conf.d/ontowiki
+ln -s /etc/ontowiki/apache.conf /etc/apache2/conf.d/ontowiki
+
+# enable mods
 a2enmod rewrite
 a2enmod env
+
+# restart apache
 service apache2 restart
 
 #DEBHELPER#