March 2012 - kune-commits - lists.ourproject.org

r1794 - trunk/debian
by Vicente J. Ruiz Jurado 26 Mar '12

26 Mar '12

Author: vjrj_ Date: 2012-03-26 05:18:42 +0200 (Mon, 26 Mar 2012) New Revision: 1794 Added: trunk/debian/config trunk/debian/docs Modified: trunk/debian/control trunk/debian/install trunk/debian/kune.debhelper.log trunk/debian/kune.dirs trunk/debian/kune.postinst trunk/debian/kune.postrm trunk/debian/kune.postrm.debhelper trunk/debian/kune.preinst trunk/debian/kune.substvars trunk/debian/rules Log: debian package (work in progress) Added: trunk/debian/config =================================================================== --- trunk/debian/config (rev 0) +++ trunk/debian/config 2012-03-26 03:18:42 UTC (rev 1794) @@ -0,0 +1,12 @@ +#!/bin/sh +# config maintainer script for kune-mysql + +# source debconf stuff +. /usr/share/debconf/confmodule + +# source dbconfig-common shell library, and call the hook function + +if [ -f /usr/share/dbconfig-common/dpkg/config.mysql ]; then + . /usr/share/dbconfig-common/dpkg/config.mysql + dbc_go kune $@ +fi \ No newline at end of file Modified: trunk/debian/control =================================================================== --- trunk/debian/control 2012-03-26 00:54:07 UTC (rev 1793) +++ trunk/debian/control 2012-03-26 03:18:42 UTC (rev 1794) @@ -10,12 +10,11 @@ Package: kune Pre-Depends: -Depends: libjmagick6-jni, sun-java6-jre | openjdk-6-jdk, mysql-server (>= 5.1) , adduser -Recommends: openfire (>= 3.7.1) +Depends: libjmagick6-jni, sun-java6-jre | openjdk-6-jdk, mysql-server (>= 5.1) , adduser, dbconfig-common +Recommends: openfire (>= 3.7.1), mysql-client Suggests: Architecture: all -#Extra-Files: ../BUGS, ../COPYRIGHT, ../CREDITS, ../INSTALL, ../README, ../TROUBLESHOOT, ../TODO -Description: distributed social network of collaborative tools for groups +Description: Distributed social net of collaborative web tools Kune (which means together in esperanto) is a web tool, for creating environments of constant inter-communication, collective intelligence, knowledge and shared work. It integrates Apache Wave. Added: trunk/debian/docs =================================================================== --- trunk/debian/docs (rev 0) +++ trunk/debian/docs 2012-03-26 03:18:42 UTC (rev 1794) @@ -0,0 +1,9 @@ +BUGS +CREDITS +INSTALL +README +TROUBLESHOOT +DEV-GUIDE +TODO +ChangeLog + Modified: trunk/debian/install =================================================================== --- trunk/debian/install 2012-03-26 00:54:07 UTC (rev 1793) +++ trunk/debian/install 2012-03-26 03:18:42 UTC (rev 1794) @@ -0,0 +1 @@ +src/main/resources/kune-production.properties /usr/share/kune/templates/ Modified: trunk/debian/kune.debhelper.log =================================================================== --- trunk/debian/kune.debhelper.log 2012-03-26 00:54:07 UTC (rev 1793) +++ trunk/debian/kune.debhelper.log 2012-03-26 03:18:42 UTC (rev 1794) @@ -1,6 +1,8 @@ dh_prep dh_installdirs dh_installdirs +dh_installdebconf +dh_installdeb dh_installdocs dh_installexamples dh_installman Modified: trunk/debian/kune.dirs =================================================================== --- trunk/debian/kune.dirs 2012-03-26 00:54:07 UTC (rev 1793) +++ trunk/debian/kune.dirs 2012-03-26 03:18:42 UTC (rev 1794) @@ -4,7 +4,9 @@ /usr/share/kune/lib/ /usr/share/kune/custom/ /usr/share/kune/webapp/ +/usr/share/kune/templates/ /usr/share/kune/webclient/ /usr/share/kune/webclient/ws/ /var/lib/kune/uploads/ /var/lib/kune/lucene/kune_prod/indexes/ +/usr/share/dbconfig-common/data/kune/install/ \ No newline at end of file Modified: trunk/debian/kune.postinst =================================================================== --- trunk/debian/kune.postinst 2012-03-26 00:54:07 UTC (rev 1793) +++ trunk/debian/kune.postinst 2012-03-26 03:18:42 UTC (rev 1794) @@ -17,9 +17,18 @@ # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package +. /usr/share/debconf/confmodule case "$1" in configure) + alias ucf="ucf --debconf-ok" + dbc_generate_include=template:/etc/kune/kune.properties + dbc_generate_include_args="-o template_infile=/usr/share/kune/templates/kune-production.properties -U" + dbc_dbname="kune_prod" + dbc_dbuser="kune" + #dbc_sql_substitutions=yes + . /usr/share/dbconfig-common/dpkg/postinst.mysql + dbc_go kune $@ ;; abort-upgrade|abort-remove|abort-deconfigure) Modified: trunk/debian/kune.postrm =================================================================== --- trunk/debian/kune.postrm 2012-03-26 00:54:07 UTC (rev 1793) +++ trunk/debian/kune.postrm 2012-03-26 03:18:42 UTC (rev 1794) @@ -23,7 +23,8 @@ purge) rm -rf /etc/kune - #TODO (the rest) and deluser/group + #TODO (the rest) and deluser/group, database + ;; remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) Modified: trunk/debian/kune.postrm.debhelper =================================================================== --- trunk/debian/kune.postrm.debhelper 2012-03-26 00:54:07 UTC (rev 1793) +++ trunk/debian/kune.postrm.debhelper 2012-03-26 03:18:42 UTC (rev 1794) @@ -1,3 +1,9 @@ +# Automatically added by dh_installdebconf +if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; then + . /usr/share/debconf/confmodule + db_purge +fi +# End automatically added section # Automatically added by dh_installinit if [ "$1" = "purge" ] ; then update-rc.d kune remove >/dev/null @@ -3,2 +9,8 @@ fi # End automatically added section +# Automatically added by dh_installdebconf +if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; then + . /usr/share/debconf/confmodule + db_purge +fi +# End automatically added section Modified: trunk/debian/kune.preinst =================================================================== --- trunk/debian/kune.preinst 2012-03-26 00:54:07 UTC (rev 1793) +++ trunk/debian/kune.preinst 2012-03-26 03:18:42 UTC (rev 1794) @@ -32,6 +32,7 @@ mkdir -p /usr/share/kune/lib mkdir -p /usr/share/kune/webapp mkdir -p /usr/share/kune/custom + mkdir -p /usr/share/kune/templates mkdir -p /var/lib/kune/uploads mkdir -p /var/lib/kune/lucene/kune_prod/indexes @@ -43,6 +44,7 @@ chown kune:kune /usr/share/kune/lib chown kune:kune /usr/share/kune/webapp chown kune:kune /usr/share/kune/custom + chown kune:kune /usr/share/kune/templates chown kune:kune /var/lib/kune/uploads chown kune:kune /var/lib/kune/lucene/kune_prod/indexes @@ -54,6 +56,7 @@ chown 0755 /usr/share/kune/lib chown 0755 /usr/share/kune/webapp chown 0755 /usr/share/kune/custom + chown 0755 /usr/share/kune/templates chmod 0755 /var/lib/kune/uploads chmod 0755 /var/lib/kune/lucene/kune_prod/indexes Modified: trunk/debian/kune.substvars =================================================================== --- trunk/debian/kune.substvars 2012-03-26 00:54:07 UTC (rev 1793) +++ trunk/debian/kune.substvars 2012-03-26 03:18:42 UTC (rev 1794) @@ -1 +1 @@ -misc:Depends= +misc:Depends=debconf (>= 0.5) | debconf-2.0 Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2012-03-26 00:54:07 UTC (rev 1793) +++ trunk/debian/rules 2012-03-26 03:18:42 UTC (rev 1794) @@ -30,34 +30,42 @@ # mvn assembly:assembly -Dgwt.compiler.skip=$(NO_GWT) -binary/kune:: +binary-indep: build install/kune +binary-arch: binary-indep +binary: binary-indep -binary-arch/kune:: - -binary-indep/kune:: - -reverse-config/kune:: - clean/kune:: mvn clean:clean install/kune:: +# dh_testdir +# dh_clean -k +# dh_installdirs # FIXME make this via http://www.debian.org/doc/manuals/maint-guide/dother.en.html#conffiles # FIXME user owner and perms of this cp $(CURDIR)/script/server.sh $(KUNE)/bin/ cp $(TARGET)/kune-0.1.0-SNAPSHOT-complete.jar $(KUNE)/lib/kune-complete.jar - cp $(RESOURCES)/kune-production.properties $(ETCDIR) +#FIXME this fails cp $(RESOURCES)/wave-server-production.properties $(ETCDIR)/wave-server.properties cp $(RESOURCES)/server.federation.config.example $(ETCDIR) cp $(RESOURCES)/jaas.config $(ETCDIR) cp $(RESOURCES)/mail-notif-template.html $(ETCDIR) + cp $(CURDIR)/script/kune_initialize.sql $(DEST)/usr/share/dbconfig-common/data/kune/install/mysql +# cp upgrade_0.6.0.sql $(DEST)/usr/share/dbconfig-common/data/confusa/upgrade/mysql/0.6.0.sql +# FIXME +# cp logrotate $(DEST)/etc/logrotate.d/ + # FIXME find another better way to do this (and remove rsync build dep) # FIXME user owner and perms of this rsync -aC $(CURDIR)/src/main/webapp/* $(KUNE)/webapp rsync -aC $(TARGETC)/ws/* $(KUNE)/webclient/ws + dh_installdebconf + dh_installdeb + + #get-orig-source: # sh -e debian/orig-tar.sh

1 0

r1793 - in trunk: . src/main/java/cc/kune/core/client/actions/xml src/main/java/cc/kune/core/server/content
by Vicente J. Ruiz Jurado 26 Mar '12

26 Mar '12

Author: vjrj_ Date: 2012-03-26 02:54:07 +0200 (Mon, 26 Mar 2012) New Revision: 1793 Modified: trunk/INSTALL trunk/src/main/java/cc/kune/core/client/actions/xml/XMLActionsParser.java trunk/src/main/java/cc/kune/core/server/content/XMLActionReader.java Log: debian package (work in progress) Modified: trunk/INSTALL =================================================================== --- trunk/INSTALL 2012-03-26 00:53:30 UTC (rev 1792) +++ trunk/INSTALL 2012-03-26 00:54:07 UTC (rev 1793) @@ -191,6 +191,7 @@ - src/main/resources/wave-server.properties - src/main/resources/log4j.properties - src/main/webapp/ws.html +- src/main/webapp/others/kune-client-actions.xml (extensions definitions) - src/main/webapp/ in general The best way to configure kune is to copy that files (for instance in /etc/kune/), to create a custom directory for ws.html and other of your custom html stuff (for instance in /var/www/kune/), and configure that directory to resources_base in wave-server.properties, for instance: Modified: trunk/src/main/java/cc/kune/core/client/actions/xml/XMLActionsParser.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/actions/xml/XMLActionsParser.java 2012-03-26 00:53:30 UTC (rev 1792) +++ trunk/src/main/java/cc/kune/core/client/actions/xml/XMLActionsParser.java 2012-03-26 00:54:07 UTC (rev 1793) @@ -49,7 +49,8 @@ public class XMLActionsParser { - public static final String ACTIONS_XML_LOCATION = "/others/kune-client-actions.xml"; + public static final String ACTIONS_XML_LOCATION_FILE = "kune-client-actions.xml"; + public static final String ACTIONS_XML_LOCATION_PATH_ABS = "/others/" + ACTIONS_XML_LOCATION_FILE; private static final String SEP = "»"; @@ -80,7 +81,8 @@ // Based on: // http://www.roseindia.net/tutorials/gwt/retrieving-xml-data.shtml - final RequestBuilder requestBuilder = new RequestBuilder(RequestBuilder.GET, ACTIONS_XML_LOCATION); + final RequestBuilder requestBuilder = new RequestBuilder(RequestBuilder.GET, + ACTIONS_XML_LOCATION_PATH_ABS); try { requestBuilder.sendRequest(null, new RequestCallback() { @Override Modified: trunk/src/main/java/cc/kune/core/server/content/XMLActionReader.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/content/XMLActionReader.java 2012-03-26 00:53:30 UTC (rev 1792) +++ trunk/src/main/java/cc/kune/core/server/content/XMLActionReader.java 2012-03-26 00:54:07 UTC (rev 1793) @@ -26,6 +26,12 @@ import java.nio.channels.FileChannel; import java.nio.charset.Charset; +import javax.servlet.ServletContextEvent; +import javax.servlet.ServletContextListener; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import cc.kune.core.client.actions.xml.XMLActionsParser; import cc.kune.core.client.actions.xml.XMLKuneClientActions; @@ -33,24 +39,46 @@ import com.google.inject.Singleton; @Singleton -public class XMLActionReader { - +public class XMLActionReader implements ServletContextListener { + public static final Log LOG = LogFactory.getLog(XMLActionReader.class); private XMLKuneClientActions actions; public XMLActionReader() throws IOException { - final File xmlFile = new File("src/main/webapp/" + XMLActionsParser.ACTIONS_XML_LOCATION); + } + @Override + public void contextDestroyed(final ServletContextEvent sce) { + } + + @Override + public void contextInitialized(final ServletContextEvent sce) { + final File xmlFile = new File(sce.getServletContext().getRealPath( + XMLActionsParser.ACTIONS_XML_LOCATION_PATH_ABS)); // Inspired in: - // http://stackoverflow.com/questions/326390/how-to-create-a-java-string-from-… - final FileInputStream stream = new FileInputStream(xmlFile); + // + // stackoverflow.com/questions/326390/how-to-create-a-java-string-from-the-con… + FileInputStream stream; try { + stream = new FileInputStream(xmlFile); final FileChannel fc = stream.getChannel(); final MappedByteBuffer bb = fc.map(FileChannel.MapMode.READ_ONLY, 0, fc.size()); final String xml = Charset.forName("UTF-8").decode(bb).toString(); actions = new XMLKuneClientActions(new ServicesTester(), xml); - } finally { stream.close(); + } catch (final IOException e) { + LOG.error("Error reading extension actions", e); } + + // Other option: + + // final InputStream iStream = + // this.getClass().getClassLoader().getResourceAsStream( + // XMLActionsParser.ACTIONS_XML_LOCATION_FILE); + // final StringWriter writer = new StringWriter(); + // IOUtils.copy(iStream, writer, "UTF-8"); + // final String xml = writer.toString(); + // actions = new XMLKuneClientActions(new ServicesTester(), xml); + } public XMLKuneClientActions getActions() {

1 0

r1792 - in trunk: . debian debian-experimental
by Vicente J. Ruiz Jurado 26 Mar '12

26 Mar '12

Author: vjrj_ Date: 2012-03-26 02:53:30 +0200 (Mon, 26 Mar 2012) New Revision: 1792 Added: trunk/debian-experimental/ trunk/debian-experimental/README trunk/debian-experimental/TODO trunk/debian-experimental/build.properties trunk/debian-experimental/changelog trunk/debian-experimental/compat trunk/debian-experimental/control trunk/debian-experimental/copyright trunk/debian-experimental/kune.poms trunk/debian-experimental/libkune-java.poms trunk/debian-experimental/libkune-java.substvars trunk/debian-experimental/maven.cleanIgnoreRules trunk/debian-experimental/maven.ignoreRules trunk/debian-experimental/maven.publishedRules trunk/debian-experimental/maven.rules trunk/debian-experimental/rules trunk/debian-experimental/stamp-poms-patched trunk/debian/install Log: debian package Added: trunk/debian/install =================================================================== Added: trunk/debian-experimental/README =================================================================== --- trunk/debian-experimental/README (rev 0) +++ trunk/debian-experimental/README 2012-03-26 00:53:30 UTC (rev 1792) @@ -0,0 +1,2 @@ +See tipical workflow in: http://wiki.debian.org/Java/MavenRepoHelper +$ mh_make Added: trunk/debian-experimental/TODO =================================================================== --- trunk/debian-experimental/TODO (rev 0) +++ trunk/debian-experimental/TODO 2012-03-26 00:53:30 UTC (rev 1792) @@ -0,0 +1,5 @@ +- create user kune +- create /var/lib/kune/uploads and give permissions +- create /var/lib/kune/lucene +- deps: libjmagick6-jni, csstidy + Added: trunk/debian-experimental/build.properties =================================================================== --- trunk/debian-experimental/build.properties (rev 0) +++ trunk/debian-experimental/build.properties 2012-03-26 00:53:30 UTC (rev 1792) @@ -0,0 +1,3 @@ +#javadoc.dir=target/api +build.directory=target +maven.test.skip=true Added: trunk/debian-experimental/changelog =================================================================== --- trunk/debian-experimental/changelog (rev 0) +++ trunk/debian-experimental/changelog 2012-03-26 00:53:30 UTC (rev 1792) @@ -0,0 +1,6 @@ +kune (0.1.0-SNAPSHOT) natty; urgency=low + + * first packaging works + + -- Vicente J. Ruiz Jurado <vjrj(a)ourproject.org> Sun, 11 Sep 2011 21:36:31 +0200 + Added: trunk/debian-experimental/compat =================================================================== --- trunk/debian-experimental/compat (rev 0) +++ trunk/debian-experimental/compat 2012-03-26 00:53:30 UTC (rev 1792) @@ -0,0 +1 @@ +5 Added: trunk/debian-experimental/control =================================================================== --- trunk/debian-experimental/control (rev 0) +++ trunk/debian-experimental/control 2012-03-26 00:53:30 UTC (rev 1792) @@ -0,0 +1,24 @@ +Source: kune +Section: java +Priority: optional +Build-Depends: debhelper (>= 5), cdbs, sun-java6-jre | openjdk-6-jdk +Homepage: http://kune.ourproject.org +Standards-Version: 3.9.2 + +Package: kune +Version: 0.1.0-0.1.0 +Maintainer: Vicente J. Ruiz Jurado <vjrj(a)ourproject.org> +Pre-Depends: +Depends: libjmagick6-jni, sun-java6-jre | openjdk-6-jdk +Recommends: openfire (>= 3.7.1) +Suggests: +Architecture: all +Copyright: ../COPYRIGHT +#Extra-Files: ../BUGS, ../COPYRIGHT, ../CREDITS, ../INSTALL, ../README, ../TROUBLESHOOT, ../TODO +# Files: <pair of space-separated paths; First is file to include, second is destination> +# <more pairs, if there's more than one file to include. Notice the starting space> +Description: Kune a distributed social network of collaborative tools for groups + Kune (which means together in esperanto) is a web tool, for creating environments of constant inter-communication, collective intelligence, knowledge and shared work. It integrates Apache Wave. + . + Kune’s main objective is to multiply the capacity and skills of people, communities and organizations, allowing their constant cooperation, regardless of physical distance. Therefore, it aims to facilitate virtual meetings, coordinate common agendas, join people with similar interests and develop projects collaboratively. Other features include managing projects and contents, and sharing them freely with anyone, anywhere + Added: trunk/debian-experimental/copyright =================================================================== --- trunk/debian-experimental/copyright (rev 0) +++ trunk/debian-experimental/copyright 2012-03-26 00:53:30 UTC (rev 1792) @@ -0,0 +1 @@ +link ../COPYRIGHT \ No newline at end of file Property changes on: trunk/debian-experimental/copyright ___________________________________________________________________ Name: svn:special + * Added: trunk/debian-experimental/kune.poms =================================================================== --- trunk/debian-experimental/kune.poms (rev 0) +++ trunk/debian-experimental/kune.poms 2012-03-26 00:53:30 UTC (rev 1792) @@ -0,0 +1,26 @@ +# List of POM files for the package +# Format of this file is: +# <path to pom file> [option]* +# where option can be: +# --ignore: ignore this POM or +# --no-parent: remove the <parent> tag from the POM +# --package=<package>: an alternative package to use when installing this POM +# and its artifact +# --has-package-version: to indicate that the original version of the POM is the same as the upstream part +# of the version for the package. +# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM +# during a clean operation with mh_cleanpom or mh_installpom +# --artifact=<path>: path to the build artifact associated with this POM, +# it will be installed when using the command mh_install +# --java-lib: install the jar into /usr/share/java to comply with Debian +# packaging guidelines +# --usj-name=<name>: name to use when installing the library in /usr/share/java +# --usj-version=<version>: version to use when installing the library in /usr/share/java +# --no-usj-versionless: don't install the versionless link in /usr/share/java +# --dest-jar=<path>: the destination for the real jar +# it will be installed with mh_install. +# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default. +# --ignore-pom: don't install the POM with mh_install or mh_installpoms. To use with POM files that are created +# temporarily for certain artifacts such as Javadoc jars. +# +pom.xml Added: trunk/debian-experimental/libkune-java.poms =================================================================== --- trunk/debian-experimental/libkune-java.poms (rev 0) +++ trunk/debian-experimental/libkune-java.poms 2012-03-26 00:53:30 UTC (rev 1792) @@ -0,0 +1,7 @@ +# List of POM files for the package +# Format of this file is: +# <path to pom file> [option] +# where option can be: +# --ignore: ignore this POM or +# --no-parent: remove the <parent> tag from the POM +pom.xml Added: trunk/debian-experimental/libkune-java.substvars =================================================================== --- trunk/debian-experimental/libkune-java.substvars (rev 0) +++ trunk/debian-experimental/libkune-java.substvars 2012-03-26 00:53:30 UTC (rev 1792) @@ -0,0 +1,8 @@ +#List of dependencies for libkune-java, generated for use by debian/control +#Sun Sep 11 19:31:18 CEST 2011 +maven.CompileDepends=libmaven-compiler-plugin-java (>\= 2.0.2), libmaven-resources-plugin-java (>\= 2.3), libsurefire-java (>\= 2.4.3) +maven.Depends= +maven.OptionalDepends= +maven.TestDepends= +maven.DocOptionalDepends= +maven.DocDepends=default-jdk-doc Added: trunk/debian-experimental/maven.cleanIgnoreRules =================================================================== --- trunk/debian-experimental/maven.cleanIgnoreRules (rev 0) +++ trunk/debian-experimental/maven.cleanIgnoreRules 2012-03-26 00:53:30 UTC (rev 1792) @@ -0,0 +1,27 @@ +# Maven clean ignore rules - ignore some Maven dependencies and plugins +# during the clean phase of a Maven build +# Format of this file is: +# [group] [artifact] [type] [version] [classifier] [scope] +# where each element can be either +# - the exact string, for example org.apache for the group, or 3.1 +# for the version. In this case, the element is simply matched +# and left as it is +# - * (the star character, alone). In this case, anything will +# match and be left as it is. For example, using * on the +# position of the artifact field will match any artifact id +# All elements much match before a rule can be applied +# Example rule: match jar with groupid= junit, artifactid= junit +# and version starting with 3., this dependency is then removed +# from the POM before mvn clean is called +# junit junit jar s/3\\..*/3.x/ + +com.google.gwt gwt-dev * * * * +com.google.gwt gwt-user * * * * +org.apache.maven.plugins maven-war-plugin * * * * +org.apache.maven.surefire surefire-junit47 * * * * +org.codehaus.mojo exec-maven-plugin * * * * +org.apache.maven.plugins maven-eclipse-plugin * * * * +org.apache.maven.plugins maven-deploy-plugin * * * * +org.apache.maven.plugins maven-idea-plugin * * * * +org.codehaus.mojo tomcat-maven-plugin * * * * +org.mortbay.jetty jetty-maven-plugin * * * * Added: trunk/debian-experimental/maven.ignoreRules =================================================================== --- trunk/debian-experimental/maven.ignoreRules (rev 0) +++ trunk/debian-experimental/maven.ignoreRules 2012-03-26 00:53:30 UTC (rev 1792) @@ -0,0 +1,26 @@ +# Maven ignore rules - ignore some Maven dependencies and plugins +# Format of this file is: +# [group] [artifact] [type] [version] [classifier] [scope] +# where each element can be either +# - the exact string, for example org.apache for the group, or 3.1 +# for the version. In this case, the element is simply matched +# and left as it is +# - * (the star character, alone). In this case, anything will +# match and be left as it is. For example, using * on the +# position of the artifact field will match any artifact id +# All elements much match before a rule can be applied +# Example rule: match jar with groupid= junit, artifactid= junit +# and version starting with 3., this dependency is then removed +# from the POM +# junit junit jar s/3\\..*/3.x/ + +com.google.gwt gwt-dev * * * * +com.google.gwt gwt-user * * * * +org.apache.maven.plugins maven-war-plugin * * * * +org.apache.maven.surefire surefire-junit47 * * * * +org.codehaus.mojo exec-maven-plugin * * * * +org.apache.maven.plugins maven-eclipse-plugin * * * * +org.apache.maven.plugins maven-deploy-plugin * * * * +org.apache.maven.plugins maven-idea-plugin * * * * +org.codehaus.mojo tomcat-maven-plugin * * * * +org.mortbay.jetty jetty-maven-plugin * * * * Added: trunk/debian-experimental/maven.publishedRules =================================================================== --- trunk/debian-experimental/maven.publishedRules (rev 0) +++ trunk/debian-experimental/maven.publishedRules 2012-03-26 00:53:30 UTC (rev 1792) @@ -0,0 +1,19 @@ +# Maven published rules - additional rules to publish, to help +# the packaging work of Debian maintainers using mh_make +# Format of this file is: +# [group] [artifact] [type] [version] [classifier] [scope] +# where each element can be either +# - the exact string, for example org.apache for the group, or 3.1 +# for the version. In this case, the element is simply matched +# and left as it is +# - * (the star character, alone). In this case, anything will +# match and be left as it is. For example, using * on the +# position of the artifact field will match any artifact id +# - a regular expression of the form s/match/replace/ +# in this case, elements that match are transformed using +# the regex rule. +# All elements much match before a rule can be applied +# Example rule: match jar with groupid= junit, artifactid= junit +# and version starting with 3., replacing the version with 3.x +# junit junit jar s/3\\..*/3.x/ + Added: trunk/debian-experimental/maven.rules =================================================================== --- trunk/debian-experimental/maven.rules (rev 0) +++ trunk/debian-experimental/maven.rules 2012-03-26 00:53:30 UTC (rev 1792) @@ -0,0 +1,20 @@ +# Maven rules - transform Maven dependencies and plugins +# Format of this file is: +# [group] [artifact] [type] [version] [classifier] [scope] +# where each element can be either +# - the exact string, for example org.apache for the group, or 3.1 +# for the version. In this case, the element is simply matched +# and left as it is +# - * (the star character, alone). In this case, anything will +# match and be left as it is. For example, using * on the +# position of the artifact field will match any artifact id +# - a regular expression of the form s/match/replace/ +# in this case, elements that match are transformed using +# the regex rule. +# All elements much match before a rule can be applied +# Example rule: match jar with groupid= junit, artifactid= junit +# and version starting with 3., replacing the version with 3.x +# junit junit jar s/3\\..*/3.x/ + +s/jdom/org.jdom/ jdom jar s/1\..*/debian/ * * +junit junit jar s/3\..*/3.x/ * * Added: trunk/debian-experimental/rules =================================================================== --- trunk/debian-experimental/rules (rev 0) +++ trunk/debian-experimental/rules 2012-03-26 00:53:30 UTC (rev 1792) @@ -0,0 +1,10 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/maven.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk + +JAVA_HOME := /usr/lib/jvm/java-6-openjdk + +#get-orig-source: +# sh -e debian/orig-tar.sh Property changes on: trunk/debian-experimental/rules ___________________________________________________________________ Name: svn:executable + * Added: trunk/debian-experimental/stamp-poms-patched ===================================================================

1 0

r1791 - trunk/src/main/resources
by Vicente J. Ruiz Jurado 26 Mar '12

26 Mar '12

Author: vjrj_ Date: 2012-03-26 02:50:33 +0200 (Mon, 26 Mar 2012) New Revision: 1791 Added: trunk/src/main/resources/kune-production.properties trunk/src/main/resources/server.federation.config.example Modified: trunk/src/main/resources/kune.properties trunk/src/main/resources/wave-server-production.properties Log: debian package Added: trunk/src/main/resources/kune-production.properties =================================================================== --- trunk/src/main/resources/kune-production.properties (rev 0) +++ trunk/src/main/resources/kune-production.properties 2012-03-26 00:50:33 UTC (rev 1791) @@ -0,0 +1,185 @@ +### kune.properties + +### general site config + +# Your site url. Please end with a slash +kune.siteurl = http://localhost:8080/ + +kune.sitelogourl = ws/images/kune-logo-16px.png +kune.sitelogourl.onover = ws/images/kune-logo-onover-16px.png + +# Every kune site have a group with this name: +# This group will be created in the first execution of kune. +# NOTE: if you change this value later, the group must exist because if not kune will try to initialize the database at start. Also, if you rename the name of this group from the preferences of the user interface, you will have to change the values here accordinly. + +kune.default.site.name = Site Administration +kune.default.site.shortName = site + +# In the server side we will use this string for mention this site in messages +# like: "Thanks for joining this site" +# Your can use another string and the message will looks like "Thanks for joining example.org" +# ws.html has a similar value for UI client +kune.default.site.commonname = this site + +### Email + +kune.site.smtp.host = localhost +kune.site.smtp.defaultfrom = noreply@localhost +# If we should avoid the use of smtp (use only for avoid emails during development) +kune.site.smtp.skip = false +# This file will we the html used to send emails to users. +# We'll substitute the first %s by the body of the notification. +# You can put this file in /etc/kune +kune.site.email.template = /etc/kune/mail-notif-template.html + +### Database + +# Persistence name, choose between: +# - production : production environment +# - development: development enviroment +# - test_db: testing environment using mysql db +# - test: testing environment using h2 db (memory) +kune.db.persistence.name = production + +# check that the db, user and passwd exists and has the correct rights (see INSTALL) +# This only used in production/develoment & test_db environment (not with h2 db): +kune.db.url = jdbc:mysql://localhost/kune_prod?createDatabaseIfNotExist=true&useUnicode=true&characterEncoding=UTF-8 +kune.db.user = kune +kune.db.password = db4kune + +# if we should ignore openfire connection in serverside (useful just for testing/development) +kune.openfire.ignore = true + +# openfire db info: +kune.openfire.db.url = jdbc:mysql://localhost/kune_openfire?createDatabaseIfNotExist=false&useUnicode=true&characterEncoding=UTF-8 +kune.openfire.db.user = kune +kune.openfire.db.password = db4kune + + +### Licenses + +kune.default.license = by-sa-v3.0 +# Current CC version, see license table and shortname field (for instance by-sa-v3.0) +kune.currentccversion = v3.0 + +### Superuser of a kune installation (is member of site group) + +kune.admin.name = Site Administrator +kune.admin.shortName = admin +kune.admin.email = admin(a)localhost.localdomain +kune.admin.password = easyeasy + +kune.chat.httpbase = /http-bind/ +kune.chat.domain = localhost +kune.chat.roomHost = rooms.localhost + +### Feedback system +kune.feedback.enabled = true +# List of participants to give feedback, comma-separated +kune.feedback.to = admin + +# Translation +# Currently, we only manage the translations of the proper kune sofware from our demo, so in other kune sites we disable the translator +kune.ui-translator.enabled = true + +### Other params + +# Reserved words to avoid it's use in the client side for user and group names (see client tokens used in SiteTokens) +kune.server.names.reservedwords = root,adm,kune,fuck,about,home,newgroup,preview,register,signin,translate,inbox,sub,www,ftp,pop,pop3,smtp,mail,wave,resetpasswd,verifyemail,prefs,gprefs + +# If defined create a copy of this wave as welcome to new users +# kune.site.welcomewave = w+9MkoynGd97A +kune.site.welcomewave = + +# which tools are available in this site by users +kune.tools.userSiteAvailableTools = docs,blogs,wiki,tasks,events,barters +# From these which tools are enabled for users after registration +# Possible values: +# kune.tools.userRegisEnabledTools = docs,blogs,wiki,tasks,barters +kune.tools.userRegisEnabledTools = docs,blogs,wiki,tasks,events,barters +# WARNING: be sure that all tools in userRegisEnabledTools are included in userSiteAvailableTools + +# which tools are available in this site by groups +kune.tools.groupSiteAvailableTools = docs,blogs,wiki,tasks,events,lists,chats +# From these which tools are enabled for groups after registration +# Possible values (don't enable chats on initialization/install, do later) +# kune.tools.groupRegisEnabledTools = docs,blogs,wiki,tasks,events,chats +kune.tools.groupRegisEnabledTools = docs,blogs,wiki,tasks,events,lists +# WARNING: be sure that all tools in groupRegisEnabledTools are included in groupSiteAvailableTools + +# This is experimental +kune.client.useContentCache = false + +kune.publispace.toolicon.visible = true + +# SVG Tutorials +# The languages in with the /tutorials/ are translated into +kune.tutorial.langs = en,es +# The default language in with the /tutorials/ are shown if the user language is not translated +kune.tutorial.defaultlang = en + +### Workspace enabled themes + +# This names are also the name of the items in the theme menu and there are translated +kune.wsthemes = default,green,purple,grey,red,sahara,blue,redblack,camp,pink,highcontrast,whiteblack,blackwhite,transparent,eurosur +kune.wsthemes.default = default +kune.wsthemes.blackwhite.backgrounds = #000, #000, #808080, #000, #000, #e3dbdb, #FFF, #000 +kune.wsthemes.blackwhite.colors = #FFF, #FFF, #000, #FFF, #FFF, #000, #000, #FFF +kune.wsthemes.blue.backgrounds = #8cbaff, #87aade, #5280c5, #528ce2, #c5dcff, #528ce2, #FFF, #c9d8f0 +kune.wsthemes.blue.colors = #FFF, #FFF, #FFF, #FFF, #0044aa, #FFF, #0044aa, #0044aa +kune.wsthemes.camp.backgrounds = #e7cc5f, #a49e87, #3c3c3c, #dcbc3a, #f6f1de, #4f472b, #FFF, #fff8dc +kune.wsthemes.camp.colors = #151515, #151515, #fecc00, #151515, #000000, #f3c401, #151515, #151515 +kune.wsthemes.default.backgrounds = #deaa87, #d99e76, #ce7f4b, #d99e76, #f6e7dd, #d99e76, #FFF, #f8eee7 +kune.wsthemes.default.colors = #FFF,#FFF,#FFF,#FFF,#552200,#FFF,#a05a2c,#a05a2c +kune.wsthemes.eurosur.backgrounds = #b8d0e1, #dfe9f1, #181870, #e0eaf2, #dfe9f1,#b8d0e1, #FFF, #dfe9f1 +kune.wsthemes.eurosur.colors = #181870,#181870,#FFF,#181870,#181870,#181870,#181870,#181870 +kune.wsthemes.green.backgrounds = #abde88, #bfe7a6, #5a8141, #749b5a, #d5efc3, #749b5a, #FFF, #eaf7e1 +kune.wsthemes.green.colors = #225500, #225500, #FFF, #FFF, #17280b, #FFF, #225500, #225500 +kune.wsthemes.grey.backgrounds = #cfcfcf, #b7b7b7, #565656, #868686, #ededed, #6e6e6e, #FFF, #e7e7e7 +kune.wsthemes.grey.colors = #4d4d4d, #4d4d4d, #FFF, #FFF, #000, #FFF, #4d4d4d, #4d4d4d +kune.wsthemes.highcontrast.backgrounds = #0c1f3d, #162d50, #000000, #0c2855, #162d50, #000000, #FFF, #162d50 +kune.wsthemes.highcontrast.colors = #FFF, #FFF, #FFF, #FFF, #FFF, #FFF, #000, #FFF +kune.wsthemes.pink.backgrounds = #e49db9, #edbdd0, #b15278, #e777a4, #ffddf8, #d25b8b, #FFF, #f6dee8 +kune.wsthemes.pink.colors = #FFF, #FFF, #FFF, #FFF, #2b0022, #FFF, #800066, #800066 +kune.wsthemes.purple.backgrounds = #ddaee9, #f4c6ff, #9753aa, #db79f4, #f4e4f8, #b852d2, #FFF, #f9e3ff +kune.wsthemes.purple.colors = #FFF, #FFF, #FFF, #FFF, #6d0c87, #FFF, #6d0c87, #6d0c87 +kune.wsthemes.red.backgrounds = #ec3a3a, #d35f5f, #9f0000, #c52b2b, #ffe0e0, #ec3a3a, #FFF, #f7e1e1 +kune.wsthemes.red.colors = #FFF, #FFF, #FFF, #FFF, #a02c2c, #FFF, #a02c2c, #a02c2c +kune.wsthemes.redblack.backgrounds = #a14242, #b96363, #424242, #a14242, #ffe0e0, #a14242, #FFF, #f7e1e1 +kune.wsthemes.redblack.colors = #FFF, #FFF, #FFF, #FFF, #800000, #FFF, #800000, #800000 +kune.wsthemes.sahara.backgrounds = #e8bc9e, #eac9b3, #d59367, #eac9b3, #f7ece4, #e0ae8d, #FFF, #f7ece4 +kune.wsthemes.sahara.colors = #502d16, #502d16, #552200, #502d16, #502d16, #784421, #d45500, #d45500 +kune.wsthemes.transparent.backgrounds = transparent, transparent, #e3dbdb, transparent, transparent, #e3dbdb, transparent, transparent +kune.wsthemes.transparent.colors = #000, #000, #000, #000, #000, #000, #000, #000 +kune.wsthemes.whiteblack.backgrounds = #FFF, #FFF, #e3dbdb, #FFF, #FFF, #e3dbdb, #FFF, #FFF +kune.wsthemes.whiteblack.colors = #000, #000, #000, #000, #000, #000, #000, #000 + +### Uploads + +kune.upload.location = /var/lib/kune/uploads/ +kune.upload.maxfilesizeinmegas = 10 +kune.upload.maxfilesizeinks = 10000000 +# to test in development phase, you can use values as 50 +kune.upload.delayfortest = 0 + +### Gallery options +kune.upload.gallerypermittedextensions = jpg,jpeg,png,gif,bmp,svg,avi,mpg,mpeg,ogg,mov,tif,tiff,mp3,wav + +# Images are resized to thumbsize pixels and later cropped (centered) to cropsize +# (integer values) +kune.images.resizewidth = 400 +kune.images.thumbsize = 100 +kune.images.cropsize = 85 +kune.images.iconsize = 16 + +### Media options + +# The code used to play local embeded videos/audios. Change this with other player/code (include a ###DOC_URL### tag) +kune.media.flvembededobject = <object width="400" height="300" data="http://flowplayer.org/swf/flowplayer-3.1.0.swf" type="application/x-shockwave-flash"> <param name="movie" value="http://flowplayer.org/swf/flowplayer-3.1.0.swf" /> <param name="allowfullscreen" value="true" /> <param name="allowscriptaccess" value="always" /> <param name="flashvars" value='config={"clip":{"url":"###DOC_URL###", "autoPlay": false, "autoBuffering": false },"canvas":{"backgroundColor":"#CC6633"},"plugins":{"controls":{"time":true,"volume":false,"fullscreen":true}}}' /> <param name="wmode" value="opaque"> </object> +kune.media.mp3embededobject = <object width="350" height="24" data="http://flowplayer.org/swf/flowplayer-3.1.0.swf" type="application/x-shockwave-flash"> <param name="movie" value="http://flowplayer.org/swf/flowplayer-3.1.0.swf" /> <param name="allowfullscreen" value="true" /> <param name="allowscriptaccess" value="always" /> <param name="flashvars" value='config={"clip":{"url":"###DOC_URL###", "autoPlay": false, "autoBuffering": false },"canvas":{"backgroundColor":"#CC6633"},"plugins":{"audio":{"url":"http://flowplayer.org/swf/flowplayer.audio.swf"},"controls":{"time":true,"volume":true,"fullscreen":false}}}' /> <param name="wmode" value="opaque"> </object> +kune.media.oggembededobject = <applet code="com.fluendo.player.Cortado.class" archive="/kune/others/cortado.jar" width="352" height="288"> <param name="url" value="###DOC_URL###"/> <param name="local" value="false"/> <param name="showStatus" value="show"/> <param name="keepAspect" value="true"/> <param name="autoPlay" value="false"/> <param name="video" value="true"/> <param name="audio" value="true"/> <param name="bufferSize" value="200"/> </applet> +kune.media.aviembededobject = <object data="###DOC_URL###" type="video/msvideo" /> + +### More info about properties +# http://en.wikipedia.org/wiki/.properties +# http://java.sun.com/javase/6/docs/api/java/util/Properties.html#load(java.i… Modified: trunk/src/main/resources/kune.properties =================================================================== --- trunk/src/main/resources/kune.properties 2012-03-26 00:47:40 UTC (rev 1790) +++ trunk/src/main/resources/kune.properties 2012-03-26 00:50:33 UTC (rev 1791) @@ -107,6 +107,7 @@ kune.tools.groupRegisEnabledTools = docs,blogs,wiki,tasks,events,lists # WARNING: be sure that all tools in groupRegisEnabledTools are included in groupSiteAvailableTools +# This is experimental kune.client.useContentCache = false kune.publispace.toolicon.visible = true Added: trunk/src/main/resources/server.federation.config.example =================================================================== --- trunk/src/main/resources/server.federation.config.example (rev 0) +++ trunk/src/main/resources/server.federation.config.example 2012-03-26 00:50:33 UTC (rev 1791) @@ -0,0 +1,55 @@ +# Federation Configuration for the Wave in a Box server +# +# Run "ant -f server-config.xml server-federation-config -Dserver_federation_config=server.federation.config" +# to generate the server.federation.config and server.config files automatically. +# To override default values pass them to the ant script. For example +# to override xmpp_server_secret pass to the ant: -Dxmpp_server_secret=yoursecret + +# These will probably need to be changed +xmpp_server_secret = @XMPP_SERVER_SECRET@ +# Default value: ${wave_server_domain}.key +certificate_private_key = @CERTIFICATE_PRIVATE_KEY@ + +# The order of certificates is important. Place intermediate certs +# after "${wave_server_domain}.crt". Please refer to +# http://www.waveprotocol.org/federation/certificates +# for more details. +# Default value: ${wave_server_domain}.crt,sub.class1.server.ca.pem,ca.pem +certificate_files = @CERTIFICATE_FILES@ + +# These should be okay to leave alone +enable_federation = true + +# Default value: ${wave_server_domain} +certificate_domain = @CERTIFICATE_DOMAIN@ + +# Default value: wave +xmpp_component_name = @XMPP_COMPONENT_NAME@ + +# Default value: ${xmpp_component_name}.${wave_server_domain} +xmpp_jid = @XMPP_JID@ + +# Default value: "Wave in a Box" +xmpp_server_description = @XMPP_SERVER_DESCRIPTION@ + +# Default value: ${wave_server_domain} +xmpp_server_hostname = @XMPP_SERVER_HOSTNAME@ + +# Default value: 5275 +xmpp_server_port = @XMPP_SERVER_PORT@ + +# Default value: wavesandbox.com +xmpp_server_ping = @XMPP_SERVER_PING@ + +# Set XMPP_SERVER_IP to localhost if the XMPP and Wave in a Box servers are +# running on the same host +# Default value: ${xmpp_server_hostname} +xmpp_server_ip = @XMPP_SERVER_IP@ + +# Set true to disable the verification of signed deltas +# Default value: false +waveserver_disable_verification = @WAVESERVER_DISABLE_VERIFICATION@ + +# Set true to disable the verification of signers (certificates) +# Default value: false +waveserver_disable_signer_verification = @WAVESERVER_DISABLE_SIGNER_VERIFICATION@ Modified: trunk/src/main/resources/wave-server-production.properties =================================================================== --- trunk/src/main/resources/wave-server-production.properties 2012-03-26 00:47:40 UTC (rev 1790) +++ trunk/src/main/resources/wave-server-production.properties 2012-03-26 00:50:33 UTC (rev 1791) @@ -15,7 +15,7 @@ # A comma separated list of webApp source directories # Default value: ./war -resource_bases = target/kune-0.1.0-SNAPSHOT/,src/main/webapp/ +resource_bases = /usr/share/kune/custom/,/usr/share/kune/webapp/,/usr/share/kune/webclient/ ### Server-specific variables ###

1 0

r1790 - trunk/debian
by Vicente J. Ruiz Jurado 26 Mar '12

26 Mar '12

Author: vjrj_ Date: 2012-03-26 02:47:40 +0200 (Mon, 26 Mar 2012) New Revision: 1790 Modified: trunk/debian/README.Debian trunk/debian/kune.dirs trunk/debian/kune.init trunk/debian/kune.preinst trunk/debian/rules Log: debian package Modified: trunk/debian/README.Debian =================================================================== --- trunk/debian/README.Debian 2012-03-25 23:00:44 UTC (rev 1789) +++ trunk/debian/README.Debian 2012-03-26 00:47:40 UTC (rev 1790) @@ -6,5 +6,7 @@ * hard nofile 20000 to prevent "Too many files open" error. +If you install openfire, configure /etc/kune/kune.properties accordingly. + -- Vicente J. Ruiz Jurado <vjrj(a)ourproject.org> Sun, 25 Mar 2012 20:35:20 +0200 Modified: trunk/debian/kune.dirs =================================================================== --- trunk/debian/kune.dirs 2012-03-25 23:00:44 UTC (rev 1789) +++ trunk/debian/kune.dirs 2012-03-26 00:47:40 UTC (rev 1790) @@ -1,9 +1,10 @@ /etc/kune/ /usr/share/kune/ -/usr/share/kune/ws/ /usr/share/kune/bin/ /usr/share/kune/lib/ /usr/share/kune/custom/ /usr/share/kune/webapp/ +/usr/share/kune/webclient/ +/usr/share/kune/webclient/ws/ /var/lib/kune/uploads/ /var/lib/kune/lucene/kune_prod/indexes/ Modified: trunk/debian/kune.init =================================================================== --- trunk/debian/kune.init 2012-03-25 23:00:44 UTC (rev 1789) +++ trunk/debian/kune.init 2012-03-26 00:47:40 UTC (rev 1790) @@ -13,7 +13,8 @@ DESC="kune server" NAME=kune DAEMON=/usr/share/kune/bin/server.sh -DAEMON_ARGS="-j /usr/share/kune/lib/kune-complete.jar -a" # Arguments to run the daemon with +# Arguments to run the daemon with (see server.sh -h) +DAEMON_ARGS="-j /usr/share/kune/lib/kune-complete.jar -a" PIDFILE=/var/run/$NAME.pid SCRIPTNAME=/etc/init.d/$NAME @@ -54,9 +55,12 @@ start-stop-daemon --start --quiet --pidfile $PIDFILE -d /usr/share/kune/ --exec $DAEMON -- \ $DAEMON_ARGS \ || return 2 + echo "." >&2 # Add code here, if necessary, that waits for the process to be ready # to handle requests from services started subsequently which depend # on this one. As a last resort, sleep for some time. + else + echo "Skiping start (see /etc/default/kune)" >&2 fi } @@ -72,6 +76,7 @@ # other if a failure occurred start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME RETVAL="$?" + echo "." >&2 [ "$RETVAL" = 2 ] && return 2 # Wait for children to finish too if this is a daemon that forks # and if the daemon is only ever run from this initscript. @@ -83,6 +88,7 @@ [ "$?" = 2 ] && return 2 # Many daemons don't delete their pidfiles when they exit. rm -f $PIDFILE + echo "." >&2 return "$RETVAL" } Modified: trunk/debian/kune.preinst =================================================================== --- trunk/debian/kune.preinst 2012-03-25 23:00:44 UTC (rev 1789) +++ trunk/debian/kune.preinst 2012-03-26 00:47:40 UTC (rev 1790) @@ -28,7 +28,7 @@ mkdir -p /etc/kune mkdir -p /usr/share/kune/bin - mkdir -p /usr/share/kune/ws + mkdir -p /usr/share/kune/webclient/ws mkdir -p /usr/share/kune/lib mkdir -p /usr/share/kune/webapp mkdir -p /usr/share/kune/custom @@ -38,7 +38,8 @@ chown kune:kune /etc/kune chown kune:kune /usr/share/kune chown kune:kune /usr/share/kune/bin - chown kune:kune /usr/share/kune/ws + chown kune:kune /usr/share/kune/webclient + chown kune:kune /usr/share/kune/webclient/ws chown kune:kune /usr/share/kune/lib chown kune:kune /usr/share/kune/webapp chown kune:kune /usr/share/kune/custom @@ -47,7 +48,8 @@ chmod 0755 /etc/kune chown 0755 /usr/share/kune - chown 0755 /usr/share/kune/ws + chown 0755 /usr/share/kune/webclient + chown 0755 /usr/share/kune/webclient/ws chown 0755 /usr/share/kune/bin chown 0755 /usr/share/kune/lib chown 0755 /usr/share/kune/webapp Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2012-03-25 23:00:44 UTC (rev 1789) +++ trunk/debian/rules 2012-03-26 00:47:40 UTC (rev 1790) @@ -44,15 +44,20 @@ install/kune:: +# FIXME make this via http://www.debian.org/doc/manuals/maint-guide/dother.en.html#conffiles +# FIXME user owner and perms of this cp $(CURDIR)/script/server.sh $(KUNE)/bin/ cp $(TARGET)/kune-0.1.0-SNAPSHOT-complete.jar $(KUNE)/lib/kune-complete.jar - cp $(RESOURCES)/kune.properties $(ETCDIR) + cp $(RESOURCES)/kune-production.properties $(ETCDIR) cp $(RESOURCES)/wave-server-production.properties $(ETCDIR)/wave-server.properties cp $(RESOURCES)/server.federation.config.example $(ETCDIR) cp $(RESOURCES)/jaas.config $(ETCDIR) cp $(RESOURCES)/mail-notif-template.html $(ETCDIR) + +# FIXME find another better way to do this (and remove rsync build dep) +# FIXME user owner and perms of this rsync -aC $(CURDIR)/src/main/webapp/* $(KUNE)/webapp - rsync -aC $(TARGETC)/ws/* $(KUNE)/ws + rsync -aC $(TARGETC)/ws/* $(KUNE)/webclient/ws #get-orig-source: # sh -e debian/orig-tar.sh

1 0

r1789 - trunk/debian
by Vicente J. Ruiz Jurado 25 Mar '12

25 Mar '12

Author: vjrj_ Date: 2012-03-26 01:00:44 +0200 (Mon, 26 Mar 2012) New Revision: 1789 Added: trunk/debian/kune.cron.d trunk/debian/kune.default trunk/debian/kune.init trunk/debian/kune.postinst trunk/debian/kune.postinst.debhelper trunk/debian/kune.postrm trunk/debian/kune.postrm.debhelper trunk/debian/kune.preinst trunk/debian/kune.prerm trunk/debian/kune.prerm.debhelper Removed: trunk/debian/init.d.ex trunk/debian/kune.cron.d.ex trunk/debian/kune.default.ex trunk/debian/postinst.ex trunk/debian/postrm.ex trunk/debian/preinst.ex trunk/debian/prerm.ex Modified: trunk/debian/control Log: debian package (work in progress) Modified: trunk/debian/control =================================================================== --- trunk/debian/control 2012-03-25 21:42:33 UTC (rev 1788) +++ trunk/debian/control 2012-03-25 23:00:44 UTC (rev 1789) @@ -1,24 +1,20 @@ Source: kune Section: java Priority: optional -Build-Depends: debhelper (>= 8.0.0), cdbs, sun-java6-jre | openjdk-6-jdk, maven2, libmaven-assembly-plugin-java +Build-Depends: debhelper (>= 8.0.0), cdbs, sun-java6-jre | openjdk-6-jdk, maven2, libmaven-assembly-plugin-java, rsync Homepage: http://kune.ourproject.org Maintainer: Vicente J. Ruiz Jurado <vjrj(a)ourproject.org> -Copyright: COPYRIGHT -Version: 0.1.0+b1 Standards-Version: 3.9.2 #Vcs-Svn: svn://scm.ourproject.org/svnroot/kune/trunk/ #Vcs-Browser: http://ourproject.org/scm/?group_id=407 Package: kune Pre-Depends: -Depends: libjmagick6-jni, sun-java6-jre | openjdk-6-jdk, mysql-server (>= 5.1) +Depends: libjmagick6-jni, sun-java6-jre | openjdk-6-jdk, mysql-server (>= 5.1) , adduser Recommends: openfire (>= 3.7.1) Suggests: Architecture: all #Extra-Files: ../BUGS, ../COPYRIGHT, ../CREDITS, ../INSTALL, ../README, ../TROUBLESHOOT, ../TODO -# Files: <pair of space-separated paths; First is file to include, second is destination> -# <more pairs, if there's more than one file to include. Notice the starting space> Description: distributed social network of collaborative tools for groups Kune (which means together in esperanto) is a web tool, for creating environments of constant inter-communication, collective intelligence, Deleted: trunk/debian/init.d.ex =================================================================== --- trunk/debian/init.d.ex 2012-03-25 21:42:33 UTC (rev 1788) +++ trunk/debian/init.d.ex 2012-03-25 23:00:44 UTC (rev 1789) @@ -1,149 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: kune -# Required-Start: $local_fs $remote_fs $network $syslog $named openfire -# Required-Stop: $local_fs $remote_fs $network $syslog $named openfire -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Start/stop kune web server -### END INIT INFO - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC=kune server -NAME=kune -DAEMON=/usr/share/kune/bin/server.sh -DAEMON_ARGS="-j /usr/share/kune/lib/kune-complete.jar -a" # Arguments to run the daemon with -PIDFILE=/var/run/$NAME.pid -SCRIPTNAME=/etc/init.d/$NAME - -# Exit if the package is not installed -[ -x $DAEMON ] || exit 0 - -# Read configuration variable file if it is present -[ -r /etc/default/$NAME ] && . /etc/default/$NAME - -# Load the VERBOSE setting and other rcS variables -. /lib/init/vars.sh - -# Define LSB log_* functions. -# Depend on lsb-base (>= 3.0-6) to ensure that this file is present. -. /lib/lsb/init-functions - -# -# Function that starts the daemon/service -# -do_start() -{ - # Return - # 0 if daemon has been started - # 1 if daemon was already running - # 2 if daemon could not be started - start-stop-daemon --start --quiet --pidfile $PIDFILE -d /usr/share/kune/ --exec $DAEMON --test > /dev/null \ - || return 1 - start-stop-daemon --start --quiet --pidfile $PIDFILE -d /usr/share/kune/ --exec $DAEMON -- \ - $DAEMON_ARGS \ - || return 2 - # Add code here, if necessary, that waits for the process to be ready - # to handle requests from services started subsequently which depend - # on this one. As a last resort, sleep for some time. -} - -# -# Function that stops the daemon/service -# -do_stop() -{ - # Return - # 0 if daemon has been stopped - # 1 if daemon was already stopped - # 2 if daemon could not be stopped - # other if a failure occurred - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME - RETVAL="$?" - [ "$RETVAL" = 2 ] && return 2 - # Wait for children to finish too if this is a daemon that forks - # and if the daemon is only ever run from this initscript. - # If the above conditions are not satisfied then add some other code - # that waits for the process to drop all resources that could be - # needed by services started subsequently. A last resort is to - # sleep for some time. - start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON - [ "$?" = 2 ] && return 2 - # Many daemons don't delete their pidfiles when they exit. - rm -f $PIDFILE - return "$RETVAL" -} - -# -# Function that sends a SIGHUP to the daemon/service -# -do_reload() { - # - # If the daemon can reload its configuration without - # restarting (for example, when it is sent a SIGHUP), - # then implement that here. - # - start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME - return 0 -} - -case "$1" in - start) - [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME" - do_start - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - stop) - [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" - do_stop - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - status) - status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? - ;; - #reload|force-reload) - # - # If do_reload() is not implemented then leave this commented out - # and leave 'force-reload' as an alias for 'restart'. - # - #log_daemon_msg "Reloading $DESC" "$NAME" - #do_reload - #log_end_msg $? - #;; - restart|force-reload) - # - # If the "reload" option is implemented then remove the - # 'force-reload' alias - # - log_daemon_msg "Restarting $DESC" "$NAME" - do_stop - case "$?" in - 0|1) - do_start - case "$?" in - 0) log_end_msg 0 ;; - 1) log_end_msg 1 ;; # Old process is still running - *) log_end_msg 1 ;; # Failed to start - esac - ;; - *) - # Failed to stop - log_end_msg 1 - ;; - esac - ;; - *) - #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 3 - ;; -esac - -: Copied: trunk/debian/kune.cron.d (from rev 1788, trunk/debian/kune.cron.d.ex) =================================================================== --- trunk/debian/kune.cron.d (rev 0) +++ trunk/debian/kune.cron.d 2012-03-25 23:00:44 UTC (rev 1789) @@ -0,0 +1,4 @@ +# +# Regular cron jobs for the kune package +# +#0 4 * * * root [ -x /usr/bin/kune_maintenance ] && /usr/bin/kune_maintenance Deleted: trunk/debian/kune.cron.d.ex =================================================================== --- trunk/debian/kune.cron.d.ex 2012-03-25 21:42:33 UTC (rev 1788) +++ trunk/debian/kune.cron.d.ex 2012-03-25 23:00:44 UTC (rev 1789) @@ -1,4 +0,0 @@ -# -# Regular cron jobs for the kune package -# -#0 4 * * * root [ -x /usr/bin/kune_maintenance ] && /usr/bin/kune_maintenance Copied: trunk/debian/kune.default (from rev 1788, trunk/debian/kune.default.ex) =================================================================== --- trunk/debian/kune.default (rev 0) +++ trunk/debian/kune.default 2012-03-25 23:00:44 UTC (rev 1789) @@ -0,0 +1,13 @@ +# Defaults for kune initscript +# sourced by /etc/init.d/kune +# installed at /etc/default/kune by the maintainer scripts + +# +# This is a POSIX shell fragment +# + +# Start kune on boot? +START=no + +# Additional options that are passed to the Daemon. +DAEMON_OPTS="" Deleted: trunk/debian/kune.default.ex =================================================================== --- trunk/debian/kune.default.ex 2012-03-25 21:42:33 UTC (rev 1788) +++ trunk/debian/kune.default.ex 2012-03-25 23:00:44 UTC (rev 1789) @@ -1,10 +0,0 @@ -# Defaults for kune initscript -# sourced by /etc/init.d/kune -# installed at /etc/default/kune by the maintainer scripts - -# -# This is a POSIX shell fragment -# - -# Additional options that are passed to the Daemon. -DAEMON_OPTS="" Copied: trunk/debian/kune.init (from rev 1788, trunk/debian/init.d.ex) =================================================================== --- trunk/debian/kune.init (rev 0) +++ trunk/debian/kune.init 2012-03-25 23:00:44 UTC (rev 1789) @@ -0,0 +1,160 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: kune +# Required-Start: $local_fs $remote_fs $network $syslog $named openfire +# Required-Stop: $local_fs $remote_fs $network $syslog $named openfire +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Start/stop kune web server +### END INIT INFO + +# PATH should only include /usr/* if it runs after the mountnfs.sh script +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="kune server" +NAME=kune +DAEMON=/usr/share/kune/bin/server.sh +DAEMON_ARGS="-j /usr/share/kune/lib/kune-complete.jar -a" # Arguments to run the daemon with +PIDFILE=/var/run/$NAME.pid +SCRIPTNAME=/etc/init.d/$NAME + +# Exit if the package is not installed +[ -x $DAEMON ] || exit 0 + +# Read configuration variable file if it is present +[ -r /etc/default/$NAME ] && . /etc/default/$NAME + +# Load the VERBOSE setting and other rcS variables +. /lib/init/vars.sh + +# Define LSB log_* functions. +# Depend on lsb-base (>= 3.0-6) to ensure that this file is present. +. /lib/lsb/init-functions + +# check if param is true/yes/0 +is_true() { + if [ "x$1" = "xtrue" -o "x$1" = "xyes" -o "x$1" = "x0" ] ; then + return 0 + else + return 1 + fi +} + +# +# Function that starts the daemon/service +# +do_start() +{ + if is_true "$START" ; then + # Return + # 0 if daemon has been started + # 1 if daemon was already running + # 2 if daemon could not be started + start-stop-daemon --start --quiet --pidfile $PIDFILE -d /usr/share/kune/ --exec $DAEMON --test > /dev/null \ + || return 1 + start-stop-daemon --start --quiet --pidfile $PIDFILE -d /usr/share/kune/ --exec $DAEMON -- \ + $DAEMON_ARGS \ + || return 2 + # Add code here, if necessary, that waits for the process to be ready + # to handle requests from services started subsequently which depend + # on this one. As a last resort, sleep for some time. + fi +} + +# +# Function that stops the daemon/service +# +do_stop() +{ + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # 2 if daemon could not be stopped + # other if a failure occurred + start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME + RETVAL="$?" + [ "$RETVAL" = 2 ] && return 2 + # Wait for children to finish too if this is a daemon that forks + # and if the daemon is only ever run from this initscript. + # If the above conditions are not satisfied then add some other code + # that waits for the process to drop all resources that could be + # needed by services started subsequently. A last resort is to + # sleep for some time. + start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --pidfile $PIDFILE + [ "$?" = 2 ] && return 2 + # Many daemons don't delete their pidfiles when they exit. + rm -f $PIDFILE + return "$RETVAL" +} + +# +# Function that sends a SIGHUP to the daemon/service +# +do_reload() { + # + # If the daemon can reload its configuration without + # restarting (for example, when it is sent a SIGHUP), + # then implement that here. + # + start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME + return 0 +} + +case "$1" in + start) + [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME" + do_start + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + stop) + [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" + do_stop + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + status) + status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? + ;; + #reload|force-reload) + # + # If do_reload() is not implemented then leave this commented out + # and leave 'force-reload' as an alias for 'restart'. + # + #log_daemon_msg "Reloading $DESC" "$NAME" + #do_reload + #log_end_msg $? + #;; + restart|force-reload) + # + # If the "reload" option is implemented then remove the + # 'force-reload' alias + # + log_daemon_msg "Restarting $DESC" "$NAME" + do_stop + case "$?" in + 0|1) + do_start + case "$?" in + 0) log_end_msg 0 ;; + 1) log_end_msg 1 ;; # Old process is still running + *) log_end_msg 1 ;; # Failed to start + esac + ;; + *) + # Failed to stop + log_end_msg 1 + ;; + esac + ;; + *) + #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 + echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 + exit 3 + ;; +esac + +: Copied: trunk/debian/kune.postinst (from rev 1788, trunk/debian/postinst.ex) =================================================================== --- trunk/debian/kune.postinst (rev 0) +++ trunk/debian/kune.postinst 2012-03-25 23:00:44 UTC (rev 1789) @@ -0,0 +1,39 @@ +#!/bin/sh +# postinst script for kune +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * <postinst> `configure' <most-recently-configured-version> +# * <old-postinst> `abort-upgrade' <new version> +# * <conflictor's-postinst> `abort-remove' `in-favour' <package> +# <new-version> +# * <postinst> `abort-remove' +# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' +# <failed-install-package> <version> `removing' +# <conflicting-package> <version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + configure) + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 Added: trunk/debian/kune.postinst.debhelper =================================================================== --- trunk/debian/kune.postinst.debhelper (rev 0) +++ trunk/debian/kune.postinst.debhelper 2012-03-25 23:00:44 UTC (rev 1789) @@ -0,0 +1,6 @@ +# Automatically added by dh_installinit +if [ -x "/etc/init.d/kune" ]; then + update-rc.d kune defaults >/dev/null + invoke-rc.d kune start || exit $? +fi +# End automatically added section Copied: trunk/debian/kune.postrm (from rev 1788, trunk/debian/postrm.ex) =================================================================== --- trunk/debian/kune.postrm (rev 0) +++ trunk/debian/kune.postrm 2012-03-25 23:00:44 UTC (rev 1789) @@ -0,0 +1,43 @@ +#!/bin/sh +# postrm script for kune +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * <postrm> `remove' +# * <postrm> `purge' +# * <old-postrm> `upgrade' <new-version> +# * <new-postrm> `failed-upgrade' <old-version> +# * <new-postrm> `abort-install' +# * <new-postrm> `abort-install' <old-version> +# * <new-postrm> `abort-upgrade' <old-version> +# * <disappearer's-postrm> `disappear' <overwriter> +# <overwriter-version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + purge) + rm -rf /etc/kune + + #TODO (the rest) and deluser/group + ;; + + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 Added: trunk/debian/kune.postrm.debhelper =================================================================== --- trunk/debian/kune.postrm.debhelper (rev 0) +++ trunk/debian/kune.postrm.debhelper 2012-03-25 23:00:44 UTC (rev 1789) @@ -0,0 +1,5 @@ +# Automatically added by dh_installinit +if [ "$1" = "purge" ] ; then + update-rc.d kune remove >/dev/null +fi +# End automatically added section Copied: trunk/debian/kune.preinst (from rev 1788, trunk/debian/preinst.ex) =================================================================== --- trunk/debian/kune.preinst (rev 0) +++ trunk/debian/kune.preinst 2012-03-25 23:00:44 UTC (rev 1789) @@ -0,0 +1,76 @@ +#!/bin/sh +# preinst script for kune +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * <new-preinst> `install' +# * <new-preinst> `install' <old-version> +# * <new-preinst> `upgrade' <old-version> +# * <old-preinst> `abort-upgrade' <new-version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + install|upgrade) + + # add the kune user + if ! getent passwd kune >/dev/null; then + adduser --disabled-password --quiet --system \ + --home /usr/share/kune --gecos "Kune server" --group kune + fi + if ! getent group kune >/dev/null; then + addgroup --system kune + fi + + mkdir -p /etc/kune + mkdir -p /usr/share/kune/bin + mkdir -p /usr/share/kune/ws + mkdir -p /usr/share/kune/lib + mkdir -p /usr/share/kune/webapp + mkdir -p /usr/share/kune/custom + mkdir -p /var/lib/kune/uploads + mkdir -p /var/lib/kune/lucene/kune_prod/indexes + + chown kune:kune /etc/kune + chown kune:kune /usr/share/kune + chown kune:kune /usr/share/kune/bin + chown kune:kune /usr/share/kune/ws + chown kune:kune /usr/share/kune/lib + chown kune:kune /usr/share/kune/webapp + chown kune:kune /usr/share/kune/custom + chown kune:kune /var/lib/kune/uploads + chown kune:kune /var/lib/kune/lucene/kune_prod/indexes + + chmod 0755 /etc/kune + chown 0755 /usr/share/kune + chown 0755 /usr/share/kune/ws + chown 0755 /usr/share/kune/bin + chown 0755 /usr/share/kune/lib + chown 0755 /usr/share/kune/webapp + chown 0755 /usr/share/kune/custom + chmod 0755 /var/lib/kune/uploads + chmod 0755 /var/lib/kune/lucene/kune_prod/indexes + + # TODO do the same (remove the user/dirs) in rm.ex + + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 Copied: trunk/debian/kune.prerm (from rev 1788, trunk/debian/prerm.ex) =================================================================== --- trunk/debian/kune.prerm (rev 0) +++ trunk/debian/kune.prerm 2012-03-25 23:00:44 UTC (rev 1789) @@ -0,0 +1,38 @@ +#!/bin/sh +# prerm script for kune +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * <prerm> `remove' +# * <old-prerm> `upgrade' <new-version> +# * <new-prerm> `failed-upgrade' <old-version> +# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version> +# * <deconfigured's-prerm> `deconfigure' `in-favour' +# <package-being-installed> <version> `removing' +# <conflicting-package> <version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + remove|upgrade|deconfigure) + ;; + + failed-upgrade) + ;; + + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 Added: trunk/debian/kune.prerm.debhelper =================================================================== --- trunk/debian/kune.prerm.debhelper (rev 0) +++ trunk/debian/kune.prerm.debhelper 2012-03-25 23:00:44 UTC (rev 1789) @@ -0,0 +1,5 @@ +# Automatically added by dh_installinit +if [ -x "/etc/init.d/kune" ]; then + invoke-rc.d kune stop || exit $? +fi +# End automatically added section Deleted: trunk/debian/postinst.ex =================================================================== --- trunk/debian/postinst.ex 2012-03-25 21:42:33 UTC (rev 1788) +++ trunk/debian/postinst.ex 2012-03-25 23:00:44 UTC (rev 1789) @@ -1,39 +0,0 @@ -#!/bin/sh -# postinst script for kune -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * <postinst> `configure' <most-recently-configured-version> -# * <old-postinst> `abort-upgrade' <new version> -# * <conflictor's-postinst> `abort-remove' `in-favour' <package> -# <new-version> -# * <postinst> `abort-remove' -# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' -# <failed-install-package> <version> `removing' -# <conflicting-package> <version> -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - configure) - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 Deleted: trunk/debian/postrm.ex =================================================================== --- trunk/debian/postrm.ex 2012-03-25 21:42:33 UTC (rev 1788) +++ trunk/debian/postrm.ex 2012-03-25 23:00:44 UTC (rev 1789) @@ -1,43 +0,0 @@ -#!/bin/sh -# postrm script for kune -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * <postrm> `remove' -# * <postrm> `purge' -# * <old-postrm> `upgrade' <new-version> -# * <new-postrm> `failed-upgrade' <old-version> -# * <new-postrm> `abort-install' -# * <new-postrm> `abort-install' <old-version> -# * <new-postrm> `abort-upgrade' <old-version> -# * <disappearer's-postrm> `disappear' <overwriter> -# <overwriter-version> -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - purge) - echo rm -rf $(ETCDIC) - - #TODO (the rest) and deluser/group - ;; - - remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - ;; - - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 Deleted: trunk/debian/preinst.ex =================================================================== --- trunk/debian/preinst.ex 2012-03-25 21:42:33 UTC (rev 1788) +++ trunk/debian/preinst.ex 2012-03-25 23:00:44 UTC (rev 1789) @@ -1,77 +0,0 @@ -#!/bin/sh -# preinst script for kune -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * <new-preinst> `install' -# * <new-preinst> `install' <old-version> -# * <new-preinst> `upgrade' <old-version> -# * <old-preinst> `abort-upgrade' <new-version> -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - install|upgrade) - - # add the kune user - if ! getent passwd kune >/dev/null; then - adduser --disabled-password --quiet --system \ - --home $(KUNE) --gecos "Kune server" --group kune - fi - if ! getent group kune >/dev/null; then - addgroup --system kune - fi - - - mkdir -p $(CURDIR)/etc/kune - mkdir -p $(CURDIR)/usr/share/kune/bin - mkdir -p $(CURDIR)/usr/share/kune/ws - mkdir -p $(CURDIR)/usr/share/kune/lib - mkdir -p $(CURDIR)/usr/share/kune/webapp - mkdir -p $(CURDIR)/usr/share/kune/custom - mkdir -p $(CURDIR)/var/lib/kune/uploads - mkdir -p $(CURDIR)/var/lib/kune/lucene/kune_prod/indexes - - chown kune:kune $(CURDIR)/etc/kune - chown kune:kune $(CURDIR)/usr/share/kune - chown kune:kune $(CURDIR)/usr/share/kune/bin - chown kune:kune $(CURDIR)/usr/share/kune/ws - chown kune:kune $(CURDIR)/usr/share/kune/lib - chown kune:kune $(CURDIR)/usr/share/kune/webapp - chown kune:kune $(CURDIR)/usr/share/kune/custom - chown kune:kune $(CURDIR)/var/lib/kune/uploads - chown kune:kune $(CURDIR)/var/lib/kune/lucene/kune_prod/indexes - - chmod 0755 $(CURDIR)/etc/kune - chown 0755 $(CURDIR)/usr/share/kune - chown 0755 $(CURDIR)/usr/share/kune/ws - chown 0755 $(CURDIR)/usr/share/kune/bin - chown 0755 $(CURDIR)/usr/share/kune/lib - chown 0755 $(CURDIR)/usr/share/kune/webapp - chown 0755 $(CURDIR)/usr/share/kune/custom - chmod 0755 $(CURDIR)/var/lib/kune/uploads - chmod 0755 $(CURDIR)/var/lib/kune/lucene/kune_prod/indexes - - # TODO do the same (remove the user/dirs) in rm.ex - - ;; - - abort-upgrade) - ;; - - *) - echo "preinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 Deleted: trunk/debian/prerm.ex =================================================================== --- trunk/debian/prerm.ex 2012-03-25 21:42:33 UTC (rev 1788) +++ trunk/debian/prerm.ex 2012-03-25 23:00:44 UTC (rev 1789) @@ -1,38 +0,0 @@ -#!/bin/sh -# prerm script for kune -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * <prerm> `remove' -# * <old-prerm> `upgrade' <new-version> -# * <new-prerm> `failed-upgrade' <old-version> -# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version> -# * <deconfigured's-prerm> `deconfigure' `in-favour' -# <package-being-installed> <version> `removing' -# <conflicting-package> <version> -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - remove|upgrade|deconfigure) - ;; - - failed-upgrade) - ;; - - *) - echo "prerm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0

1 0

r1788 - in trunk/debian: . source
by Vicente J. Ruiz Jurado 25 Mar '12

25 Mar '12

Author: vjrj_ Date: 2012-03-25 23:42:33 +0200 (Sun, 25 Mar 2012) New Revision: 1788 Added: trunk/debian/README.Debian trunk/debian/README.source trunk/debian/changelog trunk/debian/compat trunk/debian/control trunk/debian/copyright trunk/debian/files trunk/debian/init.d.ex trunk/debian/kune.cron.d.ex trunk/debian/kune.debhelper.log trunk/debian/kune.default.ex trunk/debian/kune.dirs trunk/debian/kune.links trunk/debian/kune.substvars trunk/debian/postinst.ex trunk/debian/postrm.ex trunk/debian/preinst.ex trunk/debian/prerm.ex trunk/debian/rules trunk/debian/source/ trunk/debian/source/format trunk/debian/stamp-patched Modified: trunk/debian/ Log: debian package Property changes on: trunk/debian ___________________________________________________________________ Name: svn:ignore + kune Added: trunk/debian/README.Debian =================================================================== --- trunk/debian/README.Debian (rev 0) +++ trunk/debian/README.Debian 2012-03-25 21:42:33 UTC (rev 1788) @@ -0,0 +1,10 @@ +kune for Debian +--------------- + +Add to /etc/security/limits.conf: +* soft nofile 20000 +* hard nofile 20000 +to prevent "Too many files open" error. + + -- Vicente J. Ruiz Jurado <vjrj(a)ourproject.org> Sun, 25 Mar 2012 20:35:20 +0200 + Added: trunk/debian/README.source =================================================================== --- trunk/debian/README.source (rev 0) +++ trunk/debian/README.source 2012-03-25 21:42:33 UTC (rev 1788) @@ -0,0 +1,7 @@ +kune for Debian +--------------- + +see trunk/DEV-GUIDE for development info + + + Added: trunk/debian/changelog =================================================================== --- trunk/debian/changelog (rev 0) +++ trunk/debian/changelog 2012-03-25 21:42:33 UTC (rev 1788) @@ -0,0 +1,5 @@ +kune (0.1.0+b1) unstable; urgency=low + + * For a full changelog see trunk/ChangeLog in svn repo + + -- Vicente J. Ruiz Jurado <vjrj(a)ourproject.org> Sun, 25 Mar 2012 20:34:18 +0200 Added: trunk/debian/compat =================================================================== --- trunk/debian/compat (rev 0) +++ trunk/debian/compat 2012-03-25 21:42:33 UTC (rev 1788) @@ -0,0 +1 @@ +8 Added: trunk/debian/control =================================================================== --- trunk/debian/control (rev 0) +++ trunk/debian/control 2012-03-25 21:42:33 UTC (rev 1788) @@ -0,0 +1,32 @@ +Source: kune +Section: java +Priority: optional +Build-Depends: debhelper (>= 8.0.0), cdbs, sun-java6-jre | openjdk-6-jdk, maven2, libmaven-assembly-plugin-java +Homepage: http://kune.ourproject.org +Maintainer: Vicente J. Ruiz Jurado <vjrj(a)ourproject.org> +Copyright: COPYRIGHT +Version: 0.1.0+b1 +Standards-Version: 3.9.2 +#Vcs-Svn: svn://scm.ourproject.org/svnroot/kune/trunk/ +#Vcs-Browser: http://ourproject.org/scm/?group_id=407 + +Package: kune +Pre-Depends: +Depends: libjmagick6-jni, sun-java6-jre | openjdk-6-jdk, mysql-server (>= 5.1) +Recommends: openfire (>= 3.7.1) +Suggests: +Architecture: all +#Extra-Files: ../BUGS, ../COPYRIGHT, ../CREDITS, ../INSTALL, ../README, ../TROUBLESHOOT, ../TODO +# Files: <pair of space-separated paths; First is file to include, second is destination> +# <more pairs, if there's more than one file to include. Notice the starting space> +Description: distributed social network of collaborative tools for groups + Kune (which means together in esperanto) is a web tool, for creating + environments of constant inter-communication, collective intelligence, + knowledge and shared work. It integrates Apache Wave. + . + Kune’s main objective is to multiply the capacity and skills of people, + communities and organizations, allowing their constant cooperation, regardless + of physical distance. Therefore, it aims to facilitate virtual meetings, + coordinate common agendas, join people with similar interests and develop + projects collaboratively. Other features include managing projects and + contents, and sharing them freely with anyone, anywhere. Added: trunk/debian/copyright =================================================================== --- trunk/debian/copyright (rev 0) +++ trunk/debian/copyright 2012-03-25 21:42:33 UTC (rev 1788) @@ -0,0 +1 @@ +link ../COPYRIGHT \ No newline at end of file Property changes on: trunk/debian/copyright ___________________________________________________________________ Name: svn:special + * Added: trunk/debian/files =================================================================== --- trunk/debian/files (rev 0) +++ trunk/debian/files 2012-03-25 21:42:33 UTC (rev 1788) @@ -0,0 +1 @@ +kune_0.1.0+b1_all.deb java optional Added: trunk/debian/init.d.ex =================================================================== --- trunk/debian/init.d.ex (rev 0) +++ trunk/debian/init.d.ex 2012-03-25 21:42:33 UTC (rev 1788) @@ -0,0 +1,149 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: kune +# Required-Start: $local_fs $remote_fs $network $syslog $named openfire +# Required-Stop: $local_fs $remote_fs $network $syslog $named openfire +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Start/stop kune web server +### END INIT INFO + +# PATH should only include /usr/* if it runs after the mountnfs.sh script +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC=kune server +NAME=kune +DAEMON=/usr/share/kune/bin/server.sh +DAEMON_ARGS="-j /usr/share/kune/lib/kune-complete.jar -a" # Arguments to run the daemon with +PIDFILE=/var/run/$NAME.pid +SCRIPTNAME=/etc/init.d/$NAME + +# Exit if the package is not installed +[ -x $DAEMON ] || exit 0 + +# Read configuration variable file if it is present +[ -r /etc/default/$NAME ] && . /etc/default/$NAME + +# Load the VERBOSE setting and other rcS variables +. /lib/init/vars.sh + +# Define LSB log_* functions. +# Depend on lsb-base (>= 3.0-6) to ensure that this file is present. +. /lib/lsb/init-functions + +# +# Function that starts the daemon/service +# +do_start() +{ + # Return + # 0 if daemon has been started + # 1 if daemon was already running + # 2 if daemon could not be started + start-stop-daemon --start --quiet --pidfile $PIDFILE -d /usr/share/kune/ --exec $DAEMON --test > /dev/null \ + || return 1 + start-stop-daemon --start --quiet --pidfile $PIDFILE -d /usr/share/kune/ --exec $DAEMON -- \ + $DAEMON_ARGS \ + || return 2 + # Add code here, if necessary, that waits for the process to be ready + # to handle requests from services started subsequently which depend + # on this one. As a last resort, sleep for some time. +} + +# +# Function that stops the daemon/service +# +do_stop() +{ + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # 2 if daemon could not be stopped + # other if a failure occurred + start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME + RETVAL="$?" + [ "$RETVAL" = 2 ] && return 2 + # Wait for children to finish too if this is a daemon that forks + # and if the daemon is only ever run from this initscript. + # If the above conditions are not satisfied then add some other code + # that waits for the process to drop all resources that could be + # needed by services started subsequently. A last resort is to + # sleep for some time. + start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON + [ "$?" = 2 ] && return 2 + # Many daemons don't delete their pidfiles when they exit. + rm -f $PIDFILE + return "$RETVAL" +} + +# +# Function that sends a SIGHUP to the daemon/service +# +do_reload() { + # + # If the daemon can reload its configuration without + # restarting (for example, when it is sent a SIGHUP), + # then implement that here. + # + start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME + return 0 +} + +case "$1" in + start) + [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME" + do_start + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + stop) + [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" + do_stop + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + status) + status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? + ;; + #reload|force-reload) + # + # If do_reload() is not implemented then leave this commented out + # and leave 'force-reload' as an alias for 'restart'. + # + #log_daemon_msg "Reloading $DESC" "$NAME" + #do_reload + #log_end_msg $? + #;; + restart|force-reload) + # + # If the "reload" option is implemented then remove the + # 'force-reload' alias + # + log_daemon_msg "Restarting $DESC" "$NAME" + do_stop + case "$?" in + 0|1) + do_start + case "$?" in + 0) log_end_msg 0 ;; + 1) log_end_msg 1 ;; # Old process is still running + *) log_end_msg 1 ;; # Failed to start + esac + ;; + *) + # Failed to stop + log_end_msg 1 + ;; + esac + ;; + *) + #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 + echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 + exit 3 + ;; +esac + +: Added: trunk/debian/kune.cron.d.ex =================================================================== --- trunk/debian/kune.cron.d.ex (rev 0) +++ trunk/debian/kune.cron.d.ex 2012-03-25 21:42:33 UTC (rev 1788) @@ -0,0 +1,4 @@ +# +# Regular cron jobs for the kune package +# +#0 4 * * * root [ -x /usr/bin/kune_maintenance ] && /usr/bin/kune_maintenance Added: trunk/debian/kune.debhelper.log =================================================================== --- trunk/debian/kune.debhelper.log (rev 0) +++ trunk/debian/kune.debhelper.log 2012-03-25 21:42:33 UTC (rev 1788) @@ -0,0 +1,34 @@ +dh_prep +dh_installdirs +dh_installdirs +dh_installdocs +dh_installexamples +dh_installman +dh_installinfo +dh_installmenu +dh_installcron +dh_installinit +dh_installdebconf +dh_installemacsen +dh_installcatalogs +dh_installpam +dh_installlogrotate +dh_installlogcheck +dh_installchangelogs +dh_installudev +dh_lintian +dh_bugfiles +dh_install +dh_link +dh_installmime +dh_installgsettings +dh_strip +dh_compress +dh_fixperms +dh_makeshlibs +dh_installdeb +dh_perl +dh_shlibdeps +dh_gencontrol +dh_md5sums +dh_builddeb Added: trunk/debian/kune.default.ex =================================================================== --- trunk/debian/kune.default.ex (rev 0) +++ trunk/debian/kune.default.ex 2012-03-25 21:42:33 UTC (rev 1788) @@ -0,0 +1,10 @@ +# Defaults for kune initscript +# sourced by /etc/init.d/kune +# installed at /etc/default/kune by the maintainer scripts + +# +# This is a POSIX shell fragment +# + +# Additional options that are passed to the Daemon. +DAEMON_OPTS="" Added: trunk/debian/kune.dirs =================================================================== --- trunk/debian/kune.dirs (rev 0) +++ trunk/debian/kune.dirs 2012-03-25 21:42:33 UTC (rev 1788) @@ -0,0 +1,9 @@ +/etc/kune/ +/usr/share/kune/ +/usr/share/kune/ws/ +/usr/share/kune/bin/ +/usr/share/kune/lib/ +/usr/share/kune/custom/ +/usr/share/kune/webapp/ +/var/lib/kune/uploads/ +/var/lib/kune/lucene/kune_prod/indexes/ Added: trunk/debian/kune.links =================================================================== --- trunk/debian/kune.links (rev 0) +++ trunk/debian/kune.links 2012-03-25 21:42:33 UTC (rev 1788) @@ -0,0 +1 @@ +/usr/lib/jni/libJMagick.so /usr/lib/libJMagick.so Added: trunk/debian/kune.substvars =================================================================== --- trunk/debian/kune.substvars (rev 0) +++ trunk/debian/kune.substvars 2012-03-25 21:42:33 UTC (rev 1788) @@ -0,0 +1 @@ +misc:Depends= Added: trunk/debian/postinst.ex =================================================================== --- trunk/debian/postinst.ex (rev 0) +++ trunk/debian/postinst.ex 2012-03-25 21:42:33 UTC (rev 1788) @@ -0,0 +1,39 @@ +#!/bin/sh +# postinst script for kune +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * <postinst> `configure' <most-recently-configured-version> +# * <old-postinst> `abort-upgrade' <new version> +# * <conflictor's-postinst> `abort-remove' `in-favour' <package> +# <new-version> +# * <postinst> `abort-remove' +# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' +# <failed-install-package> <version> `removing' +# <conflicting-package> <version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + configure) + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 Added: trunk/debian/postrm.ex =================================================================== --- trunk/debian/postrm.ex (rev 0) +++ trunk/debian/postrm.ex 2012-03-25 21:42:33 UTC (rev 1788) @@ -0,0 +1,43 @@ +#!/bin/sh +# postrm script for kune +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * <postrm> `remove' +# * <postrm> `purge' +# * <old-postrm> `upgrade' <new-version> +# * <new-postrm> `failed-upgrade' <old-version> +# * <new-postrm> `abort-install' +# * <new-postrm> `abort-install' <old-version> +# * <new-postrm> `abort-upgrade' <old-version> +# * <disappearer's-postrm> `disappear' <overwriter> +# <overwriter-version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + purge) + echo rm -rf $(ETCDIC) + + #TODO (the rest) and deluser/group + ;; + + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 Added: trunk/debian/preinst.ex =================================================================== --- trunk/debian/preinst.ex (rev 0) +++ trunk/debian/preinst.ex 2012-03-25 21:42:33 UTC (rev 1788) @@ -0,0 +1,77 @@ +#!/bin/sh +# preinst script for kune +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * <new-preinst> `install' +# * <new-preinst> `install' <old-version> +# * <new-preinst> `upgrade' <old-version> +# * <old-preinst> `abort-upgrade' <new-version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + install|upgrade) + + # add the kune user + if ! getent passwd kune >/dev/null; then + adduser --disabled-password --quiet --system \ + --home $(KUNE) --gecos "Kune server" --group kune + fi + if ! getent group kune >/dev/null; then + addgroup --system kune + fi + + + mkdir -p $(CURDIR)/etc/kune + mkdir -p $(CURDIR)/usr/share/kune/bin + mkdir -p $(CURDIR)/usr/share/kune/ws + mkdir -p $(CURDIR)/usr/share/kune/lib + mkdir -p $(CURDIR)/usr/share/kune/webapp + mkdir -p $(CURDIR)/usr/share/kune/custom + mkdir -p $(CURDIR)/var/lib/kune/uploads + mkdir -p $(CURDIR)/var/lib/kune/lucene/kune_prod/indexes + + chown kune:kune $(CURDIR)/etc/kune + chown kune:kune $(CURDIR)/usr/share/kune + chown kune:kune $(CURDIR)/usr/share/kune/bin + chown kune:kune $(CURDIR)/usr/share/kune/ws + chown kune:kune $(CURDIR)/usr/share/kune/lib + chown kune:kune $(CURDIR)/usr/share/kune/webapp + chown kune:kune $(CURDIR)/usr/share/kune/custom + chown kune:kune $(CURDIR)/var/lib/kune/uploads + chown kune:kune $(CURDIR)/var/lib/kune/lucene/kune_prod/indexes + + chmod 0755 $(CURDIR)/etc/kune + chown 0755 $(CURDIR)/usr/share/kune + chown 0755 $(CURDIR)/usr/share/kune/ws + chown 0755 $(CURDIR)/usr/share/kune/bin + chown 0755 $(CURDIR)/usr/share/kune/lib + chown 0755 $(CURDIR)/usr/share/kune/webapp + chown 0755 $(CURDIR)/usr/share/kune/custom + chmod 0755 $(CURDIR)/var/lib/kune/uploads + chmod 0755 $(CURDIR)/var/lib/kune/lucene/kune_prod/indexes + + # TODO do the same (remove the user/dirs) in rm.ex + + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 Added: trunk/debian/prerm.ex =================================================================== --- trunk/debian/prerm.ex (rev 0) +++ trunk/debian/prerm.ex 2012-03-25 21:42:33 UTC (rev 1788) @@ -0,0 +1,38 @@ +#!/bin/sh +# prerm script for kune +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * <prerm> `remove' +# * <old-prerm> `upgrade' <new-version> +# * <new-prerm> `failed-upgrade' <old-version> +# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version> +# * <deconfigured's-prerm> `deconfigure' `in-favour' +# <package-being-installed> <version> `removing' +# <conflicting-package> <version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + remove|upgrade|deconfigure) + ;; + + failed-upgrade) + ;; + + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 Added: trunk/debian/rules =================================================================== --- trunk/debian/rules (rev 0) +++ trunk/debian/rules 2012-03-25 21:42:33 UTC (rev 1788) @@ -0,0 +1,58 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Uncomment this to turn on verbose mode. +export DH_VERBOSE=1 + +#%: +# dh $@ + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +#include /usr/share/cdbs/1/class/maven.mk + +DEST := $(CURDIR)/debian/kune +TARGET := $(CURDIR)/target +RESOURCES := $(CURDIR)/src/main/resources +WEBAPP := $(CURDIR)/src/main/webapp +TARGETC := $(TARGET)/kune-0.1.0-SNAPSHOT + +KUNE := $(DEST)/usr/share/kune +ETCDIR := $(DEST)/etc/kune +LOGDIR := $(DEST)/var/log/kune +VARDIR := $(DEST)/var/lib/kune + +NO_GWT=true + +JAVA_HOME := /usr/lib/jvm/java-6-openjdk + +build/kune:: + +# mvn assembly:assembly -Dgwt.compiler.skip=$(NO_GWT) + +binary/kune:: + +binary-arch/kune:: + +binary-indep/kune:: + +reverse-config/kune:: + +clean/kune:: + + mvn clean:clean + +install/kune:: + + cp $(CURDIR)/script/server.sh $(KUNE)/bin/ + cp $(TARGET)/kune-0.1.0-SNAPSHOT-complete.jar $(KUNE)/lib/kune-complete.jar + cp $(RESOURCES)/kune.properties $(ETCDIR) + cp $(RESOURCES)/wave-server-production.properties $(ETCDIR)/wave-server.properties + cp $(RESOURCES)/server.federation.config.example $(ETCDIR) + cp $(RESOURCES)/jaas.config $(ETCDIR) + cp $(RESOURCES)/mail-notif-template.html $(ETCDIR) + rsync -aC $(CURDIR)/src/main/webapp/* $(KUNE)/webapp + rsync -aC $(TARGETC)/ws/* $(KUNE)/ws + +#get-orig-source: +# sh -e debian/orig-tar.sh Property changes on: trunk/debian/rules ___________________________________________________________________ Name: svn:executable + * Added: trunk/debian/source/format =================================================================== --- trunk/debian/source/format (rev 0) +++ trunk/debian/source/format 2012-03-25 21:42:33 UTC (rev 1788) @@ -0,0 +1 @@ +3.0 (quilt) Added: trunk/debian/stamp-patched ===================================================================

1 0

r1787 - trunk/debian
by Vicente J. Ruiz Jurado 25 Mar '12

25 Mar '12

Author: vjrj_ Date: 2012-03-25 23:40:22 +0200 (Sun, 25 Mar 2012) New Revision: 1787 Removed: trunk/debian/README trunk/debian/TODO trunk/debian/build.properties trunk/debian/changelog trunk/debian/compat trunk/debian/control trunk/debian/copyright trunk/debian/kune.poms trunk/debian/libkune-java.poms trunk/debian/libkune-java.substvars trunk/debian/maven.cleanIgnoreRules trunk/debian/maven.ignoreRules trunk/debian/maven.publishedRules trunk/debian/maven.rules trunk/debian/rules trunk/debian/stamp-patched trunk/debian/stamp-poms-patched Log: debian package Deleted: trunk/debian/README =================================================================== --- trunk/debian/README 2012-03-25 19:58:45 UTC (rev 1786) +++ trunk/debian/README 2012-03-25 21:40:22 UTC (rev 1787) @@ -1,2 +0,0 @@ -See tipical workflow in: http://wiki.debian.org/Java/MavenRepoHelper -$ mh_make Deleted: trunk/debian/TODO =================================================================== --- trunk/debian/TODO 2012-03-25 19:58:45 UTC (rev 1786) +++ trunk/debian/TODO 2012-03-25 21:40:22 UTC (rev 1787) @@ -1,5 +0,0 @@ -- create user kune -- create /var/lib/kune/uploads and give permissions -- create /var/lib/kune/lucene -- deps: libjmagick6-jni, csstidy - Deleted: trunk/debian/build.properties =================================================================== --- trunk/debian/build.properties 2012-03-25 19:58:45 UTC (rev 1786) +++ trunk/debian/build.properties 2012-03-25 21:40:22 UTC (rev 1787) @@ -1,3 +0,0 @@ -#javadoc.dir=target/api -build.directory=target -maven.test.skip=true Deleted: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2012-03-25 19:58:45 UTC (rev 1786) +++ trunk/debian/changelog 2012-03-25 21:40:22 UTC (rev 1787) @@ -1,6 +0,0 @@ -kune (0.1.0-SNAPSHOT) natty; urgency=low - - * first packaging works - - -- Vicente J. Ruiz Jurado <vjrj(a)ourproject.org> Sun, 11 Sep 2011 21:36:31 +0200 - Deleted: trunk/debian/compat =================================================================== --- trunk/debian/compat 2012-03-25 19:58:45 UTC (rev 1786) +++ trunk/debian/compat 2012-03-25 21:40:22 UTC (rev 1787) @@ -1 +0,0 @@ -5 Deleted: trunk/debian/control =================================================================== --- trunk/debian/control 2012-03-25 19:58:45 UTC (rev 1786) +++ trunk/debian/control 2012-03-25 21:40:22 UTC (rev 1787) @@ -1,17 +0,0 @@ -Source: kune -Section: java -Priority: optional -Maintainer: vjrj(a)ourproject.org -Build-Depends: debhelper (>= 5), cdbs, openjdk-6-jdk, quilt, maven-debian-helper, - libslf4j-java, libjdom1-java -Build-Depends-Indep: maven-repo-helper -Standards-Version: 3.9.2 - -Package: kune -Architecture: all -Depends: libjmagick6-jni -Recommends: -Description: Kune (which means together in esperanto) is a new web tool, for creating environments of constant inter-communication, collective intelligence, knowledge and shared work. - . - Kune’s main objective is to multiply the capacity and skills of people, communities and organizations, allowing their constant cooperation, regardless of physical distance. Therefore, it aims to facilitate virtual meetings, coordinate common agendas, join people with similar interests and develop projects collaboratively. Other features include managing projects and contents, and sharing them freely with anyone, anywhere - Deleted: trunk/debian/copyright =================================================================== --- trunk/debian/copyright 2012-03-25 19:58:45 UTC (rev 1786) +++ trunk/debian/copyright 2012-03-25 21:40:22 UTC (rev 1787) @@ -1 +0,0 @@ -link ../COPYRIGHT \ No newline at end of file Deleted: trunk/debian/kune.poms =================================================================== --- trunk/debian/kune.poms 2012-03-25 19:58:45 UTC (rev 1786) +++ trunk/debian/kune.poms 2012-03-25 21:40:22 UTC (rev 1787) @@ -1,7 +0,0 @@ -# List of POM files for the package -# Format of this file is: -# <path to pom file> [option] -# where option can be: -# --ignore: ignore this POM or -# --no-parent: remove the <parent> tag from the POM -pom.xml Deleted: trunk/debian/libkune-java.poms =================================================================== --- trunk/debian/libkune-java.poms 2012-03-25 19:58:45 UTC (rev 1786) +++ trunk/debian/libkune-java.poms 2012-03-25 21:40:22 UTC (rev 1787) @@ -1,7 +0,0 @@ -# List of POM files for the package -# Format of this file is: -# <path to pom file> [option] -# where option can be: -# --ignore: ignore this POM or -# --no-parent: remove the <parent> tag from the POM -pom.xml Deleted: trunk/debian/libkune-java.substvars =================================================================== --- trunk/debian/libkune-java.substvars 2012-03-25 19:58:45 UTC (rev 1786) +++ trunk/debian/libkune-java.substvars 2012-03-25 21:40:22 UTC (rev 1787) @@ -1,8 +0,0 @@ -#List of dependencies for libkune-java, generated for use by debian/control -#Sun Sep 11 19:31:18 CEST 2011 -maven.CompileDepends=libmaven-compiler-plugin-java (>\= 2.0.2), libmaven-resources-plugin-java (>\= 2.3), libsurefire-java (>\= 2.4.3) -maven.Depends= -maven.OptionalDepends= -maven.TestDepends= -maven.DocOptionalDepends= -maven.DocDepends=default-jdk-doc Deleted: trunk/debian/maven.cleanIgnoreRules =================================================================== --- trunk/debian/maven.cleanIgnoreRules 2012-03-25 19:58:45 UTC (rev 1786) +++ trunk/debian/maven.cleanIgnoreRules 2012-03-25 21:40:22 UTC (rev 1787) @@ -1,17 +0,0 @@ -# Maven clean ignore rules - ignore some Maven dependencies and plugins -# during the clean phase of a Maven build -# Format of this file is: -# [group] [artifact] [type] [version] [classifier] [scope] -# where each element can be either -# - the exact string, for example org.apache for the group, or 3.1 -# for the version. In this case, the element is simply matched -# and left as it is -# - * (the star character, alone). In this case, anything will -# match and be left as it is. For example, using * on the -# position of the artifact field will match any artifact id -# All elements much match before a rule can be applied -# Example rule: match jar with groupid= junit, artifactid= junit -# and version starting with 3., this dependency is then removed -# from the POM before mvn clean is called -# junit junit jar s/3\\..*/3.x/ - Deleted: trunk/debian/maven.ignoreRules =================================================================== --- trunk/debian/maven.ignoreRules 2012-03-25 19:58:45 UTC (rev 1786) +++ trunk/debian/maven.ignoreRules 2012-03-25 21:40:22 UTC (rev 1787) @@ -1,21 +0,0 @@ -# Maven ignore rules - ignore some Maven dependencies and plugins -# Format of this file is: -# [group] [artifact] [type] [version] [classifier] [scope] -# where each element can be either -# - the exact string, for example org.apache for the group, or 3.1 -# for the version. In this case, the element is simply matched -# and left as it is -# - * (the star character, alone). In this case, anything will -# match and be left as it is. For example, using * on the -# position of the artifact field will match any artifact id -# All elements much match before a rule can be applied -# Example rule: match jar with groupid= junit, artifactid= junit -# and version starting with 3., this dependency is then removed -# from the POM -# junit junit jar s/3\\..*/3.x/ - -com.google.gwt gwt-dev * * * * -com.google.gwt gwt-user * * * * -org.apache.maven.plugins maven-war-plugin * * * * -org.apache.maven.surefire surefire-junit47 * * * * -org.codehaus.mojo exec-maven-plugin * * * * Deleted: trunk/debian/maven.publishedRules =================================================================== --- trunk/debian/maven.publishedRules 2012-03-25 19:58:45 UTC (rev 1786) +++ trunk/debian/maven.publishedRules 2012-03-25 21:40:22 UTC (rev 1787) @@ -1,19 +0,0 @@ -# Maven published rules - additional rules to publish, to help -# the packaging work of Debian maintainers using mh_make -# Format of this file is: -# [group] [artifact] [type] [version] [classifier] [scope] -# where each element can be either -# - the exact string, for example org.apache for the group, or 3.1 -# for the version. In this case, the element is simply matched -# and left as it is -# - * (the star character, alone). In this case, anything will -# match and be left as it is. For example, using * on the -# position of the artifact field will match any artifact id -# - a regular expression of the form s/match/replace/ -# in this case, elements that match are transformed using -# the regex rule. -# All elements much match before a rule can be applied -# Example rule: match jar with groupid= junit, artifactid= junit -# and version starting with 3., replacing the version with 3.x -# junit junit jar s/3\\..*/3.x/ - Deleted: trunk/debian/maven.rules =================================================================== --- trunk/debian/maven.rules 2012-03-25 19:58:45 UTC (rev 1786) +++ trunk/debian/maven.rules 2012-03-25 21:40:22 UTC (rev 1787) @@ -1,20 +0,0 @@ -# Maven rules - transform Maven dependencies and plugins -# Format of this file is: -# [group] [artifact] [type] [version] [classifier] [scope] -# where each element can be either -# - the exact string, for example org.apache for the group, or 3.1 -# for the version. In this case, the element is simply matched -# and left as it is -# - * (the star character, alone). In this case, anything will -# match and be left as it is. For example, using * on the -# position of the artifact field will match any artifact id -# - a regular expression of the form s/match/replace/ -# in this case, elements that match are transformed using -# the regex rule. -# All elements much match before a rule can be applied -# Example rule: match jar with groupid= junit, artifactid= junit -# and version starting with 3., replacing the version with 3.x -# junit junit jar s/3\\..*/3.x/ - -s/jdom/org.jdom/ jdom jar s/1\..*/debian/ * * -junit junit jar s/3\..*/3.x/ * * Deleted: trunk/debian/rules =================================================================== --- trunk/debian/rules 2012-03-25 19:58:45 UTC (rev 1786) +++ trunk/debian/rules 2012-03-25 21:40:22 UTC (rev 1787) @@ -1,10 +0,0 @@ -#!/usr/bin/make -f - -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/maven.mk -include /usr/share/cdbs/1/rules/patchsys-quilt.mk - -JAVA_HOME := /usr/lib/jvm/java-6-openjdk - -#get-orig-source: -# sh -e debian/orig-tar.sh Deleted: trunk/debian/stamp-patched =================================================================== Deleted: trunk/debian/stamp-poms-patched ===================================================================

1 0

r1786 - trunk/src/main/webapp/tutorials
by Samer . 25 Mar '12

25 Mar '12

Author: shevek Date: 2012-03-25 21:58:45 +0200 (Sun, 25 Mar 2012) New Revision: 1786 Modified: trunk/src/main/webapp/tutorials/wiki.svg Log: Fixes in [es]. Translated to [en] Modified: trunk/src/main/webapp/tutorials/wiki.svg =================================================================== --- trunk/src/main/webapp/tutorials/wiki.svg 2012-03-25 19:53:33 UTC (rev 1785) +++ trunk/src/main/webapp/tutorials/wiki.svg 2012-03-25 19:58:45 UTC (rev 1786) @@ -17,7 +17,7 @@ id="svg2" version="1.1" inkscape:version="0.48.2 r9819" - sodipodi:docname="wiki2.svg"> + sodipodi:docname="wiki.svg"> <sodipodi:namedview id="base" pagecolor="#ffffff" @@ -25,17 +25,17 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="1.5869046" - inkscape:cx="243.10116" - inkscape:cy="1308.5714" + inkscape:zoom="1.122111" + inkscape:cx="220.00791" + inkscape:cy="632.83761" inkscape:document-units="px" - inkscape:current-layer="layer1" + inkscape:current-layer="g26610" showgrid="false" showborder="true" inkscape:showpageshadow="false" inkscape:window-width="1078" - inkscape:window-height="1867" - inkscape:window-x="0" + inkscape:window-height="714" + inkscape:window-x="60" inkscape:window-y="24" inkscape:window-maximized="0" />  @@ -48,8 +48,8 @@ ]; </script> <script - id="kunelang" - xlink:href="lang.js" /> + xlink:href="lang.js" + id="kunelang" />   <xhtml:link @@ -2042,7 +2042,7 @@ y="232.54723" /></text> </g> <g - style="display:none" + style="display:inline" inkscape:label="en-working" id="g26610" inkscape:groupmode="layer"> @@ -2058,7 +2058,7 @@ x="149.85907" id="tspan21534" sodipodi:role="line" - style="font-style:italic">pulsa con tu ratón para continuar</tspan></text> + style="font-style:italic">Mouse click to continue</tspan></text> <g transform="translate(104.08186,59.60747)" id="g21572" @@ -2088,7 +2088,7 @@ x="101.42439" y="95.114334" style="font-size:16px;font-style:normal;font-weight:normal;fill:#aa4400" - id="tspan21580">explicando el</tspan></text> + id="tspan21580">explaining the</tspan></text> </g> <text transform="translate(0,435.82679)" @@ -2103,28 +2103,26 @@ x="179.91093" sodipodi:role="line" id="tspan21584" /><tspan - style="font-size:12px;font-weight:normal;fill:#aa4400" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" y="449.63907" x="179.91093" sodipodi:role="line" - id="tspan21586">...darnos tu <tspan - id="tspan21588" - style="font-weight:bold">feedback </tspan></tspan><tspan + id="tspan21594">....and give us your</tspan><tspan style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" y="464.63907" x="179.91093" sodipodi:role="line" - id="tspan21590">y participar para </tspan><tspan - id="tspan21592" + id="tspan16964">feedback, and even</tspan><tspan style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" y="479.63907" x="179.91093" - sodipodi:role="line">mejorar esta </tspan><tspan + sodipodi:role="line" + id="tspan16966">join to improve </tspan><tspan style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" y="494.63907" x="179.91093" sodipodi:role="line" - id="tspan21594">herramienta...</tspan></text> + id="tspan16968">this tool</tspan></text> <text transform="translate(0,435.82679)" xml:space="preserve" @@ -2133,20 +2131,18 @@ y="350.59613" id="text21596" sodipodi:linespacing="125%"><tspan - id="tspan21598" + id="tspan21600" sodipodi:role="line" x="152.24879" y="350.59613" - style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">...aquí puedes crear </tspan><tspan - id="tspan21600" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">From here you can </tspan><tspan sodipodi:role="line" x="152.24879" y="365.59613" - style="font-size:12px;font-style:normal;font-weight:bold;fill:#aa4400"><tspan - id="tspan21602" - style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">nuevas </tspan>páginas wiki<tspan - id="tspan21604" - style="font-weight:normal">...</tspan></tspan></text> + style="font-size:12px;font-style:normal;font-weight:bold;fill:#aa4400" + id="tspan16070"><tspan + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + id="tspan16072">create new </tspan>wiki pages</tspan></text> <text transform="translate(0,435.82679)" xml:space="preserve" @@ -2162,15 +2158,15 @@ y="187.54723" x="195.88776" id="tspan21610" - sodipodi:role="line">Esto acelera su actualización</tspan><tspan + sodipodi:role="line">This feature speeds up the </tspan><tspan y="202.54723" x="195.88776" sodipodi:role="line" - id="tspan21612">y construcción</tspan><tspan + id="tspan16059">process of updating and building</tspan><tspan y="217.54723" x="195.88776" id="tspan21614" - sodipodi:role="line" /><tspan + sodipodi:role="line">them</tspan><tspan y="232.54723" x="195.88776" id="tspan21616" @@ -2186,22 +2182,15 @@ sodipodi:role="line" x="199.21805" y="-9.6079397" - id="tspan27457">Las páginas Wiki son <tspan - id="tspan27459" - style="font-weight:bold">similares a los documentos</tspan></tspan><tspan + id="tspan27465">The Wiki pages are similar to the documents.</tspan><tspan sodipodi:role="line" x="199.21805" y="5.3920603" - id="tspan27461">pero a diferencia de estos las wikis </tspan><tspan - style="font-weight:bold" - id="tspan27463" + id="tspan16055">However, wikis can be edited by anyone</tspan><tspan sodipodi:role="line" x="199.21805" - y="20.392059">pueden ser editadas por cualquiera</tspan><tspan - sodipodi:role="line" - x="199.21805" - y="35.392059" - id="tspan27465">no solo por los miembros del grupo</tspan></text> + y="20.392059" + id="tspan16057">and not only by the group members</tspan></text> </g> <g inkscape:groupmode="layer"

1 0

r1785 - trunk/src/main/webapp/tutorials
by Samer . 25 Mar '12

25 Mar '12

Author: shevek Date: 2012-03-25 21:53:33 +0200 (Sun, 25 Mar 2012) New Revision: 1785 Modified: trunk/src/main/webapp/tutorials/chats.svg Log: Fixes in [es]. Translation to [en] Modified: trunk/src/main/webapp/tutorials/chats.svg =================================================================== --- trunk/src/main/webapp/tutorials/chats.svg 2012-03-25 19:28:43 UTC (rev 1784) +++ trunk/src/main/webapp/tutorials/chats.svg 2012-03-25 19:53:33 UTC (rev 1785) @@ -27,15 +27,15 @@ inkscape:pageshadow="2" inkscape:zoom="1.5916065" inkscape:cx="243.10117" - inkscape:cy="1308.5714" + inkscape:cy="328.42964" inkscape:document-units="px" - inkscape:current-layer="layer1" + inkscape:current-layer="g19891" showgrid="false" showborder="true" inkscape:showpageshadow="false" - inkscape:window-width="1080" - inkscape:window-height="1868" - inkscape:window-x="0" + inkscape:window-width="1306" + inkscape:window-height="744" + inkscape:window-x="60" inkscape:window-y="24" inkscape:window-maximized="1" />  @@ -403,11 +403,11 @@ sodipodi:cy="3.6610169" sodipodi:rx="5.1525426" sodipodi:ry="5.1525426" - d="m -13.152542,3.6610169 a 5.1525426,5.1525426 0 1 1 -10.305085,0 5.1525426,5.1525426 0 1 1 10.305085,0 z" + d="m -13.152542,3.6610169 c 0,2.8456707 -2.306872,5.1525426 -5.152542,5.1525426 -2.845671,0 -5.152543,-2.3068719 -5.152543,-5.1525426 0,-2.84567065 2.306872,-5.1525426 5.152543,-5.1525426 2.84567,0 5.152542,2.30687195 5.152542,5.1525426 z" transform="matrix(1.7017328,0,0,1.7017328,109.33073,517.00513)" /> <path transform="matrix(1.7017328,0,0,1.7017328,109.33073,548.30382)" - d="m -13.152542,3.6610169 a 5.1525426,5.1525426 0 1 1 -10.305085,0 5.1525426,5.1525426 0 1 1 10.305085,0 z" + d="m -13.152542,3.6610169 c 0,2.8456707 -2.306872,5.1525426 -5.152542,5.1525426 -2.845671,0 -5.152543,-2.3068719 -5.152543,-5.1525426 0,-2.84567065 2.306872,-5.1525426 5.152543,-5.1525426 2.84567,0 5.152542,2.30687195 5.152542,5.1525426 z" sodipodi:ry="5.1525426" sodipodi:rx="5.1525426" sodipodi:cy="3.6610169" @@ -423,7 +423,7 @@ sodipodi:cy="3.6610169" sodipodi:rx="5.1525426" sodipodi:ry="5.1525426" - d="m -13.152542,3.6610169 a 5.1525426,5.1525426 0 1 1 -10.305085,0 5.1525426,5.1525426 0 1 1 10.305085,0 z" + d="m -13.152542,3.6610169 c 0,2.8456707 -2.306872,5.1525426 -5.152542,5.1525426 -2.845671,0 -5.152543,-2.3068719 -5.152543,-5.1525426 0,-2.84567065 2.306872,-5.1525426 5.152543,-5.1525426 2.84567,0 5.152542,2.30687195 5.152542,5.1525426 z" transform="matrix(1.7017328,0,0,1.7017328,140.62945,532.72866)" /> <path style="fill:none;stroke:#231f20;stroke-width:6.95526648;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" @@ -544,7 +544,7 @@ sodipodi:role="line" id="tspan14251">nuevas<tspan id="tspan13694" - style="font-weight:bold"> salas de chat</tspan></tspan></text> + style="font-weight:bold"> salas de chat</tspan>...</tspan></text> <text sodipodi:linespacing="125%" id="text13611" @@ -580,7 +580,7 @@ x="155.08841" sodipodi:role="line"><tspan id="tspan24195" - style="font-weight:bold">sistemas compatibles</tspan> (como gmail)</tspan></text> + style="font-weight:bold">sistemas compatibles</tspan> (como Gmail)</tspan></text> <text xml:space="preserve" style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" @@ -618,7 +618,7 @@ sodipodi:role="line" x="119.05811" y="650.00122" - style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">navegador</tspan></text> + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">navegador, y el chat se mantendrá intacto</tspan></text> <text sodipodi:linespacing="125%" id="text15572" @@ -630,29 +630,34 @@ y="939.13818" x="127.9239" sodipodi:role="line" - id="tspan15578">Más ventajas: este es un sistema <tspan + id="tspan13522">Más ventajas: éste es un sistema <tspan id="tspan24241" - style="font-weight:bold">descentralizado</tspan>, </tspan><tspan - id="tspan21342" + style="font-weight:bold">descentralizado </tspan>que</tspan><tspan style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" y="954.13818" x="127.9239" - sodipodi:role="line">es decir, que pones los datos de tus contactos </tspan><tspan + sodipodi:role="line" + id="tspan13695">mantiene tu privacidad. Es decir, que al usarlo y tener </tspan><tspan id="tspan21344" style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" y="969.13818" x="127.9239" - sodipodi:role="line">en un sitio que te de confianza (como quizás este) </tspan><tspan + sodipodi:role="line">aquí tu lista de contactos, ésta estará en un sistema </tspan><tspan id="tspan15585" style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" y="984.13818" x="127.9239" - sodipodi:role="line">mientras que a la vez te comunicas con usuarios/as </tspan><tspan - id="tspan21348" + sodipodi:role="line">que te dé confianza (como quizás éste), mientras que </tspan><tspan style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" y="999.13818" x="127.9239" - sodipodi:role="line">de otros sitios similares</tspan></text> + sodipodi:role="line" + id="tspan13553">a su vez te puedes comunicar con usuarios/as que </tspan><tspan + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + y="1014.1382" + x="127.9239" + sodipodi:role="line" + id="tspan13557">hayan elegido otros sistemas fuera de este sitio</tspan></text> <text xml:space="preserve" style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" @@ -664,7 +669,7 @@ sodipodi:role="line" x="116.10284" y="784.43695" - style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">Puede tener asambleas virtuales o reuniones, </tspan><tspan + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">Puede tener reuniones virtuales o asambleas, </tspan><tspan id="tspan15597" sodipodi:role="line" x="116.10284" @@ -681,7 +686,7 @@ style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">las notas sobre el encuentro</tspan></text> </g> <g - style="display:none" + style="display:inline" inkscape:label="en-working" id="g19891" inkscape:groupmode="layer"> @@ -714,7 +719,7 @@ x="101.42439" y="95.114334" style="font-size:16px;font-style:normal;font-weight:normal;fill:#aa4400" - id="tspan19901">explicando los</tspan></text> + id="tspan19901">explaining the</tspan></text> </g> <text xml:space="preserve" @@ -728,7 +733,7 @@ x="149.85907" id="tspan19905" sodipodi:role="line" - style="font-style:italic">pulsa con tu ratón para continuar</tspan></text> + style="font-style:italic">Mouse click to continue</tspan></text> <text sodipodi:linespacing="125%" id="text19907" @@ -745,24 +750,24 @@ y="1191.7134" x="149.82024" sodipodi:role="line" - id="tspan19911">...darnos tu <tspan - id="tspan19913" - style="font-weight:bold">feedback </tspan></tspan><tspan - style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + id="tspan19911">...and give us your</tspan><tspan + style="font-size:12px;font-weight:normal;fill:#aa4400" y="1206.7134" x="149.82024" sodipodi:role="line" - id="tspan19915">y participar para </tspan><tspan - id="tspan19917" - style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + id="tspan13788"><tspan + id="tspan19913" + style="font-weight:bold">feedback</tspan>, and even</tspan><tspan + style="font-size:12px;font-weight:normal;fill:#aa4400" y="1221.7134" x="149.82024" - sodipodi:role="line">mejorar esta </tspan><tspan + sodipodi:role="line" + id="tspan13793">join to improve </tspan><tspan style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" y="1236.7134" x="149.82024" sodipodi:role="line" - id="tspan19919">herramienta...</tspan></text> + id="tspan19919">this tool</tspan></text> <text xml:space="preserve" style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" @@ -774,14 +779,14 @@ sodipodi:role="line" x="122.1581" y="1092.6705" - style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">...aquí puedes crear </tspan><tspan + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">From here you can </tspan><tspan id="tspan19925" sodipodi:role="line" x="122.1581" y="1107.6705" - style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">nuevas<tspan + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">create new <tspan style="font-weight:bold" - id="tspan19927"> salas de chat</tspan></tspan></text> + id="tspan13786">chat-rooms</tspan></tspan></text> <text xml:space="preserve" style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" @@ -793,31 +798,33 @@ x="155.08841" y="419.41821" style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" - id="tspan19931">Mientras modificas contenidos, </tspan><tspan + id="tspan19931">While you modify the contents, you can</tspan><tspan sodipodi:role="line" x="155.08841" y="434.41821" style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" - id="tspan19933">puedes chatear con colegas o</tspan><tspan + id="tspan13563">chat with your colleagues or have a </tspan><tspan sodipodi:role="line" x="155.08841" y="449.41821" style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" - id="tspan19935">tener <tspan + id="tspan13565"><tspan style="font-weight:bold" - id="tspan19937">charlas en grupo</tspan> con usuarios/as </tspan><tspan + id="tspan13569">group chat</tspan> with other users from this site, </tspan><tspan sodipodi:role="line" x="155.08841" y="464.41821" style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" - id="tspan19939">de este sitio, pero también de otros</tspan><tspan + id="tspan13571">and also with users from <tspan + style="font-weight:bold" + id="tspan13604">compatible </tspan></tspan><tspan sodipodi:role="line" x="155.08841" y="479.41821" style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" id="tspan19941"><tspan style="font-weight:bold" - id="tspan19943">sistemas compatibles</tspan> (como gmail)</tspan></text> + id="tspan13606">systems</tspan> (such as Gmail)</tspan></text> <text sodipodi:linespacing="125%" id="text19945" @@ -829,33 +836,33 @@ style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" y="590.00122" x="119.05811" - sodipodi:role="line">Y lo puedes hacer incluso, <tspan + sodipodi:role="line">You can do it even <tspan style="font-weight:bold" - id="tspan19949">mientras navegas </tspan></tspan><tspan + id="tspan13613">while you surf</tspan> through </tspan><tspan style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" y="605.00122" x="119.05811" sodipodi:role="line" - id="tspan19951">por este sitio (prueba a navegar entre páginas </tspan><tspan + id="tspan13611">this website (try to surf in these pages while </tspan><tspan style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" y="620.00122" x="119.05811" sodipodi:role="line" - id="tspan19953">mientras chateas), sin perder las conversaciones. </tspan><tspan + id="tspan13615">you chat), without fear of losing conversations.</tspan><tspan style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" y="635.00122" x="119.05811" sodipodi:role="line" - id="tspan19955">Puedes pulsar sin miedo <tspan + id="tspan13617">You can click <tspan style="font-weight:bold" - id="tspan19957">atrás</tspan> y <tspan + id="tspan13649">Back</tspan> and <tspan style="font-weight:bold" - id="tspan19959">delante</tspan> en tu </tspan><tspan + id="tspan13647">Forward</tspan> in your browser</tspan><tspan style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" y="650.00122" x="119.05811" sodipodi:role="line" - id="tspan19961">navegador</tspan></text> + id="tspan19961">while using your open chat </tspan></text> <text xml:space="preserve" style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" @@ -867,29 +874,34 @@ sodipodi:role="line" x="127.9239" y="939.13818" - style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">Más ventajas: este es un sistema <tspan + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">Other benefits: this is a <tspan style="font-weight:bold" - id="tspan19967">descentralizado</tspan>, </tspan><tspan + id="tspan13686">decentralized </tspan>system that</tspan><tspan sodipodi:role="line" x="127.9239" y="954.13818" style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" - id="tspan19969">es decir, que pones los datos de tus contactos </tspan><tspan + id="tspan13749">protects your privacy. That is, while you use it and</tspan><tspan sodipodi:role="line" x="127.9239" y="969.13818" style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" - id="tspan19971">en un sitio que te de confianza (como quizás este) </tspan><tspan + id="tspan13751">thus keep here your contact list, such info can be in a</tspan><tspan sodipodi:role="line" x="127.9239" y="984.13818" style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" - id="tspan19973">mientras que a la vez te comunicas con usuarios/as </tspan><tspan + id="tspan13753">system you trust (as maybe this one), while you can</tspan><tspan sodipodi:role="line" x="127.9239" y="999.13818" style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" - id="tspan19975">de otros sitios similares</tspan></text> + id="tspan13755">still communicate with other users that chose other</tspan><tspan + sodipodi:role="line" + x="127.9239" + y="1014.1382" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + id="tspan13747">systems outside of this one.</tspan></text> <text sodipodi:linespacing="125%" id="text19977" @@ -901,21 +913,21 @@ y="784.43695" x="116.10284" sodipodi:role="line" - id="tspan19979">Puede tener asambleas virtuales o reuniones, </tspan><tspan + id="tspan19979">You can have virtual meetings or assemblies, </tspan><tspan style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" y="799.43695" x="116.10284" sodipodi:role="line" - id="tspan19981">y por ejemplo, <tspan + id="tspan13653">and for instance, <tspan style="font-weight:bold" - id="tspan19983">editar <tspan - id="tspan19985" - style="font-weight:normal">entre todos/as</tspan> el acta</tspan> o </tspan><tspan + id="tspan13668">edit</tspan> all together the <tspan + style="font-weight:bold" + id="tspan13670">minutes</tspan></tspan><tspan style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" y="814.43695" x="116.10284" sodipodi:role="line" - id="tspan19987">las notas sobre el encuentro</tspan></text> + id="tspan19987">or event notes</tspan></text> </g> <g inkscape:groupmode="layer"

1 0