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

[Ian Haywood]

The following commit has been merged in the newmaster branch:
commit 733688ef1e562002de07229d475ac9f50b5b7535
Merge: 785301dd884b67f8edf12006b5f0dc1d0146c3d9 049756b388a5d60aac1cb7614671963070419500
Author: Ian Haywood <ian at haywood.id.au>
Date:   Sun Feb 16 11:34:59 2014 +1100

    Merge branch 'newmaster' of git://git.debian.org/git/pkg-gambas/gambas3 into newmaster
    
    Conflicts:
    	debian/changelog
    	debian/control

diff --combined debian/changelog
index 143424f,776b81b..9836a53
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,12 +1,19 @@@
 +gambas3 (3.5.2-1) UNRELEASED; urgency=low
 +
 +  * New upstream version
 +  * New packages gb.media, gb.logging, gb.desktop.gnome
 +
 + -- Ian Haywood <ian at haywood.id.au>  Sat, 15 Feb 2014 14:23:48 +1100
 +
- gambas3 (3.5.1-2) UNRELEASED; urgency=low
- 
-   * Fix bug in gb.geom
-   * add SIL font licence to debian/copyright
+ gambas3 (3.5.2-1) unstable; urgency=low
+  
+   * New upstream version
+   * Fix bug in gb.geom (Closes: #731487)
+   * Added SIL font licence to debian/copyright
    * fix permissions on gb.sdl/data/src/_default.bdf
  
   -- Ian Haywood <ian at haywood.id.au>  Fri, 14 Feb 2014 14:41:15 +1100
  
- 
  gambas3 (3.5.1-1) unstable; urgency=low
  
    [ José L. Redrejo Rodríguez ]
diff --combined debian/control
index 516ddaf,06f1834..2ba0308
--- a/debian/control
+++ b/debian/control
@@@ -4,13 -4,13 +4,13 @@@ Priority: optiona
  Homepage: http://gambas.sourceforge.net
  Maintainer: Gambas Debian Maintainers <pkg-gambas-devel at lists.alioth.debian.org> 
  Uploaders: Ian Haywood <ian at haywood.id.au>, David Paleino <dapal at debian.org>, José L. Redrejo Rodríguez <jredrejo at debian.org>
 -Build-Depends: debhelper (>> 7), dh-autoreconf, libpq-dev, libv4l-dev [linux-any], libv4l-dev [kfreebsd-any], libcam-dev [kfreebsd-any], libmysqlclient-dev, libbz2-dev, libglew-dev, libqt4-dev, libqt4-opengl-dev, libcurl4-openssl-dev, libsdl-mixer1.2-dev, libsqlite0-dev, libxml2-dev, libxslt1-dev, kdelibs5-dev, libssl-dev, zlib1g-dev, unixodbc-dev, libsqlite3-dev, libgtk2.0-dev, libxt-dev, pkg-config, mesa-common-dev, libsdl-sound1.2-dev, libsdl-image1.2-dev, libsdl-gfx1.2-dev, libsdl-ttf2.0-dev, libpcre3-dev, libsdl1.2-dev, libjpeg-dev, libpng12-dev, libpoppler-private-dev, libimlib2-dev, librsvg2-dev, bzip2, gettext, libxtst-dev, libffi-dev, libdbus-1-dev, libgnome-keyring-dev, libgtkglext1-dev, linux-libc-dev [linux-any], libc0.1 [kfreebsd-any], libqtwebkit-dev, libgsl0-dev, libncurses5-dev, libtool, libgmime-2.6-dev, llvm-dev (>> 1:3.1) [amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc], libgmp-dev, libopenal-dev, libalure-dev 
 +Build-Depends: debhelper (>> 7), dh-autoreconf, libpq-dev, libv4l-dev [linux-any], libv4l-dev [kfreebsd-any], libcam-dev [kfreebsd-any], libmysqlclient-dev, libbz2-dev, libglew-dev, libqt4-dev, libqt4-opengl-dev, libcurl4-openssl-dev, libsdl-mixer1.2-dev, libsqlite0-dev, libxml2-dev, libxslt1-dev, kdelibs5-dev, libssl-dev, zlib1g-dev, unixodbc-dev, libsqlite3-dev, libgtk2.0-dev, libxt-dev, pkg-config, mesa-common-dev, libsdl-sound1.2-dev, libsdl-image1.2-dev, libsdl-gfx1.2-dev, libsdl-ttf2.0-dev, libpcre3-dev, libsdl1.2-dev, libjpeg-dev, libpng12-dev, libpoppler-private-dev, libimlib2-dev, librsvg2-dev, bzip2, gettext, libxtst-dev, libffi-dev, libdbus-1-dev, libgnome-keyring-dev, libgtkglext1-dev, linux-libc-dev [linux-any], libc0.1 [kfreebsd-any], libqtwebkit-dev, libgsl0-dev, libncurses5-dev, libtool, libgmime-2.6-dev, llvm-dev (>> 1:3.1) [amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc], libgmp-dev, libopenal-dev, libalure-dev, libgstreamer1.0-dev, libgstreamer-plugins-base1.0-dev
- Standards-Version: 3.9.4
+ Standards-Version: 3.9.5
  
  Package: gambas3
  Architecture: all
  Section: devel
 -Depends: ${misc:Depends}, gambas3-gb-cairo (>= ${binary:Version}), gambas3-gb-clipper (>= ${binary:Version}), gambas3-gb-dbus (>= ${binary:Version}), gambas3-examples (>= ${binary:Version}), gambas3-gb-form-stock (>= ${binary:Version}), gambas3-gb-chart (>= ${binary:Version}), gambas3-gb-compress-bzlib2 (>= ${binary:Version}), gambas3-gb-compress-zlib (>= ${binary:Version}), gambas3-gb-crypt (>= ${binary:Version}), gambas3-gb-db-form (>= ${binary:Version}), gambas3-gb-db-mysql (>= ${binary:Version}), gambas3-gb-db-postgresql (>= ${binary:Version}), gambas3-gb-db-odbc (>= ${binary:Version}), gambas3-gb-db-sqlite3 (>= ${binary:Version}) | gambas3-gb-db-sqlite2 (>= ${binary:Version}), gambas3-gb-desktop (>= ${binary:Version}), gambas3-gb-form-dialog (>= ${binary:Version}), gambas3-gb-form-mdi (>= ${binary:Version}), gambas3-gb-gmp (>= ${binary:Version}), gambas3-gb-gui-opengl (>= ${binary:Version}), gambas3-gb-image-effect (>= ${binary:Version}), gambas3-gb-image-imlib (>= ${binary:Version}), gambas3-gb-image-io (>= ${binary:Version}), gambas3-gb-net-curl (>= ${binary:Version}), gambas3-gb-net-smtp (>= ${binary:Version}), gambas3-gb-net-pop3 (>= ${binary:Version}), gambas3-gb-openal (>= ${binary:Version}), gambas3-gb-opengl-glsl (>= ${binary:Version}), gambas3-gb-opengl-glu (>= ${binary:Version}), gambas3-gb-opengl-sge (>= ${binary:Version}), gambas3-gb-openssl (>= ${binary:Version}), gambas3-gb-pcre (>= ${binary:Version}), gambas3-gb-pdf (>= ${binary:Version}), gambas3-gb-qt4-ext (>= ${binary:Version}), gambas3-gb-qt4-webkit (>= ${binary:Version}), gambas3-gb-report (>= ${binary:Version}), gambas3-gb-sdl-sound (>= ${binary:Version}), gambas3-gb-settings (>= ${binary:Version}), gambas3-gb-vb, gambas3-gb-v4l (>= ${binary:Version}), gambas3-gb-web, gambas3-gb-xml-rpc (>= ${binary:Version}), gambas3-gb-xml-xslt (>= ${binary:Version}), gambas3-gb-xml-html (>= ${binary:Version}), gambas3-gb-libxml (>= ${binary:Version}), gambas3-ide (>= ${binary:Version}), gambas3-gb-mysql (>= ${binary:Version}), gambas3-gb-option (>= ${binary:Version}), gambas3-gb-gsl (>= ${binary:Version}), gambas3-gb-ncurses (>= ${binary:Version}), gambas3-gb-complex (>= ${binary:Version}), gambas3-gb-data (>= ${binary:Version}), gambas3-gb-mime (>= ${binary:Version}), gambas3-gb-httpd (>= ${binary:Version}), gambas3-gb-memcached (>= ${binary:Version}), gambas3-gb-args (>= ${binary:Version}), gambas3-gb-map (>= ${binary:Version}), gambas3-gb-jit (>= ${binary:Version})
 +Depends: ${misc:Depends}, gambas3-gb-cairo (>= ${binary:Version}), gambas3-gb-clipper (>= ${binary:Version}), gambas3-gb-dbus (>= ${binary:Version}), gambas3-examples (>= ${binary:Version}), gambas3-gb-form-stock (>= ${binary:Version}), gambas3-gb-chart (>= ${binary:Version}), gambas3-gb-compress-bzlib2 (>= ${binary:Version}), gambas3-gb-compress-zlib (>= ${binary:Version}), gambas3-gb-crypt (>= ${binary:Version}), gambas3-gb-db-form (>= ${binary:Version}), gambas3-gb-db-mysql (>= ${binary:Version}), gambas3-gb-db-postgresql (>= ${binary:Version}), gambas3-gb-db-odbc (>= ${binary:Version}), gambas3-gb-db-sqlite3 (>= ${binary:Version}) | gambas3-gb-db-sqlite2 (>= ${binary:Version}), gambas3-gb-desktop (>= ${binary:Version}), gambas3-gb-form-dialog (>= ${binary:Version}), gambas3-gb-form-mdi (>= ${binary:Version}), gambas3-gb-gmp (>= ${binary:Version}), gambas3-gb-gui-opengl (>= ${binary:Version}), gambas3-gb-image-effect (>= ${binary:Version}), gambas3-gb-image-imlib (>= ${binary:Version}), gambas3-gb-image-io (>= ${binary:Version}), gambas3-gb-net-curl (>= ${binary:Version}), gambas3-gb-net-smtp (>= ${binary:Version}), gambas3-gb-net-pop3 (>= ${binary:Version}), gambas3-gb-openal (>= ${binary:Version}), gambas3-gb-opengl-glsl (>= ${binary:Version}), gambas3-gb-opengl-glu (>= ${binary:Version}), gambas3-gb-opengl-sge (>= ${binary:Version}), gambas3-gb-openssl (>= ${binary:Version}), gambas3-gb-pcre (>= ${binary:Version}), gambas3-gb-pdf (>= ${binary:Version}), gambas3-gb-qt4-ext (>= ${binary:Version}), gambas3-gb-qt4-webkit (>= ${binary:Version}), gambas3-gb-report (>= ${binary:Version}), gambas3-gb-sdl-sound (>= ${binary:Version}), gambas3-gb-settings (>= ${binary:Version}), gambas3-gb-vb, gambas3-gb-v4l (>= ${binary:Version}), gambas3-gb-web, gambas3-gb-xml-rpc (>= ${binary:Version}), gambas3-gb-xml-xslt (>= ${binary:Version}), gambas3-gb-xml-html (>= ${binary:Version}), gambas3-gb-libxml (>= ${binary:Version}), gambas3-ide (>= ${binary:Version}), gambas3-gb-mysql (>= ${binary:Version}), gambas3-gb-option (>= ${binary:Version}), gambas3-gb-gsl (>= ${binary:Version}), gambas3-gb-ncurses (>= ${binary:Version}), gambas3-gb-complex (>= ${binary:Version}), gambas3-gb-data (>= ${binary:Version}), gambas3-gb-mime (>= ${binary:Version}), gambas3-gb-httpd (>= ${binary:Version}), gambas3-gb-memcached (>= ${binary:Version}), gambas3-gb-args (>= ${binary:Version}), gambas3-gb-map (>= ${binary:Version}), gambas3-gb-jit (>= ${binary:Version}), gambas3-gb-desktop-gnome (>= ${binary:Version}), gambas3-gb-media (>= ${binary:Version}), gambas3-gb-logging (>= ${binary:Version})
  Description: Complete visual development environment for Gambas
   Gambas is a free development environment based on a Basic interpreter
   with object extensions, like Visual Basic(tm) (but it is NOT a clone!).
@@@ -816,34 -816,3 +816,34 @@@ Description: Gambas Just-In-Time compil
   with object extensions, like Visual Basic(tm) (but it is NOT a clone!).
   .
   This package provides a Just-In-Time compiler for Gambas.
 +
 +Package: gambas3-gb-media
 +Architecture: any
 +Section: libdevel
 +Depends: ${misc:Depends}, ${shlibs:Depends}
 +Description: Gambas media component
 + Gambas is a free development environment based on a Basic interpreter
 + with object extensions, like Visual Basic(tm) (but it is NOT a clone!).
 + .
 + This package is a simplified interface to the GStreamer library.
 +
 +Package: gambas3-gb-logging
 +Architecture: all
 +Section: libdevel
 +Depends: ${misc:Depends}, gambas3-runtime (>= ${binary:Version})
 +Description: Gambas logging system component
 + Gambas is a free development environment based on a Basic interpreter
 + with object extensions, like Visual Basic(tm) (but it is NOT a clone!).
 + .
 + This package brings a flexible logging system for Gambas applications.
 +
 +
 +Package: gambas3-gb-desktop-gnome
 +Architecture: any
 +Section: libdevel
 +Depends: ${misc:Depends}, ${shlibs:Depends}, gambas3-gb-desktop (>= ${binary:Version})
 +Description: Gambas desktop GNOME component
 + Gambas is a free development environment based on a Basic interpreter
 + with object extensions, like Visual Basic(tm) (but it is NOT a clone!).
 + .
 + This package allow to use gb.desktop components on GNOME desktop.

-- 
Gambas 3