[Pkg-owncloud-commits] [owncloud] 56/63: Recommend owncloud-apps

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8.0
in repository owncloud.

commit f15b8239c1f9fe64ef7d1df55798977edcffba5e
Author: David Prévot <taffit at debian.org>
Date:   Wed Aug 19 15:38:59 2015 +0200

    Recommend owncloud-apps
    
    Perform upgrades without disabling apps.
---
 debian/NEWS          | 10 ++++++++++
 debian/README.Debian |  7 +++++++
 debian/control       |  1 +
 debian/postinst      |  2 +-
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/debian/NEWS b/debian/NEWS
index e6088ba..48430de 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,13 @@
+owncloud (8.0.10~dfsg-1) experimental; urgency=medium
+
+  owncloud-apps (now recommended by owncloud), should be installed to
+  ensure smooth upgrades, it depends on all applications that used to
+  be shipped in ownCloud, some of them were even enabled by default.
+  ownCloud will likely show a blank page on the web interface after the
+  upgrade if an application is missing.
+
+ -- David Prévot <taffit at debian.org>  Wed, 19 Aug 2015 16:05:10 +0200
+
 owncloud (5.0.3+dfsg-1) experimental; urgency=low
 
   Upgrade from a previous major revision (4.0) is not supported upstream, and
diff --git a/debian/README.Debian b/debian/README.Debian
index 85be994..7faf13b 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -69,6 +69,13 @@ for the configuration.
 Recommended packages
 ~~~~~~~~~~~~~~~~~~~~
 
+Smooth upgrade:			owncloud-apps
+
+[ Some apps have been removed from ownCloud core, some of them were
+  enabled by default. In order to ensure smooth upgrades and keep
+  the owncloud package feature equivalent, they are now available in
+  their own packages. owncloud-apps depends on all of them. ]
+
 Send mail notification:		exim4 | mail-transport-agent
 
 Some apps, not enabled by default, need the following dependencies:
diff --git a/debian/control b/debian/control
index 65d4ad5..4dadfb0 100644
--- a/debian/control
+++ b/debian/control
@@ -46,6 +46,7 @@ Depends: libjs-handlebars,
          php5-mysql | php5-pgsql | php5-sqlite,
          ${misc:Depends}
 Recommends: exim4 | mail-transport-agent,
+            owncloud-apps (>= 0~8),
             php-aws-sdk (<< 3),
             php-aws-sdk (>= 2.7.27),
             php-dropbox,
diff --git a/debian/postinst b/debian/postinst
index 8aed4b3..b1f343a 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -28,7 +28,7 @@ if [ "$1" = "configure" ] ; then
 	# Update the database on upgrade
 	# Don’t let it fail, since it exits with 3 if no upgrade is necessary
 	if [ -e /etc/owncloud/config.php ] ; then
-		su -s /bin/sh -c "/usr/sbin/occ upgrade" www-data || true
+		su -s /bin/sh -c "/usr/sbin/occ upgrade --no-app-disable" www-data || true
 	fi
 fi
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git