diff options
| author | Mikko Rantalainen <mikko.rantalainen@peda.net> | 2010-05-04 16:23:27 +0300 |
|---|---|---|
| committer | Mikko Rantalainen <mikko.rantalainen@peda.net> | 2010-05-06 11:30:22 +0300 |
| commit | 7d7fb9f26aa59584b7916bd6ea383473bb7bdfb7 (patch) | |
| tree | 6ae1858adc78cb2dbbc0aa283a3bf2576a21fb1d | |
| parent | 9c31a14b268b4e7c42d7302d7b3830faacc0b45a (diff) | |
| download | etherpad-7d7fb9f26aa59584b7916bd6ea383473bb7bdfb7.tar.gz etherpad-7d7fb9f26aa59584b7916bd6ea383473bb7bdfb7.tar.xz etherpad-7d7fb9f26aa59584b7916bd6ea383473bb7bdfb7.zip | |
Fixed debian installation scripts
Directory /usr/share/etherpad/etherpad/data was not created which caused
install process to stop with error message:
Adding system-user for etherpad
chown: cannot access `/usr/share/etherpad/etherpad/data': No such file or directory
dpkg: error processing etherpad (--install):
subprocess installed post-installation script returned error exit status 1
Processing triggers for ureadahead ...
Errors were encountered while processing:
etherpad
Fixed location of scala-library.jar in Ubuntu. This may need changes in the
future to help building the JAR on both Debian based systems and other systems.
Added scala-library to Build-Depends in addition to scala dependency.
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | debian/rules | 2 | ||||
| -rwxr-xr-x | infrastructure/bin/makejar.sh | 4 |
4 files changed, 11 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 9f15642..ab34057 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +etherpad (1.0fixed) karmic; urgency=low + + * Fixed installation scripts + + -- Mikko Rantalainen <mikko.rantalainen@peda.net> Tue, 04 May 2010 12:57:28 +0300 + etherpad (1.0) unstable; urgency=low * Initial Release. diff --git a/debian/control b/debian/control index 4a54b64..c6ea8cd 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: etherpad Section: unknown Priority: extra Maintainer: Egil Möller <egil.moller@piratpartiet.se> -Build-Depends: debhelper (>= 7), dbconfig-common, sun-java6-jdk, mysql-client, libmysql-java, scala (>= 2.7) +Build-Depends: debhelper (>= 7), dbconfig-common, sun-java6-jdk, mysql-client, libmysql-java, scala (>= 2.7), scala-library (>= 2.7) Build-Conflicts: libgcj-common, java-gcj-compat-headless, java-gcj-compat, gcj-4.3-base Standards-Version: 3.8.0 Homepage: <insert the upstream URL, if relevant> diff --git a/debian/rules b/debian/rules index 3a06dbe..dcbce4e 100755 --- a/debian/rules +++ b/debian/rules @@ -82,6 +82,8 @@ install-arch: mkdir -p debian/etherpad/usr/share/etherpad cp -a $$(ls | grep -v debian) debian/etherpad/usr/share/etherpad + # create directory to save user data + mkdir -p debian/etherpad/usr/share/etherpad/etherpad/data mkdir -p debian/etherpad/etc mv debian/etherpad/usr/share/etherpad/etherpad/etc debian/etherpad/etc/etherpad diff --git a/infrastructure/bin/makejar.sh b/infrastructure/bin/makejar.sh index c774fa6..feace68 100755 --- a/infrastructure/bin/makejar.sh +++ b/infrastructure/bin/makejar.sh @@ -32,11 +32,11 @@ fi TMPSTORE=/tmp/ajbuild-tmpstore-`date +%s` -JARFILES=`echo $SCALA_HOME/lib/scala-library.jar lib/*.jar lib/manifest` +JARFILES=`echo $SCALA_HOME/scala-library.jar lib/*.jar lib/manifest` function genjar { echo "unzipping JARs..." pushd $1 >> /dev/null - $JAR xf $SCALA_HOME/lib/scala-library.jar + $JAR xf $SCALA_HOME/scala-library.jar rm -rf META-INF for a in ../../lib/*.jar; do $JAR xf $a |