[Merge] lp:~noskcaj/ubuntu/saucy/spotweb/liberation into lp:ubuntu/spotweb

[Colin Watson]

On Wed, Sep 11, 2013 at 09:26:28PM -0000, Jackson Doak wrote:
> +  * refresh patches to apply cleanly

Please undo this.  They apply just fine according to dpkg-source -x, and
there's no need to carry an additional delta that will probably confuse
people merging the package in future.

> === modified file 'debian/control'
> --- debian/control	2011-12-30 20:21:08 +0000
> +++ debian/control	2013-09-11 21:25:50 +0000
> @@ -14,7 +14,7 @@
>  Depends: ${misc:Depends}, dbconfig-common, ucf, 
>   apache2, libapache2-mod-php5, 
>   php5-mysql, php5-curl, php-net-nntp (>= 1.5.0~rc1), php5-gmp, 
> - php5-gd, ttf-liberation,
> + php5-gd, fonts-liberation,
>   libjs-jquery (>= 1.6.2), libjs-jquery-fancybox, libjs-jquery-cookie,
>   libjs-jquery-mousewheel, libjs-jquery-easing, libjs-jquery-ui (>= 1.8.ooops.14)
>  Recommends: mysql-client, mysql-server
> 

This is the only change that should be in this branch - please undo
everything else.

-- 
https://code.launchpad.net/~noskcaj/ubuntu/saucy/spotweb/liberation/+merge/185168
Your team Ubuntu branches is requested to review the proposed merge of lp:~noskcaj/ubuntu/saucy/spotweb/liberation into lp:ubuntu/spotweb.