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

[Thomas Müller]

Hi,

hmm jquery 1.7.2 is in unstable for more thant 50 days due.
http://release.debian.org/migration/testing.pl?package=jquery

As we depends on 1.7.2 will this case issues for us regarding May 20th?

Just asking.

Tom

PS:
I couldn't make it yesterday evening but I'll be online tonight.

-- 
Thomas Müller                 E-Mail: thomas.mueller at tmit.eu


Am Dienstag, dem 15.05.2012 um 17:29 schrieb Paul van Tilburg:
> The following commit has been merged in the master branch:
> commit 618337350f5a7015fa1420bb86c567a52304cc68
> Author: Paul van Tilburg <paulvt at debian.org>
> Date:   Tue May 15 17:12:34 2012 +0200
> 
>     Versioned the depend on libjs-jquery
> 
> diff --git a/debian/TODO b/debian/TODO
> index f5bdd68..251fb9c 100644
> --- a/debian/TODO
> +++ b/debian/TODO
> @@ -13,6 +13,6 @@
>    [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 is complaining about some php-libs
> +* refresh/fix/check patches
> +* moodle and ownCloud both ship PHP simpletest, it should probably be
> +  packaged separately
> diff --git a/debian/changelog b/debian/changelog
> index 78b0f41..43b05fc 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -4,7 +4,9 @@ owncloud (4.0.0~rc-1) UNRELEASED; urgency=low
>    * New upstream release 4.0.0-rc as of May 14th.
>  
>    [ Paul van Tilburg ]
> -  * debian/control: added a depend on libphp-phpmailer.
> +  * debian/control:
> +    - Added a depend on libphp-phpmailer.
> +    - Bumped the libjs-jquery depend to >= 1.7.2-1.
>    * debian/copyright, debian/rules: updated for new upstream release.
>  
>   -- Thomas Mueller <thomas.mueller at tmit.eu>  Tue, 15 May 2012 00:42:12 +0200
> diff --git a/debian/control b/debian/control
> index 55b9bfa..5eeca6a 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -18,7 +18,7 @@ Depends:  ${misc:Depends}, dbconfig-common, debconf | debconf-2.0, ucf,
>   php-mdb2, php-mdb2-schema, php-mdb2-driver-mysql,
>   libphp-phpmailer,
>   mysql-client | virtual-mysql-client,
> - libjs-jquery-ui, libjs-jquery-jplayer, libjs-jquery
> + libjs-jquery-ui, libjs-jquery-jplayer, libjs-jquery (>= 1.7.2-1)
>  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
> diff --git a/debian/owncloud.links b/debian/owncloud.links
> index 5f8ea98..c81e6d3 100644
> --- a/debian/owncloud.links
> +++ b/debian/owncloud.links
> @@ -14,7 +14,7 @@ usr/share/owncloud/status.php var/lib/owncloud/status.php
>  etc/owncloud var/lib/owncloud/config
>  etc/owncloud/htaccess var/lib/owncloud/.htaccess
>  
> -usr/share/javascript/jquery/jquery.min.js usr/share/owncloud/core/js/jquery-1.6.4.min.js
> +usr/share/javascript/jquery/jquery.min.js usr/share/owncloud/core/js/jquery-1.7.2.min.js
>  usr/share/javascript/jquery-jplayer/Jplayer.swf usr/share/owncloud/apps/media/js/Jplayer.swf
>  usr/share/javascript/jquery-jplayer/jquery.jplayer.min.js usr/share/owncloud/apps/media/js/jquery.jplayer.min.js
>  usr/share/javascript/jquery-jplayer/add-on usr/share/owncloud/apps/media/js/add-on
> 
> -- 
> owncloud.git
> 
> _______________________________________________
> Pkg-owncloud-commits mailing list
> Pkg-owncloud-commits at lists.alioth.debian.org
> http://lists.alioth.debian.org/mailman/listinfo/pkg-owncloud-commits