From: Andrea Zagli <azagli@libero.it>
Date: Mon, 23 May 2016 15:09:02 +0000 (+0200)
Subject: Debian package: adjustments for wheezy.
X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=360fd28aa9455e789e3ce03d5f31b71885c95410;p=libgdaex

Debian package: adjustments for wheezy.
---

diff --git a/debian/patches/0002-Glib-old-version.patch b/debian/patches/0002-Glib-old-version.patch
new file mode 100644
index 0000000..08c0aae
--- /dev/null
+++ b/debian/patches/0002-Glib-old-version.patch
@@ -0,0 +1,34 @@
+From: Andrea Zagli <azagli@libero.it>
+Date: Mon, 23 May 2016 16:26:40 +0200
+Subject: Glib old version.
+
+---
+ configure.ac   | 2 +-
+ libgdaex.pc.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0f4b99a..74ac3a4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -47,7 +47,7 @@ AM_GLIB_GNU_GETTEXT
+ # Checks for libraries.
+ PKG_CHECK_MODULES(GDAEX, [gmodule-2.0 >= 2
+                           libgda-5.0 >= 5
+-                          gio-2.0 >= 2.36
++                          gio-2.0 >= 2.32
+                           gtk+-3.0 >= 3
+ 						  libxml-2.0 >= 2
+ 						  libzakutils])
+diff --git a/libgdaex.pc.in b/libgdaex.pc.in
+index 7f64fdf..a61eda9 100644
+--- a/libgdaex.pc.in
++++ b/libgdaex.pc.in
+@@ -7,6 +7,6 @@ modulesdir=@libdir@/@PACKAGE@/modules
+ Name: @PACKAGE_NAME@
+ Description: A libgda's "subclass"
+ Version: @PACKAGE_VERSION@
+-Requires: libgda-5.0 gio-2.0 >= 2.36 gtk+-3.0
++Requires: libgda-5.0 gio-2.0 >= 2.32 gtk+-3.0 libxml-2.0 libzakutils
+ Libs: -L${libdir} -lgdaex
+ Cflags: -I${includedir}
diff --git a/debian/patches/0003-Gda-old-version-constants-not-present.patch b/debian/patches/0003-Gda-old-version-constants-not-present.patch
new file mode 100644
index 0000000..82ddf22
--- /dev/null
+++ b/debian/patches/0003-Gda-old-version-constants-not-present.patch
@@ -0,0 +1,22 @@
+From: Andrea Zagli <azagli@libero.it>
+Date: Mon, 23 May 2016 16:31:13 +0200
+Subject: Gda old version - constants not present.
+
+---
+ src/sqlbuilder.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/sqlbuilder.c b/src/sqlbuilder.c
+index feaf3d6..377eb73 100644
+--- a/src/sqlbuilder.c
++++ b/src/sqlbuilder.c
+@@ -495,9 +495,7 @@ gdaex_sql_builder_where (GdaExSqlBuilder *sqlb, GdaSqlOperatorType op, ...)
+ 				case GDA_SQL_OPERATOR_TYPE_EQ:
+ 				case GDA_SQL_OPERATOR_TYPE_IS:
+ 				case GDA_SQL_OPERATOR_TYPE_LIKE:
+-				case GDA_SQL_OPERATOR_TYPE_NOTLIKE:
+ 				case GDA_SQL_OPERATOR_TYPE_ILIKE:
+-				case GDA_SQL_OPERATOR_TYPE_NOTILIKE:
+ 				case GDA_SQL_OPERATOR_TYPE_GT:
+ 				case GDA_SQL_OPERATOR_TYPE_LT:
+ 				case GDA_SQL_OPERATOR_TYPE_GEQ:
diff --git a/debian/patches/0004-Gtk-old-version-gtk_label_set_xalign.patch b/debian/patches/0004-Gtk-old-version-gtk_label_set_xalign.patch
new file mode 100644
index 0000000..455f42d
--- /dev/null
+++ b/debian/patches/0004-Gtk-old-version-gtk_label_set_xalign.patch
@@ -0,0 +1,22 @@
+From: Andrea Zagli <azagli@libero.it>
+Date: Mon, 23 May 2016 16:53:07 +0200
+Subject: Gtk old version - gtk_label_set_xalign.
+
+---
+ src/queryeditor.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/queryeditor.c b/src/queryeditor.c
+index d08fac3..5c64973 100644
+--- a/src/queryeditor.c
++++ b/src/queryeditor.c
+@@ -4610,8 +4610,7 @@ gdaex_query_editor_on_sel_where_changed (GtkTreeSelection *treeselection,
+ 					                  G_CALLBACK (gdaex_query_editor_on_cb_where_type_changed), user_data);
+ 
+ 					priv->lbl_to = gtk_label_new (_("and"));
+-					gtk_label_set_xalign (GTK_LABEL (priv->lbl_to), 1.0);
+-					gtk_label_set_yalign (GTK_LABEL (priv->lbl_to), 0.5);
++					gtk_misc_set_alignment (GTK_MISC (priv->lbl_to), 1.0, 0.5);
+ 					gtk_grid_attach (GTK_GRID (priv->tbl), priv->lbl_to, 5, 1, 1, 1);
+ 				}
+ 
diff --git a/debian/patches/series b/debian/patches/series
index c779459..bcc36f4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,4 @@
 0001-DESTDIR-support.patch
+0002-Glib-old-version.patch
+0003-Gda-old-version-constants-not-present.patch
+0004-Gtk-old-version-gtk_label_set_xalign.patch