[Pkg-gambas-commits] [SCM] gambas3 branch, newmaster, updated. upstream/3.4.2-43-g42237ca

[Ian Haywood]

The following commit has been merged in the newmaster branch:
commit 42237caa4e956d2e1e1457cdd4f6ce9c5514ae1f
Author: Ian Haywood <ian at haywood.id.au>
Date:   Sat Jan 4 07:57:13 2014 +1100

    put back use of the | operator as more work needed

diff --git a/debian/control b/debian/control
index fb7a310..645388e 100644
--- a/debian/control
+++ b/debian/control
@@ -287,7 +287,7 @@ Description: Gambas GTK+ OpenGL component
 Package: gambas3-gb-gui
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends}, ${shlibs:Depends}, gambas3-gb-qt4 (>= ${binary:Version}) | gambas3-gb-gtk (>= ${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, gambas3-gb-qt4 (>= ${binary:Version}), gambas3-gb-gtk (>= ${binary:Version})
 Description: Gambas graphical toolkit selector
  Gambas is a free development environment based on a Basic interpreter
  with object extensions, like Visual Basic(tm) (but it is NOT a clone!).
@@ -300,7 +300,7 @@ Description: Gambas graphical toolkit selector
 Package: gambas3-gb-gui-opengl
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends}, ${shlibs:Depends}, gambas3-gb-gui (>= ${binary:Version}), gambas3-gb-gtk-opengl (>= ${binary:Version}) | gambas3-gb-qt4-opengl (>= ${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, gambas3-gb-gui (>= ${binary:Version}), gambas3-gb-gtk-opengl (>= ${binary:Version}), gambas3-gb-qt4-opengl (>= ${binary:Version})
 Description: Gambas OpenGL selector
  Gambas is a free development environment based on a Basic interpreter
  with object extensions, like Visual Basic(tm) (but it is NOT a clone!).

-- 
Gambas 3