- updated to 5.2.9

- removed obsolete format,vapigen-detect,convert-files-to-unicode,openssl patches
- updated java-arch patch
- added db patch (cover db 6.1)
- added -glade subpackage with glade catalog+icons

diff --git a/convert-files-to-unicode.patch b/convert-files-to-unicode.patch
deleted file mode 100644 (file)
index 0d8925c..0000000
--- a/convert-files-to-unicode.patch
+++ /dev/null
@@ -1,846 +0,0 @@
-From 3188779740219cfdd7c7f0c2834001dc071f3e64 Mon Sep 17 00:00:00 2001
-From: Jan Tojnar <jtojnar@gmail.com>
-Date: Sun, 11 Feb 2018 10:28:21 -0500
-Subject: [PATCH] Fix encoding of copyright headers
-
-Some older files contain names in the copyright headers written in
-ISO-8859-1 instead of UTF-8. This breaks with the new glib-mkenums
-which expects a valid UTF-8 file.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=787685
----
- libgda-report/engine/rt-parser.h                           |    2 +-
- libgda-report/gda-report-document-private.h                |    2 +-
- libgda-report/gda-report-document.h                        |    2 +-
- libgda-report/libgda-report.h                              |    2 +-
- libgda-ui/gdaui-easy.h                                     |    2 +-
- libgda-ui/libgda-ui.h                                      |    2 +-
- libgda-xslt/libgda-xslt.h                                  |    2 +-
- libgda/binreloc/gda-binreloc.h                             |    2 +-
- libgda/gda-column.c                                        |    2 +-
- libgda/gda-column.h                                        |    2 +-
- libgda/gda-connection-internal.h                           |    2 +-
- libgda/gda-connection-sqlite.h                             |    2 +-
- libgda/gda-connection.c                                    |    4 ++--
- libgda/gda-connection.h                                    |    2 +-
- libgda/gda-data-model-array.c                              |    2 +-
- libgda/gda-data-model-extra.h                              |    2 +-
- libgda/gda-data-model-iter-extra.h                         |    2 +-
- libgda/gda-data-model.c                                    |    2 +-
- libgda/gda-data-model.h                                    |    2 +-
- libgda/gda-init.c                                          |    2 +-
- libgda/gda-meta-store-extra.h                              |    2 +-
- libgda/gda-meta-struct-private.h                           |    2 +-
- libgda/gda-mutex.h                                         |    2 +-
- libgda/gda-row.c                                           |    2 +-
- libgda/gda-row.h                                           |    4 ++--
- libgda/gda-server-operation-private.h                      |    2 +-
- libgda/gda-server-provider-private.h                       |    2 +-
- libgda/gda-server-provider.c                               |    2 +-
- libgda/gda-util.c                                          |    2 +-
- libgda/gda-util.h                                          |    2 +-
- libgda/libgda-global-variables.h                           |    2 +-
- libgda/libgda.h.in                                         |    4 ++--
- libgda/providers-support/gda-data-select-priv.h            |    2 +-
- libgda/sql-parser/gda-sql-statement.h                      |    2 +-
- libgda/sql-parser/gda-statement-struct-delete.h            |    2 +-
- libgda/sql-parser/gda-statement-struct-unknown.h           |    2 +-
- libgda/sql-parser/gda-statement-struct-util.h              |    2 +-
- libgda/sqlite/gda-sqlite-provider.c                        |    6 +++---
- libgda/sqlite/gda-sqlite-provider.h                        |    2 +-
- libgda/sqlite/gda-sqlite-recordset.c                       |    4 ++--
- libgda/sqlite/gda-sqlite-recordset.h                       |    2 +-
- libgda/sqlite/gda-sqlite-util.c                            |    2 +-
- libgda/sqlite/gda-sqlite.h                                 |    2 +-
- libgda/sqlite/virtual/gda-vconnection-data-model-private.h |    2 +-
- libgda/sqlite/virtual/libgda-virtual.h.in                  |    2 +-
- libgda/thread-wrapper/gda-thread-provider.h                |    2 +-
- providers/bdbsql/libmain.c                                 |    2 +-
- providers/firebird/gda-firebird-recordset.c                |    2 +-
- providers/firebird/gda-firebird.h                          |    2 +-
- providers/jdbc/gda-jdbc.h                                  |    2 +-
- providers/ldap/gda-ldap-provider.c                         |    2 +-
- providers/ldap/gdaprov-data-model-ldap.h                   |    2 +-
- providers/mdb/gda-mdb-provider.c                           |    4 ++--
- providers/mdb/gda-mdb-provider.h                           |    2 +-
- providers/mdb/gda-mdb.h                                    |    2 +-
- providers/mysql/gda-mysql-provider.c                       |    6 +++---
- providers/mysql/gda-mysql-provider.h                       |    2 +-
- providers/mysql/gda-mysql-recordset.c                      |    2 +-
- providers/mysql/gda-mysql-recordset.h                      |    2 +-
- providers/mysql/gda-mysql.h                                |    2 +-
- providers/oracle/gda-oracle-recordset.c                    |    2 +-
- providers/postgres/gda-postgres-provider.c                 |    4 ++--
- providers/postgres/gda-postgres-recordset.c                |    2 +-
- providers/postgres/gda-postgres-recordset.h                |    2 +-
- providers/sqlcipher/libmain.c                              |    2 +-
- providers/sqlite/libmain.c                                 |    2 +-
- tools/browser/dnd.c                                        |    2 +-
- 67 files changed, 77 insertions(+), 77 deletions(-)
-
---- a/libgda-report/engine/rt-parser.h
-+++ b/libgda-report/engine/rt-parser.h
-@@ -1,7 +1,7 @@
- /*
-  * Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
-  * Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
-- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2001 - 2012 Vivien Malerba <malerba@gnome-db.org>
-  * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
-  *
---- a/libgda-report/gda-report-document-private.h
-+++ b/libgda-report/gda-report-document-private.h
-@@ -1,7 +1,7 @@
- /*
-  * Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
-  * Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
-- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
-  * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
-  *
---- a/libgda-report/gda-report-document.h
-+++ b/libgda-report/gda-report-document.h
-@@ -1,6 +1,6 @@
- /*
-  * Copyright (C) 2001 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
-- * Copyright (C) 2002 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2002 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
-  * Copyright (C) 2003 Santi Camps <santi@gnome-db.org>
-  * Copyright (C) 2003 Santi Camps Taltavull <santi@src.gnome.org>
---- a/libgda-report/libgda-report.h
-+++ b/libgda-report/libgda-report.h
-@@ -1,7 +1,7 @@
- /*
-  * Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
-  * Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
-- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
-  * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
-  *
---- a/libgda-ui/gdaui-easy.h
-+++ b/libgda-ui/gdaui-easy.h
-@@ -1,7 +1,7 @@
- /*
-  * Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
-  * Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
-- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
-  * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
-  *
---- a/libgda-ui/libgda-ui.h
-+++ b/libgda-ui/libgda-ui.h
-@@ -1,7 +1,7 @@
- /*
-  * Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
-  * Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
-- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
-  * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
-  *
---- a/libgda-xslt/libgda-xslt.h
-+++ b/libgda-xslt/libgda-xslt.h
-@@ -1,7 +1,7 @@
- /*
-  * Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
-  * Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
-- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
-  * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
-  *
---- a/libgda/binreloc/gda-binreloc.h
-+++ b/libgda/binreloc/gda-binreloc.h
-@@ -1,7 +1,7 @@
- /*
-  * Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
-  * Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
-- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
-  * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
-  *
---- a/libgda/gda-column.c
-+++ b/libgda/gda-column.c
-@@ -1,7 +1,7 @@
- /*
-  * Copyright (C) 2005 Andrew Hill <andru@src.gnome.org>
-  * Copyright (C) 2005 - 2011 Vivien Malerba <malerba@gnome-db.org>
-- * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
-+ * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
-  * Copyright (C) 2007 - 2008 Murray Cumming <murrayc@murrayc.com>
-  * Copyright (C) 2008 Johannes Schmid <johannes.schmid@openismus.com>
-  * Copyright (C) 2008 Przemysław Grzegorczyk <pgrzegorczyk@gmail.com>
---- a/libgda/gda-column.h
-+++ b/libgda/gda-column.h
-@@ -1,6 +1,6 @@
- /*
-  * Copyright (C) 2005 - 2011 Vivien Malerba <malerba@gnome-db.org>
-- * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
-+ * Copyright (C) 2005 Álvaro Peńa <alvaropg@telefonica.net>
-  * Copyright (C) 2008 Przemysław Grzegorczyk <pgrzegorczyk@gmail.com>
-  *
-  * This library is free software; you can redistribute it and/or
---- a/libgda/gda-connection-internal.h
-+++ b/libgda/gda-connection-internal.h
-@@ -1,7 +1,7 @@
- /*
-  * Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
-  * Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
-- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
-  * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
-  *
---- a/libgda/gda-connection-sqlite.h
-+++ b/libgda/gda-connection-sqlite.h
-@@ -1,7 +1,7 @@
- /*
-  * Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
-  * Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
-- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
-  * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
-  *
---- a/libgda/gda-connection.c
-+++ b/libgda/gda-connection.c
-@@ -10,10 +10,10 @@
-  * Copyright (C) 2003 Paisa Seeluangsawat <paisa@users.sf.net>
-  * Copyright (C) 2004 - 2005 Alan Knowles <alank@src.gnome.org>
-  * Copyright (C) 2004 Dani Baeyens <daniel.baeyens@hispalinux.es>
-- * Copyright (C) 2004 José María Casanova Crespo <jmcasanova@igalia.com>
-+ * Copyright (C) 2004 José María Casanova Crespo <jmcasanova@igalia.com>
-  * Copyright (C) 2004 Szalai Ferenc <szferi@einstein.ki.iif.hu>
-  * Copyright (C) 2005 - 2009 Bas Driessen <bas.driessen@xobas.com>
-- * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
-+ * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
-  * Copyright (C) 2006 - 2012 Murray Cumming <murrayc@murrayc.com>
-  * Copyright (C) 2007 Armin Burgmeier <armin@openismus.com>
-  * Copyright (C) 2007 Leonardo Boshell <lb@kmc.com.co>
---- a/libgda/gda-connection.h
-+++ b/libgda/gda-connection.h
-@@ -6,7 +6,7 @@
-  * Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-  * Copyright (C) 2003 Filip Van Raemdonck <mechanix@debian.org>
-  * Copyright (C) 2004 - 2005 Alan Knowles <alank@src.gnome.org>
-- * Copyright (C) 2004 José María Casanova Crespo <jmcasanova@igalia.com>
-+ * Copyright (C) 2004 José María Casanova Crespo <jmcasanova@igalia.com>
-  * Copyright (C) 2005 - 2009 Bas Driessen <bas.driessen@xobas.com>
-  * Copyright (C) 2006 - 2008 Murray Cumming <murrayc@murrayc.com>
-  * Copyright (C) 2007 Leonardo Boshell <lb@kmc.com.co>
---- a/libgda/gda-data-model-array.c
-+++ b/libgda/gda-data-model-array.c
-@@ -6,7 +6,7 @@
-  * Copyright (C) 2004 Szalai Ferenc <szferi@einstein.ki.iif.hu>
-  * Copyright (C) 2005 Bas Driessen <bas.driessen@xobas.com>
-  * Copyright (C) 2005 - 2012 Vivien Malerba <malerba@gnome-db.org>
-- * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
-+ * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
-  * Copyright (C) 2006 - 2008 Murray Cumming <murrayc@murrayc.com>
-  * Copyright (C) 2008 Phil Longstaff <plongstaff@rogers.com>
-  * Copyright (C) 2008 Przemysław Grzegorczyk <pgrzegorczyk@gmail.com>
---- a/libgda/gda-data-model-extra.h
-+++ b/libgda/gda-data-model-extra.h
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2001 - 2003 Rodrigo Moya <rodrigo@gnome-db.org>
-  * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
-  * Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <gonzalo@gnome-db.org>
---- a/libgda/gda-data-model-iter-extra.h
-+++ b/libgda/gda-data-model-iter-extra.h
-@@ -1,7 +1,7 @@
- /*
-  * Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
-  * Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
-- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
-  * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
-  *
---- a/libgda/gda-data-model.c
-+++ b/libgda/gda-data-model.c
-@@ -7,7 +7,7 @@
-  * Copyright (C) 2003 Philippe CHARLIER <p.charlier@chello.be>
-  * Copyright (C) 2004 Dani Baeyens <daniel.baeyens@hispalinux.es>
-  * Copyright (C) 2004 Szalai Ferenc <szferi@einstein.ki.iif.hu>
-- * Copyright (C) 2004 - 2005 Álvaro Peña <alvaropg@telefonica.net>
-+ * Copyright (C) 2004 - 2005 Álvaro Peña <alvaropg@telefonica.net>
-  * Copyright (C) 2005 - 2009 Bas Driessen <bas.driessen@xobas.com>
-  * Copyright (C) 2005 Dan Winship <danw@src.gnome.org>
-  * Copyright (C) 2005 Stanislav Brabec <sbrabec@suse.de>
---- a/libgda/gda-data-model.h
-+++ b/libgda/gda-data-model.h
-@@ -4,7 +4,7 @@
-  * Copyright (C) 2003 Laurent Sansonetti <lrz@gnome.org>
-  * Copyright (C) 2005 Dan Winship <danw@src.gnome.org>
-  * Copyright (C) 2005 - 2012 Vivien Malerba <malerba@gnome-db.org>
-- * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
-+ * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
-  * Copyright (C) 2007 Murray Cumming <murrayc@murrayc.com>
-  * Copyright (C) 2011 Daniel Espinosa <despinosa@src.gnome.org>
-  *
---- a/libgda/gda-init.c
-+++ b/libgda/gda-init.c
-@@ -1,7 +1,7 @@
- /*
-  * Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
-  * Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
-- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
-  * Copyright (C) 2002 Andrew Hill <andru@src.gnome.org>
-  * Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <gonzalo@gnome-db.org>
---- a/libgda/gda-meta-store-extra.h
-+++ b/libgda/gda-meta-store-extra.h
-@@ -1,7 +1,7 @@
- /*
-  * Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
-  * Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
-- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
-  * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
-  *
---- a/libgda/gda-meta-struct-private.h
-+++ b/libgda/gda-meta-struct-private.h
-@@ -1,7 +1,7 @@
- /*
-  * Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
-  * Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
-- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
-  * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
-  *
---- a/libgda/gda-mutex.h
-+++ b/libgda/gda-mutex.h
-@@ -1,7 +1,7 @@
- /*
-  * Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
-  * Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
-- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2001 - 2013 Vivien Malerba <malerba@gnome-db.org>
-  * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
-  *
---- a/libgda/gda-row.c
-+++ b/libgda/gda-row.c
-@@ -4,7 +4,7 @@
-  * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@gnome-db.org>
-  * Copyright (C) 2003 Laurent Sansonetti <laurent@datarescue.be>
-  * Copyright (C) 2003 Paisa Seeluangsawat <paisa@users.sf.net>
-- * Copyright (C) 2003 Xabier Rodríguez Calvar <xrcalvar@igalia.com>
-+ * Copyright (C) 2003 Xabier Rodríguez Calvar <xrcalvar@igalia.com>
-  * Copyright (C) 2004 Paisa  Seeluangsawat <paisa@users.sf.net>
-  * Copyright (C) 2004 Szalai Ferenc <szferi@einstein.ki.iif.hu>
-  * Copyright (C) 2005 - 2011 Vivien Malerba <malerba@gnome-db.org>
---- a/libgda/gda-row.h
-+++ b/libgda/gda-row.h
-@@ -3,10 +3,10 @@
-  * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
-  * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@gnome-db.org>
-  * Copyright (C) 2003 Laurent Sansonetti <laurent@datarescue.be>
-- * Copyright (C) 2003 Xabier Rodríguez Calvar <xrcalvar@igalia.com>
-+ * Copyright (C) 2003 Xabier Rodríguez Calvar <xrcalvar@igalia.com>
-  * Copyright (C) 2004 Paisa  Seeluangsawat <paisa@users.sf.net>
-  * Copyright (C) 2005 Bas Driessen <bas.driessen@xobas.com>
-- * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
-+ * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
-  *
-  * This library is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU Lesser General Public
---- a/libgda/gda-server-operation-private.h
-+++ b/libgda/gda-server-operation-private.h
-@@ -1,7 +1,7 @@
- /*
-  * Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
-  * Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
-- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
-  * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
-  *
---- a/libgda/gda-server-provider-private.h
-+++ b/libgda/gda-server-provider-private.h
-@@ -1,7 +1,7 @@
- /*
-  * Copyright (C) 2005 Dan Winship <danw@src.gnome.org>
-  * Copyright (C) 2005 - 2011 Vivien Malerba <malerba@gnome-db.org>
-- * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
-+ * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
-  * Copyright (C) 2007 Murray Cumming <murrayc@murrayc.com>
-  *
-  * This library is free software; you can redistribute it and/or
---- a/libgda/gda-server-provider.c
-+++ b/libgda/gda-server-provider.c
-@@ -8,7 +8,7 @@
-  * Copyright (C) 2004 Julio M. Merino Vidal <jmmv@menta.net>
-  * Copyright (C) 2005 - 2006 Bas Driessen <bas.driessen@xobas.com>
-  * Copyright (C) 2005 - 2011 Vivien Malerba <malerba@gnome-db.org>
-- * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
-+ * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
-  * Copyright (C) 2007 Armin Burgmeier <armin@openismus.com>
-  * Copyright (C) 2008 Murray Cumming <murrayc@murrayc.com>
-  * Copyright (C) 2008 Przemysław Grzegorczyk <pgrzegorczyk@gmail.com>
---- a/libgda/gda-util.c
-+++ b/libgda/gda-util.c
-@@ -4,7 +4,7 @@
-  * Copyright (C) 2003 - 2004 Laurent Sansonetti <lrz@gnome.org>
-  * Copyright (C) 2003 Paisa Seeluangsawat <paisa@users.sf.net>
-  * Copyright (C) 2004 Caolan McNamara <caolanm@redhat.com>
-- * Copyright (C) 2004 Jürg Billeter <j@bitron.ch>
-+ * Copyright (C) 2004 Jürg Billeter <j@bitron.ch>
-  * Copyright (C) 2004 - 2011 Murray Cumming <murrayc@murrayc.com>
-  * Copyright (C) 2005 - 2013 Vivien Malerba <malerba@gnome-db.org>
-  * Copyright (C) 2007 - 2009 Armin Burgmeier <armin@openismus.com>
---- a/libgda/gda-util.h
-+++ b/libgda/gda-util.h
-@@ -1,7 +1,7 @@
- /*
-  * Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
-  * Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
-- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2001 - 2013 Vivien Malerba <malerba@gnome-db.org>
-  * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
-  * Copyright (C) 2006 - 2007 Murray Cumming <murrayc@murrayc.com>
---- a/libgda/libgda-global-variables.h
-+++ b/libgda/libgda-global-variables.h
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2001 - 2003 Rodrigo Moya <rodrigo@gnome-db.org>
-  * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
-  * Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <gonzalo@gnome-db.org>
---- a/libgda/libgda.h.in
-+++ b/libgda/libgda.h.in
-@@ -1,14 +1,14 @@
- /*
-  * Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
-  * Copyright (C) 2000 - 2004 Rodrigo Moya <rodrigo@gnome-db.org>
-- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
-  * Copyright (C) 2002 Andrew Hill <andru@src.gnome.org>
-  * Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-  * Copyright (C) 2003 - 2006 Murray Cumming <murrayc@murrayc.com>
-  * Copyright (C) 2004 Szalai Ferenc <szferi@einstein.ki.iif.hu>
-  * Copyright (C) 2005 Bas Driessen <bas.driessen@xobas.com>
-- * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
-+ * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
-  *
-  * This library is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU Lesser General Public
---- a/libgda/providers-support/gda-data-select-priv.h
-+++ b/libgda/providers-support/gda-data-select-priv.h
-@@ -1,7 +1,7 @@
- /*
-  * Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
-  * Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
-- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
-  * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
-  *
---- a/libgda/sql-parser/gda-sql-statement.h
-+++ b/libgda/sql-parser/gda-sql-statement.h
-@@ -1,7 +1,7 @@
- /*
-  * Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
-  * Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
-- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
-  * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
-  * Copyright (C) 2011 Murray Cumming <murrayc@murrayc.com>
---- a/libgda/sql-parser/gda-statement-struct-delete.h
-+++ b/libgda/sql-parser/gda-statement-struct-delete.h
-@@ -1,7 +1,7 @@
- /*
-  * Copyright (C) 2005 Dan Winship <danw@src.gnome.org>
-  * Copyright (C) 2005 - 2011 Vivien Malerba <malerba@gnome-db.org>
-- * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
-+ * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
-  * Copyright (C) 2007 Armin Burgmeier <armin@openismus.com>
-  * Copyright (C) 2007 - 2009 Murray Cumming <murrayc@murrayc.com>
-  *
---- a/libgda/sql-parser/gda-statement-struct-unknown.h
-+++ b/libgda/sql-parser/gda-statement-struct-unknown.h
-@@ -1,7 +1,7 @@
- /*
-  * Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
-  * Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
-- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
-  * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
-  * Copyright (C) 2009 Murray Cumming <murrayc@murrayc.com>
---- a/libgda/sql-parser/gda-statement-struct-util.h
-+++ b/libgda/sql-parser/gda-statement-struct-util.h
-@@ -1,7 +1,7 @@
- /*
-  * Copyright (C) 2005 Dan Winship <danw@src.gnome.org>
-  * Copyright (C) 2005 - 2011 Vivien Malerba <malerba@gnome-db.org>
-- * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
-+ * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
-  * Copyright (C) 2007 - 2009 Murray Cumming <murrayc@murrayc.com>
-  *
-  * This library is free software; you can redistribute it and/or
---- a/libgda/sqlite/gda-sqlite-provider.c
-+++ b/libgda/sqlite/gda-sqlite-provider.c
-@@ -1,15 +1,15 @@
- /*
-- * Copyright (C) 2001 - 2002 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2001 - 2002 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2001 - 2003 Rodrigo Moya <rodrigo@gnome-db.org>
-  * Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
-  * Copyright (C) 2004 Benjamin Otte <in7y118@public.uni-hamburg.de>
-  * Copyright (C) 2004 J.H.M. Dassen (Ray) <jdassen@debian.org>
-  * Copyright (C) 2004 Julio M. Merino Vidal <jmmv@menta.net>
-- * Copyright (C) 2004 Jürg Billeter <j@bitron.ch>
-+ * Copyright (C) 2004 Jürg Billeter <j@bitron.ch>
-  * Copyright (C) 2004 Nikolai Weibull <ruby-gnome2-devel-en-list@pcppopper.org>
-  * Copyright (C) 2005 Denis Fortin <denis.fortin@free.fr>
-  * Copyright (C) 2005 - 2013 Vivien Malerba <malerba@gnome-db.org>
-- * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
-+ * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
-  * Copyright (C) 2008 - 2009 Bas Driessen <bas.driessen@xobas.com>
-  * Copyright (C) 2008 - 2011 Murray Cumming <murrayc@murrayc.com>
-  * Copyright (C) 2009 Armin Burgmeier <armin@openismus.com>
---- a/libgda/sqlite/gda-sqlite-provider.h
-+++ b/libgda/sqlite/gda-sqlite-provider.h
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (C) 2001 - 2002 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2001 - 2002 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
-  * Copyright (C) 2002 Rodrigo Moya <rodrigo@gnome-db.org>
-  * Copyright (C) 2007 - 2011 Vivien Malerba <malerba@gnome-db.org>
---- a/libgda/sqlite/gda-sqlite-recordset.c
-+++ b/libgda/sqlite/gda-sqlite-recordset.c
-@@ -1,10 +1,10 @@
- /*
-- * Copyright (C) 2001 - 2002 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2001 - 2002 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
-  * Copyright (C) 2002 - 2005 Rodrigo Moya <rodrigo@gnome-db.org>
-  * Copyright (C) 2005 Denis Fortin <denis.fortin@free.fr>
-  * Copyright (C) 2005 - 2013 Vivien Malerba <malerba@gnome-db.org>
-- * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
-+ * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
-  * Copyright (C) 2006 - 2008 Murray Cumming <murrayc@murrayc.com>
-  * Copyright (C) 2007 Armin Burgmeier <arminb@src.gnome.org>
-  * Copyright (C) 2009 Bas Driessen <bas.driessen@xobas.com>
---- a/libgda/sqlite/gda-sqlite-recordset.h
-+++ b/libgda/sqlite/gda-sqlite-recordset.h
-@@ -1,7 +1,7 @@
- /*
-  * Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
-  * Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
-- * Copyright (C) 2001 - 2002 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2001 - 2002 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
-  * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
-  *
---- a/libgda/sqlite/gda-sqlite-util.c
-+++ b/libgda/sqlite/gda-sqlite-util.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (C) 2001 - 2002 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2001 - 2002 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2001 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
-  * Copyright (C) 2001 - 2012 Vivien Malerba <malerba@gnome-db.org>
-  * Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
---- a/libgda/sqlite/gda-sqlite.h
-+++ b/libgda/sqlite/gda-sqlite.h
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (C) 2001 - 2002 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2001 - 2002 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2001 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
-  * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
-  * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
---- a/libgda/sqlite/virtual/gda-vconnection-data-model-private.h
-+++ b/libgda/sqlite/virtual/gda-vconnection-data-model-private.h
-@@ -1,7 +1,7 @@
- /*
-  * Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
-  * Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
-- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2001 - 2012 Vivien Malerba <malerba@gnome-db.org>
-  * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
-  *
---- a/libgda/sqlite/virtual/libgda-virtual.h.in
-+++ b/libgda/sqlite/virtual/libgda-virtual.h.in
-@@ -1,7 +1,7 @@
- /*
-  * Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
-  * Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
-- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
-  * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
-  *
---- a/libgda/thread-wrapper/gda-thread-provider.h
-+++ b/libgda/thread-wrapper/gda-thread-provider.h
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (C) 2001 - 2002 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2001 - 2002 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
-  * Copyright (C) 2002 Rodrigo Moya <rodrigo@gnome-db.org>
-  * Copyright (C) 2007 - 2011 Vivien Malerba <malerba@gnome-db.org>
---- a/providers/bdbsql/libmain.c
-+++ b/providers/bdbsql/libmain.c
-@@ -1,7 +1,7 @@
- /*
-  * Copyright (C) 2001 - 2002 Gonzalo Paniagua Javier <gonzalo@gnome-db.org>
-  * Copyright (C) 2001 - 2004 Rodrigo Moya <rodrigo@gnome-db.org>
-- * Copyright (C) 2002 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2002 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2005 Bas Driessen <bas.driessen@xobas.com>
-  * Copyright (C) 2005 Stanislav Brabec <sbrabec@suse.de>
-  * Copyright (C) 2005 - 2011 Vivien Malerba <malerba@gnome-db.org>
---- a/providers/firebird/gda-firebird-recordset.c
-+++ b/providers/firebird/gda-firebird-recordset.c
-@@ -4,7 +4,7 @@
-  * Copyright (C) 2004 Jeronimo Albi <jeronimoalbi@yahoo.com.ar>
-  * Copyright (C) 2004 - 2012 Vivien Malerba <malerba@gnome-db.org>
-  * Copyright (C) 2005 Christopher Taylor <christophth@tiscali.it>
-- * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
-+ * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
-  * Copyright (C) 2009 Bas Driessen <bas.driessen@xobas.com>
-  *
-  * This library is free software; you can redistribute it and/or
---- a/providers/firebird/gda-firebird.h
-+++ b/providers/firebird/gda-firebird.h
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2001 - 2003 Rodrigo Moya <rodrigo@gnome-db.org>
-  * Copyright (C) 2001 - 2012 Vivien Malerba <malerba@gnome-db.org>
-  * Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <gonzalo@gnome-db.org>
---- a/providers/jdbc/gda-jdbc.h
-+++ b/providers/jdbc/gda-jdbc.h
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2001 - 2003 Rodrigo Moya <rodrigo@gnome-db.org>
-  * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
-  * Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <gonzalo@gnome-db.org>
---- a/providers/ldap/gda-ldap-provider.c
-+++ b/providers/ldap/gda-ldap-provider.c
-@@ -4,7 +4,7 @@
-  * Copyright (C) 2003 Gonzalo Paniagua Javier <gonzalo@gnome-db.org>
-  * Copyright (C) 2003 Rodrigo Moya <rodrigo@gnome-db.org>
-  * Copyright (C) 2004 Julio M. Merino Vidal <jmmv@menta.net>
-- * Copyright (C) 2004 Jürg Billeter <j@bitron.ch>
-+ * Copyright (C) 2004 Jürg Billeter <j@bitron.ch>
-  * Copyright (C) 2004 Szalai Ferenc <szferi@einstein.ki.iif.hu>
-  * Copyright (C) 2005 - 2012 Vivien Malerba <malerba@gnome-db.org>
-  *
---- a/providers/ldap/gdaprov-data-model-ldap.h
-+++ b/providers/ldap/gdaprov-data-model-ldap.h
-@@ -1,7 +1,7 @@
- /*
-  * Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
-  * Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
-- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
-  * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
-  *
---- a/providers/mdb/gda-mdb-provider.c
-+++ b/providers/mdb/gda-mdb-provider.c
-@@ -4,9 +4,9 @@
-  * Copyright (C) 2003 Filip Van Raemdonck <mechanix@debian.org>
-  * Copyright (C) 2003 Gonzalo Paniagua Javier <gonzalo@gnome-db.org>
-  * Copyright (C) 2004 Julio M. Merino Vidal <jmmv@menta.net>
-- * Copyright (C) 2004 Jürg Billeter <j@bitron.ch>
-+ * Copyright (C) 2004 Jürg Billeter <j@bitron.ch>
-  * Copyright (C) 2005 - 2012 Vivien Malerba <malerba@gnome-db.org>
-- * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
-+ * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
-  * Copyright (C) 2006 - 2007 Murray Cumming <murrayc@murrayc.com>
-  * Copyright (C) 2007 yselkowitz <yselkowitz@users.sourceforge.net>
-  *
---- a/providers/mdb/gda-mdb-provider.h
-+++ b/providers/mdb/gda-mdb-provider.h
-@@ -1,7 +1,7 @@
- /*
-  * Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
-  * Copyright (C) 2000 - 2003 Rodrigo Moya <rodrigo@gnome-db.org>
-- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
-  * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
-  *
---- a/providers/mdb/gda-mdb.h
-+++ b/providers/mdb/gda-mdb.h
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2001 - 2003 Rodrigo Moya <rodrigo@gnome-db.org>
-  * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
-  * Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <gonzalo@gnome-db.org>
---- a/providers/mysql/gda-mysql-provider.c
-+++ b/providers/mysql/gda-mysql-provider.c
-@@ -3,17 +3,17 @@
-  * Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-  * Copyright (C) 2002 Holger Thon <holger.thon@gnome-db.org>
-  * Copyright (C) 2002 Zbigniew Chyla <cyba@gnome.pl>
-- * Copyright (C) 2002   Cleber Rodrigues <cleber@gnome-db.org>
-+ * Copyright (C) 2002 Cleber Rodrigues <cleber@gnome-db.org>
-  * Copyright (C) 2003 Akira TAGOH <tagoh@gnome-db.org>
-  * Copyright (C) 2003 Paisa Seeluangsawat <paisa@users.sf.net>
-  * Copyright (C) 2004 - 2005 Alan Knowles <alan@akbkhome.com>
-  * Copyright (C) 2004 Caolan McNamara <caolanm@redhat.com>
-  * Copyright (C) 2004 Julio M. Merino Vidal <jmmv@menta.net>
-- * Copyright (C) 2004 Jürg Billeter <j@bitron.ch>
-+ * Copyright (C) 2004 Jürg Billeter <j@bitron.ch>
-  * Copyright (C) 2004 Szalai Ferenc <szferi@einstein.ki.iif.hu>
-  * Copyright (C) 2005 - 2009 Bas Driessen <bas.driessen@xobas.com>
-  * Copyright (C) 2005 - 2013 Vivien Malerba <malerba@gnome-db.org>
-- * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
-+ * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
-  * Copyright (C) 2007 Armin Burgmeier <armin@openismus.com>
-  * Copyright (C) 2007 - 2011 Murray Cumming <murrayc@murrayc.com>
-  *
---- a/providers/mysql/gda-mysql-provider.h
-+++ b/providers/mysql/gda-mysql-provider.h
-@@ -1,7 +1,7 @@
- /*
-  * Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
-  * Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
-- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
-  * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
-  * Copyright (C) 2005 Alan Knowles <alan@akbkhome.com>
---- a/providers/mysql/gda-mysql-recordset.c
-+++ b/providers/mysql/gda-mysql-recordset.c
-@@ -11,7 +11,7 @@
-  * Copyright (C) 2005 Alan Knowles <alan@akbkhome.com>
-  * Copyright (C) 2005 - 2009 Bas Driessen <bas.driessen@xobas.com>
-  * Copyright (C) 2005 Mike Fisk <mfisk@woozle.org>
-- * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
-+ * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
-  * Copyright (C) 2011 Murray Cumming <murrayc@murrayc.com>
-  *
-  * This library is free software; you can redistribute it and/or
---- a/providers/mysql/gda-mysql-recordset.h
-+++ b/providers/mysql/gda-mysql-recordset.h
-@@ -1,7 +1,7 @@
- /*
-  * Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
-  * Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
-- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
-  * Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <gonzalo@ximian.com>
-  * Copyright (C) 2005 Bas Driessen <bas.driessen@xobas.com>
---- a/providers/mysql/gda-mysql.h
-+++ b/providers/mysql/gda-mysql.h
-@@ -1,7 +1,7 @@
- /*
-  * Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
-  * Copyright (C) 2000 - 2004 Rodrigo Moya <rodrigo@gnome-db.org>
-- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
-  * Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
-  * Copyright (C) 2005 Alan Knowles <alan@akbkhome.com>
---- a/providers/oracle/gda-oracle-recordset.c
-+++ b/providers/oracle/gda-oracle-recordset.c
-@@ -6,7 +6,7 @@
-  * Copyright (C) 2003 Laurent Sansonetti <lrz@gnome.org>
-  * Copyright (C) 2003 Steve Fosdick <fozzy@src.gnome.org>
-  * Copyright (C) 2005 - 2011 Vivien Malerba <malerba@gnome-db.org>
-- * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
-+ * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
-  * Copyright (C) 2007 Murray Cumming <murrayc@murrayc-desktop>
-  * Copyright (C) 2009 Bas Driessen <bas.driessen@xobas.com>
-  *
---- a/providers/postgres/gda-postgres-provider.c
-+++ b/providers/postgres/gda-postgres-provider.c
-@@ -6,10 +6,10 @@
-  * Copyright (C) 2003 Akira TAGOH <tagoh@gnome-db.org>
-  * Copyright (C) 2004 - 2005 Alan Knowles <alank@src.gnome.org>
-  * Copyright (C) 2004 Denis Loginov <dloginov@crl.nmsu.edu>
-- * Copyright (C) 2004 José María Casanova Crespo <jmcasanova@igalia.com>
-+ * Copyright (C) 2004 José María Casanova Crespo <jmcasanova@igalia.com>
-  * Copyright (C) 2004 Julio M. Merino Vidal <jmmv@menta.net>
-  * Copyright (C) 2005 - 2009 Bas Driessen <bas.driessen@xobas.com>
-- * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
-+ * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
-  * Copyright (C) 2006 - 2010 Murray Cumming <murrayc@murrayc.com>
-  * Copyright (C) 2007 Armin Burgmeier <armin@openismus.com>
-  * Copyright (C) 2010 David King <davidk@openismus.com>
---- a/providers/postgres/gda-postgres-recordset.c
-+++ b/providers/postgres/gda-postgres-recordset.c
-@@ -9,7 +9,7 @@
-  * Copyright (C) 2004 Szalai Ferenc <szferi@einstein.ki.iif.hu>
-  * Copyright (C) 2004 - 2013 Vivien Malerba <malerba@gnome-db.org>
-  * Copyright (C) 2005 Alex <alex@igalia.com>
-- * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
-+ * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net>
-  * Copyright (C) 2006 - 2011 Murray Cumming <murrayc@murrayc.com>
-  * Copyright (C) 2007 Armin Burgmeier <armin@openismus.com>
-  * Copyright (C) 2010 David King <davidk@openismus.com>
---- a/providers/postgres/gda-postgres-recordset.h
-+++ b/providers/postgres/gda-postgres-recordset.h
-@@ -1,7 +1,7 @@
- /*
-  * Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
-  * Copyright (C) 2000 - 2004 Rodrigo Moya <rodrigo@ximian.com>
-- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
-  * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@gnome-db.org>
-  *
---- a/providers/sqlcipher/libmain.c
-+++ b/providers/sqlcipher/libmain.c
-@@ -1,7 +1,7 @@
- /*
-  * Copyright (C) 2001 - 2002 Gonzalo Paniagua Javier <gonzalo@gnome-db.org>
-  * Copyright (C) 2001 - 2004 Rodrigo Moya <rodrigo@gnome-db.org>
-- * Copyright (C) 2002 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2002 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2005 Bas Driessen <bas.driessen@xobas.com>
-  * Copyright (C) 2005 Stanislav Brabec <sbrabec@suse.de>
-  * Copyright (C) 2005 - 2011 Vivien Malerba <malerba@gnome-db.org>
---- a/providers/sqlite/libmain.c
-+++ b/providers/sqlite/libmain.c
-@@ -1,7 +1,7 @@
- /*
-  * Copyright (C) 2001 - 2002 Gonzalo Paniagua Javier <gonzalo@gnome-db.org>
-  * Copyright (C) 2001 - 2004 Rodrigo Moya <rodrigo@gnome-db.org>
-- * Copyright (C) 2002 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2002 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2005 Bas Driessen <bas.driessen@xobas.com>
-  * Copyright (C) 2005 Stanislav Brabec <sbrabec@suse.de>
-  * Copyright (C) 2005 - 2011 Vivien Malerba <malerba@gnome-db.org>
---- a/tools/browser/dnd.c
-+++ b/tools/browser/dnd.c
-@@ -1,7 +1,7 @@
- /*
-  * Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org>
-  * Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org>
-- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-+ * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org>
-  * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org>
-  * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org>
-  *

diff --git a/java-arch.patch b/java-arch.patch
index 9f27d7f2523bc43c10b3c35fcb3427f560f77921..0cf94bd3a5143354e8999c26250673347182c130 100644 (file)
--- a/java-arch.patch
+++ b/java-arch.patch
@@ -29,15 +29,15 @@
                                String lp2=System.getProperty("java.library.path");
                                System.out.println(lp1+":"+lp2);
                        }
---- libgda-5.2.1/m4/java.m4~   2013-10-19 14:35:27.000000000 +0200
-+++ libgda-5.2.1/m4/java.m4    2013-12-01 10:07:36.001317264 +0100
-@@ -213,9 +213,9 @@
+--- libgda-5.2.9/m4/java.m4.orig       2019-07-02 19:34:15.673428245 +0200
++++ libgda-5.2.9/m4/java.m4    2019-07-02 19:36:58.065881823 +0200
+@@ -221,9 +221,9 @@
                            JAVA_LD_PATH=
                            ;;
                        *)
 -                          RUN_JAVA(JAVA_LIBS, [-classpath ${srcdir} getsp -libs])
 +                          RUN_JAVA(JAVA_LIBS, [-classpath ${srcdir} getsp -libs ${_JAVA_SUFFIX}])
-                           JAVA_LIBS="${JAVA_LIBS} -ljvm"
+                           JAVA_LIBS="${JAVA_LIBS} -L${JAVA_HOME}/lib/server -ljvm"
 -                          RUN_JAVA(JAVA_LD_PATH, [-classpath ${srcdir} getsp -ldpath])
 +                          RUN_JAVA(JAVA_LD_PATH, [-classpath ${srcdir} getsp -ldpath ${_JAVA_SUFFIX}])
                            ;;

diff --git a/libgda5-db.patch b/libgda5-db.patch
new file mode 100644 (file)
index 0000000..8f1c668
--- /dev/null
+++ b/libgda5-db.patch
@@ -0,0 +1,11 @@
+--- libgda-5.2.9/m4/bdb.m4.orig        2019-03-18 01:56:22.000000000 +0100
++++ libgda-5.2.9/m4/bdb.m4     2019-07-02 20:48:51.682512956 +0200
+@@ -128,7 +128,7 @@
+       do
+           bdbdir=""
+           AC_MSG_CHECKING([for Berkeley DB files in $d])
+-          for version in "" 6.0 5.3 5.1 5.0 4.9 4.8 4.7
++          for version in "" 6.1 6.0 5.3 5.1 5.0 4.9 4.8 4.7
+           do
+               if test $platform_win32 = yes
+               then

diff --git a/libgda5-format.patch b/libgda5-format.patch
deleted file mode 100644 (file)
index bb5f4e4..0000000
--- a/libgda5-format.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgda-5.2.0/libgda-ui/demos/ddl_queries.c.orig    2013-10-19 14:35:28.000000000 +0200
-+++ libgda-5.2.0/libgda-ui/demos/ddl_queries.c 2013-11-15 17:05:25.348494222 +0100
-@@ -478,7 +478,7 @@
- 
-               dlg = gtk_message_dialog_new_with_markup (GTK_WINDOW (data->top_window),
-                                                         GTK_DIALOG_MODAL,
--                                                        msg_type, GTK_BUTTONS_CLOSE, msg);
-+                                                        msg_type, GTK_BUTTONS_CLOSE, "%s", msg);
-               g_free (sql);
-               g_free (msg);
- 

diff --git a/libgda5.spec b/libgda5.spec
index dd680e93add475ccec6eef11f245f20c0069bf1a..ffd2287d519fcf7418408e1b64e1d01caa5143e1 100644 (file)
--- a/libgda5.spec
+++ b/libgda5.spec
@@ -1,8 +1,7 @@
-# TODO:
-# - glade catalog?
 #
 # Conditional build:
 %bcond_without apidocs         # API documentation
+%bcond_without glade           # Glade catalog
 %bcond_without static_libs     # static libraries build
 %bcond_without vala            # Vala APIs and GdaData C library
 # - database plugins:
@@ -22,34 +21,31 @@
 Summary:       GNU Data Access library
 Summary(pl.UTF-8):     Biblioteka GNU Data Access
 Name:          libgda5
-Version:       5.2.4
-Release:       12
+Version:       5.2.9
+Release:       1
 License:       LGPL v2+/GPL v2+
 Group:         Libraries
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/libgda/5.2/libgda-%{version}.tar.xz
-# Source0-md5: d008c9e9af2e9cd35dfe550cfbfd99d6
+# Source0-md5: 29bfbf4787a05a150fc506a7e1f38523
 Patch0:                %{name}-configure.patch
 Patch1:                %{name}-oracle.patch
 Patch2:                %{name}-missing.patch
-Patch3:                %{name}-format.patch
+Patch3:                %{name}-db.patch
 Patch4:                %{name}-yelp.patch
 Patch5:                java-arch.patch
 Patch6:                java8.patch
-Patch7:                vapigen-detect.patch
 Patch8:                %{name}-sqlite.patch
-Patch9:                convert-files-to-unicode.patch
-Patch10:       openssl.patch
-URL:           http://www.gnome-db.org/
+URL:           https://www.gnome-db.org/
 %{?with_firebird:BuildRequires:        Firebird-devel}
 BuildRequires: autoconf >= 2.68
 BuildRequires: automake >= 1:1.11.1
-BuildRequires: bison
-BuildRequires: db-devel
-%{?with_dbsql:BuildRequires:   db-sql-devel}
+BuildRequires: db-devel >= 4.7
+%{?with_dbsql:BuildRequires:   db-sql-devel >= 4.7}
 BuildRequires: docbook-dtd412-xml
-BuildRequires: flex
 BuildRequires: gdk-pixbuf2-devel >= 2.0
 BuildRequires: gettext-tools
+# pkgconfig(gladeui-2.0)
+%{?with_glade:BuildRequires:   glade-devel >= 3.0}
 BuildRequires: glib2-devel >= 1:2.32.0
 BuildRequires: glibc-misc
 BuildRequires: gobject-introspection-devel >= 1.30.0
@@ -60,14 +56,12 @@ BuildRequires:      gtk-doc >= 1.14
 BuildRequires: gtksourceview3-devel >= 3.0
 BuildRequires: intltool >= 0.40.6
 BuildRequires: iso-codes
-%{?with_jdbc:BuildRequires:    jdk}
+%{?with_jdbc:BuildRequires:    jdk >= 1.5}
 BuildRequires: json-glib-devel
 BuildRequires: libgcrypt-devel >= 1.1.42
-%{?with_vala:BuildRequires:    libgee-devel >= 0.8.0}
 BuildRequires: libsecret-devel
 BuildRequires: libsoup-devel >= 2.24.0
 BuildRequires: libtool >= 2:2.2.6
-BuildRequires: libunique-devel
 BuildRequires: libxml2-devel >= 1:2.6.26
 BuildRequires: libxslt-devel >= 1.1.17
 %{?with_mdb:BuildRequires:     mdbtools-devel >= 0.6-0.pre1.7}
@@ -81,7 +75,7 @@ BuildRequires:        pkgconfig >= 1:0.18
 BuildRequires: python
 BuildRequires: readline-devel >= 5.0
 BuildRequires: rpmbuild(macros) >= 1.601
-BuildRequires: sqlite3-devel >= 3.6.11
+BuildRequires: sqlite3-devel >= 3.10.2
 BuildRequires: tar >= 1:1.22
 %{?with_vala:BuildRequires:    vala >= 2:0.26.0}
 BuildRequires: xz
@@ -351,6 +345,7 @@ Summary:    GDA SQLite provider
 Summary(pl.UTF-8):     Źródło danych SQLite dla GDA
 Group:         Libraries
 Requires:      %{name} = %{version}-%{release}
+Requires:      sqlite3 >= 3.10.2
 
 %description provider-sqlite
 This package contains the GDA SQLite provider.
@@ -384,6 +379,19 @@ Graphical tools for GDA.
 %description tools -l pl.UTF-8
 Narzędzia graficzne dla GDA.
 
+%package glade
+Summary:       libgda catalog file and icons for Glade
+Summary(pl.UTF-8):     Plik katalogu oraz ikony libgda dla Glade
+Group:         X11/Development/Libraries
+Requires:      %{name}-devel = %{version}-%{release}
+Requires:      glade >= 3
+
+%description glade
+libgda catalog file and icons for Glade.
+
+%description glade -l pl.UTF-8
+Plik katalogu oraz ikony libgda dla Glade.
+
 %prep
 %setup -q -n libgda-%{version}
 %patch0 -p1
@@ -393,10 +401,7 @@ Narzędzia graficzne dla GDA.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
 %patch8 -p1
-%patch9 -p1
-%patch10 -p1
 
 %build
 # included version is bash-specific, use system file
@@ -458,9 +463,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %{!?with_apidocs:rm -rf $RPM_BUILD_ROOT%{_gtkdocdir}}
 
-# outdated version of sr@latin
-%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/sr@Latn
-
 %py_comp $RPM_BUILD_ROOT%{_datadir}/libgda-5.0/gda_trml2html
 %py_comp $RPM_BUILD_ROOT%{_datadir}/libgda-5.0/gda_trml2pdf
 %py_ocomp $RPM_BUILD_ROOT%{_datadir}/libgda-5.0/gda_trml2html
@@ -499,14 +501,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %ghost %{_libdir}/libgda-report-5.0.so.4
 %attr(755,root,root) %{_libdir}/libgda-xslt-5.0.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgda-xslt-5.0.so.4
-%if %{with vala}
-%attr(755,root,root) %{_libdir}/libgdadata-5.0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgdadata-5.0.so.0
-%endif
 %{_libdir}/girepository-1.0/Gda-5.0.typelib
-%if %{with vala}
-%{_libdir}/girepository-1.0/GdaData-5.0.typelib
-%endif
 %dir %{_libdir}/libgda-5.0
 %dir %{_libdir}/libgda-5.0/providers
 %dir %{_datadir}/libgda-5.0
@@ -532,13 +527,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libgda-5.0.so
 %attr(755,root,root) %{_libdir}/libgda-report-5.0.so
 %attr(755,root,root) %{_libdir}/libgda-xslt-5.0.so
-%if %{with vala}
-%attr(755,root,root) %{_libdir}/libgdadata-5.0.so
-%endif
 %{_datadir}/gir-1.0/Gda-5.0.gir
-%if %{with vala}
-%{_datadir}/gir-1.0/GdaData-5.0.gir
-%endif
 %{_includedir}/libgda-5.0
 %{_pkgconfigdir}/libgda-5.0.pc
 %{_pkgconfigdir}/libgda-bdb-5.0.pc
@@ -555,7 +544,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_pkgconfigdir}/libgda-sqlite-5.0.pc
 %{_pkgconfigdir}/libgda-xslt-5.0.pc
 %{_pkgconfigdir}/libgda-web-5.0.pc
-%{?with_vala:%{_pkgconfigdir}/libgdadata-5.0.pc}
 
 %if %{with static_libs}
 %files static
@@ -563,15 +551,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgda-5.0.a
 %{_libdir}/libgda-report-5.0.a
 %{_libdir}/libgda-xslt-5.0.a
-%if %{with vala}
-%{_libdir}/libgdadata-5.0.a
-%endif
 %endif
 
 %if %{with vala}
 %files -n vala-libgda5
 %defattr(644,root,root,755)
-%{_datadir}/vala/vapi/gdadata-5.0.vapi
 %{_datadir}/vala/vapi/libgda-5.0.vapi
 %endif
 
@@ -601,7 +585,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with vala}
 %files -n vala-libgda5-ui
 %defattr(644,root,root,755)
-%{_datadir}/vala/vapi/libgdaui-5.0.vapi
+%{_datadir}/vala/vapi/libgda-ui-5.0.vapi
 %endif
 
 %if %{with apidocs}
@@ -701,3 +685,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_desktopdir}/gda-control-center-5.0.desktop
 %{_pixmapsdir}/gda-browser-5.0.png
 %{_iconsdir}/hicolor/*/apps/gda-control-center.png
+
+%if %{with glade}
+%files glade
+%defattr(644,root,root,755)
+%{_datadir}/glade/catalogs/gdaui-catalog.xml
+%{_datadir}/glade/pixmaps/widget-gdaui-gdauibasicform.png
+%{_datadir}/glade/pixmaps/widget-gdaui-gdauicombo.png
+%{_datadir}/glade/pixmaps/widget-gdaui-gdauigrid.png
+%{_datadir}/glade/pixmaps/widget-gdaui-gdauilogin.png
+%{_datadir}/glade/pixmaps/widget-gdaui-gdauirawgrid.png
+%endif

diff --git a/openssl.patch b/openssl.patch
deleted file mode 100644 (file)
index 61906bd..0000000
--- a/openssl.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- libgda-5.2.4/providers/sqlcipher/sqlite3.c.org     2015-06-13 11:10:56.000000000 +0200
-+++ libgda-5.2.4/providers/sqlcipher/sqlite3.c 2018-09-20 13:39:30.385033922 +0200
-@@ -15696,14 +15696,16 @@ static int sqlcipher_openssl_random (voi
- }
- 
- static int sqlcipher_openssl_hmac(void *ctx, unsigned char *hmac_key, int key_sz, unsigned char *in, int in_sz, unsigned char *in2, int in2_sz, unsigned char *out) {
--  HMAC_CTX hctx;
-+  HMAC_CTX *hctx;
-   unsigned int outlen;
--  HMAC_CTX_init(&hctx);
--  HMAC_Init_ex(&hctx, hmac_key, key_sz, EVP_sha1(), NULL);
--  HMAC_Update(&hctx, in, in_sz);
--  HMAC_Update(&hctx, in2, in2_sz);
--  HMAC_Final(&hctx, out, &outlen);
--  HMAC_CTX_cleanup(&hctx);
-+  hctx = HMAC_CTX_new();
-+  if (hctx == NULL)
-+    return SQLITE_NOMEM;
-+  HMAC_Init_ex(hctx, hmac_key, key_sz, EVP_sha1(), NULL);
-+  HMAC_Update(hctx, in, in_sz);
-+  HMAC_Update(hctx, in2, in2_sz);
-+  HMAC_Final(hctx, out, &outlen);
-+  HMAC_CTX_free(hctx);
-   return SQLITE_OK; 
- }
- 
-@@ -15713,18 +15715,21 @@ static int sqlcipher_openssl_kdf(void *c
- }
- 
- static int sqlcipher_openssl_cipher(void *ctx, int mode, unsigned char *key, int key_sz, unsigned char *iv, unsigned char *in, int in_sz, unsigned char *out) {
--  EVP_CIPHER_CTX ectx;
-+  EVP_CIPHER_CTX *ectx;
-   int tmp_csz, csz;
-  
--  EVP_CipherInit(&ectx, ((openssl_ctx *)ctx)->evp_cipher, NULL, NULL, mode);
--  EVP_CIPHER_CTX_set_padding(&ectx, 0); // no padding
--  EVP_CipherInit(&ectx, NULL, key, iv, mode);
--  EVP_CipherUpdate(&ectx, out, &tmp_csz, in, in_sz);
-+  ectx = EVP_CIPHER_CTX_new();
-+  if (ectx == NULL)
-+    return SQLITE_NOMEM;
-+  EVP_CipherInit(ectx, ((openssl_ctx *)ctx)->evp_cipher, NULL, NULL, mode);
-+  EVP_CIPHER_CTX_set_padding(ectx, 0); // no padding
-+  EVP_CipherInit(ectx, NULL, key, iv, mode);
-+  EVP_CipherUpdate(ectx, out, &tmp_csz, in, in_sz);
-   csz = tmp_csz;  
-   out += tmp_csz;
--  EVP_CipherFinal(&ectx, out, &tmp_csz);
-+  EVP_CipherFinal(ectx, out, &tmp_csz);
-   csz += tmp_csz;
--  EVP_CIPHER_CTX_cleanup(&ectx);
-+  EVP_CIPHER_CTX_free(ectx);
-   assert(in_sz == csz);
-   return SQLITE_OK; 
- }

diff --git a/vapigen-detect.patch b/vapigen-detect.patch
deleted file mode 100644 (file)
index eb877ea..0000000
--- a/vapigen-detect.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgda-5.2.4/configure.ac~ 2015-06-13 11:07:23.000000000 +0200
-+++ libgda-5.2.4/configure.ac  2016-05-05 19:21:21.587028339 +0200
-@@ -550,7 +550,7 @@
-       AM_PROG_VALAC([0.26.0])
-       if test "x$VALA_API_VERSION" = "x"
-       then
--              VAPIGEN_CHECK([0.26.0],[0.26],,no)
-+              VAPIGEN_CHECK([0.26.0],,,no)
-               vala_api="0.26 (Default)"
-       else
-               VAPIGEN_CHECK([0.26.0],$VALA_API_VERSION,,no)