[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/4.0.5debian2-2-6-g57803b3

[Thomas Mueller]

The following commit has been merged in the master branch:
commit 57803b349e1d7f9d3ad285c22fadc34a6938a71a
Author: Thomas Mueller <thomas.mueller at tmit.eu>
Date:   Wed Aug 15 13:32:05 2012 +0200

      * New upstream bugfix release 4.0.7
      * debian/patches:
        - Removed patch fix_writing_to_shared_readonly.diff
      * debian/repack.sh:
        - Remove experimental feature 'files_external'

diff --git a/debian/changelog b/debian/changelog
index d74a99a..a522ca9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+owncloud (4.0.7debian-1) UNRELEASED; urgency=low
+
+  * New upstream bugfix release
+  * debian/patches:
+    - Removed patch fix_writing_to_shared_readonly.diff
+  * debian/repack.sh:
+    - Remove experimental feature 'files_external'
+
+ -- Thomas Mueller <thomas.mueller at tmit.eu>  Wed, 15 Aug 2012 12:21:03 +0200
+
 owncloud (4.0.5debian2-2) unstable; urgency=high
 
   * debian/patches:
diff --git a/debian/patches/fix_writing_to_shared_readonly.diff b/debian/patches/fix_writing_to_shared_readonly.diff
deleted file mode 100644
index 4e42a9f..0000000
--- a/debian/patches/fix_writing_to_shared_readonly.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-Origin: upstream, http://gitorious.org/owncloud/owncloud/commit/05648dac619942dfccc76180d30fcd79364355ec
-Author: Michael Gapczynski <mtgap at owncloud.com>
-Bug-Debian: http://bugs.debian.org/684426
-Last-Update: 2012-08-08
-
---- owncloud-4.0.5debian2.orig/apps/files_sharing/sharedstorage.php
-+++ owncloud-4.0.5debian2/apps/files_sharing/sharedstorage.php
-@@ -416,6 +416,25 @@ class OC_Filestorage_Shared extends OC_F
- 	public function fopen($path, $mode) {
- 		$source = $this->getSource($path);
- 		if ($source) {
-+			switch ($mode) {
-+				case 'r+':
-+				case 'rb+':
-+				case 'w+':
-+				case 'wb+':
-+				case 'x+':
-+				case 'xb+':
-+				case 'a+':
-+				case 'ab+':
-+				case 'w':
-+				case 'wb':
-+				case 'x':
-+				case 'xb':
-+				case 'a':
-+				case 'ab':
-+					if (!$this->is_writable($path)) {
-+						return false;
-+					}
-+			}
- 			$storage = OC_Filesystem::getStorage($source);
- 			return $storage->fopen($this->getInternalPath($source), $mode);
- 		}
-
diff --git a/debian/patches/series b/debian/patches/series
index f9e4be2..e933a28 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,4 @@
 fix_tar_require.diff
 fix_sabre_requires.diff
 fix_config.php_mode.diff
-fix_writing_to_shared_readonly.diff
+
diff --git a/debian/repack.sh b/debian/repack.sh
index d8618bf..f961182 100755
--- a/debian/repack.sh
+++ b/debian/repack.sh
@@ -31,8 +31,12 @@ fi
 rm -vfr $UP_BASE/3rdparty/timepicker/css/include
 rm -vfr $UP_BASE/core/js/jquery-1.7.2.min.js
 rm -vfr $UP_BASE/core/js/jquery-ui-1.8.16.custom.min.js
+# following two have incompatible license with Debian
 rm -vfr $UP_BASE/3rdparty/Console/Getopt.php
 rm -vfr $UP_BASE/3rdparty/Crypt_Blowfish
+# remove expermental app: external storage
+rm -vfr $UP_BASE/apps/files_external
+rm -vfr $UP_BASE/3rdparty/smb4php
 ## End
 
 mv "$UP_BASE" "$DIR/$REPACK_DIR"
diff --git a/debian/rules b/debian/rules
index 6f2164b..eda6e8e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,9 +10,6 @@
 override_dh_install:
 	dh_install
 
-	# Remove experimental feature external storage
-	rm -r debian/owncloud/usr/share/owncloud/apps/files_external/
-
 	# Remove redundant license files as it is already captured in debian/copyright.
 	rm debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/LICENSE.md
 	rm debian/owncloud/usr/share/owncloud/3rdparty/fullcalendar/*-LICENSE.txt

-- 
owncloud.git