From c6c9281b939ca20b351a9c178254f05e69ced28b Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Wed, 28 Apr 2010 22:14:31 +0200 Subject: git-buildpackage-converted debian packaging --- debian/README | 6 +++ debian/README.Debian | 6 +++ debian/changelog | 5 ++ debian/compat | 1 + debian/config | 49 ++++++++++++++++++ debian/control | 20 ++++++++ debian/copyright | 42 ++++++++++++++++ debian/postinst | 81 ++++++++++++++++++++++++++++++ debian/postrm | 38 ++++++++++++++ debian/preinst | 34 +++++++++++++ debian/prerm | 43 ++++++++++++++++ debian/rules | 139 +++++++++++++++++++++++++++++++++++++++++++++++++++ debian/templates | 11 ++++ 13 files changed, 475 insertions(+) create mode 100644 debian/README create mode 100644 debian/README.Debian create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/config create mode 100644 debian/control create mode 100644 debian/copyright create mode 100755 debian/postinst create mode 100644 debian/postrm create mode 100644 debian/preinst create mode 100755 debian/prerm create mode 100755 debian/rules create mode 100644 debian/templates (limited to 'debian') diff --git a/debian/README b/debian/README new file mode 100644 index 0000000..21f1d88 --- /dev/null +++ b/debian/README @@ -0,0 +1,6 @@ +The Debian Package etherpad +---------------------------- + +Comments regarding the Package + + -- Egil Möller Mon, 26 Apr 2010 19:51:51 +0200 diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 0000000..b246eb5 --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,6 @@ +etherpad for Debian +------------------- + + + + -- Egil Möller Mon, 26 Apr 2010 19:51:51 +0200 diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..9f15642 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +etherpad (1.0) unstable; urgency=low + + * Initial Release. + + -- Egil Möller Mon, 26 Apr 2010 19:51:51 +0200 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..7f8f011 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +7 diff --git a/debian/config b/debian/config new file mode 100644 index 0000000..f97ab33 --- /dev/null +++ b/debian/config @@ -0,0 +1,49 @@ +#!/bin/bash + +################################################################################ +# +# Copyright (c) 2010 penSec.IT UG (haftungsbeschränkt) +# http://www.pensec.it +# mail@pensec.it +# Copyright (c) 2010 Egil Möller +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may not +# use this file except in compliance with the License. You may obtain a copy of +# the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations under +# the License. +# +################################################################################ + + + +set -e +. /usr/share/debconf/confmodule + +if [ -n "$ETHERPAD_DEBUG" ]; then + echo "now debugging $0 $@" + set -x +fi + +db_version 2.0 + +# Set up database +. /usr/share/dbconfig-common/dpkg/config.mysql +dbc_go etherpad $@ + +db_input high "etherpad/admin_password" || true +db_go + +db_get "etherpad/topdomains" +if ! [ "$RET" ]; then + db_set "etherpad/topdomains" "$(hostname -f)" +fi + +db_input high "etherpad/topdomains" || true +db_go diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..14ffd66 --- /dev/null +++ b/debian/control @@ -0,0 +1,20 @@ +Source: etherpad +Section: unknown +Priority: extra +Maintainer: Egil Möller +Build-Depends: debhelper (>= 7), dbconfig-common, sun-java6-jdk, mysql-client, libmysql-java, scala (>= 2.7) +Build-Conflicts: libgcj-common, java-gcj-compat-headless, java-gcj-compat, gcj-4.3-base +Standards-Version: 3.8.0 +Homepage: + +Package: etherpad +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, dbconfig-common, sun-java6-jdk, mysql-client, libmysql-java, scala (>= 2.7) +Description: Etherpad multiuser web-based word processor + EtherPad is the only web-based word processor that allows people to work + together in really real-time. + . + When multiple people edit the same document simultaneously, any changes are + instantly reflected on everyone's screen. The result is a new and productive + way to collaborate on text documents, useful for meeting notes, drafting + sessions, education, team programming, and more. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..21f3788 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,42 @@ +This package was debianized by Egil Möller on +Mon, 26 Apr 2010 19:51:51 +0200. + +It was downloaded from + +Upstream Author(s): + + + + +Copyright: + + + + +License: + + Redistribution and use in source and binary forms, with or without + modification, are permitted under the terms of the BSD License. + + THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + +On Debian systems, the complete text of the BSD License can be +found in `/usr/share/common-licenses/BSD'. + + +The Debian packaging is copyright 2010, Egil Möller and +is licensed under the GPL, see `/usr/share/common-licenses/GPL'. + + +# Please also look if there are files or directories which have a +# different copyright/license attached and list them here. diff --git a/debian/postinst b/debian/postinst new file mode 100755 index 0000000..3b85741 --- /dev/null +++ b/debian/postinst @@ -0,0 +1,81 @@ +#!/bin/bash + +################################################################################ +# +# Copyright (c) 2010 penSec.IT UG (haftungsbeschränkt) +# http://www.pensec.it +# mail@pensec.it +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may not +# use this file except in compliance with the License. You may obtain a copy of +# the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations under +# the License. +# +################################################################################ + + + +set -e +. /usr/share/debconf/confmodule + +if [ -n "$ETHERPAD_DEBUG" ]; then + echo "now debugging $0 $@" + set -x +fi + +db_version 2.0 + +. /usr/share/dbconfig-common/dpkg/postinst.mysql +dbc_go etherpad $@ + +db_get "etherpad/admin_password" +db_admin_password="$RET" +db_get "etherpad/topdomains" +db_topdomains="$RET" + +. /etc/dbconfig-common/etherpad.conf + + + +# Create system user +if ! getent passwd etherpad > /dev/null ; then + echo 'Adding system-user for etherpad' 1>&2 + adduser --system --group --quiet \ + --home /usr/share/etherpad --no-create-home \ + --disabled-login --force-badname etherpad +fi + +# Give user the rights to write into the log & data directory +chown -R etherpad:etherpad "/var/log/etherpad" +chown -R etherpad:etherpad "/usr/share/etherpad/etherpad/data" +# Give user the rights do write everywhere, did not yet figure +# out which rights are necessary, exactly +chown -R etherpad:etherpad "/usr/share/etherpad" + +if ! [ "$dbc_dbserver" ]; then + dbc_dbserver=localhost +fi +if ! [ "$dbc_dbport" ]; then + dbc_dbport=3306 +fi + + +m4 \ + -D __db_admin_password__="$db_admin_password" \ + -D __dbc_dbserver__="$dbc_dbserver" \ + -D __dbc_dbport__="$dbc_dbport" \ + -D __dbc_dbname__="$dbc_dbname" \ + -D __dbc_dbpass__="$dbc_dbpass" \ + -D __dbc_dbuser__="$dbc_dbuser" \ + -D __db_topdomains__="$db_topdomains" \ + < /etc/etherpad/etherpad.local.properties.tmpl \ + > /etc/etherpad/etherpad.local.properties + +chown etherpad:etherpad /etc/etherpad/etherpad.local.properties diff --git a/debian/postrm b/debian/postrm new file mode 100644 index 0000000..ef4425a --- /dev/null +++ b/debian/postrm @@ -0,0 +1,38 @@ +#!/bin/bash + +################################################################################ +# +# Copyright (c) 2010 penSec.IT UG (haftungsbeschränkt) +# http://www.pensec.it +# mail@pensec.it +# Copyright (c) 2010 Egil Möller +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may not +# use this file except in compliance with the License. You may obtain a copy of +# the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations under +# the License. +# +################################################################################ + + + +set -e +. /usr/share/debconf/confmodule + +if [ -n "$ETHERPAD_DEBUG" ]; then + echo "now debugging $0 $@" + set -x +fi + +db_version 2.0 + +# Set up database +. /usr/share/dbconfig-common/dpkg/postrm.mysql +dbc_go etherpad $@ diff --git a/debian/preinst b/debian/preinst new file mode 100644 index 0000000..ffced88 --- /dev/null +++ b/debian/preinst @@ -0,0 +1,34 @@ +#!/bin/bash + +################################################################################ +# +# Copyright (c) 2010 penSec.IT UG (haftungsbeschränkt) +# http://www.pensec.it +# mail@pensec.it +# Copyright (c) 2010 Egil Möller +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may not +# use this file except in compliance with the License. You may obtain a copy of +# the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations under +# the License. +# +################################################################################ + + + +set -e +. /usr/share/debconf/confmodule + +if [ -n "$ETHERPAD_DEBUG" ]; then + echo "now debugging $0 $@" + set -x +fi + +db_version 2.0 diff --git a/debian/prerm b/debian/prerm new file mode 100755 index 0000000..7b7d352 --- /dev/null +++ b/debian/prerm @@ -0,0 +1,43 @@ +#!/bin/bash + +################################################################################ +# +# Copyright (c) 2010 penSec.IT UG (haftungsbeschränkt) +# http://www.pensec.it +# mail@pensec.it +# Copyright (c) 2010 Egil Möller +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may not +# use this file except in compliance with the License. You may obtain a copy of +# the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations under +# the License. +# +################################################################################ + + + +set -e +. /usr/share/debconf/confmodule + +if [ -n "$ETHERPAD_DEBUG" ]; then + echo "now debugging $0 $@" + set -x +fi + +db_version 2.0 + +# Set up database +. /usr/share/dbconfig-common/dpkg/prerm.mysql +dbc_go etherpad $@ + +# Remove log+data directories, otherwise uninstall will fail +rm -rf /var/log/etherpad +rm -rf /usr/share/etherpad/etherpad/data + diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..3a06dbe --- /dev/null +++ b/debian/rules @@ -0,0 +1,139 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. +# +# Modified to make a template file for a multi-binary package with separated +# build-arch and build-indep targets by Bill Allombert 2001 + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This has to be exported to make some magic below work. +export DH_OPTIONS + + + + + + +configure: configure-stamp +configure-stamp: + dh_testdir + # Add here commands to configure the package. + + touch configure-stamp + + +#Architecture +build: build-arch build-indep + +build-arch: build-arch-stamp +build-arch-stamp: configure-stamp + + # Add here commands to compile the arch part of the package. + #$(MAKE) + bin/build.sh + touch $@ + +build-indep: build-indep-stamp +build-indep-stamp: configure-stamp + + # Add here commands to compile the indep part of the package. + #$(MAKE) doc + touch $@ + +clean: + dh_testdir + dh_testroot + rm -f build-arch-stamp build-indep-stamp configure-stamp + + # Add here commands to clean up after the build process. + #git clean -X + + dh_clean --exclude ./build/apt/.tmp.local/infrastructure/bin/makejar.sh.orig --exclude ./build/apt/.tmp.local/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Decompiler.java.orig --exclude ./build/apt/.tmp.local/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Parser.java.orig --exclude ./build/apt/.tmp.local/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Token.java.orig --exclude ./build/apt/.tmp.local/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/TokenStream.java.orig --exclude ./infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Decompiler.java.orig --exclude ./infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Parser.java.orig --exclude ./infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Token.java.orig --exclude ./infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/TokenStream.java.orig + +install: install-indep install-arch +install-indep: + dh_testdir + dh_testroot + dh_prep -i --exclude ./build/apt/.tmp.local/infrastructure/bin/makejar.sh.orig --exclude ./build/apt/.tmp.local/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Decompiler.java.orig --exclude ./build/apt/.tmp.local/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Parser.java.orig --exclude ./build/apt/.tmp.local/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Token.java.orig --exclude ./build/apt/.tmp.local/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/TokenStream.java.orig --exclude ./infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Decompiler.java.orig --exclude ./infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Parser.java.orig --exclude ./infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Token.java.orig --exclude ./infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/TokenStream.java.orig + dh_installdirs -i + + # Add here commands to install the indep part of the package into + # debian/-doc. + #INSTALLDOC# + + dh_install -i + +install-arch: + dh_testdir + dh_testroot + dh_prep -s --exclude ./build/apt/.tmp.local/infrastructure/bin/makejar.sh.orig --exclude ./build/apt/.tmp.local/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Decompiler.java.orig --exclude ./build/apt/.tmp.local/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Parser.java.orig --exclude ./build/apt/.tmp.local/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Token.java.orig --exclude ./build/apt/.tmp.local/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/TokenStream.java.orig --exclude ./infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Decompiler.java.orig --exclude ./infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Parser.java.orig --exclude ./infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Token.java.orig --exclude ./infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/TokenStream.java.orig + dh_installdirs -s + + # Add here commands to install the arch part of the package into + # debian/tmp. + # $(MAKE) DESTDIR=$(CURDIR)/debian/etherpad install + + mkdir -p debian/etherpad/usr/share/etherpad + cp -a $$(ls | grep -v debian) debian/etherpad/usr/share/etherpad + + mkdir -p debian/etherpad/etc + mv debian/etherpad/usr/share/etherpad/etherpad/etc debian/etherpad/etc/etherpad + ln -s /etc/etherpad debian/etherpad/usr/share/etherpad/etherpad/etc + + mkdir -p debian/etherpad/var/log/etherpad + + mkdir -p debian/etherpad/etc/init.d + ln -s /usr/share/etherpad/bin/etherpad.init.d debian/etherpad/etc/init.d/etherpad + + + dh_install -s + +# Must not depend on anything. This is to be called by +# binary-arch/binary-indep +# in another 'make' thread. +binary-common: + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installexamples +# dh_installmenu + dh_installdebconf +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_python +# dh_installinit +# dh_installcron +# dh_installinfo + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms +# dh_perl + dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture independant packages using the common target. +binary-indep: build-indep install-indep + $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common + +# Build architecture dependant packages using the common target. +binary-arch: build-arch install-arch + $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common + +binary: binary-arch binary-indep +.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure diff --git a/debian/templates b/debian/templates new file mode 100644 index 0000000..b73dc5e --- /dev/null +++ b/debian/templates @@ -0,0 +1,11 @@ +Template: etherpad/admin_password +Type: password +Default: password +Description: etherpad administration password + Please insert the administration password, default is password. + +Template: etherpad/topdomains +Type: string +Default: +Description: Domain name of site + Please insert the domain name of your site. -- cgit v1.2.3 From a2bc8a493519bc022d7436c6d11cb5bdb62bd381 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Wed, 28 Apr 2010 22:45:39 +0200 Subject: Oupsi, dbconfig-common is a pre-depends --- debian/control | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/control b/debian/control index 14ffd66..55aebd1 100644 --- a/debian/control +++ b/debian/control @@ -10,6 +10,7 @@ Homepage: Package: etherpad Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, dbconfig-common, sun-java6-jdk, mysql-client, libmysql-java, scala (>= 2.7) +Pre-Depends: dbconfig-common Description: Etherpad multiuser web-based word processor EtherPad is the only web-based word processor that allows people to work together in really real-time. -- cgit v1.2.3 From c2691887b0fc00e03ae56a320ca3269e7f4fd0fd Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Mon, 3 May 2010 23:39:30 +0200 Subject: Updated dependencies --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 55aebd1..4a54b64 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Homepage: Package: etherpad Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, dbconfig-common, sun-java6-jdk, mysql-client, libmysql-java, scala (>= 2.7) +Depends: ${shlibs:Depends}, ${misc:Depends}, dbconfig-common, sun-java6-jdk, mysql-client, libmysql-java, scala (>= 2.7), mysql-server, m4 Pre-Depends: dbconfig-common Description: Etherpad multiuser web-based word processor EtherPad is the only web-based word processor that allows people to work -- cgit v1.2.3 From 7d7fb9f26aa59584b7916bd6ea383473bb7bdfb7 Mon Sep 17 00:00:00 2001 From: Mikko Rantalainen Date: Tue, 4 May 2010 16:23:27 +0300 Subject: Fixed debian installation scripts Directory /usr/share/etherpad/etherpad/data was not created which caused install process to stop with error message: Adding system-user for etherpad chown: cannot access `/usr/share/etherpad/etherpad/data': No such file or directory dpkg: error processing etherpad (--install): subprocess installed post-installation script returned error exit status 1 Processing triggers for ureadahead ... Errors were encountered while processing: etherpad Fixed location of scala-library.jar in Ubuntu. This may need changes in the future to help building the JAR on both Debian based systems and other systems. Added scala-library to Build-Depends in addition to scala dependency. --- debian/changelog | 6 ++++++ debian/control | 2 +- debian/rules | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9f15642..ab34057 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +etherpad (1.0fixed) karmic; urgency=low + + * Fixed installation scripts + + -- Mikko Rantalainen Tue, 04 May 2010 12:57:28 +0300 + etherpad (1.0) unstable; urgency=low * Initial Release. diff --git a/debian/control b/debian/control index 4a54b64..c6ea8cd 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: etherpad Section: unknown Priority: extra Maintainer: Egil Möller -Build-Depends: debhelper (>= 7), dbconfig-common, sun-java6-jdk, mysql-client, libmysql-java, scala (>= 2.7) +Build-Depends: debhelper (>= 7), dbconfig-common, sun-java6-jdk, mysql-client, libmysql-java, scala (>= 2.7), scala-library (>= 2.7) Build-Conflicts: libgcj-common, java-gcj-compat-headless, java-gcj-compat, gcj-4.3-base Standards-Version: 3.8.0 Homepage: diff --git a/debian/rules b/debian/rules index 3a06dbe..dcbce4e 100755 --- a/debian/rules +++ b/debian/rules @@ -82,6 +82,8 @@ install-arch: mkdir -p debian/etherpad/usr/share/etherpad cp -a $$(ls | grep -v debian) debian/etherpad/usr/share/etherpad + # create directory to save user data + mkdir -p debian/etherpad/usr/share/etherpad/etherpad/data mkdir -p debian/etherpad/etc mv debian/etherpad/usr/share/etherpad/etherpad/etc debian/etherpad/etc/etherpad -- cgit v1.2.3 From eae8518d5db31cc70856cf9845c6974caee04bf3 Mon Sep 17 00:00:00 2001 From: Mikko Rantalainen Date: Wed, 5 May 2010 16:49:45 +0300 Subject: Removed dummy README.Debian --- debian/README.Debian | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 debian/README.Debian (limited to 'debian') diff --git a/debian/README.Debian b/debian/README.Debian deleted file mode 100644 index b246eb5..0000000 --- a/debian/README.Debian +++ /dev/null @@ -1,6 +0,0 @@ -etherpad for Debian -------------------- - - - - -- Egil Möller Mon, 26 Apr 2010 19:51:51 +0200 -- cgit v1.2.3 From 7f531c2cb5a27f055208ca4ce746254a7ba3479e Mon Sep 17 00:00:00 2001 From: Mikko Rantalainen Date: Thu, 6 May 2010 09:39:46 +0300 Subject: Fixed debian/copyright The copyright file contained placeholders that I filled in. In addition, the copyright file contained wrong license (BSD) instead of the Apache License 2.0 claimed in the source files. --- debian/copyright | 54 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 22 deletions(-) (limited to 'debian') diff --git a/debian/copyright b/debian/copyright index 21f3788..0ddd16e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,42 +1,52 @@ This package was debianized by Egil Möller on -Mon, 26 Apr 2010 19:51:51 +0200. +Mon, 26 Apr 2010 19:51:51 +0200 and further fixed by Mikko Rantalainen. -It was downloaded from +It was downloaded from http://github.com/mikkorantalainen/pad Upstream Author(s): - - + Aaron Iba + Chris Ball + Dan Bentley + David Greenspan + Egil Moeller + Elliot Kroo + Jeff Mitchell + Jeppe Toustrup + Michael Prasuhn + Mikko Rantalainen + penSec.IT UG (haftungsbeschränkt) + Per Andersson + Peter Martischka + Unknown + Simon Bohlin + Simon B @piratpartiet Copyright: - - + Copyright (C) 2007-2009 Google Inc. + Copyright (C) 2009-2010 upstream authors, see above License: Redistribution and use in source and binary forms, with or without modification, are permitted under the terms of the BSD License. - THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - SUCH DAMAGE. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at -On Debian systems, the complete text of the BSD License can be -found in `/usr/share/common-licenses/BSD'. + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +On Debian systems, the complete text of the Apache 2.0 License can be +found in `/usr/share/common-licenses/Apache-2.0'. The Debian packaging is copyright 2010, Egil Möller and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. - -# Please also look if there are files or directories which have a -# different copyright/license attached and list them here. -- cgit v1.2.3 From 2a18a9a2c2e034467e177baa6dc9d485c2ae5f7f Mon Sep 17 00:00:00 2001 From: Mikko Rantalainen Date: Thu, 6 May 2010 09:42:23 +0300 Subject: Added debian/etherpad.init As far as I know, this is the correct way to do init.d scripts in a debian package. --- debian/etherpad.init | 186 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 186 insertions(+) create mode 100755 debian/etherpad.init (limited to 'debian') diff --git a/debian/etherpad.init b/debian/etherpad.init new file mode 100755 index 0000000..225ef3d --- /dev/null +++ b/debian/etherpad.init @@ -0,0 +1,186 @@ +#!/bin/bash + +### BEGIN INIT INFO +# Provides: etherpad +# Required-Start: $networking $syslog $remote_fs +# Required-Stop: $networking $syslog $remote_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Run Etherpad +# Description: A web-based word processor that allows +# people to work together in real-time. +# . +# When multiple people edit the same document simultaneously, +# any changes are instantly reflected on everyone's screen. +# The result is a new and productive way to collaborate on +# text documents, useful for meeting notes, drafting +# sessions, education, team programming, and more. +### END INIT INFO + +# Author: penSec.IT UG (haftungsbeschränkt) +# Author: Per Andersson +# Author: Mikko Rantalainen + +################################################################################ +# +# Copyright (c) 2010 penSec.IT UG (haftungsbeschränkt) +# http://www.pensec.it +# mail@pensec.it +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may not +# use this file except in compliance with the License. You may obtain a copy of +# the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations under +# the License. +# +################################################################################ + +# Do NOT "set -e" + +# PATH should only include /usr/* if it runs after the mountnfs.sh script +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="Collaborative real-time editor" +NAME="etherpad" +DAEMON_BASE="/usr/share/etherpad" +DAEMON=$DAEMON_BASE/bin/run.sh +DAEMON_ARGS="" +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 +[ -f /etc/default/rcS ] && . /etc/default/rcS + +# 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 --background --chdir $DAEMON_BASE --chuid etherpad:etherpad --start --quiet --make-pidfile --pidfile $PIDFILE --exec $DAEMON --test \ + || return 1 + start-stop-daemon --background --chdir $DAEMON_BASE --chuid etherpad:etherpad --start --quiet --make-pidfile --pidfile $PIDFILE --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 + 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 + 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 -p $PIDFILE "$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 + +: + -- cgit v1.2.3 From 1278c2649dd16e5ebfc32f128201be1e933ca3e1 Mon Sep 17 00:00:00 2001 From: Mikko Rantalainen Date: Thu, 6 May 2010 10:52:52 +0300 Subject: Added #DEBHELPER# marker to scripts This marker is required by dh_* scripts used in debian/rules. --- debian/postinst | 3 +++ debian/postrm | 3 +++ debian/preinst | 3 +++ debian/prerm | 2 ++ 4 files changed, 11 insertions(+) (limited to 'debian') diff --git a/debian/postinst b/debian/postinst index 3b85741..3ce2754 100755 --- a/debian/postinst +++ b/debian/postinst @@ -79,3 +79,6 @@ m4 \ > /etc/etherpad/etherpad.local.properties chown etherpad:etherpad /etc/etherpad/etherpad.local.properties + +#DEBHELPER# + diff --git a/debian/postrm b/debian/postrm index ef4425a..1e555a0 100644 --- a/debian/postrm +++ b/debian/postrm @@ -36,3 +36,6 @@ db_version 2.0 # Set up database . /usr/share/dbconfig-common/dpkg/postrm.mysql dbc_go etherpad $@ + +#DEBHELPER# + diff --git a/debian/preinst b/debian/preinst index ffced88..9f854cb 100644 --- a/debian/preinst +++ b/debian/preinst @@ -32,3 +32,6 @@ if [ -n "$ETHERPAD_DEBUG" ]; then fi db_version 2.0 + +#DEBHELPER# + diff --git a/debian/prerm b/debian/prerm index 7b7d352..ddabe3e 100755 --- a/debian/prerm +++ b/debian/prerm @@ -41,3 +41,5 @@ dbc_go etherpad $@ rm -rf /var/log/etherpad rm -rf /usr/share/etherpad/etherpad/data +#DEBHELPER# + -- cgit v1.2.3 From 357023aec09f08e8066e8ae9b8edefed131ab437 Mon Sep 17 00:00:00 2001 From: Mikko Rantalainen Date: Thu, 6 May 2010 11:19:15 +0300 Subject: Allow localization of packaging The debian/templates should always allow localization. A nice software for creating a new localization is "virtaal". --- debian/po/POTFILES.in | 1 + debian/po/fi.po | 76 +++++++++++++++++++++++++++++++++++++++++++++++++ debian/po/templates.pot | 58 +++++++++++++++++++++++++++++++++++++ debian/templates | 21 ++++++++++---- 4 files changed, 150 insertions(+), 6 deletions(-) create mode 100644 debian/po/POTFILES.in create mode 100644 debian/po/fi.po create mode 100644 debian/po/templates.pot (limited to 'debian') diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in new file mode 100644 index 0000000..cef83a3 --- /dev/null +++ b/debian/po/POTFILES.in @@ -0,0 +1 @@ +[type: gettext/rfc822deb] templates diff --git a/debian/po/fi.po b/debian/po/fi.po new file mode 100644 index 0000000..788d6f0 --- /dev/null +++ b/debian/po/fi.po @@ -0,0 +1,76 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Mikko Rantalainen , 2010 +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: etherpad@packages.debian.org\n" +"POT-Creation-Date: 2010-05-06 11:07+0300\n" +"PO-Revision-Date: 2010-05-06 11:13+0300\n" +"Last-Translator: Mikko Rantalainen \n" +"Language-Team: Peda.net\n" +"Language: fi\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Virtaal 0.3.1\n" + +#. Type: password +#. Default +#. Note: the translation of this string should match the prompt below +#: ../templates:1001 +msgid "password" +msgstr "salasana" + +#. Type: password +#. Description +#. Note: the translation of this string should match the default password above +#: ../templates:1002 +msgid "Etherpad administrator password:" +msgstr "Etherpad-ylläpitäjän salasana:" + +#. Type: password +#. Description +#. Note: the translation of this string should match the default password above +#: ../templates:1002 +msgid "" +"The Etherpad system can be administrated with a browser. To make this safe, " +"a good password should be set for the administrator. The default is password " +"is \"password\" (THIS IS NOT SAFE)." +msgstr "" +"Etherpad-järjestelmää voidaan ylläpitää selaimella. Ylläpitäjällä tulee olla " +"hyvä salasana, jotta tämä olisi turvallista. Oletuksena salasana on " +"\"salasana\" (TÄMÄ EI OLE TURVALLINENN SALASANA)." + +#. Type: string +#. Description +#: ../templates:2001 +msgid "Fully qualified domain name of the site:" +msgstr "Etherpad-palvelimen osoite (esimerkiksi example.com):" + +#. Type: string +#. Description +#: ../templates:2001 +msgid "" +"The system needs to know the fully qualified domain name of the site where " +"etherpad system is visible to the world. This may be different from the name " +"of the system where etherpad is installed (e.g. in case of reverse proxy or " +"port forwarding). Notice that if you enter \"example.com\" here, the service " +"will be available at \"http://example.com:9000\" by default." +msgstr "" +"Järjestelmän tulee tietää Etherpad-palvelun täydellinen julkinen domain-" +"nimi. Tämä voi olla eri kuin sen tietokoneen domain-nimi, johon palvelu " +"asennetaan (esimerkiksi kun käytetään porttien uudelleenohjausta tai reverse " +"proxy -määrityksiä). Huomaa, että jos syötät tässä \"example.com\", niin " +"palvelu on oletuksena nähtävillä osoitteessa \"http://example.com:9000\"." + +#~ msgid "Please insert the administration password, default is password." +#~ msgstr "" +#~ "Koko Etherpad-asennuksen pääkäyttäjän salasana, oletus on \"salasana\"." + +#~ msgid "Please insert the domain name of your site." +#~ msgstr "" +#~ "Syötä tähän Etherpad-palvelimesi osoite. Varsinainen Etherpad-palvelu " +#~ "toimii oletuksena portissa 9000 (esimerkiksi http://example.com:9000)." diff --git a/debian/po/templates.pot b/debian/po/templates.pot new file mode 100644 index 0000000..92cb5bc --- /dev/null +++ b/debian/po/templates.pot @@ -0,0 +1,58 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: etherpad@packages.debian.org\n" +"POT-Creation-Date: 2010-05-06 11:07+0300\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: password +#. Default +#. Note: the translation of this string should match the prompt below +#: ../templates:1001 +msgid "password" +msgstr "" + +#. Type: password +#. Description +#. Note: the translation of this string should match the default password above +#: ../templates:1002 +msgid "Etherpad administrator password:" +msgstr "" + +#. Type: password +#. Description +#. Note: the translation of this string should match the default password above +#: ../templates:1002 +msgid "" +"The Etherpad system can be administrated with a browser. To make this safe, " +"a good password should be set for the administrator. The default is password " +"is \"password\" (THIS IS NOT SAFE)." +msgstr "" + +#. Type: string +#. Description +#: ../templates:2001 +msgid "Fully qualified domain name of the site:" +msgstr "" + +#. Type: string +#. Description +#: ../templates:2001 +msgid "" +"The system needs to know the fully qualified domain name of the site where " +"etherpad system is visible to the world. This may be different from the name " +"of the system where etherpad is installed (e.g. in case of reverse proxy or " +"port forwarding). Notice that if you enter \"example.com\" here, the service " +"will be available at \"http://example.com:9000\" by default." +msgstr "" diff --git a/debian/templates b/debian/templates index b73dc5e..19c3886 100644 --- a/debian/templates +++ b/debian/templates @@ -1,11 +1,20 @@ Template: etherpad/admin_password Type: password -Default: password -Description: etherpad administration password - Please insert the administration password, default is password. +# Note: the translation of this string should match the prompt below +_Default: password +# Note: the translation of this string should match the default password above +_Description: Etherpad administrator password: + The Etherpad system can be administrated with a browser. To make this + safe, a good password should be set for the administrator. + The default is password is "password" (THIS IS NOT SAFE). Template: etherpad/topdomains Type: string -Default: -Description: Domain name of site - Please insert the domain name of your site. +Default: localhost +_Description: Fully qualified domain name of the site: + The system needs to know the fully qualified domain name of the site where + etherpad system is visible to the world. This may be different from the + name of the system where etherpad is installed (e.g. in case of reverse proxy + or port forwarding). Notice that if you enter "example.com" here, the service + will be available at "http://example.com:9000" by default. + -- cgit v1.2.3 From 26e426cd446067da7ba22eb3307abcf1b98401eb Mon Sep 17 00:00:00 2001 From: Mikko Rantalainen Date: Thu, 6 May 2010 11:21:58 +0300 Subject: Improved packaging building Fixed debian/control and debian/rules to generate architecture independent binary packages as Etherpad does not include machine code (as opposed to virtual machine byte code). Changed the debian source format to "3.0 (native)". --- debian/control | 20 ++++---- debian/rules | 129 ++++++++++++++++++++------------------------------- debian/source/format | 1 + 3 files changed, 61 insertions(+), 89 deletions(-) create mode 100644 debian/source/format (limited to 'debian') diff --git a/debian/control b/debian/control index c6ea8cd..6c99c6f 100644 --- a/debian/control +++ b/debian/control @@ -1,19 +1,19 @@ Source: etherpad -Section: unknown +Section: contrib/httpd Priority: extra Maintainer: Egil Möller -Build-Depends: debhelper (>= 7), dbconfig-common, sun-java6-jdk, mysql-client, libmysql-java, scala (>= 2.7), scala-library (>= 2.7) +Build-Depends: po-debconf, debhelper (>= 7) +Build-Depends-indep: dbconfig-common, sun-java6-jdk, mysql-client, libmysql-java, scala (>= 2.7), scala-library (>= 2.7) Build-Conflicts: libgcj-common, java-gcj-compat-headless, java-gcj-compat, gcj-4.3-base -Standards-Version: 3.8.0 -Homepage: +Standards-Version: 3.8.4 +Homepage: http://github.com/mikkorantalainen/pad Package: etherpad -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, dbconfig-common, sun-java6-jdk, mysql-client, libmysql-java, scala (>= 2.7), mysql-server, m4 -Pre-Depends: dbconfig-common -Description: Etherpad multiuser web-based word processor - EtherPad is the only web-based word processor that allows people to work - together in really real-time. +Architecture: all +Depends: ${misc:Depends}, sun-java6-jdk, mysql-client, libmysql-java, scala (>= 2.7), mysql-server, m4 +Pre-Depends: dbconfig-common, debconf, adduser +Description: A web-based word processor that allows people to work + together in real-time. . When multiple people edit the same document simultaneously, any changes are instantly reflected on everyone's screen. The result is a new and productive diff --git a/debian/rules b/debian/rules index dcbce4e..2c692b1 100755 --- a/debian/rules +++ b/debian/rules @@ -1,87 +1,57 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. +# Sample debian/rules that uses debhelper. +# This file is public domain software, originally written by Joey Hess. # -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. +# This version is for packages that are architecture independent. +# +# Rules to build etherpad # -# Modified to make a template file for a multi-binary package with separated -# build-arch and build-indep targets by Bill Allombert 2001 - # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -# This has to be exported to make some magic below work. -export DH_OPTIONS - - - - - - -configure: configure-stamp -configure-stamp: +build: build-stamp +build-stamp: dh_testdir - # Add here commands to configure the package. - - touch configure-stamp - - -#Architecture -build: build-arch build-indep - -build-arch: build-arch-stamp -build-arch-stamp: configure-stamp - # Add here commands to compile the arch part of the package. + # Add here commands to compile the package. #$(MAKE) bin/build.sh - touch $@ + touch build-stamp -build-indep: build-indep-stamp -build-indep-stamp: configure-stamp - - # Add here commands to compile the indep part of the package. - #$(MAKE) doc - touch $@ - -clean: +clean: + # update template translation strings: + debconf-updatepo dh_testdir dh_testroot - rm -f build-arch-stamp build-indep-stamp configure-stamp + rm -f build-stamp # Add here commands to clean up after the build process. - #git clean -X + #$(MAKE) clean + #$(MAKE) distclean - dh_clean --exclude ./build/apt/.tmp.local/infrastructure/bin/makejar.sh.orig --exclude ./build/apt/.tmp.local/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Decompiler.java.orig --exclude ./build/apt/.tmp.local/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Parser.java.orig --exclude ./build/apt/.tmp.local/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Token.java.orig --exclude ./build/apt/.tmp.local/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/TokenStream.java.orig --exclude ./infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Decompiler.java.orig --exclude ./infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Parser.java.orig --exclude ./infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Token.java.orig --exclude ./infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/TokenStream.java.orig + dh_clean -install: install-indep install-arch -install-indep: +install: build dh_testdir dh_testroot - dh_prep -i --exclude ./build/apt/.tmp.local/infrastructure/bin/makejar.sh.orig --exclude ./build/apt/.tmp.local/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Decompiler.java.orig --exclude ./build/apt/.tmp.local/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Parser.java.orig --exclude ./build/apt/.tmp.local/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Token.java.orig --exclude ./build/apt/.tmp.local/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/TokenStream.java.orig --exclude ./infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Decompiler.java.orig --exclude ./infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Parser.java.orig --exclude ./infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Token.java.orig --exclude ./infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/TokenStream.java.orig - dh_installdirs -i + dh_prep + dh_installdirs + + # Add here commands to install the package into debian/. + #$(MAKE) prefix=`pwd`/debian/`dh_listpackages`/usr install # Add here commands to install the indep part of the package into # debian/-doc. #INSTALLDOC# - dh_install -i - -install-arch: - dh_testdir - dh_testroot - dh_prep -s --exclude ./build/apt/.tmp.local/infrastructure/bin/makejar.sh.orig --exclude ./build/apt/.tmp.local/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Decompiler.java.orig --exclude ./build/apt/.tmp.local/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Parser.java.orig --exclude ./build/apt/.tmp.local/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Token.java.orig --exclude ./build/apt/.tmp.local/infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/TokenStream.java.orig --exclude ./infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Decompiler.java.orig --exclude ./infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Parser.java.orig --exclude ./infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/Token.java.orig --exclude ./infrastructure/yuicompressor/src/yuicompressor/org/mozilla/javascript/TokenStream.java.orig - dh_installdirs -s + mkdir -p debian/etherpad/usr/share/etherpad - # Add here commands to install the arch part of the package into - # debian/tmp. - # $(MAKE) DESTDIR=$(CURDIR)/debian/etherpad install + # try to copy content correctly + cp -a $$(ls | grep -E -v 'debian|LICENSE|COPYING|INSTALL') debian/etherpad/usr/share/etherpad + # fix ups (because the above copy is too dump), remove unneeded stuff + find debian/etherpad -type f -and -name ".gitignore" -exec rm {} + + find debian/etherpad -type f -and -name "build-stamp" -exec rm {} + - mkdir -p debian/etherpad/usr/share/etherpad - cp -a $$(ls | grep -v debian) debian/etherpad/usr/share/etherpad # create directory to save user data mkdir -p debian/etherpad/usr/share/etherpad/etherpad/data @@ -90,52 +60,53 @@ install-arch: ln -s /etc/etherpad debian/etherpad/usr/share/etherpad/etherpad/etc mkdir -p debian/etherpad/var/log/etherpad + mkdir -p debian/etherpad/usr/share/lintian/overrides + cp debian/source/lintian-overrides debian/etherpad/usr/share/lintian/overrides/etherpad - mkdir -p debian/etherpad/etc/init.d - ln -s /usr/share/etherpad/bin/etherpad.init.d debian/etherpad/etc/init.d/etherpad + #mkdir -p debian/etherpad/etc/init.d + #ln -s /usr/share/etherpad/bin/etherpad.init.d debian/etherpad/etc/init.d/etherpad + dh_installinit --update-rcd-params="start 05 2 3 4 5 . stop 95 S 0 1 6 ." + dh_install -i - dh_install -s -# Must not depend on anything. This is to be called by -# binary-arch/binary-indep -# in another 'make' thread. -binary-common: +# Build architecture-independent files here. +binary-indep: build install dh_testdir dh_testroot - dh_installchangelogs + dh_installchangelogs dh_installdocs + # on the fly final copyright file creation: + cat debian/copyright LICENSE > debian/etherpad/usr/share/doc/etherpad/copyright dh_installexamples # dh_installmenu dh_installdebconf # dh_installlogrotate # dh_installemacsen +# dh_installcatalogs # dh_installpam # dh_installmime -# dh_python # dh_installinit # dh_installcron # dh_installinfo +# dh_installwm +# dh_installudev +# dh_lintian +# dh_bugfiles +# dh_undocumented dh_installman dh_link - dh_strip dh_compress dh_fixperms # dh_perl - dh_makeshlibs dh_installdeb - dh_shlibdeps dh_gencontrol dh_md5sums dh_builddeb -# Build architecture independant packages using the common target. -binary-indep: build-indep install-indep - $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common - -# Build architecture dependant packages using the common target. -binary-arch: build-arch install-arch - $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common +# Build architecture-dependent files here. +binary-arch: build install +# We have nothing to do by default. -binary: binary-arch binary-indep -.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) -- cgit v1.2.3 From 6c99f719772806ba81a2748fed44098c4b91f28a Mon Sep 17 00:00:00 2001 From: Mikko Rantalainen Date: Thu, 6 May 2010 11:26:35 +0300 Subject: Added lintian overrides to silent an invalid error and an invalid warning The lintian does not correctly detect the magic shell script that is a scala program in the same time. As a result, lintian will mark this script as invalid because sh -n reports a parse error. However, this is not a real parse error, because the script contains unconditional "exit" before the "error". The template contains default field for default password which should be translated. The field contains notes to translators as a comment but lintian would want to have an extra comment inside the string to translate. The note as a comment should be enough, make lintian silent about this. --- debian/source/lintian-overrides | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 debian/source/lintian-overrides (limited to 'debian') diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides new file mode 100644 index 0000000..31f525d --- /dev/null +++ b/debian/source/lintian-overrides @@ -0,0 +1,8 @@ +# The script infrastructure/ace/bin/serve is really a scala program +# but contains magic to make it as executable shell script (the couple first +# lines in the script will execute scala on itself): +etherpad source: shell-script-fails-syntax-check ./usr/share/etherpad/infrastructure/ace/bin/serve +etherpad binary: shell-script-fails-syntax-check ./usr/share/etherpad/infrastructure/ace/bin/serve +# The template already has a comment for the default field, lintian would +# want to have an extra comment inside the string to translate, I don't agree: +etherpad source: translated-default-field templates: 4 -- cgit v1.2.3 From ad459d28430d59aff1fef00c777fa7f462a872b6 Mon Sep 17 00:00:00 2001 From: Mikko Rantalainen Date: Fri, 7 May 2010 15:52:18 +0300 Subject: Updated Maintainer in debian/control --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 6c99c6f..7544199 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: etherpad Section: contrib/httpd Priority: extra -Maintainer: Egil Möller +Maintainer: Etherpad Foundation Build-Depends: po-debconf, debhelper (>= 7) Build-Depends-indep: dbconfig-common, sun-java6-jdk, mysql-client, libmysql-java, scala (>= 2.7), scala-library (>= 2.7) Build-Conflicts: libgcj-common, java-gcj-compat-headless, java-gcj-compat, gcj-4.3-base -- cgit v1.2.3 From 964580a0f3ca14479ab5c3f7e12f5716e69465a4 Mon Sep 17 00:00:00 2001 From: Mikko Rantalainen Date: Fri, 7 May 2010 15:52:54 +0300 Subject: Refer to http://github.com/ether/pad as source in control and copyright --- debian/control | 2 +- debian/copyright | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 7544199..1689ea7 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Build-Depends: po-debconf, debhelper (>= 7) Build-Depends-indep: dbconfig-common, sun-java6-jdk, mysql-client, libmysql-java, scala (>= 2.7), scala-library (>= 2.7) Build-Conflicts: libgcj-common, java-gcj-compat-headless, java-gcj-compat, gcj-4.3-base Standards-Version: 3.8.4 -Homepage: http://github.com/mikkorantalainen/pad +Homepage: http://github.com/ether/pad Package: etherpad Architecture: all diff --git a/debian/copyright b/debian/copyright index 0ddd16e..2fb4a07 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,7 +1,7 @@ This package was debianized by Egil Möller on Mon, 26 Apr 2010 19:51:51 +0200 and further fixed by Mikko Rantalainen. -It was downloaded from http://github.com/mikkorantalainen/pad +It was downloaded from http://github.com/ether/pad Upstream Author(s): -- cgit v1.2.3 From e6c45eb7884e8845cfa0cf3741f8609771a6b1b9 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Sat, 8 May 2010 23:15:50 +0200 Subject: Bugfix for git-buildpackage and the translation system --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 2c692b1..d1253c7 100755 --- a/debian/rules +++ b/debian/rules @@ -19,8 +19,8 @@ build-stamp: touch build-stamp clean: - # update template translation strings: - debconf-updatepo + # update template translation strings commented out as git-buildpackage complains that the file changes all the times otherwise... + # debconf-updatepo dh_testdir dh_testroot rm -f build-stamp -- cgit v1.2.3 From 70d1f9d6fcaefe611e778b8dbf3bafea8934aa08 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Mon, 10 May 2010 20:02:12 +0200 Subject: Set Maintainer to the correct email --- debian/changelog | 6 ++++++ debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ab34057..a43df1b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +etherpad (1.0.1) karmic; urgency=low + + * Changed maintainer to Packaging + + -- Etherpad Foundation (Packaging) Mon, 10 May 2010 19:22:19 +0200 + etherpad (1.0fixed) karmic; urgency=low * Fixed installation scripts diff --git a/debian/control b/debian/control index 1689ea7..feb76f6 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: etherpad Section: contrib/httpd Priority: extra -Maintainer: Etherpad Foundation +Maintainer: Etherpad Foundation (Packaging) Build-Depends: po-debconf, debhelper (>= 7) Build-Depends-indep: dbconfig-common, sun-java6-jdk, mysql-client, libmysql-java, scala (>= 2.7), scala-library (>= 2.7) Build-Conflicts: libgcj-common, java-gcj-compat-headless, java-gcj-compat, gcj-4.3-base -- cgit v1.2.3