[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/4.0.8debian-1.6-73-g3edb4f3

[David Prévot]

The following commit has been merged in the master branch:
commit 15f7265a958eeb759f38a4332855681768ac0464
Author: David Prévot <taffit at debian.org>
Date:   Tue Apr 2 11:32:18 2013 -0400

    Fix displayed version

diff --git a/debian/changelog b/debian/changelog
index 2ccb64b..6699e86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,7 @@ owncloud (5.0.1+dfsg-1) UNRELEASED; urgency=low
     - Drop unneeded patches
     - fix_mediawiki.diff: Adapt path to mediawi’s classes
     - fix_upgrade.diff: Fix upgrade issue from 4.0.8
+    - fix_displayed_version.diff: Fix displayed version
   * debian/owncloud.links:
     - Link to Zend Framework instead of embedding a partial copy
     - Adapt to updated JQuery UI version
diff --git a/debian/patches/fix_displayed_version.diff b/debian/patches/fix_displayed_version.diff
new file mode 100644
index 0000000..8adcfc3
--- /dev/null
+++ b/debian/patches/fix_displayed_version.diff
@@ -0,0 +1,41 @@
+Description: Fix displayed version
+ Since the update shall be done via a package manager, checking if a
+ new version in the administration is useless, thus checking disabled
+ by default, and displayed version fixed to make it clear that’s a
+ Debian package.
+Author: David Prévot <taffit at debian.org>
+Forwarded: not-needed
+Last-Update: 2013-04-02
+--- a/lib/updater.php
++++ b/lib/updater.php
+@@ -71,7 +71,7 @@
+ 	public static function ShowUpdatingHint() {
+ 		$l = OC_L10N::get('lib');
+ 
+-		if(OC_Config::getValue('updatechecker', true)==true) {
++		if(OC_Config::getValue('updatechecker', false)==true) {
+ 			$data=OC_Updater::check();
+ 			if(isset($data['version']) and $data['version']<>'') {
+ 				$txt='<span style="color:#AA0000; font-weight:bold;">'
+--- a/settings/templates/admin.php
++++ b/settings/templates/admin.php
+@@ -228,7 +228,7 @@
+ 
+ <fieldset class="personalblock">
+ 	<legend><strong><?php p($l->t('Version'));?></strong></legend>
+-	<strong>ownCloud</strong> <?php p(OC_Util::getVersionString()); ?> <?php p(OC_Util::getEditionString()); ?>
++	<strong>ownCloud</strong> @VERSION@ <?php p(OC_Util::getEditionString()); ?>
+ 	(<?php p(OC_Updater::ShowUpdatingHint()); ?>)<br/>
+ 	<?php print_unescaped($l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.')); ?>
+ </fieldset>
+--- a/settings/templates/personal.php
++++ b/settings/templates/personal.php
+@@ -100,7 +100,7 @@
+ 
+ <fieldset class="personalblock">
+ 	<legend><strong><?php p($l->t('Version'));?></strong></legend>
+-	<strong>ownCloud</strong> <?php p(OC_Util::getVersionString()); ?>
++	<strong>ownCloud</strong> @VERSION@
+ 	<?php p(OC_Util::getEditionString()); ?> <br />
+ 	<?php print_unescaped($l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.')); ?>
+ </fieldset>
diff --git a/debian/patches/series b/debian/patches/series
index 4929c78..da0934c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 fix_tar_require.diff
 fix_mediawiki.diff
 fix_upgrade.diff
+fix_displayed_version.diff
diff --git a/debian/rules b/debian/rules
index 6b888ea..467b474 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+VERSION := $(shell head -1 debian/changelog | sed 's/.*(//;s/).*//')
+
 %:
 	dh $@
 
@@ -103,6 +105,11 @@ override_dh_install:
 	# Remove the Updater app since upgrade must be made via the package
 	rm -r debian/owncloud/usr/share/owncloud/apps/updater
 
+	# Fix displayed version
+	sed -i "s/@VERSION@/$(VERSION) (Debian)/" \
+		debian/owncloud/usr/share/owncloud/settings/templates/admin.php \
+		debian/owncloud/usr/share/owncloud/settings/templates/personal.php
+
 override_dh_fixperms:
 	dh_fixperms -X var/lib/owncloud
 	chown www-data:www-data debian/owncloud/etc/owncloud/

-- 
owncloud.git