[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. upstream/4.0.0-rc-46-g80af4d0

[Thomas Mueller]

The following commit has been merged in the master branch:
commit 80af4d0d91311e4d7ce46d13e8d64c53bf6f8abc
Author: Thomas Mueller <thomas.mueller at tmit.eu>
Date:   Tue May 15 01:01:13 2012 +0200

    fast fix to create the 4.0.0 package

diff --git a/.gitignore b/.gitignore
index 404c322..f5b5463 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,4 @@ debian/files
 debian/owncloud.debhelper.log
 debian/owncloud.substvars
 debian/owncloud/*
-
+debian/owncloud.*.debhelper
diff --git a/debian/TODO b/debian/TODO
index 2d96d9a..8627872 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -12,3 +12,8 @@
 * blame apps/remoteStorage/oauth_ro_auth.php - correct file header
   [done for UC4 - fixed upstream]
 
+AFTER OC4 UPDATE:
+* fix patches
+* Debian has jquery 1.7.1 - OC ships 1.7.2, will it work?
+* lintian reported some new license files
+* lintian is complaining about some php-libs
diff --git a/debian/changelog b/debian/changelog
index a71f59d..d5d49eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+owncloud (4.0.0-1) unstable; urgency=low
+
+  [ Thomas Mueller ]
+  * New upstream release 4.0.0-rc as of May 14th.
+
+  [ Paul van Tilburg ]
+
+ -- Thomas Mueller <thomas.mueller at tmit.eu>  Tue, 15 May 2012 00:42:12 +0200
+
 owncloud (3.0.3-1) unstable; urgency=low
 
   [ Thomas Mueller ]
diff --git a/debian/patches/series b/debian/patches/series
index d60c065..a537d15 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
-01_fix_data_path.diff
-02_fix_crypt.diff
-03_fix_pear_mdb2_missmatch.diff
-05_adding_jquery_fancyboxbox.diff
-06_adding_jquery.mousewheel.diff
+# 01_fix_data_path.diff
+# 02_fix_crypt.diff
+# 03_fix_pear_mdb2_missmatch.diff
+# 05_adding_jquery_fancyboxbox.diff
+# 06_adding_jquery.mousewheel.diff
diff --git a/debian/rules b/debian/rules
index 9d357fd..9bbbc1e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,16 +34,15 @@ override_dh_install:
 	rm debian/owncloud/usr/share/owncloud/apps/contacts/js/LICENSE.jquery.inview
 	rm debian/owncloud/usr/share/owncloud/apps/files_pdfviewer/js/pdfjs/LICENSE
 	rm debian/owncloud/usr/share/owncloud/apps/files_texteditor/js/aceeditor/LICENSE
-	rm debian/owncloud/usr/share/owncloud/apps/media/getID3/license*.txt
+	rm debian/owncloud/usr/share/owncloud/3rdparty/getid3/license*.txt
 	rm debian/owncloud/usr/share/owncloud/settings/img/log\ Icon\ License
 
 	# remove other stuff
 	rm debian/owncloud/usr/share/owncloud/3rdparty/timepicker/releases.txt
-	rm debian/owncloud/usr/share/owncloud/3rdparty/fullcalendar/changelog.txt
-
+	
 	# Remove an unused script and minified JavaScript files.
 	rm debian/owncloud/usr/share/owncloud/l10n/l10n.pl # not really of any useScriptTags
-	rm debian/owncloud/usr/share/owncloud/core/js/jquery-1.6.4.min.js
+	rm debian/owncloud/usr/share/owncloud/core/js/jquery-1.7.2.min.js
 	rm debian/owncloud/usr/share/owncloud/core/js/jquery-ui-1.8.16.custom.min.js
 	rm -rf debian/owncloud/usr/share/owncloud/3rdparty/timepicker/css/include
 	rm debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/README.md

-- 
owncloud.git