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

[Ian Haywood]

The following commit has been merged in the newmaster branch:
commit ee179e9bd935b46f55395a62b08edd003273d2d2
Author: Ian Haywood <ian at haywood.id.au>
Date:   Fri Jan 3 17:26:36 2014 +1100

    fixes to gb.geom, new log
    experiment with | in gabas3-db-gui dependencies

diff --git a/debian/changelog b/debian/changelog
index 2dabcca..f45fcab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gambas3 (3.5.1-2) UNRELEASED; urgency=low
+
+  * Fix bug in gb.geom
+
+ -- Ian Haywood <ian at haywood.id.au>  Fri, 03 Jan 2014 14:41:15 +1100
+
 gambas3 (3.5.1-1) unstable; urgency=low
 
   [ José L. Redrejo Rodríguez ]
diff --git a/debian/control b/debian/control
index 645388e..fb7a310 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