r53425 - in /packages/unstable/libgda5/debian: changelog patches/0001-Convert-files-to-Unicode.patch patches/glib-2.54-ftbfs.patch patches/series
jordi at users.alioth.debian.org
jordi at users.alioth.debian.org
Mon Sep 4 00:13:07 UTC 2017
Author: jordi
Date: Mon Sep 4 00:13:06 2017
New Revision: 53425
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=53425
Log:
Add patches from Adrian Bunk to fix FTBFS issues with new glib,
by converting files with mixed encoding to UTF-8 (closes: #870741).
Added:
packages/unstable/libgda5/debian/patches/0001-Convert-files-to-Unicode.patch
packages/unstable/libgda5/debian/patches/glib-2.54-ftbfs.patch
Modified:
packages/unstable/libgda5/debian/changelog
packages/unstable/libgda5/debian/patches/series
Modified: packages/unstable/libgda5/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgda5/debian/changelog?rev=53425&op=diff
==============================================================================
--- packages/unstable/libgda5/debian/changelog [utf-8] (original)
+++ packages/unstable/libgda5/debian/changelog [utf-8] Mon Sep 4 00:13:06 2017
@@ -1,6 +1,11 @@
libgda5 (5.2.4-4) UNRELEASED; urgency=medium
+ [ Emilio Pozuelo Monfort ]
* debian/rules: If the test suite fails, print the actual errors.
+
+ [ Jordi Mallach ]
+ * Add patches from Adrian Bunk to fix FTBFS issues with new glib,
+ by converting files with mixed encoding to UTF-8 (closes: #870741).
-- Emilio Pozuelo Monfort <pochu at debian.org> Sun, 20 Nov 2016 21:07:10 +0100
Added: packages/unstable/libgda5/debian/patches/0001-Convert-files-to-Unicode.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgda5/debian/patches/0001-Convert-files-to-Unicode.patch?rev=53425&op=file
==============================================================================
--- packages/unstable/libgda5/debian/patches/0001-Convert-files-to-Unicode.patch (added)
+++ packages/unstable/libgda5/debian/patches/0001-Convert-files-to-Unicode.patch [utf-8] Mon Sep 4 00:13:06 2017
@@ -0,0 +1,83 @@
+From b611c805b3a2248e2f4f85f993f96c13a05b4730 Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi at gnome.org>
+Date: Mon, 17 Jul 2017 22:37:50 +0100
+Subject: Convert files to Unicode
+
+These header files have mixed encoding, and makes various tools choke on
+them.
+---
+ libgda/gda-connection.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 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/libgda/gda-connection.h b/libgda/gda-connection.h
+index 94d1b27b5..19ca63fc3 100644
+--- a/libgda/gda-connection.h
++++ b/libgda/gda-connection.h
+@@ -6,7 +6,7 @@
+ * Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <gonzalo at ximian.com>
+ * Copyright (C) 2003 Filip Van Raemdonck <mechanix at debian.org>
+ * Copyright (C) 2004 - 2005 Alan Knowles <alank at src.gnome.org>
+- * Copyright (C) 2004 Jos� Mar�a Casanova Crespo <jmcasanova at igalia.com>
++ * Copyright (C) 2004 José María Casanova Crespo <jmcasanova at igalia.com>
+ * Copyright (C) 2005 - 2009 Bas Driessen <bas.driessen at xobas.com>
+ * Copyright (C) 2006 - 2008 Murray Cumming <murrayc at murrayc.com>
+ * Copyright (C) 2007 Leonardo Boshell <lb at kmc.com.co>
+diff --git a/libgda/sql-parser/gda-sql-statement.h b/libgda/sql-parser/gda-sql-statement.h
+index 0ba1f9edc..8783ca8a1 100644
+--- 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 at src.gnome.org>
+ * Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo at gnome-db.org>
+- * Copyright (C) 2001 Carlos Perell� Mar�n <carlos at gnome-db.org>
++ * Copyright (C) 2001 Carlos Perelló Marín <carlos at gnome-db.org>
+ * Copyright (C) 2001 - 2011 Vivien Malerba <malerba at gnome-db.org>
+ * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo at src.gnome.org>
+ * Copyright (C) 2011 Murray Cumming <murrayc at murrayc.com>
+diff --git a/libgda/sql-parser/gda-statement-struct-delete.h b/libgda/sql-parser/gda-statement-struct-delete.h
+index cab8b9dad..2e51c5eae 100644
+--- 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 at src.gnome.org>
+ * Copyright (C) 2005 - 2011 Vivien Malerba <malerba at gnome-db.org>
+- * Copyright (C) 2005 �lvaro Pe�a <alvaropg at telefonica.net>
++ * Copyright (C) 2005 Álvaro Peña <alvaropg at telefonica.net>
+ * Copyright (C) 2007 Armin Burgmeier <armin at openismus.com>
+ * Copyright (C) 2007 - 2009 Murray Cumming <murrayc at murrayc.com>
+ *
+diff --git a/libgda/sql-parser/gda-statement-struct-unknown.h b/libgda/sql-parser/gda-statement-struct-unknown.h
+index 5c530d4d9..e0aaf945f 100644
+--- 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 at src.gnome.org>
+ * Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo at gnome-db.org>
+- * Copyright (C) 2001 Carlos Perell� Mar�n <carlos at gnome-db.org>
++ * Copyright (C) 2001 Carlos Perelló Marín <carlos at gnome-db.org>
+ * Copyright (C) 2001 - 2011 Vivien Malerba <malerba at gnome-db.org>
+ * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo at src.gnome.org>
+ * Copyright (C) 2009 Murray Cumming <murrayc at murrayc.com>
+diff --git a/libgda/sql-parser/gda-statement-struct-util.h b/libgda/sql-parser/gda-statement-struct-util.h
+index cd4596281..252d6edcc 100644
+--- 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 at src.gnome.org>
+ * Copyright (C) 2005 - 2011 Vivien Malerba <malerba at gnome-db.org>
+- * Copyright (C) 2005 �lvaro Pe�a <alvaropg at telefonica.net>
++ * Copyright (C) 2005 Álvaro Peña <alvaropg at telefonica.net>
+ * Copyright (C) 2007 - 2009 Murray Cumming <murrayc at murrayc.com>
+ *
+ * This library is free software; you can redistribute it and/or
+--
+2.11.0
+
Added: packages/unstable/libgda5/debian/patches/glib-2.54-ftbfs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgda5/debian/patches/glib-2.54-ftbfs.patch?rev=53425&op=file
==============================================================================
--- packages/unstable/libgda5/debian/patches/glib-2.54-ftbfs.patch (added)
+++ packages/unstable/libgda5/debian/patches/glib-2.54-ftbfs.patch [utf-8] Mon Sep 4 00:13:06 2017
@@ -0,0 +1,103 @@
+Description: Fix FTBFS with glib 2.54
+ glib-mkenums now expects input files to be UTF-8,
+ fix the encoding of libgnomeui/gnome-scores.h
+Author: Adrian Bunk <bunk at debian.org>
+
+--- libgda5-5.2.4.orig/libgda/gda-column.h
++++ libgda5-5.2.4/libgda/gda-column.h
+@@ -1,6 +1,6 @@
+ /*
+ * Copyright (C) 2005 - 2011 Vivien Malerba <malerba at gnome-db.org>
+- * Copyright (C) 2005 �lvaro Pe�a <alvaropg at telefonica.net>
++ * Copyright (C) 2005 Álvaro Peña <alvaropg at telefonica.net>
+ * Copyright (C) 2008 Przemysław Grzegorczyk <pgrzegorczyk at gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+--- libgda5-5.2.4.orig/libgda/gda-data-model-extra.h
++++ libgda5-5.2.4/libgda/gda-data-model-extra.h
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2001 Carlos Perell� Mar�n <carlos at gnome-db.org>
++ * Copyright (C) 2001 Carlos Perelló Marín <carlos at gnome-db.org>
+ * Copyright (C) 2001 - 2003 Rodrigo Moya <rodrigo at gnome-db.org>
+ * Copyright (C) 2001 - 2011 Vivien Malerba <malerba at gnome-db.org>
+ * Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <gonzalo at gnome-db.org>
+--- libgda5-5.2.4.orig/libgda/gda-data-model-iter-extra.h
++++ libgda5-5.2.4/libgda/gda-data-model-iter-extra.h
+@@ -1,7 +1,7 @@
+ /*
+ * Copyright (C) 2000 Reinhard Müller <reinhard at src.gnome.org>
+ * Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo at gnome-db.org>
+- * Copyright (C) 2001 Carlos Perell� Mar�n <carlos at gnome-db.org>
++ * Copyright (C) 2001 Carlos Perelló Marín <carlos at gnome-db.org>
+ * Copyright (C) 2001 - 2011 Vivien Malerba <malerba at gnome-db.org>
+ * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo at src.gnome.org>
+ *
+--- libgda5-5.2.4.orig/libgda/gda-data-model.h
++++ libgda5-5.2.4/libgda/gda-data-model.h
+@@ -4,7 +4,7 @@
+ * Copyright (C) 2003 Laurent Sansonetti <lrz at gnome.org>
+ * Copyright (C) 2005 Dan Winship <danw at src.gnome.org>
+ * Copyright (C) 2005 - 2012 Vivien Malerba <malerba at gnome-db.org>
+- * Copyright (C) 2005 �lvaro Pe�a <alvaropg at telefonica.net>
++ * Copyright (C) 2005 Álvaro Peña <alvaropg at telefonica.net>
+ * Copyright (C) 2007 Murray Cumming <murrayc at murrayc.com>
+ * Copyright (C) 2011 Daniel Espinosa <despinosa at src.gnome.org>
+ *
+--- libgda5-5.2.4.orig/libgda/gda-mutex.h
++++ libgda5-5.2.4/libgda/gda-mutex.h
+@@ -1,7 +1,7 @@
+ /*
+ * Copyright (C) 2000 Reinhard Müller <reinhard at src.gnome.org>
+ * Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo at gnome-db.org>
+- * Copyright (C) 2001 Carlos Perell� Mar�n <carlos at gnome-db.org>
++ * Copyright (C) 2001 Carlos Perelló Marín <carlos at gnome-db.org>
+ * Copyright (C) 2001 - 2013 Vivien Malerba <malerba at gnome-db.org>
+ * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo at src.gnome.org>
+ *
+--- libgda5-5.2.4.orig/libgda/gda-row.h
++++ libgda5-5.2.4/libgda/gda-row.h
+@@ -3,10 +3,10 @@
+ * Copyright (C) 2001 - 2011 Vivien Malerba <malerba at gnome-db.org>
+ * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo at gnome-db.org>
+ * Copyright (C) 2003 Laurent Sansonetti <laurent at datarescue.be>
+- * Copyright (C) 2003 Xabier Rodr�guez Calvar <xrcalvar at igalia.com>
++ * Copyright (C) 2003 Xabier Rodríguez Calvar <xrcalvar at igalia.com>
+ * Copyright (C) 2004 Paisa Seeluangsawat <paisa at users.sf.net>
+ * Copyright (C) 2005 Bas Driessen <bas.driessen at xobas.com>
+- * Copyright (C) 2005 �lvaro Pe�a <alvaropg at telefonica.net>
++ * Copyright (C) 2005 Álvaro Peña <alvaropg at telefonica.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+--- libgda5-5.2.4.orig/libgda/gda-server-provider-private.h
++++ libgda5-5.2.4/libgda/gda-server-provider-private.h
+@@ -1,7 +1,7 @@
+ /*
+ * Copyright (C) 2005 Dan Winship <danw at src.gnome.org>
+ * Copyright (C) 2005 - 2011 Vivien Malerba <malerba at gnome-db.org>
+- * Copyright (C) 2005 �lvaro Pe�a <alvaropg at telefonica.net>
++ * Copyright (C) 2005 Álvaro Peña <alvaropg at telefonica.net>
+ * Copyright (C) 2007 Murray Cumming <murrayc at murrayc.com>
+ *
+ * This library is free software; you can redistribute it and/or
+--- libgda5-5.2.4.orig/libgda/gda-util.h
++++ libgda5-5.2.4/libgda/gda-util.h
+@@ -1,7 +1,7 @@
+ /*
+ * Copyright (C) 2000 Reinhard Müller <reinhard at src.gnome.org>
+ * Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo at gnome-db.org>
+- * Copyright (C) 2001 Carlos Perell� Mar�n <carlos at gnome-db.org>
++ * Copyright (C) 2001 Carlos Perelló Marín <carlos at gnome-db.org>
+ * Copyright (C) 2001 - 2013 Vivien Malerba <malerba at gnome-db.org>
+ * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo at src.gnome.org>
+ * Copyright (C) 2006 - 2007 Murray Cumming <murrayc at murrayc.com>
+--- libgda5-5.2.4.orig/libgda/libgda-global-variables.h
++++ libgda5-5.2.4/libgda/libgda-global-variables.h
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2001 Carlos Perell� Mar�n <carlos at gnome-db.org>
++ * Copyright (C) 2001 Carlos Perelló Marín <carlos at gnome-db.org>
+ * Copyright (C) 2001 - 2003 Rodrigo Moya <rodrigo at gnome-db.org>
+ * Copyright (C) 2001 - 2011 Vivien Malerba <malerba at gnome-db.org>
+ * Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <gonzalo at gnome-db.org>
Modified: packages/unstable/libgda5/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgda5/debian/patches/series?rev=53425&op=diff
==============================================================================
--- packages/unstable/libgda5/debian/patches/series [utf-8] (original)
+++ packages/unstable/libgda5/debian/patches/series [utf-8] Mon Sep 4 00:13:06 2017
@@ -1,2 +1,4 @@
01-link-sqlite-provider-against-sqlite3.patch
Accept-SQLITE_INDEX_CONSTRAINT_LIKE-from-sqlite.patch
+0001-Convert-files-to-Unicode.patch
+glib-2.54-ftbfs.patch
More information about the pkg-gnome-commits
mailing list