[Pkg-gambas-commits] [SCM] gambas3 branch, master, updated. debian/2.99.3-1-36-gb2be8f7
José L. Redrejo Rodríguez
jredrejo at debian.org
Thu Sep 5 15:33:18 UTC 2013
The following commit has been merged in the master branch:
commit fd70794f16c1e6789bd682614b5e5c42bb3689b3
Author: José L. Redrejo Rodríguez <jredrejo at debian.org>
Date: Thu Sep 5 17:29:00 2013 +0200
merge changes from Ian Haywood
diff --git a/debian/control b/debian/control
index 00cc329..fac88fa 100644
--- a/debian/control
+++ b/debian/control
@@ -4,13 +4,13 @@ Priority: optional
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, llvm-dev, libgmime-2.6-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]
Standards-Version: 3.9.3
Package: gambas3
Architecture: all
Section: devel
-Depends: ${misc:Depends}, gambas3-gb-cairo (>= ${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-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-opengl-glsl (>= ${binary:Version}), gambas3-gb-opengl-glu (>= ${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})
+Depends: ${misc:Depends}, gambas3-gb-cairo (>= ${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-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-opengl-glsl (>= ${binary:Version}), gambas3-gb-opengl-glu (>= ${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})
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!).
@@ -89,7 +89,7 @@ Description: Gambas compression 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 have the needed base libraries for the rest of compression
+ This package has the needed base libraries for the other compression
components.
Package: gambas3-gb-compress-bzlib2
@@ -207,7 +207,7 @@ Description: Gambas Portland project compatibility 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 provides an access to the Portland project
+ This package provides access to the Portland project
(http://portland.freedesktop.org/wiki/) xdg utilities.
Package: gambas3-gb-form
@@ -218,7 +218,7 @@ Description: Gambas native form 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 is a native Gambas component to serve as base for graphic components.
+ This is a native gambas component to serve as base for graphic components.
Package: gambas3-gb-form-dialog
Architecture: all
@@ -228,7 +228,7 @@ Description: Gambas native mdi form 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 is a native Gambas component that implements the Workspace control.
+ This is a native gambas component that implements the Workspace control.
Package: gambas3-gb-form-mdi
Architecture: all
@@ -238,7 +238,7 @@ Description: Gambas native mdi form 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 is a native Gambas component that implements the Workspace control.
+ This is a native gambas component that implements the Workspace control.
Package: gambas3-gb-gtk
Architecture: any
@@ -258,7 +258,7 @@ Description: Gambas GTK+ OpenGL 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 allows to use the gb.opengl component in GTK+ applications.
+ This package allows you to use the gb.opengl component in GTK+ applications.
Package: gambas3-gb-gui
Architecture: any
@@ -563,8 +563,17 @@ Section: libdevel
Depends: ${misc:Depends}, ${shlibs:Depends}, gambas3-gb-xml (>= ${binary:Version})
Description: Gambas XSLT 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!).
+Package: gambas3-gb-jit
+Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Section: libdevel
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Gambas Just-In-Time compiler 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 provides a Just-In-Time compiler for Gambas.
+ .
This package brings the power of the libxslt libraries to Gambas.
Package: gambas3-gb-xml-html
@@ -749,3 +758,13 @@ Description: Gambas online map viewer
.
This package allowing to display maps from many different sources
(Google Maps, OpenStreetMap).
+
+Package: gambas3-gb-jit
+Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Section: libdevel
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Gambas Just-In-Time compiler 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 provides a Just-In-Time compiler for Gambas.
diff --git a/debian/copyright b/debian/copyright
index a0d6810..bc7c0ad 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -142,7 +142,26 @@ License: LGPL-2.1+
version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1`.
Files: debian/*
-Copyright: 2002-2012, José L. Redrejo Rodríguez <jredrejo at debian.org>
- 2011-2012, Ian Haywood <ian at haywood.id.au>
+Copyright: 2002-2013, José L. Redrejo Rodríguez <jredrejo at debian.org>
+ 2011-2013, Ian Haywood <ian at haywood.id.au>
2011-2012, David Paleino <dapal at debian.org>
+ 2011-2012, Krisztián Kende <nemh at freemail.hu>
License: GPL-2+
+
+Files: gb.gsl/*
+Copyright: 2012, Randall Morgan <rmorgan62 at gmail.com>
+ 2012, Benoît Minisini <gambas at users.sourceforge.net>
+License: GPL-2+
+
+Files: gb.jit/*
+Copyright: 2012, Emil Lenngren <emil.lenngren [at] gmail.com>
+License: GPL-2+
+
+Files: gb.ncurses/*
+Copyright: 2012, Tobias Boege <tobias at gambas-buch.de>
+License: GPL-2+
+
+Files: gb.net.curl/*
+Copyright: 2003-2008, Daniel Campos Fernández <dcamposf at gmail.com>
+License: GPL-2+
+
diff --git a/debian/gambas3.1 b/debian/gambas3.1
index 8c67c8d..05099aa 100644
--- a/debian/gambas3.1
+++ b/debian/gambas3.1
@@ -1,4 +1,4 @@
-.TH "Gambas" "1" "March 2012" "Ubuntu" ""
+.TH "Gambas" "1" "March 2012" "Debian" ""
.SH "NAME"
gambas \- Integrated Development Environment.
diff --git a/debian/gba3.1 b/debian/gba3.1
index 800d698..50ca296 100644
--- a/debian/gba3.1
+++ b/debian/gba3.1
@@ -1,4 +1,4 @@
-.TH "gba3" "1" "March 2012" "Ubuntu" "User Commands"
+.TH "gba3" "1" "March 2012" "Debian" "User Commands"
.SH "NAME"
gba3 \- GAMBAS Archiver
diff --git a/debian/gbc3.1 b/debian/gbc3.1
index eaf24da..9cf3e15 100644
--- a/debian/gbc3.1
+++ b/debian/gbc3.1
@@ -1,4 +1,4 @@
-.TH "gbc3" "1" "March 2012" "Ubuntu" "User Commands"
+.TH "gbc3" "1" "March 2012" "Debian" "User Commands"
.SH "NAME"
gbc3 \- GAMBAS Compiler
@@ -46,6 +46,6 @@ Report bugs to
.SH "COPYRIGHT"
Copyright\(co 2002, 2012 Benoit Minisini <gambas at users.sourceforge.net;
-.PP
+.PP
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/debian/gbi3.1 b/debian/gbi3.1
index 6715350..cec4d4a 100644
--- a/debian/gbi3.1
+++ b/debian/gbi3.1
@@ -1,4 +1,4 @@
-.TH "gbi3" "1" "March 2012" "Ubuntu" "User Commands"
+.TH "gbi3" "1" "March 2012" "Debian" "User Commands"
.SH "NAME"
gbi3 \- GAMBAS Component Informer
diff --git a/debian/gbr3.1 b/debian/gbr3.1
index d25f56a..6241adc 100644
--- a/debian/gbr3.1
+++ b/debian/gbr3.1
@@ -1,4 +1,4 @@
-.TH "gbr3" "1" "March 2012" "Ubuntu" "User Commands"
+.TH "gbr3" "1" "March 2012" "Debian" "User Commands"
.SH "NAME"
gbr3 \- GAMBAS Interpreter
diff --git a/debian/gbs3.1 b/debian/gbs3.1
index 07964c0..e4145dc 100644
--- a/debian/gbs3.1
+++ b/debian/gbs3.1
@@ -1,11 +1,11 @@
-.TH "gbs3" "1" "March 2012" "Ubuntu" "User Commands"
+.TH "gbs3" "1" "July 2012" "Debian" "User Commands"
.SH "NAME"
gbs3 \- GAMBAS Scripter
.SH "SYNOPSIS"
.B gbs3
-[\fIoptions\fR] [<script file>]...
+[\fIoptions\fR] [<script file>]
.SH "DESCRIPTION"
Gambas is a free development environment based on a Basic interpreter with object extensions, like Visual Basic(tm) (but it is NOT a clone!).
@@ -15,15 +15,24 @@ With Gambas, you can quickly design your program GUI, access MySQL or PostgreSQL
.SH "OPTIONS"
.TP
-\fB\-h\fR
-display help and exit
+\fB\-c\fR, \fB\-\-nocache\fR
+force the script compilation (do not check cache)
.TP
-\fB\-V\fR
-display version
+\fB\-v\fR, \fB\-\-verbose\fR
+be verbose
+.TP
+\fB\-V\fR, \fB\-\-version\fR
+display version information and exit
+.TP
+\fB\-L\fR, \fB\-\-license\fR
+display license and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+display this help and exit
.SH "AVAILABILITY"
The latest version of Gambas can always be obtained from
-\fBwww.sourceforge.net\fR or \fBwww.freshmeat.net\fR.
+\fBhttp://gambas.sf.net\fR.
.SH "REPORTING BUGS"
Report bugs to
diff --git a/debian/gbw3.1 b/debian/gbw3.1
index d8608ba..a976176 100644
--- a/debian/gbw3.1
+++ b/debian/gbw3.1
@@ -1,12 +1,11 @@
-.TH "gbw3" "1" "March 2012" "Ubuntu" "User Commands"
+.TH "gbw3" "1" "July 2012" "Debian" "User Commands"
.SH "NAME"
gbx3 \- GAMBAS Web Page Interpeter
.SH "SYNOPSIS"
.B gbw3
-[\fIoptions\fR] [<file>]...
-.br
+[\fIoptions\fR] [<server page file>]
.SH "DESCRIPTION"
@@ -16,12 +15,27 @@ With Gambas, you can quickly design your program GUI, access MySQL or PostgreSQL
\fBgbx3\fR is the interpreter that allows you to execute Gambas Server Pages. Not a lot is known about how to use it.
.SH "OPTIONS"
+.TP
+\fB\-c\fR, \fB\-\-nocache\fR
+force the script compilation (do not check cache)
+.TP
+\fB\-v\fR, \fB\-\-verbose\fR
+be verbose
+.TP
+\fB\-V\fR, \fB\-\-version\fR
+display version information and exit
+.TP
+\fB\-L\fR, \fB\-\-license\fR
+display license and exit
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+display this help and exit
-Options are unknown.
.SH "AVAILABILITY"
The latest version of Gambas can always be obtained from
-\fBwww.sourceforge.net\fR or \fBwww.freshmeat.net\fR.
+\fBhttp://gambas.sf.net\fR.
+
.SH "REPORTING BUGS"
Report bugs to
diff --git a/debian/gbx3.1 b/debian/gbx3.1
index b6790a2..c9a6d65 100644
--- a/debian/gbx3.1
+++ b/debian/gbx3.1
@@ -1,4 +1,4 @@
-.TH "gbx3" "1" "March 2012" "Ubuntu" "User Commands"
+.TH "gbx3" "1" "March 2012" "Debian" "User Commands"
.SH "NAME"
gbx3 \- GAMBAS Interpreter
diff --git a/debian/rules b/debian/rules
index d0d09b8..5dea789 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,10 @@
#!/usr/bin/make -f
export DH_OPTION
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- CFLAGS = -g
-endif
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
configure:
@@ -20,7 +12,7 @@ configure:
config.status: configure
- CFLAGS="$(CFLAGS)" ./configure --host=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) --build=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -C --prefix=/usr --with-sdl-includes=/usr/include/SDL --with-sdl-libraries=/usr/lib --with-libxml-includes=/usr/include/libxml2 --with-xslt-includes=/usr/include/libxslt
+ CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CXXFLAGS="$(CXXFLAGS)" LLVM_CONFIG=/usr/bin/llvm-config ./configure --host=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) --build=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -C --prefix=/usr --with-sdl-includes=/usr/include/SDL --with-sdl-libraries=/usr/lib --with-libxml-includes=/usr/include/libxml2 --with-xslt-includes=/usr/include/libxslt
touch configure-stamp
--
Gambas 3
More information about the Pkg-gambas-commits
mailing list