From b9f487fdb7f5b847a7a66a22b96e0cb479fc385e Mon Sep 17 00:00:00 2001
From: Romain Beauxis <toots@rastageeks.org>
Date: Tue, 13 Mar 2007 13:29:56 +0000
Subject: [PATCH] Initial work: * Restarted changelog from scratch * Moved to
experimental * Moved to cdbs * Changed maintainers according to the new team
* Changed installation details, moved all files to /var/lib/roundcube and
made symlinks from and to this place. This way, eveyrthing is contained in
at a unique place * Changed apache.conf accordingly, and commented the alias
section since it can be an issue with servers running multiple sites *
Corrected lintian/linda warnings * Corrected dependencies: php5-myqli does
not exist any more..
---
debian/README.Debian | 5 ---
debian/changelog | 67 ++------------------------------
debian/conf/apache.conf | 21 +++++++++--
debian/config | 2 +-
debian/control | 10 +++--
debian/control.in | 22 +++++++++++
debian/dirs | 3 +-
debian/install | 6 +++
debian/links | 6 +++
debian/po/templates.pot | 6 +--
debian/rules | 84 +++++++++++------------------------------
debian/templates | 2 +-
12 files changed, 89 insertions(+), 145 deletions(-)
delete mode 100644 debian/README.Debian
create mode 100644 debian/control.in
create mode 100644 debian/install
create mode 100644 debian/links
diff --git a/debian/README.Debian b/debian/README.Debian
deleted file mode 100644
index 68f9cfb..0000000
--- a/debian/README.Debian
+++ /dev/null
@@ -1,5 +0,0 @@
-All configuration files are in /etc/roundcube. Logs are in
-/var/log/roundcube and the temporary directory is
-/var/cache/roundcube/temp.
-
- -- Vincent Bernat <bernat@luffy.cx>, Sun, 11 Feb 2007 22:06:48 +0100
diff --git a/debian/changelog b/debian/changelog
index a3d8118..ee3aa73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,66 +1,5 @@
-roundcube (0.1~beta2.2-10) unstable; urgency=low
+roundcube (0.1~beta2.2-1) experimental; urgency=low
- * Depends on PHP pear modules instead of shipping them in the package
-
- -- Vincent Bernat <bernat@luffy.cx> Tue, 6 Mar 2007 20:44:33 +0100
-
-roundcube (0.1~beta2.2-9) unstable; urgency=low
-
- * Licenses clarification in debian/copyright
- * Only keep php5 | php4 in Depends:.
-
- -- Vincent Bernat <bernat@luffy.cx> Mon, 5 Mar 2007 22:31:28 +0100
-
-roundcube (0.1~beta2.2-8) unstable; urgency=low
-
- * Use current locale to guess the language to select
-
- -- Vincent Bernat <bernat@luffy.cx> Sun, 25 Feb 2007 19:43:35 +0100
-
-roundcube (0.1~beta2.2-7) unstable; urgency=low
-
- * Fix language selection
-
- -- Vincent Bernat <bernat@luffy.cx> Sat, 17 Feb 2007 08:14:54 +0100
-
-roundcube (0.1~beta2.2-6) unstable; urgency=low
-
- * Really fix crontab
- * Add language selection
-
- -- Vincent Bernat <bernat@luffy.cx> Sat, 17 Feb 2007 07:51:32 +0100
-
-roundcube (0.1~beta2.2-5) unstable; urgency=low
-
- * Fix crontab
- * Provide roundcube.default
-
- -- Vincent Bernat <bernat@luffy.cx> Fri, 16 Feb 2007 20:40:46 +0100
-
-roundcube (0.1~beta2.2-4) unstable; urgency=low
-
- * Allow to control the expiration of temporary files (following a
- suggestion from Sean Finney)
-
- -- Vincent Bernat <bernat@luffy.cx> Mon, 12 Feb 2007 21:15:32 +0100
-
-roundcube (0.1~beta2.2-3) unstable; urgency=low
-
- * Depends on SQL client to allow dbconfig-common to setup the database
- * Move temp directory to /var/cache/roundcube/temp
-
- -- Vincent Bernat <bernat@luffy.cx> Sun, 11 Feb 2007 21:56:03 +0100
-
-roundcube (0.1~beta2.2-2) unstable; urgency=low
-
- * Delete log files on purge
- * Setup logrotate
-
- -- Vincent Bernat <bernat@luffy.cx> Sun, 11 Feb 2007 09:25:43 +0100
-
-roundcube (0.1~beta2.2-1) unstable; urgency=low
-
- * Initial release (Closes: #333756, #344949)
-
- -- Vincent Bernat <bernat@luffy.cx> Sun, 11 Feb 2007 09:11:02 +0100
+ * Initial release. (Closes: #333756, #344949)
+ -- Romain Beauxis <toots@rastageeks.org> Tue, 13 Mar 2007 13:28:05 +0100
diff --git a/debian/conf/apache.conf b/debian/conf/apache.conf
index c6612ca..9154a86 100644
--- a/debian/conf/apache.conf
+++ b/debian/conf/apache.conf
@@ -1,4 +1,17 @@
-# Define /roundcube alias, this is the default
-<IfModule mod_alias.c>
- Alias /roundcube /usr/share/roundcube
-</IfModule>
+# This alias does not work properly with several hosts on your apache server
+# Uncomment it to use it
+# Alias /roundcube /var/lib/roundcube
+
+<Directory /var/lib/roundcube/>
+ Options +FollowSymLinks
+ AllowOverride All
+ order allow,deny
+ allow from all
+</Directory>
+
+# Protecting basic directories:
+<Directory /var/lib/roundcube/config>
+ Options -FollowSymLinks
+ AllowOverride None
+</Directory>
+
diff --git a/debian/config b/debian/config
index fc5d34b..277866b 100644
--- a/debian/config
+++ b/debian/config
@@ -12,7 +12,7 @@ instd_langs=$(echo /usr/share/roundcube/program/localization/*/messages.inc | \
sed 's+[^ ]*/\([^ ]*\)/messages.inc+\1,+g' | sed 's+,$++')
# Retrieve the old list
db_metaget roundcube/language languages && oldchoices="$RET"
-if [ ! "$oldchoices" -o "$instd_langs" != "$oldchoices" ]; then
+if [ ! "$oldchoices" ] || [ "$instd_langs" != "$oldchoices" ]; then
db_subst roundcube/language languages $instd_langs
db_fset roundcube/language seen false
# Try to guess the locale
diff --git a/debian/control b/debian/control
index 303a3d4..c210237 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,15 @@
Source: roundcube
Section: web
Priority: extra
-Maintainer: Vincent Bernat <bernat@luffy.cx>
-Build-Depends: debhelper (>= 5), po-debconf
+Maintainer: Debian Roundcube Maintainers <pkg-roundcube-maintainers@lists.alioth.debian.org>
+Uploaders: Vincent Bernat <bernat@luffy.cx>, Romain Beauxis <toots@rastageeks.org>
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5)
+Build-Depends-Indep: po-debconf
Standards-Version: 3.7.2
Package: roundcube
Architecture: all
-Depends: dbconfig-common, debconf, apache2 | httpd, php5 | php4, php5-mysql | php5-mysqli | php4-mysql | php5-pgsql | php4-pgsql | php5-sqlite | php4-sqlite, php-db, php-auth, php-net-smtp, php-net-socket, php-mail-mime, ucf, mysql-client | virtual-mysql-client | postgresql-client-8.1 | postgresql-client | sqlite, ${misc:Depends}
+Depends: dbconfig-common, debconf | debconf-2.0, apache2 | httpd, php5 | php4, php5-mysql | php4-mysql | php5-pgsql | php4-pgsql | php5-sqlite | php4-sqlite, php-db, php-auth, php-net-smtp, php-net-socket, php-mail-mime, ucf, mysql-client | virtual-mysql-client | postgresql-client-8.1 | postgresql-client | sqlite, ${misc:Depends}
Suggests: mysql-server | posgresql-server
Description: modern, skinnable, AJAX based webmail solution for IMAP servers
RoundCube Webmail is a browser-based multilingual IMAP client with an
@@ -17,4 +19,4 @@ Description: modern, skinnable, AJAX based webmail solution for IMAP servers
.
The user interface is fully skinnable using XHTML and CSS 2.
.
- Homepage: http://www.roundcube.net/
+ Homepage: http://www.roundcube.net/
diff --git a/debian/control.in b/debian/control.in
new file mode 100644
index 0000000..1260204
--- /dev/null
+++ b/debian/control.in
@@ -0,0 +1,22 @@
+Source: roundcube
+Section: web
+Priority: extra
+Maintainer: Debian Roundcube Maintainers <pkg-roundcube-maintainers@lists.alioth.debian.org>
+Uploaders: Vincent Bernat <bernat@luffy.cx>, Romain Beauxis <toots@rastageeks.org>
+Build-Depends: @cdbs@
+Build-Depends-Indep: po-debconf
+Standards-Version: 3.7.2
+
+Package: roundcube
+Architecture: all
+Depends: dbconfig-common, debconf | debconf-2.0, apache2 | httpd, php5 | php4, php5-mysql | php4-mysql | php5-pgsql | php4-pgsql | php5-sqlite | php4-sqlite, php-db, php-auth, php-net-smtp, php-net-socket, php-mail-mime, ucf, mysql-client | virtual-mysql-client | postgresql-client-8.1 | postgresql-client | sqlite, ${misc:Depends}
+Suggests: mysql-server | posgresql-server
+Description: modern, skinnable, AJAX based webmail solution for IMAP servers
+ RoundCube Webmail is a browser-based multilingual IMAP client with an
+ application-like user interface. It provides full functionality you
+ expect from an e-mail client, including MIME support, address book,
+ folder manipulation and message filters.
+ .
+ The user interface is fully skinnable using XHTML and CSS 2.
+ .
+ Homepage: http://www.roundcube.net/
diff --git a/debian/dirs b/debian/dirs
index d4c0359..c337f5d 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,7 +1,6 @@
usr/share/roundcube
-usr/share/roundcube/config
usr/share/dbconfig-common/data/roundcube/install
etc/roundcube
var/log/roundcube
-var/cache/roundcube/temp
+var/lib/roundcube/config
etc/default
diff --git a/debian/install b/debian/install
new file mode 100644
index 0000000..39d6a41
--- /dev/null
+++ b/debian/install
@@ -0,0 +1,6 @@
+index.php program/ usr/share/roundcube
+skins temp var/lib/roundcube
+debian/conf/* etc/roundcube
+SQL/mysql.initial.sql usr/share/dbconfig-common/data/roundcube/install/mysql
+SQL/postgres.initial.sql usr/share/dbconfig-common/data/roundcube/install/pqsql
+SQL/sqlite.initial.sql usr/share/dbconfig-common/data/roundcube/install/sqlite
diff --git a/debian/links b/debian/links
new file mode 100644
index 0000000..cd4e0b3
--- /dev/null
+++ b/debian/links
@@ -0,0 +1,6 @@
+etc/roundcube/main.inc.php var/lib/roundcube/config/main.inc.php
+etc/roundcube/db.inc.php var/lib/roundcube/config/db.inc.php
+var/lib/roundcube/temp usr/share/roundcube/temp
+var/lib/roundcube/skins usr/share/roundcube/skins
+var/lib/roundcube/config usr/share/roundcube/config
+var/log/roundcube var/lib/roundcube/logs
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index b02147e..beb66a3 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: bernat@luffy.cx\n"
-"POT-Creation-Date: 2007-02-17 07:53+0100\n"
+"Report-Msgid-Bugs-To: pkg-roundcube-maintainers@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2007-03-13 14:16+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -32,7 +32,7 @@ msgstr ""
#. Description
#: ../templates:1002
msgid ""
-"RoundCube supports any web server that php4 does, but this automatic "
+"RoundCube supports any web server that php does, but this automatic "
"configuration process only supports Apache. Please select which apache "
"version you want to configure the RoundCube frontend for."
msgstr ""
diff --git a/debian/rules b/debian/rules
index 2dd606a..02058c1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,66 +1,28 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- touch configure-stamp
+# In order to regenerate 'debian/control' :
+# DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean
+# Then check manually if everything's ok
-
-build: build-stamp
-
-build-stamp: configure-stamp
- dh_testdir
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- install -m 0644 $(CURDIR)/index.php $(CURDIR)/debian/roundcube/usr/share/roundcube
- cp -r $(CURDIR)/program $(CURDIR)/debian/roundcube/usr/share/roundcube
+binary-install/roundcube::
rm -rf $(CURDIR)/debian/roundcube/usr/share/roundcube/program/lib/{Auth,DB,DB.php,Mail,Net,PEAR.php}
- cp -r $(CURDIR)/skins $(CURDIR)/debian/roundcube/usr/share/roundcube
- find $(CURDIR)/debian/roundcube/usr/share/roundcube -type f -print0 | xargs -0 chmod 644
-
- cp $(CURDIR)/config/*.php $(CURDIR)/debian/roundcube/usr/share/roundcube/config
- install -m 0644 $(CURDIR)/debian/conf/apache.conf $(CURDIR)/debian/roundcube/etc/roundcube
- install -m 0640 $(CURDIR)/debian/conf/db.inc.php $(CURDIR)/debian/roundcube/etc/roundcube
- install -m 0640 $(CURDIR)/debian/default $(CURDIR)/debian/roundcube/etc/default/roundcube.default
-
- install -m 0644 $(CURDIR)/SQL/mysql.initial.sql $(CURDIR)/debian/roundcube/usr/share/dbconfig-common/data/roundcube/install/mysql
- install -m 0644 $(CURDIR)/SQL/postgres.initial.sql $(CURDIR)/debian/roundcube/usr/share/dbconfig-common/data/roundcube/install/pgsql
- install -m 0644 $(CURDIR)/SQL/sqlite.initial.sql $(CURDIR)/debian/roundcube/usr/share/dbconfig-common/data/roundcube/install/sqlite
-
-
-binary-indep: build install
-
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs CHANGELOG
- dh_installdocs
- dh_installlogrotate
- dh_install
- dh_installcron
- dh_installdebconf
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+ find debian/roundcube/usr/share/roundcube -maxdepth 1 -mindepth 1 | \
+ while read i; do \
+ dh_link "`echo "$$i" | sed -e s#debian/roundcube/##`" \
+ "`echo "$$i" | sed -e s#debian/roundcube/usr/share/roundcube/#var/lib/roundcube/#`"; \
+ done
+ chmod -x $(CURDIR)/debian/roundcube/usr/share/roundcube/program/include/rcube_mdb2.inc
+ chmod -x $(CURDIR)/debian/roundcube/var/lib/roundcube/skins/default/images/icons/plus.gif
+ chmod -x $(CURDIR)/debian/roundcube/var/lib/roundcube/skins/default/common.css
+ chmod -x $(CURDIR)/debian/roundcube/var/lib/roundcube/skins/default/images/display/loading.gif
+ chmod -x $(CURDIR)/debian/roundcube/var/lib/roundcube/skins/default/images/buttons/up_arrow.png
+ chmod -x $(CURDIR)/debian/roundcube/usr/share/roundcube/program/include/rcube_db.inc
+ chmod -x $(CURDIR)/debian/roundcube/var/lib/roundcube/skins/default/images/buttons/down_arrow.png
+ chmod -x $(CURDIR)/debian/roundcube/var/lib/roundcube/skins/default/googiespell.css
+ chmod -x $(CURDIR)/debian/roundcube/usr/share/dbconfig-common/data/roundcube/install/pqsql/postgres.initial.sql
+ chmod -x $(CURDIR)/debian/roundcube/usr/share/roundcube/program/js/googiespell.js
+
+cleanbuilddir/roundcube::
+ debconf-updatepo
diff --git a/debian/templates b/debian/templates
index 09d74b3..b75b54c 100644
--- a/debian/templates
+++ b/debian/templates
@@ -3,7 +3,7 @@ Type: multiselect
_Choices: apache, apache-ssl, apache-perl, apache2
Default: apache, apache-ssl, apache-perl, apache2
_Description: Webserver Reconfiguration:
- RoundCube supports any web server that php4 does, but this automatic
+ RoundCube supports any web server that php does, but this automatic
configuration process only supports Apache. Please select which
apache version you want to configure the RoundCube frontend for.
--
2.39.5