[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-3' - 3 commits - loolwsd/configure.ac loolwsd/debian

[Tor Lillqvist]

 loolwsd/configure.ac   |    2 +-
 loolwsd/debian/control |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8bca709a2ea98fd538e1e98988c7730b41ac1f2c
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Jul 24 14:31:11 2015 +0300

    Bump version to 1.1.11 after tarball

diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index dfcd79b..a6404fc 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.69])
 
-AC_INIT([loolwsd], [1.1.10], [libreoffice at collabora.com])
+AC_INIT([loolwsd], [1.1.11], [libreoffice at collabora.com])
 
 AM_INIT_AUTOMAKE([1.11 silent-rules])
 
commit e53fa7d6ece3fd94c4410dd0300452c9e3397812
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Jul 24 14:22:29 2015 +0300

    Bump version to 1.1.10 for tarball (and packaging)

diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index d8946ea..dfcd79b 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.69])
 
-AC_INIT([loolwsd], [1.1.9], [libreoffice at collabora.com])
+AC_INIT([loolwsd], [1.1.10], [libreoffice at collabora.com])
 
 AM_INIT_AUTOMAKE([1.11 silent-rules])
 
commit 089ee2c92bbcbb00cba09fb7403d1b4c99532fef
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Jul 24 14:21:49 2015 +0300

    Let's try to have a bit saner dependencies
    
    Surely loolwsd shouldn't depend on dev packages. And libpng12 gets included
    automatically.

diff --git a/loolwsd/debian/control b/loolwsd/debian/control
index 178761f..6a204c7 100644
--- a/loolwsd/debian/control
+++ b/loolwsd/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.2
 Package: loolwsd
 Section: web
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libssl1.0.0, libmysqlclient18, libodbc1, libpng12-0, libxinerama-dev, libcairo2-dev, libgl1-mesa-dev, libcups2-dev, libdbus-glib-1-dev, cpio
+Depends: ${shlibs:Depends}, ${misc:Depends}, libssl1.0.0, libmysqlclient18, libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2, cpio
 Description: LibreOffice On-Line WebSocket Daemon
  LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
  services.