[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. upstream/4.0.0-96-g94bbac2

Tue May 22 09:51:09 UTC 2012

The following commit has been merged in the master branch:
commit f1b0ad45f5149462fa5996e33ab1337cd95ef875
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Tue May 22 11:43:23 2012 +0200

    Add owncloud-{mysql,pgsql,sqlite} dependency packages; updated/installed READMEs

diff --git a/debian/changelog b/debian/changelog
index 16742a1..3acb73e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ owncloud (4.0.0-1) UNRELEASED; urgency=low
   * debian/control:
     - Added a depend on libphp-phpmailer.
     - Bumped the libjs-jquery depend to >= 1.7.2-1.
+  * debian/control: add owncloud-{mysql,pgsql,sqlite} dependency packages.
   * debian/copyright, debian/rules: updated for new upstream release.
   * debian/owncloud.postinst: updated to enable Apache's rewrite module.
   * debian/patches:
@@ -19,7 +20,7 @@ owncloud (4.0.0-1) UNRELEASED; urgency=low
       05_adding_jquery_fancyboxbox.diff,
       06_adding_jquery.mousewheel.diff as this is handled upstream now.
     - Added 03_fix_phpmailer.diff to fix the phpmailer require.
-  * debian/README.Debian: added to explain the database setup and virtual
+  * debian/*.README.Debian: added to explain the database setup and virtual
     host stuff.
   * debian/README.source: added to explain the state of the source and how
     it is processed when installing. 
diff --git a/debian/control b/debian/control
index 3997482..eb6772d 100644
--- a/debian/control
+++ b/debian/control
@@ -14,14 +14,43 @@ Package: owncloud
 Architecture: all
 Depends:  ${misc:Depends}, dbconfig-common, debconf | debconf-2.0, ucf,
  apache2 | httpd,
- php5, php-pear, php-xml-parser, php-crypt-blowfish, php-sabredav,
- php-mdb2, php-mdb2-schema, php-mdb2-driver-mysql, php5-gd,
- libphp-phpmailer,
- mysql-client | virtual-mysql-client,
- libjs-jquery-ui, libjs-jquery-jplayer, libjs-jquery (>= 1.7.2-1)
+ php5, php5-gd, php-pear, php-xml-parser, php-crypt-blowfish, php-sabredav,
+ php-mdb2, php-mdb2-schema, libphp-phpmailer,
+ owncloud-mysql (= ${source:Version}) | owncloud-pgsql (= ${source:Version}) | owncloud-sqlite (= ${source:Version}),
+ libjs-jquery (>= 1.7.2-1), libjs-jquery-ui, libjs-jquery-jplayer
+Description: cloud storage for files, music, contacts, calendars and many more
+ ownCloud gives you universal access to your files through a web interface
+ or WebDAV.  It also provides a platform to easily view & sync your
+ contacts, calendars and bookmarks across all your devices and enables
+ basic editing right on the web.
+
+Package: owncloud-mysql
+Architecture: all
+Depends: php-mdb2-driver-mysql,
+ mysql-client | virtual-mysql-client, ${misc:Depends}
 Suggests: mysql-server
-Description: cloud storage for files, music, contracts, calendars and many more
- ownCloud gives you universal access to your files through a web interface or
- WebDAV. It also provides a platform to easily view & sync your contacts,
- calendars and bookmarks across all your devices and enables basic editing
- right on the web.
+Description: meta-package providing MySQL dependencies for ownCloud
+ This package provides MySQL dependencies for ownCloud, a cloud storage
+ application for files, music, contacts, calendars and many more.
+ .
+ Install this package if you wan to use a MySQL database with ownCloud.
+
+Package: owncloud-pgsql
+Architecture: all
+Depends: php-mdb2-driver-pgsql,
+ postgresql-client-8.1 | postgresql-client, ${misc:Depends}
+Suggests: postgresql-server
+Description: meta-package providing PostgreSQL dependencies for ownCloud
+ This package provides PostgreSQL dependencies for ownCloud, a cloud
+ storage application for files, music, contacts, calendars and many more.
+ .
+ Install this package if you wan to use a PostgreSQL database with ownCloud.
+
+Package: owncloud-sqlite
+Architecture: all
+Depends: ${misc:Depends}
+Description: meta-package providing SQLite dependencies for ownCloud
+ This package provides SQLite dependencies for ownCloud, a cloud storage
+ application for files, music, contacts, calendars and many more.
+ .
+ Install this package if you wan to use a SQLite database with ownCloud.
diff --git a/debian/owncloud-mysql.README.Debian b/debian/owncloud-mysql.README.Debian
new file mode 100644
index 0000000..fa490d2
--- /dev/null
+++ b/debian/owncloud-mysql.README.Debian
@@ -0,0 +1,16 @@
+ownCloud for Debian on MySQL
+============================
+
+ownCloud in Debian currently supports MySQL as database backend (as
+default), but the database will not be set automatically (yet); this may be
+added in a later version of the package.
+
+Before going to http://localhost/owncloud after installation, first set up
+an ownCloud MySQL user and empty database in MySQL.  Ensure that the user
+has permissions to modify the database and remember the password!
+
+Once you vist http://localhost/owncloud, the ownCloud setup pages will
+appear; it will ask you for the user/password/database information.
+To be ready for the future when the database will be managed by the Debian
+package, it may be useful to ensure that the name of the MySQL user and
+database is "owncloud".
diff --git a/debian/owncloud-pgsql.README.Debian b/debian/owncloud-pgsql.README.Debian
new file mode 100644
index 0000000..d2166bd
--- /dev/null
+++ b/debian/owncloud-pgsql.README.Debian
@@ -0,0 +1,16 @@
+ownCloud for Debian on PostgreSQL
+=================================
+
+ownCloud in Debian currently supports PostgreSQL as database backend, but
+the database will not be set automatically (yet); this may be added in a
+later version of the package.
+
+Before going to http://localhost/owncloud after installation, first set up
+an ownCloud PosgreSQL user and empty database in PosgreSQL.  Ensure that
+the user has permissions to modify the database and remember the password!
+
+Once you vist http://localhost/owncloud, the ownCloud setup pages will
+appear; it will ask you for the user/password/database information.
+To be ready for the future when the database will be managed by the Debian
+package, it may be useful to ensure that the name of the PostgreSQL user
+and database is "owncloud".
diff --git a/debian/README.Debian b/debian/owncloud.README.Debian
similarity index 59%
rename from debian/README.Debian
rename to debian/owncloud.README.Debian
index 818c4c7..8510c49 100644
--- a/debian/README.Debian
+++ b/debian/owncloud.README.Debian
@@ -1,20 +1,13 @@
 ownCloud for Debian
 ===================
 
-ownCloud in Debian currently only supports MySQL as database backend.
-The database will not be set automatically (yet); this may be added in
-a later version of the package.
-
-Before going to http://localhost/owncloud after installation, first set up
-an ownCloud MySQL user and empty database in MySQL.  Ensure that the user
-has permissions to modify the database and remember the password!
-
-Once you vist http://localhost/owncloud, the ownCloud setup pages will
-appear; it will ask you for the user/password/database information.
-To be ready for the future when the database will be managed by the Debian
-package, it may be useful to ensure that the name of the MySQL user and
-database is "owncloud".
+Database
+--------
 
+ownCloud for Debian supports several databases: MySQL, PostgeSQL, and
+SQLite.  By default MySQL support is installed.  For more information about
+the specific database, please see the README.Debian file in the
+documentation of the owncloud-<database> package.
 
 Running on specific/single virtual host(s)
 ------------------------------------------

-- 
owncloud.git

